Enabling Surefire to run test classes and test methods in any order specified

maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java

@@ -310,6 +310,10 @@ public class IntegrationTestMojo
     @Parameter( property = "failsafe.runOrder", defaultValue = "filesystem" )
     private String runOrder;
 
+    //TODO docs
+    @Parameter( property = "failsafe.methodRunOrder", defaultValue = "default" )
+    private String methodRunOrder;
+
     /**
      * Sets the random seed that will be used to order the tests if {@code failsafe.runOrder} is set to {@code random}.
      * <br>
@@ -907,6 +911,12 @@ public void setRunOrder( String runOrder )
         this.runOrder = runOrder;
     }
 
+    @Override
+    public String getMethodRunOrder()
+    {
+        return methodRunOrder;
+    }
+
     @Override
     public Long getRunOrderRandomSeed()
     {

maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java

@@ -86,6 +86,7 @@
 import org.apache.maven.surefire.api.testset.TestSetFailedException;
 import org.apache.maven.surefire.api.util.DefaultScanResult;
 import org.apache.maven.surefire.api.util.RunOrder;
+import org.apache.maven.surefire.util.MethodRunOrder;
 import org.apache.maven.toolchain.DefaultToolchain;
 import org.apache.maven.toolchain.Toolchain;
 import org.apache.maven.toolchain.ToolchainManager;
@@ -679,7 +680,7 @@ public abstract class AbstractSurefireMojo
      *
      * @since 2.2
      */
