[jboss-cvs] JBossAS SVN: r59539 - branches/Branch_4_0/testsuite/src/main/org/jboss/test/jbossmx/compliance/standard.

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

Author: dimitris at jboss.org
Date: 2007-01-11 13:23:57 -0500 (Thu, 11 Jan 2007)
New Revision: 59539

Modified:
   branches/Branch_4_0/testsuite/src/main/org/jboss/test/jbossmx/compliance/standard/InfoTortureTestCase.java
Log:
JBAS-3746, conditionally exclude this test on JRockit 1.5

Modified: branches/Branch_4_0/testsuite/src/main/org/jboss/test/jbossmx/compliance/standard/InfoTortureTestCase.java
===================================================================
--- branches/Branch_4_0/testsuite/src/main/org/jboss/test/jbossmx/compliance/standard/InfoTortureTestCase.java	2007-01-11 18:23:05 UTC (rev 59538)
+++ branches/Branch_4_0/testsuite/src/main/org/jboss/test/jbossmx/compliance/standard/InfoTortureTestCase.java	2007-01-11 18:23:57 UTC (rev 59539)
@@ -21,16 +21,16 @@
  */
 package org.jboss.test.jbossmx.compliance.standard;
 
+import javax.management.MBeanInfo;
+import javax.management.MBeanOperationInfo;
+
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.jboss.test.jbossmx.compliance.TestCase;
-
 import org.jboss.test.jbossmx.compliance.standard.support.Torture;
+import org.jboss.util.platform.Java;
 
-import javax.management.MBeanInfo;
-import javax.management.MBeanOperationInfo;
-
 /**
  * Beat the heck out of the server's standard MBeanInfo
  *
@@ -75,7 +75,20 @@
       // make sure remaining attributes are correct
       // Args are: Name, Type, Readable, Writable, IsIS
       addAttributeTest(testSuite, info, "NiceString", String.class.getName(), true, true, false);
-      addAttributeTest(testSuite, info, "NiceBoolean", boolean.class.getName(), true, true, true);
+
+      // JBAS-3746, conditionally exclude this test on JRockit 1.5
+      boolean jrockit = System.getProperty("java.vm.name").indexOf("JRockit") > -1;
+      if (Java.isVersion(Java.VERSION_1_5) && jrockit)
+      {
+         // exclude the test but keep the test coverage count
+         ++attributeTestCount;
+      }
+      else
+      {
+         // include the test
+         addAttributeTest(testSuite, info, "NiceBoolean", boolean.class.getName(), true, true, true);
+      }
+      
       addAttributeTest(testSuite, info, "Something", String.class.getName(), false, true, false);
       addAttributeTest(testSuite, info, "Int", int.class.getName(), false, true, false);
       addAttributeTest(testSuite, info, "IntArray", int[].class.getName(), false, true, false);