[jboss-cvs] JBossAS SVN: r75590 - 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: 2008-07-10 05:04:39 -0400 (Thu, 10 Jul 2008)
New Revision: 75590

Modified:
   branches/Branch_4_2/testsuite/src/main/org/jboss/test/jbossmx/compliance/objectname/MalformedTestCase.java
Log:
Make it pass with jdk6.

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	2008-07-10 08:56:49 UTC (rev 75589)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/jbossmx/compliance/objectname/MalformedTestCase.java	2008-07-10 09:04:39 UTC (rev 75590)
@@ -50,9 +50,11 @@
    public static final String GOOD_DOMAIN = "domain";
    public static final String GOOD_KEY = "key1";
    public static final String GOOD_VALUE = "val1";
+   public static String[] BAD_KEYVALS = null;
 
    // strings containing illegal chars to use in key or value positions
-   public static final String[] BAD_KEYVALS = {
+   // JBAS-5031 WildCards are allowed with JDK 6
+   public static final String[] BAD_KEYVALS_JDK5 = {
       "som:thing", // cannot contain domain separator
       "som?thing", // cannot contain pattern chars
       "som*thing", // cannot contain pattern chars
@@ -60,6 +62,12 @@
       "som=thing", // cannot contain kvp separator
    };
 
+   public static final String[] BAD_KEYVALS_JDK6 = {
+      "som:thing", // cannot contain domain separator
+      "som,thing", // cannot contain kvp chunk separator
+      "som=thing", // cannot contain kvp separator
+   };
+
    // domains containing illegal domain chars
    public static final String[] BAD_DOMAINS = {
       "doma:in", // : char in domain
@@ -103,6 +111,12 @@
       }
 
       // all illegal key value characters
+
+      if (Java.isVersion(Java.VERSION_1_5) == true)
+         BAD_KEYVALS = BAD_KEYVALS_JDK5; 
+      else
+	     BAD_KEYVALS = BAD_KEYVALS_JDK6; 
+
       for (int i = 0; i < BAD_KEYVALS.length; i++)
       {
          suite.addTest(new FullNameTEST(GOOD_DOMAIN + ":" + BAD_KEYVALS[i] + "=" + GOOD_VALUE));
@@ -258,9 +272,13 @@
 
       public void testNonStringKey()
       {
-         Hashtable h = new Hashtable();
-         h.put(new Object(), GOOD_VALUE);
-         doCheck(GOOD_DOMAIN, h, "<non_string_key>=" + GOOD_VALUE);
+         // JDK6 expects Hashtable keys to be Strings
+         if (Java.isVersion(Java.VERSION_1_5) == true)
+         {
+            Hashtable h = new Hashtable();
+            h.put(new Object(), GOOD_VALUE);
+            doCheck(GOOD_DOMAIN, h, "<non_string_key>=" + GOOD_VALUE);
+         }
       }
 
       public void testNonStringValue()