Allow all supported values of [parallel] option

apache · Apr 8, 2022 · b744c49 · b744c49
1 parent 157d2d9
commit b744c49
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/...ire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG740Configurator.java b/...ire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG740Configurator.java
@@ -50,14 +50,19 @@ public void configure( XmlSuite suite, Map<String, String> options )
         String parallel = options.get( PARALLEL_PROP );
         if ( parallel != null )
         {
-            if ( !"methods".equalsIgnoreCase( parallel ) && !"classes".equalsIgnoreCase( parallel ) )
+            Class enumClass = tryLoadClass( XmlSuite.class.getClassLoader(), "org.testng.xml.XmlSuite$ParallelMode" );
+            if ( enumClass != null )
             {
-                throw new TestSetFailedException( "Unsupported TestNG parallel setting: "
-                    + parallel + " ( only METHODS or CLASSES supported )" );
+                try
+                {
+                    Enum<?> parallelEnum = Enum.valueOf( enumClass, parallel.toUpperCase() );
+                    invokeSetter( suite, "setParallel", enumClass, parallelEnum );
+                }
+                catch ( IllegalArgumentException e )
+                {
+                    throw new TestSetFailedException( "Unsupported TestNG parallel setting: " + parallel, e );
+                }
             }
-            Class enumClass = tryLoadClass( XmlSuite.class.getClassLoader(), "org.testng.xml.XmlSuite$ParallelMode" );
-            Enum<?> parallelEnum = Enum.valueOf( enumClass, parallel.toUpperCase() );
-            invokeSetter( suite, "setParallel", enumClass, parallelEnum );
         }
 
         String dataProviderThreadCount = options.get( "dataproviderthreadcount" );