[jboss-cvs] JBossAS SVN: r90760 - branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/test.

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

Author: emuckenhuber
Date: 2009-07-02 05:18:41 -0400 (Thu, 02 Jul 2009)
New Revision: 90760

Modified:
   branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/test/PlatformMBeanUnitTestCase.java
Log:
fix assertion for jdk6

Modified: branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/test/PlatformMBeanUnitTestCase.java
===================================================================
--- branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/test/PlatformMBeanUnitTestCase.java	2009-07-02 06:12:55 UTC (rev 90759)
+++ branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/test/PlatformMBeanUnitTestCase.java	2009-07-02 09:18:41 UTC (rev 90760)
@@ -302,7 +302,12 @@
       Set<ManagedOperation> ops = mo.getOperations();
       log.debug(ops);
 
-      assertEquals("Ops count is 8", 8, 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);