[jboss-cvs] JBossAS SVN: r87837 - projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/plain/test.

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

Author: alesj
Date: 2009-04-25 06:48:49 -0400 (Sat, 25 Apr 2009)
New Revision: 87837

Modified:
   projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanRedeployAfterErrorPlainUnitTestCase.java
Log:
Fix the test for JDK6.

Modified: projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanRedeployAfterErrorPlainUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanRedeployAfterErrorPlainUnitTestCase.java	2009-04-25 03:22:30 UTC (rev 87836)
+++ projects/microcontainer/trunk/jmx-mc-int/src/test/java/org/jboss/test/system/controller/instantiate/plain/test/PlainMBeanRedeployAfterErrorPlainUnitTestCase.java	2009-04-25 10:48:49 UTC (rev 87837)
@@ -54,6 +54,15 @@
    // The JDK MBeanServer eats the error message :-(
    public void testPlainMBeanGetMBeanInfoError() throws Exception
    {
-      assertMaybeDeployFailure(BrokenDynamicMBean.OBJECT_NAME, NotCompliantMBeanException.class);
+      try
+      {
+         assertMaybeDeployFailure(BrokenDynamicMBean.OBJECT_NAME, NotCompliantMBeanException.class);
+      }
+      catch (Throwable t)
+      {
+         // in JDK6 we get different expected Throwable == Error
+         assertInstanceOf(t, Error.class, false);
+         assertEquals("BROKEN", t.getMessage());
+      }
    }
 }