Fixed: The XML parser doesn't recognize parallel="instances"

freynaud · Aug 26, 2011 · aa48f78 · aa48f78
1 parent 163505c
commit aa48f78
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 19 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,5 +1,6 @@
 Current
 
+Fixed: The XML parser doesn't recognize parallel="instances"
 Fixed: NPE when using inner classes
 Fixed: @AfterClass not being run in some subclassing situations
 

diff --git a/src/main/java/org/testng/xml/TestNGContentHandler.java b/src/main/java/org/testng/xml/TestNGContentHandler.java
@@ -136,16 +136,10 @@ private void xmlSuite(boolean start, Attributes attributes) {
         m_currentSuite.setJUnit( Boolean.valueOf(jUnit).booleanValue());
       }
       String parallel = attributes.getValue("parallel");
-      if (null != parallel) {
-        if(XmlSuite.PARALLEL_METHODS.equals(parallel)
-            || XmlSuite.PARALLEL_TESTS.equals(parallel)
-            || XmlSuite.PARALLEL_NONE.equals(parallel)
-            || XmlSuite.PARALLEL_CLASSES.equals(parallel)
-            || "true".equals(parallel)
-            || "false".equals(parallel)) {
+      if (parallel != null) {
+        if (isValidParallel(parallel)) {
           m_currentSuite.setParallel(parallel);
-        }
-        else {
+        } else {
           Utils.log("Parser", 1, "[WARN] Unknown value of attribute 'parallel' at suite level: '" + parallel + "'.");
         }
       }
@@ -273,16 +267,12 @@ private void xmlTest(boolean start, Attributes attributes) {
         m_currentTest.setPreserveOrder(preserveOrder);
       }
       String parallel = attributes.getValue("parallel");
-      if (null != parallel) {
-        if(XmlSuite.PARALLEL_METHODS.equals(parallel)
-            || XmlSuite.PARALLEL_NONE.equals(parallel)
-            || XmlSuite.PARALLEL_CLASSES.equals(parallel)
-            || "true".equals(parallel)
-            || "false".equals(parallel)) {
+      if (parallel != null) {
+        if (isValidParallel(parallel)) {
           m_currentTest.setParallel(parallel);
-        }
-        else {
-          Utils.log("Parser", 1, "[WARN] Unknown value of attribute 'parallel' for test '" + m_currentTest.getName() + "': '" + parallel + "'");
+        } else {
+          Utils.log("Parser", 1, "[WARN] Unknown value of attribute 'parallel' for test '"
+            + m_currentTest.getName() + "': '" + parallel + "'");
         }
       }
       String threadCount = attributes.getValue("thread-count");
@@ -322,6 +312,10 @@ private void xmlTest(boolean start, Attributes attributes) {
     }
   }
 
+  private boolean isValidParallel(String parallel) {
+    return XmlSuite.PARALLEL_MODES.contains(parallel);
+  }
+
   /**
    * Parse <classes>
    */

diff --git a/src/main/java/org/testng/xml/XmlSuite.java b/src/main/java/org/testng/xml/XmlSuite.java
@@ -11,6 +11,7 @@
 import org.testng.reporters.XMLStringBuffer;
 
 import java.io.Serializable;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -43,6 +44,15 @@ public class XmlSuite implements Serializable, Cloneable {
   public static final String PARALLEL_CLASSES = "classes";
   public static final String PARALLEL_INSTANCES = "instances";
   public static final String PARALLEL_NONE = "none";
+  public static Set<String> PARALLEL_MODES = new HashSet<String>() {{
+    add(PARALLEL_TESTS);
+    add(PARALLEL_METHODS);
+    add(PARALLEL_CLASSES);
+    add(PARALLEL_INSTANCES);
+    add(PARALLEL_NONE);
+    add("true");
+    add("false");
+  }};
 
   /** Configuration failure policy options */
   public static final String SKIP = "skip";

diff --git a/src/main/resources/testng-1.0.dtd b/src/main/resources/testng-1.0.dtd
@@ -59,7 +59,7 @@ Cedric Beust & Alexandru Popescu
     name CDATA #REQUIRED
     junit (true | false) "false"
     verbose CDATA #IMPLIED
-    parallel (false | methods | tests | classes) "false"
+    parallel (false | methods | tests | classes | instances) "false"
     configfailurepolicy (skip | continue) "skip"
     thread-count CDATA "5"
     annotations CDATA #IMPLIED