[jboss-cvs] JBossAS SVN: r87722 - projects/jboss-man/trunk/managed/src/test/java/org/jboss/test/managed/factory/test.

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

Author: alesj
Date: 2009-04-23 08:10:06 -0400 (Thu, 23 Apr 2009)
New Revision: 87722

Modified:
   projects/jboss-man/trunk/managed/src/test/java/org/jboss/test/managed/factory/test/PlatformMBeanUnitTestCase.java
Log:
Check against JDK version.

Modified: projects/jboss-man/trunk/managed/src/test/java/org/jboss/test/managed/factory/test/PlatformMBeanUnitTestCase.java
===================================================================
--- projects/jboss-man/trunk/managed/src/test/java/org/jboss/test/managed/factory/test/PlatformMBeanUnitTestCase.java	2009-04-23 11:50:11 UTC (rev 87721)
+++ projects/jboss-man/trunk/managed/src/test/java/org/jboss/test/managed/factory/test/PlatformMBeanUnitTestCase.java	2009-04-23 12:10:06 UTC (rev 87722)
@@ -22,21 +22,15 @@
 package org.jboss.test.managed.factory.test;
 
 import java.lang.annotation.Annotation;
-import java.lang.management.ClassLoadingMXBean;
 import java.lang.management.ManagementFactory;
-import java.lang.management.MemoryMXBean;
-import java.lang.management.MemoryPoolMXBean;
 import java.lang.management.MemoryUsage;
-import java.lang.management.OperatingSystemMXBean;
 import java.lang.management.RuntimeMXBean;
 import java.lang.management.ThreadInfo;
 import java.lang.management.ThreadMXBean;
-import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import javax.management.MBeanInfo;
 import javax.management.MBeanOperationInfo;
 import javax.management.MBeanParameterInfo;
@@ -46,13 +40,10 @@
 import javax.management.openmbean.CompositeDataSupport;
 
 import junit.framework.Test;
-
 import org.jboss.managed.api.ManagedObject;
 import org.jboss.managed.api.ManagedOperation;
 import org.jboss.managed.api.ManagedProperty;
 import org.jboss.managed.api.annotation.ManagementComponent;
-import org.jboss.managed.api.annotation.ManagementOperation;
-import org.jboss.managed.api.annotation.ManagementProperty;
 import org.jboss.managed.api.factory.ManagedObjectFactory;
 import org.jboss.managed.plugins.ManagedOperationMatcher;
 import org.jboss.managed.plugins.jmx.CompositeDataMetaValueBuilder;
@@ -64,9 +55,7 @@
 import org.jboss.metatype.api.values.SimpleValue;
 import org.jboss.metatype.api.values.SimpleValueSupport;
 import org.jboss.test.managed.factory.AbstractManagedObjectFactoryTest;
-import org.jboss.test.managed.factory.support.ManagementObjectChangedName;
-import org.jboss.test.managed.factory.support.amof.CustomName;
-import org.jboss.test.managed.factory.support.amof.ManagementObjectWithRuntimeRef;
+import org.jboss.util.platform.Java;
 
 /**
  * Tests of creating ManagedObjects for the jvm platform mbeans
@@ -304,7 +293,10 @@
       Set<ManagedOperation> ops = mo.getOperations();
       log.debug(ops);
 
-      assertEquals("Ops count is 8", 8, ops.size());
+      boolean isJDK16 = Java.isCompatible(Java.VERSION_1_6);
+      int opsSize = isJDK16 ? 11 : 8;
+
+      assertEquals("Ops count is " + opsSize, opsSize, ops.size());
       ManagedOperation getThreadInfo = ManagedOperationMatcher.findOperation(ops,
             "getThreadInfo", SimpleMetaType.LONG_PRIMITIVE, SimpleMetaType.INTEGER_PRIMITIVE);
       assertNotNull("getThreadInfo", getThreadInfo);
@@ -321,7 +313,7 @@
       ObjectName tname = new ObjectName(ManagementFactory.THREAD_MXBEAN_NAME);
       MBeanInfo tinfo = server.getMBeanInfo(tname);
       MBeanOperationInfo[] tops = tinfo.getOperations();
-      assertEquals(8, tops.length);
+      assertEquals(opsSize, tops.length);
       for(MBeanOperationInfo op : tops)
       {
          MBeanParameterInfo[] params = op.getSignature();