[jboss-cvs] JBossAS SVN: r84421 - in projects/jboss-man/branches/Branch_2_1/managed/src: test/java/org/jboss/test/managed/factory/test and 1 other directory.

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

Author: scott.stark at jboss.org
Date: 2009-02-18 23:31:13 -0500 (Wed, 18 Feb 2009)
New Revision: 84421

Modified:
   projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/jmx/ManagementFactoryUtils.java
   projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/test/PlatformMBeanUnitTestCase.java
Log:
JBMAN-53, correct the os system mbean name

Modified: projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/jmx/ManagementFactoryUtils.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/jmx/ManagementFactoryUtils.java	2009-02-19 04:16:19 UTC (rev 84420)
+++ projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/jmx/ManagementFactoryUtils.java	2009-02-19 04:31:13 UTC (rev 84421)
@@ -127,7 +127,7 @@
    public static ManagedObject getOperatingSystemMXBean(ManagedObjectFactory mof)
    {
       OperatingSystemMXBean mbean = ManagementFactory.getOperatingSystemMXBean();
-      ManagedObject mo = getMO(mbean, MemoryMXBeanMO.class, mof);
+      ManagedObject mo = getMO(mbean, OperatingSystemMXBeanMO.class, mof);
       return mo;
    }
 

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-02-19 04:16:19 UTC (rev 84420)
+++ projects/jboss-man/branches/Branch_2_1/managed/src/test/java/org/jboss/test/managed/factory/test/PlatformMBeanUnitTestCase.java	2009-02-19 04:31:13 UTC (rev 84421)
@@ -365,8 +365,19 @@
       ManagedObjectFactory mof = getMOF();
       ManagedObject mo = ManagementFactoryUtils.getOperatingSystemMXBean(mof);
       assertNotNull(mo);
-      assertEquals(ManagementFactory.MEMORY_MXBEAN_NAME, mo.getName());
+      assertEquals(ManagementFactory.OPERATING_SYSTEM_MXBEAN_NAME, mo.getName());
       validateComponentType(mo);
+
+      ManagedProperty arch = mo.getProperty("arch");
+      assertNotNull(arch);
+      ManagedProperty availableProcessors = mo.getProperty("availableProcessors");
+      assertNotNull(availableProcessors);
+      SimpleValue procsSV = (SimpleValue) availableProcessors.getValue();
+      Integer procs = (Integer) procsSV.getValue();
+      assertTrue(procs.intValue() >= 1);
+      ManagedProperty version = mo.getProperty("version");
+      assertNotNull(version);
+      log.debug(version.getValue());
    }
    public void testMemoryManagerMXBeans()
    {