[jboss-cvs] JBossAS SVN: r73169 - trunk/testsuite/src/main/org/jboss/test/jbossmx/compliance/objectname.

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

Author: smcgowan at redhat.com
Date: 2008-05-08 15:08:31 -0400 (Thu, 08 May 2008)
New Revision: 73169

Modified:
   trunk/testsuite/src/main/org/jboss/test/jbossmx/compliance/objectname/MalformedTestCase.java
Log:
JBAS-5476

Modified: trunk/testsuite/src/main/org/jboss/test/jbossmx/compliance/objectname/MalformedTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmx/compliance/objectname/MalformedTestCase.java	2008-05-08 19:06:53 UTC (rev 73168)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmx/compliance/objectname/MalformedTestCase.java	2008-05-08 19:08:31 UTC (rev 73169)
@@ -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,13 @@
       }
 
       // 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));
@@ -290,6 +305,13 @@
                return;
             }
          }
+         catch (ClassCastException cce)
+         {
+  	    if (Java.isVersion(Java.VERSION_1_5) == false)
+            {
+               return;
+            }
+         }
          fail("invalid object name: " + domain + ":" + failureHint);
       }
    }