[prev in list] [next in list] [prev in thread] [next in thread]
List: jboss-cvs-commits
Subject: [jboss-cvs] jboss-j2se/src/tests/org/jboss/test/jmx/compliance/openmbean OpenMBeanInfoSupportTestCas
From: Adrian Brock <ejort () users ! sourceforge ! net>
Date: 2005-03-31 23:46:34
Message-ID: E1DH9Mw-0002TC-9g () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]
User: ejort
Date: 05/03/31 15:46:34
Modified: src/tests/org/jboss/test/jmx/compliance/openmbean
OpenMBeanInfoSupportTestCase.java
OpenTypeTestCase.java
OpenMBeanOperationInfoSupportTestCase.java
Log:
More source code tidyup
Revision Changes Path
1.2 +9 -8 \
jboss-j2se/src/tests/org/jboss/test/jmx/compliance/openmbean/OpenMBeanInfoSupportTestCase.java
Index: OpenMBeanInfoSupportTestCase.java
===================================================================
RCS file: /cvsroot/jboss/jboss-j2se/src/tests/org/jboss/test/jmx/compliance/openmbean/OpenMBeanInfoSupportTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OpenMBeanInfoSupportTestCase.java 25 Mar 2005 00:34:20 -0000 1.1
+++ OpenMBeanInfoSupportTestCase.java 31 Mar 2005 23:46:34 -0000 1.2
@@ -17,6 +17,7 @@
import java.util.HashSet;
import java.util.Set;
+import javax.management.MBeanOperationInfo;
import javax.management.MBeanParameterInfo;
import javax.management.MBeanNotificationInfo;
import javax.management.openmbean.OpenMBeanAttributeInfo;
@@ -97,7 +98,7 @@
{
new OpenMBeanOperationInfoSupport(
"name", "description", parms,
- SimpleType.STRING, OpenMBeanOperationInfoSupport.ACTION_INFO)
+ SimpleType.STRING, MBeanOperationInfo.ACTION_INFO)
};
MBeanNotificationInfo[] notifications = new MBeanNotificationInfo[]
{
@@ -137,7 +138,7 @@
{
new OpenMBeanOperationInfoSupport(
"name", "description", parms,
- SimpleType.STRING, OpenMBeanOperationInfoSupport.ACTION_INFO)
+ SimpleType.STRING, MBeanOperationInfo.ACTION_INFO)
};
MBeanNotificationInfo[] notifications = new MBeanNotificationInfo[]
{
@@ -237,7 +238,7 @@
{
new OpenMBeanOperationInfoSupport(
"name2", "description", parms,
- SimpleType.STRING, OpenMBeanOperationInfoSupport.ACTION_INFO)
+ SimpleType.STRING, MBeanOperationInfo.ACTION_INFO)
};
info2 = new OpenMBeanInfoSupport(
@@ -250,10 +251,10 @@
{
new OpenMBeanOperationInfoSupport(
"name2", "description", parms,
- SimpleType.STRING, OpenMBeanOperationInfoSupport.ACTION_INFO),
+ SimpleType.STRING, MBeanOperationInfo.ACTION_INFO),
new OpenMBeanOperationInfoSupport(
"name3", "description", parms,
- SimpleType.STRING, OpenMBeanOperationInfoSupport.ACTION_INFO)
+ SimpleType.STRING, MBeanOperationInfo.ACTION_INFO)
};
info2 = new OpenMBeanInfoSupport(
@@ -321,7 +322,7 @@
{
new OpenMBeanOperationInfoSupport(
"name", "description", parms,
- SimpleType.STRING, OpenMBeanOperationInfoSupport.ACTION_INFO)
+ SimpleType.STRING, MBeanOperationInfo.ACTION_INFO)
};
MBeanNotificationInfo[] notifications = new MBeanNotificationInfo[]
{
@@ -363,7 +364,7 @@
{
new OpenMBeanOperationInfoSupport(
"name", "description", parms,
- SimpleType.STRING, OpenMBeanOperationInfoSupport.ACTION_INFO)
+ SimpleType.STRING, MBeanOperationInfo.ACTION_INFO)
};
MBeanNotificationInfo[] notifications = new MBeanNotificationInfo[]
{
@@ -411,7 +412,7 @@
{
new OpenMBeanOperationInfoSupport(
"name", "description", parms,
- SimpleType.STRING, OpenMBeanOperationInfoSupport.ACTION_INFO)
+ SimpleType.STRING, MBeanOperationInfo.ACTION_INFO)
};
MBeanNotificationInfo[] notifications = new MBeanNotificationInfo[]
{
1.2 +2 -0 \
jboss-j2se/src/tests/org/jboss/test/jmx/compliance/openmbean/OpenTypeTestCase.java
Index: OpenTypeTestCase.java
===================================================================
RCS file: /cvsroot/jboss/jboss-j2se/src/tests/org/jboss/test/jmx/compliance/openmbean/OpenTypeTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OpenTypeTestCase.java 25 Mar 2005 00:34:20 -0000 1.1
+++ OpenTypeTestCase.java 31 Mar 2005 23:46:34 -0000 1.2
@@ -276,6 +276,8 @@
public static class MyOpenType
extends OpenType
{
+ private static final long serialVersionUID = -1;
+
public MyOpenType(String className, String typeName, String description)
throws OpenDataException
{
1.2 +32 -31 \
jboss-j2se/src/tests/org/jboss/test/jmx/compliance/openmbean/OpenMBeanOperationInfoSupportTestCase.java
Index: OpenMBeanOperationInfoSupportTestCase.java
===================================================================
RCS file: /cvsroot/jboss/jboss-j2se/src/tests/org/jboss/test/jmx/compliance/openmbean/OpenMBeanOperationInfoSupportTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OpenMBeanOperationInfoSupportTestCase.java 25 Mar 2005 00:34:20 -0000 1.1
+++ OpenMBeanOperationInfoSupportTestCase.java 31 Mar 2005 23:46:34 -0000 1.2
@@ -16,6 +16,7 @@
import java.util.Arrays;
import java.util.Set;
+import javax.management.MBeanOperationInfo;
import javax.management.openmbean.OpenMBeanParameterInfo;
import javax.management.openmbean.OpenMBeanParameterInfoSupport;
import javax.management.openmbean.OpenMBeanOperationInfoSupport;
@@ -50,23 +51,23 @@
throws Exception
{
OpenMBeanOperationInfoSupport info = new OpenMBeanOperationInfoSupport(
- "name", "description", null, SimpleType.STRING, \
OpenMBeanOperationInfoSupport.ACTION_INFO); + "name", "description", null, \
SimpleType.STRING, MBeanOperationInfo.ACTION_INFO); assertEquals("name", \
info.getName()); assertEquals("description", info.getDescription());
assertEquals(0, info.getSignature().length);
assertEquals("java.lang.String", info.getReturnType());
assertEquals(SimpleType.STRING, info.getReturnOpenType());
- assertEquals(OpenMBeanOperationInfoSupport.ACTION_INFO, info.getImpact());
+ assertEquals(MBeanOperationInfo.ACTION_INFO, info.getImpact());
info = new OpenMBeanOperationInfoSupport(
"name", "description", new OpenMBeanParameterInfoSupport[0],
- SimpleType.STRING, OpenMBeanOperationInfoSupport.ACTION_INFO);
+ SimpleType.STRING, MBeanOperationInfo.ACTION_INFO);
assertEquals("name", info.getName());
assertEquals("description", info.getDescription());
assertEquals(0, info.getSignature().length);
assertEquals("java.lang.String", info.getReturnType());
assertEquals(SimpleType.STRING, info.getReturnOpenType());
- assertEquals(OpenMBeanOperationInfoSupport.ACTION_INFO, info.getImpact());
+ assertEquals(MBeanOperationInfo.ACTION_INFO, info.getImpact());
OpenMBeanParameterInfoSupport[] parms = new OpenMBeanParameterInfoSupport[]
{
@@ -75,13 +76,13 @@
};
info = new OpenMBeanOperationInfoSupport(
"name", "description", parms,
- SimpleType.STRING, OpenMBeanOperationInfoSupport.ACTION_INFO);
+ SimpleType.STRING, MBeanOperationInfo.ACTION_INFO);
assertEquals("name", info.getName());
assertEquals("description", info.getDescription());
assertEquals(1, info.getSignature().length);
assertEquals("java.lang.String", info.getReturnType());
assertEquals(SimpleType.STRING, info.getReturnOpenType());
- assertEquals(OpenMBeanOperationInfoSupport.ACTION_INFO, info.getImpact());
+ assertEquals(MBeanOperationInfo.ACTION_INFO, info.getImpact());
}
public void testReturnOpenType()
@@ -94,7 +95,7 @@
};
OpenMBeanOperationInfoSupport info = new OpenMBeanOperationInfoSupport(
"name", "description", parms,
- SimpleType.BOOLEAN, OpenMBeanOperationInfoSupport.ACTION_INFO);
+ SimpleType.BOOLEAN, MBeanOperationInfo.ACTION_INFO);
assertEquals(SimpleType.BOOLEAN, info.getReturnOpenType());
}
@@ -103,25 +104,25 @@
throws Exception
{
OpenMBeanOperationInfoSupport info = new OpenMBeanOperationInfoSupport(
- "name", "description", null, SimpleType.STRING, \
OpenMBeanOperationInfoSupport.ACTION_INFO); + "name", "description", null, \
SimpleType.STRING, MBeanOperationInfo.ACTION_INFO);
assertTrue("Null should not be equal", info.equals(null) == false);
assertTrue("Only OpenMBeanOperationInfo should be equal", info.equals(new \
Object()) == false);
OpenMBeanOperationInfoSupport info2 = new OpenMBeanOperationInfoSupport(
- "name", "description", null, SimpleType.STRING, \
OpenMBeanOperationInfoSupport.ACTION_INFO); + "name", "description", null, \
SimpleType.STRING, MBeanOperationInfo.ACTION_INFO);
assertTrue("Different instances of the same data are equal", \
info.equals(info2));
assertTrue("Different instances of the same data are equal", \
info2.equals(info));
info2 = new OpenMBeanOperationInfoSupport(
- "name", "description2", null, SimpleType.STRING, \
OpenMBeanOperationInfoSupport.ACTION_INFO); + "name", "description2", null, \
SimpleType.STRING, MBeanOperationInfo.ACTION_INFO);
assertTrue("Different instances with different descriptions are equal", \
info.equals(info2));
assertTrue("Different instances with different descritpions are equal", \
info2.equals(info));
info2 = new OpenMBeanOperationInfoSupport(
- "name2", "description", null, SimpleType.STRING, \
OpenMBeanOperationInfoSupport.ACTION_INFO); + "name2", "description", null, \
SimpleType.STRING, MBeanOperationInfo.ACTION_INFO);
assertTrue("Instances with different names are not equal", \
info.equals(info2) == false);
assertTrue("Instances with different names are not equal", \
info2.equals(info) == false); @@ -133,20 +134,20 @@
info = new OpenMBeanOperationInfoSupport(
"name", "description", new OpenMBeanParameterInfoSupport[] { param1, \
param2 },
- SimpleType.STRING, OpenMBeanOperationInfoSupport.ACTION_INFO);
+ SimpleType.STRING, MBeanOperationInfo.ACTION_INFO);
info2 = new OpenMBeanOperationInfoSupport(
"name", "description", new OpenMBeanParameterInfoSupport[] { param1, \
param2 },
- SimpleType.STRING, OpenMBeanOperationInfoSupport.ACTION_INFO);
+ SimpleType.STRING, MBeanOperationInfo.ACTION_INFO);
assertTrue("Different instances with the same parameters are equal", \
info.equals(info2));
assertTrue("Different instances with the same parameters are equal", \
info2.equals(info));
info = new OpenMBeanOperationInfoSupport(
"name", "description", new OpenMBeanParameterInfoSupport[] { param1, \
param2 },
- SimpleType.STRING, OpenMBeanOperationInfoSupport.ACTION_INFO);
+ SimpleType.STRING, MBeanOperationInfo.ACTION_INFO);
info2 = new OpenMBeanOperationInfoSupport(
"name", "description", new OpenMBeanParameterInfoSupport[] { param2, \
param1 },
- SimpleType.STRING, OpenMBeanOperationInfoSupport.ACTION_INFO);
+ SimpleType.STRING, MBeanOperationInfo.ACTION_INFO);
assertTrue("Different instances with the same signature but different \
parameters are not equal", info.equals(info2) == false);
@@ -157,7 +158,7 @@
"name2", "description", SimpleType.INTEGER);
info2 = new OpenMBeanOperationInfoSupport(
"name", "description", new OpenMBeanParameterInfoSupport[] { param1, \
param2 },
- SimpleType.STRING, OpenMBeanOperationInfoSupport.ACTION_INFO);
+ SimpleType.STRING, MBeanOperationInfo.ACTION_INFO);
assertTrue("Different instances with different signatures are not equal",
info.equals(info2) == false);
@@ -166,7 +167,7 @@
info2 = new OpenMBeanOperationInfoSupport(
"name", "description", new OpenMBeanParameterInfoSupport[] { param1 },
- SimpleType.STRING, OpenMBeanOperationInfoSupport.ACTION_INFO);
+ SimpleType.STRING, MBeanOperationInfo.ACTION_INFO);
assertTrue("Different instances with different numbers of paramters are not \
equal", info.equals(info2) == false);
@@ -175,7 +176,7 @@
info2 = new OpenMBeanOperationInfoSupport(
"name", "description", new OpenMBeanParameterInfoSupport[] { param1, \
param2 },
- SimpleType.INTEGER, OpenMBeanOperationInfoSupport.ACTION_INFO);
+ SimpleType.INTEGER, MBeanOperationInfo.ACTION_INFO);
assertTrue("Different instances with different return types are not equal",
info.equals(info2) == false);
@@ -184,7 +185,7 @@
info2 = new OpenMBeanOperationInfoSupport(
"name", "description", new OpenMBeanParameterInfoSupport[] { param1, \
param2 },
- SimpleType.STRING, OpenMBeanOperationInfoSupport.ACTION);
+ SimpleType.STRING, MBeanOperationInfo.ACTION);
assertTrue("Different instances with different impacts are not equal",
info.equals(info2) == false);
@@ -202,10 +203,10 @@
};
OpenMBeanOperationInfoSupport info = new OpenMBeanOperationInfoSupport(
"name", "description", parms,
- SimpleType.STRING, OpenMBeanOperationInfoSupport.ACTION_INFO);
+ SimpleType.STRING, MBeanOperationInfo.ACTION_INFO);
int myHash = "name".hashCode() + Arrays.asList(parms).hashCode()
- + SimpleType.STRING.hashCode() + \
OpenMBeanOperationInfoSupport.ACTION_INFO; + + \
SimpleType.STRING.hashCode() + MBeanOperationInfo.ACTION_INFO; assertEquals(myHash, \
info.hashCode()); }
@@ -219,7 +220,7 @@
};
OpenMBeanOperationInfoSupport info = new OpenMBeanOperationInfoSupport(
"NAME", "DESCRIPTION", parms,
- SimpleType.INTEGER, OpenMBeanOperationInfoSupport.ACTION_INFO);
+ SimpleType.INTEGER, MBeanOperationInfo.ACTION_INFO);
String toString = info.toString();
@@ -241,7 +242,7 @@
};
OpenMBeanOperationInfoSupport info = new OpenMBeanOperationInfoSupport(
"name", "description", parms,
- SimpleType.STRING, OpenMBeanOperationInfoSupport.ACTION_INFO);
+ SimpleType.STRING, MBeanOperationInfo.ACTION_INFO);
// Serialize it
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -269,7 +270,7 @@
};
new OpenMBeanOperationInfoSupport(
null, "description", parms,
- SimpleType.STRING, OpenMBeanOperationInfoSupport.ACTION_INFO);
+ SimpleType.STRING, MBeanOperationInfo.ACTION_INFO);
}
catch (IllegalArgumentException e)
{
@@ -288,7 +289,7 @@
};
new OpenMBeanOperationInfoSupport(
"", "description", parms,
- SimpleType.STRING, OpenMBeanOperationInfoSupport.ACTION_INFO);
+ SimpleType.STRING, MBeanOperationInfo.ACTION_INFO);
}
catch (IllegalArgumentException e)
{
@@ -307,7 +308,7 @@
};
new OpenMBeanOperationInfoSupport(
"name", null, parms,
- SimpleType.STRING, OpenMBeanOperationInfoSupport.ACTION_INFO);
+ SimpleType.STRING, MBeanOperationInfo.ACTION_INFO);
}
catch (IllegalArgumentException e)
{
@@ -326,7 +327,7 @@
};
new OpenMBeanOperationInfoSupport(
"name", "", parms,
- SimpleType.STRING, OpenMBeanOperationInfoSupport.ACTION_INFO);
+ SimpleType.STRING, MBeanOperationInfo.ACTION_INFO);
}
catch (IllegalArgumentException e)
{
@@ -340,7 +341,7 @@
{
new OpenMBeanOperationInfoSupport(
"name", "description", new MyOpenMBeanParameterInfo[] { new \
MyOpenMBeanParameterInfo() },
- SimpleType.STRING, OpenMBeanOperationInfoSupport.ACTION_INFO);
+ SimpleType.STRING, MBeanOperationInfo.ACTION_INFO);
}
catch (ArrayStoreException e)
{
@@ -359,7 +360,7 @@
};
new OpenMBeanOperationInfoSupport(
"name", "description", parms,
- null, OpenMBeanOperationInfoSupport.ACTION_INFO);
+ null, MBeanOperationInfo.ACTION_INFO);
}
catch (IllegalArgumentException e)
{
@@ -378,7 +379,7 @@
};
new OpenMBeanOperationInfoSupport(
"name", "description", parms,
- SimpleType.VOID, OpenMBeanOperationInfoSupport.ACTION_INFO);
+ SimpleType.VOID, MBeanOperationInfo.ACTION_INFO);
}
catch (IllegalArgumentException e)
{
@@ -416,7 +417,7 @@
};
new OpenMBeanOperationInfoSupport(
"name", "description", parms,
- SimpleType.STRING, OpenMBeanOperationInfoSupport.UNKNOWN);
+ SimpleType.STRING, MBeanOperationInfo.UNKNOWN);
}
catch (IllegalArgumentException e)
{
-------------------------------------------------------
This SF.net email is sponsored by Demarc:
A global provider of Threat Management Solutions.
Download our HomeAdmin security software for free today!
http://www.demarc.com/info/Sentarus/hamr30
_______________________________________________
jboss-cvs-commits mailing list
jboss-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jboss-cvs-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic