[jboss-cvs] JBossAS SVN: r90197 - projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/test.

[jboss-cvs-commits at lists.jboss.org]

Author: emuckenhuber
Date: 2009-06-15 11:33:21 -0400 (Mon, 15 Jun 2009)
New Revision: 90197

Modified:
   projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/test/PlatformMBeanUnitTestCase.java
Log:
fix testcase.

Modified: projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/test/PlatformMBeanUnitTestCase.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/test/PlatformMBeanUnitTestCase.java	2009-06-15 14:59:48 UTC (rev 90196)
+++ projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/test/PlatformMBeanUnitTestCase.java	2009-06-15 15:33:21 UTC (rev 90197)
@@ -294,7 +294,12 @@
       Set<ManagedOperation> ops = mo.getOperations();
       log.debug(ops);
 
-      assertEquals(mo + " has wrong number of ManagedOperations.", 11, ops.size());
+      String javaSpecVersion = System.getProperty("java.specification.version");
+      if (javaSpecVersion.equals("1.5") || javaSpecVersion.equals("5.0"))
+         assertEquals(mo + " has wrong number of ManagedOperations.", 8, ops.size());
+      else if (javaSpecVersion.equals("1.6") || javaSpecVersion.equals("6.0"))
+         assertEquals(mo + " has wrong number of ManagedOperations.", 11, ops.size());
+      
       ManagedOperation getThreadInfo = ManagedOperationMatcher.findOperation(ops,
             "getThreadInfo", SimpleMetaType.LONG_PRIMITIVE, SimpleMetaType.INTEGER_PRIMITIVE);
       assertNotNull("getThreadInfo", getThreadInfo);
@@ -311,7 +316,6 @@
       ObjectName tname = new ObjectName(ManagementFactory.THREAD_MXBEAN_NAME);
       MBeanInfo tinfo = server.getMBeanInfo(tname);
       MBeanOperationInfo[] tops = tinfo.getOperations();
-      String javaSpecVersion = System.getProperty("java.specification.version");
       if (javaSpecVersion.equals("1.5") || javaSpecVersion.equals("5.0"))
          assertEquals(8, tops.length);
       else if (javaSpecVersion.equals("1.6") || javaSpecVersion.equals("6.0"))