[jboss-cvs] JBossAS SVN: r59455 - branches/Branch_4_2/testsuite/src/main/org/jboss/test/jbossmx/compliance/objectname.

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

Author: dimitris at jboss.org
Date: 2007-01-09 15:22:24 -0500 (Tue, 09 Jan 2007)
New Revision: 59455

Modified:
   branches/Branch_4_2/testsuite/src/main/org/jboss/test/jbossmx/compliance/objectname/MalformedTestCase.java
Log:
JBAS-3615, conditionally exclude the test when running under jdk5 because it is broken.

Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/jbossmx/compliance/objectname/MalformedTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/jbossmx/compliance/objectname/MalformedTestCase.java	2007-01-09 20:19:28 UTC (rev 59454)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/jbossmx/compliance/objectname/MalformedTestCase.java	2007-01-09 20:22:24 UTC (rev 59455)
@@ -21,14 +21,17 @@
  */
 package org.jboss.test.jbossmx.compliance.objectname;
 
+import java.util.Hashtable;
+
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
 import junit.framework.Test;
 import junit.framework.TestSuite;
+
 import org.jboss.test.jbossmx.compliance.TestCase;
+import org.jboss.util.platform.Java;
 
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-import java.util.Hashtable;
-
 /**
  * Hammer ObjectName, making sure it spots all malformed inputs.
  * <p/>
@@ -40,7 +43,7 @@
  * 
  * @author <a href="mailto:trevor at protocool.com">Trevor Squires</a>
  * @author <a href="mailto:dimitris at jboss.org">Dimitris Andreadis</a>
- * @version $Revision:$
+ * @version $Revision$
  */
 public class MalformedTestCase extends TestSuite
 {
@@ -65,7 +68,6 @@
    // pre-cooked name strings dealing with structural malformations
    public static final String[] BAD_FULLNAMES = {
       "domain:key=val,key=val2", // duplicate key
-      "domain:=val,foo=bar", // JBAS-3615, empty key
       "domain:key=val,,foo=bar", // missing kvp in middle
       "domain:,key=val,foo=bar", // missing kvp at beginning
       "domain:key=val,foo=bar,", // missing kvp at end
@@ -116,6 +118,11 @@
       {
          suite.addTest(new FullNameTEST(BAD_FULLNAMES[i]));
       }
+      if (Java.isVersion(Java.VERSION_1_5) == false)
+      {
+         // exclude test when running under jdk5 - it's broken
+         suite.addTest(new FullNameTEST("domain:=val,foo=bar")); // JBAS-3615, empty key
+      }
 
       return suite;
    }