[jboss-cvs] JBossAS SVN: r67596 - in trunk/j2se/src/tests/org/jboss/test/jmx/compliance: standard and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Nov 29 05:32:12 EST 2007
Author: adrian at jboss.org
Date: 2007-11-29 05:32:12 -0500 (Thu, 29 Nov 2007)
New Revision: 67596
Modified:
trunk/j2se/src/tests/org/jboss/test/jmx/compliance/openmbean/OpenMBeanAttributeInfoSupportTestCase.java
trunk/j2se/src/tests/org/jboss/test/jmx/compliance/openmbean/OpenMBeanParameterInfoSupportTestCase.java
trunk/j2se/src/tests/org/jboss/test/jmx/compliance/standard/StandardMBeanTEST.java
Log:
Changes in Java6: Generification of OpenMBeanInfo
Modified: trunk/j2se/src/tests/org/jboss/test/jmx/compliance/openmbean/OpenMBeanAttributeInfoSupportTestCase.java
===================================================================
--- trunk/j2se/src/tests/org/jboss/test/jmx/compliance/openmbean/OpenMBeanAttributeInfoSupportTestCase.java 2007-11-29 07:25:46 UTC (rev 67595)
+++ trunk/j2se/src/tests/org/jboss/test/jmx/compliance/openmbean/OpenMBeanAttributeInfoSupportTestCase.java 2007-11-29 10:32:12 UTC (rev 67596)
@@ -34,6 +34,7 @@
import javax.management.openmbean.OpenMBeanAttributeInfoSupport;
import javax.management.openmbean.OpenType;
import javax.management.openmbean.SimpleType;
+import javax.management.openmbean.TabularData;
import javax.management.openmbean.TabularDataSupport;
import javax.management.openmbean.TabularType;
@@ -85,7 +86,7 @@
assertEquals(true, info.hasDefaultValue());
info = new OpenMBeanAttributeInfoSupport(
- "name", "description", SimpleType.STRING, true, true, false, null);
+ "name", "description", SimpleType.STRING, true, true, false, (String) null);
assertEquals("name", info.getName());
assertEquals("description", info.getDescription());
assertEquals("java.lang.String", info.getType());
@@ -193,7 +194,7 @@
info = new OpenMBeanAttributeInfoSupport(
"name", "description", SimpleType.STRING, true, true, false, "default",
- new Object[] { "legal1", "legal2", "default" });
+ new String[] { "legal1", "legal2", "default" });
assertEquals("name", info.getName());
assertEquals("description", info.getDescription());
assertEquals("java.lang.String", info.getType());
@@ -208,7 +209,7 @@
info = new OpenMBeanAttributeInfoSupport(
"name", "description", SimpleType.STRING, true, true, false, null,
- new Object[] { "legal1", "legal2", "default" });
+ new String[] { "legal1", "legal2", "default" });
assertEquals("name", info.getName());
assertEquals("description", info.getDescription());
assertEquals("java.lang.String", info.getType());
@@ -260,7 +261,7 @@
assertEquals(true, info.hasDefaultValue());
info = new OpenMBeanAttributeInfoSupport(
- "name", "description", SimpleType.STRING, true, true, false, null);
+ "name", "description", SimpleType.STRING, true, true, false, (String) null);
assertEquals(false, info.hasDefaultValue());
info = new OpenMBeanAttributeInfoSupport(
@@ -280,7 +281,7 @@
assertEquals(false, info.hasMaxValue());
info = new OpenMBeanAttributeInfoSupport(
- "name", "description", SimpleType.INTEGER, true, true, false, null, new Object[] { new Integer(3) });
+ "name", "description", SimpleType.INTEGER, true, true, false, null, new Integer[] { new Integer(3) });
assertEquals(true, info.hasLegalValues());
info = new OpenMBeanAttributeInfoSupport(
@@ -474,37 +475,37 @@
info = new OpenMBeanAttributeInfoSupport(
"name", "description", SimpleType.INTEGER, true, true, false,
- null, new Object[] { new Integer(2), new Integer(3) });
+ null, new Integer[] { new Integer(2), new Integer(3) });
info2 = new OpenMBeanAttributeInfoSupport(
"name", "description", SimpleType.INTEGER, true, true, false,
- null, new Object[] { new Integer(2), new Integer(3) });
+ null, new Integer[] { new Integer(2), new Integer(3) });
assertTrue("Different instances of the same legal values are equal", info.equals(info2));
assertTrue("Different instances of the same legal values are equal", info2.equals(info));
info = new OpenMBeanAttributeInfoSupport(
"name", "description", SimpleType.INTEGER, true, true, false,
- null, new Object[] { new Integer(2), new Integer(3) });
+ null, new Integer[] { new Integer(2), new Integer(3) });
info2 = new OpenMBeanAttributeInfoSupport(
"name", "description", SimpleType.INTEGER, true, true, false,
- null, new Object[] { new Integer(2), new Integer(4) });
+ null, new Integer[] { new Integer(2), new Integer(4) });
assertTrue("Different instances with different legal values are equal", info.equals(info2) == false);
assertTrue("Different instances with different legal values are equal", info2.equals(info) == false);
info = new OpenMBeanAttributeInfoSupport(
"name", "description", SimpleType.INTEGER, true, true, false,
- null, new Object[] { new Integer(2), new Integer(3) });
+ null, new Integer[] { new Integer(2), new Integer(3) });
info2 = new OpenMBeanAttributeInfoSupport(
"name", "description", SimpleType.INTEGER, true, true, false,
- null, new Object[] { new Integer(2) });
+ null, new Integer[] { new Integer(2) });
assertTrue("Different instances with different legal values are equal", info.equals(info2) == false);
assertTrue("Different instances with different legal values are equal", info2.equals(info) == false);
info = new OpenMBeanAttributeInfoSupport(
"name", "description", SimpleType.INTEGER, true, true, false,
- null, new Object[] { new Integer(2), new Integer(3) });
+ null, new Integer[] { new Integer(2), new Integer(3) });
info2 = new OpenMBeanAttributeInfoSupport(
"name", "description", SimpleType.INTEGER, true, true, false,
null, null);
@@ -524,7 +525,7 @@
assertEquals(myHash, info.hashCode());
info = new OpenMBeanAttributeInfoSupport(
"name", "description", SimpleType.INTEGER, true, true, false, new Integer(3),
- new Object[] { new Integer(2), new Integer(3), new Integer(4) } );
+ new Integer[] { new Integer(2), new Integer(3), new Integer(4) } );
myHash = "name".hashCode() + SimpleType.INTEGER.hashCode() +
new Integer(3).hashCode() + new Integer(2).hashCode() + new Integer(3).hashCode() + new Integer(4).hashCode();
assertEquals(myHash, info.hashCode());
@@ -549,7 +550,7 @@
info = new OpenMBeanAttributeInfoSupport(
"name", "description", SimpleType.INTEGER, true, true, false, new Integer(3),
- new Object[] { new Integer(2), new Integer(3), new Integer(4) } );
+ new Integer[] { new Integer(2), new Integer(3), new Integer(4) } );
assertTrue("info.toString() should contain the legal value 2",
toString.indexOf(new Integer(2).toString()) != -1);
assertTrue("info.toString() should contain the legal value 3",
@@ -578,7 +579,7 @@
info = new OpenMBeanAttributeInfoSupport(
"name", "description", SimpleType.INTEGER, true, true, false, new Integer(3),
- new Object[] { new Integer(2), new Integer(3), new Integer(4) } );
+ new Integer[] { new Integer(2), new Integer(3), new Integer(4) } );
// Serialize it
baos = new ByteArrayOutputStream();
@@ -759,19 +760,6 @@
caught = false;
try
{
- new OpenMBeanAttributeInfoSupport(
- "name", "description", SimpleType.STRING, true, true, false, new Integer(3));
- }
- catch (OpenDataException e)
- {
- caught = true;
- }
- if (caught == false)
- fail("Expected OpenDataException for wrong simple type and default value");
-
- caught = false;
- try
- {
ArrayType arrayType = new ArrayType(1, SimpleType.STRING);
new OpenMBeanAttributeInfoSupport(
"name", "description", arrayType, true, true, false, new String[0]);
@@ -788,7 +776,7 @@
{
ArrayType arrayType = new ArrayType(1, SimpleType.STRING);
new OpenMBeanAttributeInfoSupport(
- "name", "description", arrayType, true, true, false, null);
+ "name", "description", arrayType, true, true, false, (String[]) null);
}
catch (OpenDataException e)
{
@@ -833,7 +821,7 @@
TabularType tabularType = new TabularType("typeName", "description", rowType, indexNames);
new OpenMBeanAttributeInfoSupport(
- "name", "description", tabularType, true, true, false, null);
+ "name", "description", tabularType, true, true, false, (TabularData) null);
}
catch (OpenDataException e)
{
@@ -933,20 +921,6 @@
caught = false;
try
{
- new OpenMBeanAttributeInfoSupport(
- "name", "description", SimpleType.STRING, true, true, false,
- new Integer(3), new Integer[] { new Integer(3), new Integer(4) });
- }
- catch (OpenDataException e)
- {
- caught = true;
- }
- if (caught == false)
- fail("Expected OpenDataException for wrong simple type and default value");
-
- caught = false;
- try
- {
ArrayType arrayType = new ArrayType(1, SimpleType.STRING);
new OpenMBeanAttributeInfoSupport(
"name", "description", arrayType, true, true, false, new String[0], null);
@@ -1089,20 +1063,6 @@
}
if (caught == true)
fail("Didn't expect OpenDataException for tabular type and null default value and empty legals");
-
- caught = false;
- try
- {
- new OpenMBeanAttributeInfoSupport(
- "name", "description", SimpleType.STRING, true, true, false,
- new Integer(3), new Integer[] { new Integer(2), new Integer(4) });
- }
- catch (OpenDataException e)
- {
- caught = true;
- }
- if (caught == false)
- fail("Expected OpenDataException for default value not a legal value");
}
public void testErrors4()
@@ -1191,45 +1151,6 @@
caught = false;
try
{
- new OpenMBeanAttributeInfoSupport(
- "name", "description", SimpleType.STRING, true, true, false, new Integer(3), null, null);
- }
- catch (OpenDataException e)
- {
- caught = true;
- }
- if (caught == false)
- fail("Expected OpenDataException for wrong simple type and default value");
-
- caught = false;
- try
- {
- new OpenMBeanAttributeInfoSupport(
- "name", "description", SimpleType.STRING, true, true, false, null, new Integer(3), null);
- }
- catch (OpenDataException e)
- {
- caught = true;
- }
- if (caught == false)
- fail("Expected OpenDataException for wrong simple type and minimum value");
-
- caught = false;
- try
- {
- new OpenMBeanAttributeInfoSupport(
- "name", "description", SimpleType.STRING, true, true, false, null, null, new Integer(3));
- }
- catch (OpenDataException e)
- {
- caught = true;
- }
- if (caught == false)
- fail("Expected OpenDataException for wrong simple type and maximum value");
-
- caught = false;
- try
- {
ArrayType arrayType = new ArrayType(1, SimpleType.STRING);
new OpenMBeanAttributeInfoSupport(
"name", "description", arrayType, true, true, false, new String[0], null, null);
@@ -1318,20 +1239,6 @@
try
{
new OpenMBeanAttributeInfoSupport(
- "name", "description", SimpleType.STRING, true, true, false,
- new Integer(3), new Integer(4), new Integer(5));
- }
- catch (OpenDataException e)
- {
- caught = true;
- }
- if (caught == false)
- fail("Expected OpenDataException for default value less than minimum value");
-
- caught = false;
- try
- {
- new OpenMBeanAttributeInfoSupport(
"name", "description", SimpleType.INTEGER, true, true, false,
new Integer(4), new Integer(4), new Integer(5));
}
Modified: trunk/j2se/src/tests/org/jboss/test/jmx/compliance/openmbean/OpenMBeanParameterInfoSupportTestCase.java
===================================================================
--- trunk/j2se/src/tests/org/jboss/test/jmx/compliance/openmbean/OpenMBeanParameterInfoSupportTestCase.java 2007-11-29 07:25:46 UTC (rev 67595)
+++ trunk/j2se/src/tests/org/jboss/test/jmx/compliance/openmbean/OpenMBeanParameterInfoSupportTestCase.java 2007-11-29 10:32:12 UTC (rev 67596)
@@ -34,6 +34,7 @@
import javax.management.openmbean.OpenMBeanParameterInfoSupport;
import javax.management.openmbean.OpenType;
import javax.management.openmbean.SimpleType;
+import javax.management.openmbean.TabularData;
import javax.management.openmbean.TabularDataSupport;
import javax.management.openmbean.TabularType;
@@ -79,7 +80,7 @@
assertEquals(true, info.hasDefaultValue());
info = new OpenMBeanParameterInfoSupport(
- "name", "description", SimpleType.STRING, null);
+ "name", "description", SimpleType.STRING, (String) null);
assertEquals("name", info.getName());
assertEquals("description", info.getDescription());
assertEquals("java.lang.String", info.getType());
@@ -160,7 +161,7 @@
info = new OpenMBeanParameterInfoSupport(
"name", "description", SimpleType.STRING, "default",
- new Object[] { "legal1", "legal2", "default" });
+ new String[] { "legal1", "legal2", "default" });
assertEquals("name", info.getName());
assertEquals("description", info.getDescription());
assertEquals("java.lang.String", info.getType());
@@ -172,7 +173,7 @@
info = new OpenMBeanParameterInfoSupport(
"name", "description", SimpleType.STRING, null,
- new Object[] { "legal1", "legal2", "default" });
+ new String[] { "legal1", "legal2", "default" });
assertEquals("name", info.getName());
assertEquals("description", info.getDescription());
assertEquals("java.lang.String", info.getType());
@@ -215,7 +216,7 @@
assertEquals(true, info.hasDefaultValue());
info = new OpenMBeanParameterInfoSupport(
- "name", "description", SimpleType.STRING, null);
+ "name", "description", SimpleType.STRING, (String) null);
assertEquals(false, info.hasDefaultValue());
info = new OpenMBeanParameterInfoSupport(
@@ -235,7 +236,7 @@
assertEquals(false, info.hasMaxValue());
info = new OpenMBeanParameterInfoSupport(
- "name", "description", SimpleType.INTEGER, null, new Object[] { new Integer(3) });
+ "name", "description", SimpleType.INTEGER, null, new Integer[] { new Integer(3) });
assertEquals(true, info.hasLegalValues());
info = new OpenMBeanParameterInfoSupport(
@@ -359,31 +360,31 @@
assertTrue("Instances with different maximums are not equal", info2.equals(info) == false);
info = new OpenMBeanParameterInfoSupport(
- "name", "description", SimpleType.INTEGER, null, new Object[] { new Integer(2), new Integer(3) });
+ "name", "description", SimpleType.INTEGER, null, new Integer[] { new Integer(2), new Integer(3) });
info2 = new OpenMBeanParameterInfoSupport(
- "name", "description", SimpleType.INTEGER, null, new Object[] { new Integer(2), new Integer(3) });
+ "name", "description", SimpleType.INTEGER, null, new Integer[] { new Integer(2), new Integer(3) });
assertTrue("Different instances of the same legal values are equal", info.equals(info2));
assertTrue("Different instances of the same legal values are equal", info2.equals(info));
info = new OpenMBeanParameterInfoSupport(
- "name", "description", SimpleType.INTEGER, null, new Object[] { new Integer(2), new Integer(3) });
+ "name", "description", SimpleType.INTEGER, null, new Integer[] { new Integer(2), new Integer(3) });
info2 = new OpenMBeanParameterInfoSupport(
- "name", "description", SimpleType.INTEGER, null, new Object[] { new Integer(2), new Integer(4) });
+ "name", "description", SimpleType.INTEGER, null, new Integer[] { new Integer(2), new Integer(4) });
assertTrue("Different instances with different legal values are equal", info.equals(info2) == false);
assertTrue("Different instances with different legal values are equal", info2.equals(info) == false);
info = new OpenMBeanParameterInfoSupport(
- "name", "description", SimpleType.INTEGER, null, new Object[] { new Integer(2), new Integer(3) });
+ "name", "description", SimpleType.INTEGER, null, new Integer[] { new Integer(2), new Integer(3) });
info2 = new OpenMBeanParameterInfoSupport(
- "name", "description", SimpleType.INTEGER, null, new Object[] { new Integer(2) });
+ "name", "description", SimpleType.INTEGER, null, new Integer[] { new Integer(2) });
assertTrue("Different instances with different legal values are equal", info.equals(info2) == false);
assertTrue("Different instances with different legal values are equal", info2.equals(info) == false);
info = new OpenMBeanParameterInfoSupport(
- "name", "description", SimpleType.INTEGER, null, new Object[] { new Integer(2), new Integer(3) });
+ "name", "description", SimpleType.INTEGER, null, new Integer[] { new Integer(2), new Integer(3) });
info2 = new OpenMBeanParameterInfoSupport(
"name", "description", SimpleType.INTEGER, null, null);
@@ -402,7 +403,7 @@
assertEquals(myHash, info.hashCode());
info = new OpenMBeanParameterInfoSupport(
"name", "description", SimpleType.INTEGER, new Integer(3),
- new Object[] { new Integer(2), new Integer(3), new Integer(4) } );
+ new Integer[] { new Integer(2), new Integer(3), new Integer(4) } );
myHash = "name".hashCode() + SimpleType.INTEGER.hashCode() +
new Integer(3).hashCode() + new Integer(2).hashCode() + new Integer(3).hashCode() + new Integer(4).hashCode();
assertEquals(myHash, info.hashCode());
@@ -427,7 +428,7 @@
info = new OpenMBeanParameterInfoSupport(
"name", "description", SimpleType.INTEGER, new Integer(3),
- new Object[] { new Integer(2), new Integer(3), new Integer(4) } );
+ new Integer[] { new Integer(2), new Integer(3), new Integer(4) } );
assertTrue("info.toString() should contain the legal value 2",
toString.indexOf(new Integer(2).toString()) != -1);
assertTrue("info.toString() should contain the legal value 3",
@@ -456,7 +457,7 @@
info = new OpenMBeanParameterInfoSupport(
"name", "description", SimpleType.INTEGER, new Integer(3),
- new Object[] { new Integer(2), new Integer(3), new Integer(4) } );
+ new Integer[] { new Integer(2), new Integer(3), new Integer(4) } );
// Serialize it
baos = new ByteArrayOutputStream();
@@ -637,19 +638,6 @@
caught = false;
try
{
- new OpenMBeanParameterInfoSupport(
- "name", "description", SimpleType.STRING, new Integer(3));
- }
- catch (OpenDataException e)
- {
- caught = true;
- }
- if (caught == false)
- fail("Expected OpenDataException for wrong simple type and default value");
-
- caught = false;
- try
- {
ArrayType arrayType = new ArrayType(1, SimpleType.STRING);
new OpenMBeanParameterInfoSupport(
"name", "description", arrayType, new String[0]);
@@ -666,7 +654,7 @@
{
ArrayType arrayType = new ArrayType(1, SimpleType.STRING);
new OpenMBeanParameterInfoSupport(
- "name", "description", arrayType, null);
+ "name", "description", arrayType, (String[]) null);
}
catch (OpenDataException e)
{
@@ -711,7 +699,7 @@
TabularType tabularType = new TabularType("typeName", "description", rowType, indexNames);
new OpenMBeanParameterInfoSupport(
- "name", "description", tabularType, null);
+ "name", "description", tabularType, (TabularData) null);
}
catch (OpenDataException e)
{
@@ -805,19 +793,6 @@
caught = false;
try
{
- new OpenMBeanParameterInfoSupport(
- "name", "description", SimpleType.STRING, new Integer(3), new Integer[] { new Integer(3), new Integer(4) });
- }
- catch (OpenDataException e)
- {
- caught = true;
- }
- if (caught == false)
- fail("Expected OpenDataException for wrong simple type and default value");
-
- caught = false;
- try
- {
ArrayType arrayType = new ArrayType(1, SimpleType.STRING);
new OpenMBeanParameterInfoSupport(
"name", "description", arrayType, new String[0], null);
@@ -960,19 +935,6 @@
}
if (caught == true)
fail("Didn't expect OpenDataException for tabular type and null default value and empty legals");
-
- caught = false;
- try
- {
- new OpenMBeanParameterInfoSupport(
- "name", "description", SimpleType.STRING, new Integer(3), new Integer[] { new Integer(2), new Integer(4) });
- }
- catch (OpenDataException e)
- {
- caught = true;
- }
- if (caught == false)
- fail("Expected OpenDataException for default value not a legal value");
}
public void testErrors4()
@@ -1059,45 +1021,6 @@
caught = false;
try
{
- new OpenMBeanParameterInfoSupport(
- "name", "description", SimpleType.STRING, new Integer(3), null, null);
- }
- catch (OpenDataException e)
- {
- caught = true;
- }
- if (caught == false)
- fail("Expected OpenDataException for wrong simple type and default value");
-
- caught = false;
- try
- {
- new OpenMBeanParameterInfoSupport(
- "name", "description", SimpleType.STRING, null, new Integer(3), null);
- }
- catch (OpenDataException e)
- {
- caught = true;
- }
- if (caught == false)
- fail("Expected OpenDataException for wrong simple type and minimum value");
-
- caught = false;
- try
- {
- new OpenMBeanParameterInfoSupport(
- "name", "description", SimpleType.STRING, null, null, new Integer(3));
- }
- catch (OpenDataException e)
- {
- caught = true;
- }
- if (caught == false)
- fail("Expected OpenDataException for wrong simple type and maximum value");
-
- caught = false;
- try
- {
ArrayType arrayType = new ArrayType(1, SimpleType.STRING);
new OpenMBeanParameterInfoSupport(
"name", "description", arrayType, new String[0], null, null);
@@ -1186,19 +1109,6 @@
try
{
new OpenMBeanParameterInfoSupport(
- "name", "description", SimpleType.STRING, new Integer(3), new Integer(4), new Integer(5));
- }
- catch (OpenDataException e)
- {
- caught = true;
- }
- if (caught == false)
- fail("Expected OpenDataException for default value less than minimum value");
-
- caught = false;
- try
- {
- new OpenMBeanParameterInfoSupport(
"name", "description", SimpleType.INTEGER, new Integer(4), new Integer(4), new Integer(5));
}
catch (OpenDataException e)
Modified: trunk/j2se/src/tests/org/jboss/test/jmx/compliance/standard/StandardMBeanTEST.java
===================================================================
--- trunk/j2se/src/tests/org/jboss/test/jmx/compliance/standard/StandardMBeanTEST.java 2007-11-29 07:25:46 UTC (rev 67595)
+++ trunk/j2se/src/tests/org/jboss/test/jmx/compliance/standard/StandardMBeanTEST.java 2007-11-29 10:32:12 UTC (rev 67596)
@@ -93,7 +93,7 @@
public void testGetImplementationSpecified()
throws Exception
{
- Object obj = new MyRunnable();
+ Runnable obj = new MyRunnable();
StandardMBean std = new StandardMBean(obj, Runnable.class);
assertTrue("MyRunnable is the implementation", obj == std.getImplementation());
assertTrue("MyRunnable is the implementation class", obj.getClass() == std.getImplementationClass());
@@ -109,7 +109,7 @@
public void testMBeanInterfaceSpecified()
throws Exception
{
- Object obj = new MyRunnable();
+ Runnable obj = new MyRunnable();
StandardMBean std = new StandardMBean(obj, Runnable.class);
assertTrue("MyRunnable has Runnable as a management interface", Runnable.class == std.getMBeanInterface());
}
@@ -199,17 +199,6 @@
caught = false;
try
{
- new StandardMBean(new MyRunnable(), ArbitraryInterface.class);
- }
- catch (NotCompliantMBeanException e)
- {
- caught = true;
- }
- assertTrue("Expected NotCompliantMBeanException for the wrong management interface", caught);
-
- caught = false;
- try
- {
new StandardMBean(new MyRunnable(), null);
}
catch (NotCompliantMBeanException e)
More information about the jboss-cvs-commits
mailing list