-    @Parameter( property = "trimStackTrace", defaultValue = "true" )
+    @Parameter( property = "trimStackTrace", defaultValue = "false" )
     private boolean trimStackTrace;
 
     /**
@@ -865,6 +866,8 @@ public abstract class AbstractSurefireMojo
 
     public abstract void setRunOrder( String runOrder );
 
+    public abstract String getMethodRunOrder();
+
     public abstract Long getRunOrderRandomSeed();
 
     public abstract void setRunOrderRandomSeed( Long runOrderRandomSeed );
@@ -1291,7 +1294,8 @@ private RunResult executeProvider( @Nonnull ProviderInfo provider, @Nonnull Defa
         ClassLoaderConfiguration classLoaderConfiguration = getClassLoaderConfiguration();
         provider.addProviderProperties();
         RunOrderParameters runOrderParameters =
-            new RunOrderParameters( getRunOrder(), getStatisticsFile( getConfigChecksum() ), getRunOrderRandomSeed() );
+            new RunOrderParameters( getRunOrder(), getStatisticsFile( getConfigChecksum() ), getRunOrderRandomSeed(),
+                                    getMethodRunOrder() );
 
         if ( isNotForking() )
         {
@@ -2754,6 +2758,7 @@ private String getConfigChecksum()
         checksum.add( getObjectFactory() );
         checksum.add( getFailIfNoTests() );
         checksum.add( getRunOrder() );
+        checksum.add( getMethodRunOrder().toString() );
         checksum.add( getDependenciesToScan() );
         checksum.add( getForkedProcessExitTimeoutInSeconds() );
         checksum.add( getRerunFailingTestsCount() );
@@ -3068,7 +3073,9 @@ protected void warnIfIllegalFailOnFlakeCount() throws MojoFailureException
 
     private void printDefaultSeedIfNecessary()
     {
-        if ( getRunOrderRandomSeed() == null && getRunOrder().equals( RunOrder.RANDOM.name() ) )
+        if ( getRunOrderRandomSeed() == null
+             && ( getRunOrder().equals( RunOrder.RANDOM.name() )
+                  || getMethodRunOrder().equals( MethodRunOrder.RANDOM.name() ) ) )
         {
             setRunOrderRandomSeed( System.nanoTime() );
             getConsoleLogger().info(

maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/BooterSerializer.java

@@ -54,6 +54,7 @@
 import static org.apache.maven.surefire.booter.BooterConstants.INCLUDES_PROPERTY_PREFIX;
 import static org.apache.maven.surefire.booter.BooterConstants.ISTRIMSTACKTRACE;
 import static org.apache.maven.surefire.booter.BooterConstants.MAIN_CLI_OPTIONS;
+import static org.apache.maven.surefire.booter.BooterConstants.METHOD_RUN_ORDER;
 import static org.apache.maven.surefire.booter.BooterConstants.PLUGIN_PID;
 import static org.apache.maven.surefire.booter.BooterConstants.PROCESS_CHECKER;
 import static org.apache.maven.surefire.booter.BooterConstants.PROVIDER_CONFIGURATION;
@@ -163,6 +164,7 @@ File serialize( KeyValueSource sourceProperties, ProviderConfiguration providerC
         {
             properties.setProperty( RUN_ORDER, RunOrder.asString( runOrderParameters.getRunOrder() ) );
             properties.setProperty( RUN_STATISTICS_FILE, runOrderParameters.getRunStatisticsFile() );
+            properties.setProperty( METHOD_RUN_ORDER, runOrderParameters.getMethodRunOrder().toString() );
             properties.setProperty( RUN_ORDER_RANDOM_SEED, runOrderParameters.getRunOrderRandomSeed() );
         }
 

maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java

@@ -839,6 +839,12 @@ public void setRunOrder( String runOrder )
 
         }
 
+        @Override
+        public String getMethodRunOrder()
+        {
+            return null;
+        };
+
         @Override
         public Long getRunOrderRandomSeed()
         {

maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java

@@ -2382,6 +2382,12 @@ public void setRunOrder( String runOrder )
 
         }
 
+        @Override
+        public String getMethodRunOrder()
+        {
+            return null;
+        };
+
         @Override
         public Long getRunOrderRandomSeed()
         {

maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/MojoMocklessTest.java

@@ -709,6 +709,12 @@ public void setRunOrder( String runOrder )
 
         }
 
+        @Override
+        public String getMethodRunOrder()
+        {
+            return null;
+        };
+
         @Override
         public Long getRunOrderRandomSeed()
         {

maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java

@@ -39,6 +39,7 @@
 import org.apache.maven.surefire.api.testset.TestListResolver;
 import org.apache.maven.surefire.api.testset.TestRequest;
 import org.apache.maven.surefire.api.util.RunOrder;
+import org.apache.maven.surefire.util.MethodRunOrder;
 import org.junit.After;
 import org.junit.Before;
 
@@ -276,7 +277,8 @@ private ProviderConfiguration getTestProviderConfiguration( DirectoryScannerPara
             new TestRequest( getSuiteXmlFileStrings(), getTestSourceDirectory(),
                              new TestListResolver( USER_REQUESTED_TEST + "#aUserRequestedTestMethod" ),
                     RERUN_FAILING_TEST_COUNT );
-        RunOrderParameters runOrderParameters = new RunOrderParameters( RunOrder.DEFAULT, null );
+        RunOrderParameters runOrderParameters = new RunOrderParameters( RunOrder.DEFAULT, null, null,
+            MethodRunOrder.DEFAULT );
         return new ProviderConfiguration( directoryScannerParameters, runOrderParameters, true, reporterConfiguration,
                 new TestArtifactInfo( "5.0", "ABC" ), testSuiteDefinition, new HashMap<String, String>(), TEST_TYPED,
                 readTestsFromInStream, cli, 0, Shutdown.DEFAULT, 0 );

maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java

@@ -38,6 +38,7 @@
 import org.apache.maven.surefire.api.testset.TestListResolver;
 import org.apache.maven.surefire.api.testset.TestRequest;
 import org.apache.maven.surefire.api.util.RunOrder;
+import org.apache.maven.surefire.util.MethodRunOrder;
 import org.junit.After;
 import org.junit.Before;
 
@@ -197,7 +198,8 @@ private ProviderConfiguration getProviderConfiguration()
             new TestRequest( Arrays.asList( getSuiteXmlFileStrings() ), getTestSourceDirectory(),
                              new TestListResolver( "aUserRequestedTest#aUserRequestedTestMethod" ) );
 
-        RunOrderParameters runOrderParameters = new RunOrderParameters( RunOrder.DEFAULT, null );
+        RunOrderParameters runOrderParameters = new RunOrderParameters( RunOrder.DEFAULT, null, null,
+            MethodRunOrder.DEFAULT );
         return new ProviderConfiguration( directoryScannerParameters, runOrderParameters, true, reporterConfiguration,
                 new TestArtifactInfo( "5.0", "ABC" ), testSuiteDefinition, new HashMap<String, String>(),
                 BooterDeserializerProviderConfigurationTest.TEST_TYPED, true, cli, 0, Shutdown.DEFAULT, 0 );

maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java

@@ -20,6 +20,9 @@
  */
 
 import java.io.File;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -302,6 +305,10 @@ public class SurefirePlugin
     @Parameter( property = "surefire.runOrder", defaultValue = "filesystem" )
     private String runOrder;
 
