[jboss-cvs] JBossAS SVN: r59540 - trunk/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:24:32 -0500 (Thu, 11 Jan 2007)
New Revision: 59540

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

Modified: trunk/testsuite/src/main/org/jboss/test/jbossmx/compliance/standard/InfoTortureTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmx/compliance/standard/InfoTortureTestCase.java	2007-01-11 18:23:57 UTC (rev 59539)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmx/compliance/standard/InfoTortureTestCase.java	2007-01-11 18:24:32 UTC (rev 59540)
@@ -1,36 +1,36 @@
 /*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
 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);