+    //TODO docs
+    @Parameter( property = "surefire.methodRunOrder", defaultValue = "default" )
+    private String methodRunOrder;
+
     /**
      * Sets the random seed that will be used to order the tests if {@code surefire.runOrder} is set to {@code random}.
      * <br>
@@ -629,6 +636,24 @@ public void setReportsDirectory( File reportsDirectory )
     @Override
     public String getTest()
     {
+        File f = new File( test );
+        if ( f.exists() && !f.isDirectory ( ) )
+        {
+            try
+            {
+                List<String> l = Files.readAllLines( f.toPath(), Charset.defaultCharset( ) );
+                StringBuilder sb = new StringBuilder( );
+                for ( String s : l )
+                {
+                    sb.append( s + "," );
+                }
+                String s = sb.toString( );
+                return s.substring( 0 , s.length( ) - 1 );
+            }
+            catch ( IOException e )
+            {
+            }
+        }
         return test;
     }
 
@@ -832,6 +857,13 @@ public void setRunOrder( String runOrder )
         this.runOrder = runOrder;
     }
 
+
+    @Override
+    public String getMethodRunOrder()
+    {
+        return methodRunOrder;
+    }
+
     @Override
     public Long getRunOrderRandomSeed()
     {

pom.xml

@@ -502,7 +502,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>animal-sniffer-maven-plugin</artifactId>
-          <version>1.17</version>
+          <version>1.18</version>
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>

surefire-api/src/main/java/org/apache/maven/surefire/api/testset/RunOrderParameters.java

@@ -21,6 +21,7 @@
 
 import java.io.File;
 import org.apache.maven.surefire.api.util.RunOrder;
+import org.apache.maven.surefire.util.MethodRunOrder;
 
 /**
  * @author Kristian Rosenvold
@@ -31,39 +32,70 @@ public class RunOrderParameters
 
     private File runStatisticsFile;
 
+    private final MethodRunOrder methodRunOrder;
+
     private Long runOrderRandomSeed;
 
-    public RunOrderParameters( RunOrder[] runOrder, File runStatisticsFile )
+    public RunOrderParameters( RunOrder[] runOrder, File runStatisticsFile, MethodRunOrder methodRunOrder )
     {
         this.runOrder = runOrder;
         this.runStatisticsFile = runStatisticsFile;
+        this.methodRunOrder = methodRunOrder;
         this.runOrderRandomSeed = null;
     }
 
-    public RunOrderParameters( String runOrder, File runStatisticsFile )
+    public RunOrderParameters( RunOrder[] runOrder, File runStatisticsFile, Long runOrderRandomSeed,
+                               MethodRunOrder methodRunOrder )
+    {
+        this.runOrder = runOrder;
+        this.runStatisticsFile = runStatisticsFile;
+        this.methodRunOrder = methodRunOrder;
+        this.runOrderRandomSeed = runOrderRandomSeed;
+    }
+
+    public RunOrderParameters( String runOrder, File runStatisticsFile, Long runOrderRandomSeed, String methodRunOrder )
     {
         this.runOrder = runOrder == null ? RunOrder.DEFAULT : RunOrder.valueOfMulti( runOrder );
         this.runStatisticsFile = runStatisticsFile;
-        this.runOrderRandomSeed = null;
+        this.methodRunOrder = MethodRunOrder.valueOf( methodRunOrder );
+        this.runOrderRandomSeed = runOrderRandomSeed;
     }
 
     public RunOrderParameters( RunOrder[] runOrder, File runStatisticsFile, Long runOrderRandomSeed )
     {
         this.runOrder = runOrder;
         this.runStatisticsFile = runStatisticsFile;
         this.runOrderRandomSeed = runOrderRandomSeed;
+        this.methodRunOrder = MethodRunOrder.DEFAULT;
     }
 
     public RunOrderParameters( String runOrder, File runStatisticsFile, Long runOrderRandomSeed )
     {
         this.runOrder = runOrder == null ? RunOrder.DEFAULT : RunOrder.valueOfMulti( runOrder );
         this.runStatisticsFile = runStatisticsFile;
         this.runOrderRandomSeed = runOrderRandomSeed;
+        this.methodRunOrder = MethodRunOrder.DEFAULT;
+    }
+
+    public RunOrderParameters( RunOrder[] runOrder, File runStatisticsFile )
+    {
+        this.runOrder = runOrder;
+        this.runStatisticsFile = runStatisticsFile;
+        this.runOrderRandomSeed = null;
+        this.methodRunOrder = MethodRunOrder.DEFAULT;
+    }
+
+    public RunOrderParameters( String runOrder, File runStatisticsFile )
+    {
+        this.runOrder = runOrder == null ? RunOrder.DEFAULT : RunOrder.valueOfMulti( runOrder );
+        this.runStatisticsFile = runStatisticsFile;
+        this.runOrderRandomSeed = null;
+        this.methodRunOrder = MethodRunOrder.DEFAULT;
     }
 
     public static RunOrderParameters alphabetical()
     {
-        return new RunOrderParameters( new RunOrder[]{ RunOrder.ALPHABETICAL }, null );
+        return new RunOrderParameters( new RunOrder[]{ RunOrder.ALPHABETICAL }, null, null, MethodRunOrder.DEFAULT );
     }
 
     public RunOrder[] getRunOrder()
@@ -86,4 +118,9 @@ public File getRunStatisticsFile()
         return runStatisticsFile;
     }
 
+    public MethodRunOrder getMethodRunOrder()
+    {
+        return methodRunOrder;
+    }
+
 }