Implement some ordering fron runorder parameter and fix IT Surefire806SpecifiedTestControlsIT

Signed-off-by: Olivier Lamy <[email protected]>

Author: olamy

surefire-its/src/test/resources/surefire-806-specifiedTests-multi/pom.xml

@@ -37,7 +37,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

surefire-its/src/test/resources/surefire-806-specifiedTests-single/pom.xml

@@ -37,7 +37,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

surefire-providers/surefire-junit-platform/pom.xml

@@ -102,7 +102,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <scope>test</scope>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>

surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProvider.java

@@ -115,6 +115,7 @@ public JUnitPlatformProvider(ProviderParameters parameters) {
         this.parameters = parameters;
         this.launcherSessionFactory = launcherSessionFactory;
         filters = newFilters();
+        setupRunOrder();
         parameters.getProviderProperties().entrySet().stream()
                 .filter(entry -> entry.getKey().startsWith("junit.vintage.execution.parallel"))
                 .forEach(entry -> getConfigurationParameters().put(entry.getKey(), entry.getValue()));
@@ -153,6 +154,34 @@ public JUnitPlatformProvider(ProviderParameters parameters) {
                         getConfigurationParameters().put("testng.dataProviderThreadCount", dataproviderthreadcount));
     }
 
+    private void setupRunOrder() {
+        String runOrder = parameters.getProviderProperties().get("runOrder");
+        if (runOrder != null) {
+            if (runOrder.equals("random")) {
+                getConfigurationParameters()
+                        .put("junit.jupiter.testmethod.order.default", "org.junit.jupiter.api.MethodOrderer$Random");
+                getConfigurationParameters()
+                        .put("junit.jupiter.testclass.order.default", "org.junit.jupiter.api.ClassOrderer$Random");
+            } else if (runOrder.equals("alphabetical")) {
+                getConfigurationParameters()
+                        .put(
+                                "junit.jupiter.testmethod.order.default",
+                                "org.junit.jupiter.api.MethodOrderer$MethodName");
+                getConfigurationParameters()
+                        .put("junit.jupiter.testclass.order.default", "org.junit.jupiter.api.ClassOrderer$ClassName");
+            } else if (runOrder.equals("reversealphabetical")) {
+                getConfigurationParameters()
+                        .put(
+                                "junit.jupiter.testmethod.order.default",
+                                "org.apache.maven.surefire.junitplatform.ReverseOrdering$ReverseMethodOrder");
+                getConfigurationParameters()
+                        .put(
+                                "junit.jupiter.testclass.order.default",
+                                "org.apache.maven.surefire.junitplatform.ReverseOrdering$ReverseClassOrder");
+            }
+        }
+    }
+
     @Override
     public Iterable<Class<?>> getSuites() {
         try (LauncherSessionAdapter launcherSession = launcherSessionFactory.openSession()) {

surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/ReverseOrdering.java

@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.surefire.junitplatform;
+
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Optional;
+
+import org.junit.jupiter.api.ClassDescriptor;
+import org.junit.jupiter.api.ClassOrderer;
+import org.junit.jupiter.api.ClassOrdererContext;
+import org.junit.jupiter.api.MethodDescriptor;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.MethodOrdererContext;
+import org.junit.jupiter.api.parallel.ExecutionMode;
+import org.junit.platform.commons.util.ClassUtils;
+
+public class ReverseOrdering {
+
+    public static class ReverseMethodOrder implements MethodOrderer {
+
+        private static final Comparator<MethodDescriptor> COMPARATOR =
+                Comparator.comparing((descriptor) -> descriptor.getMethod().getName());
+
+        @Override
+        public void orderMethods(MethodOrdererContext context) {
+            context.getMethodDescriptors().sort(COMPARATOR);
+            Collections.reverse(context.getMethodDescriptors());
+        }
+
+        private static String parameterList(Method method) {
+            return ClassUtils.nullSafeToString(method.getParameterTypes());
+        }
+
+        @Override
+        public Optional<ExecutionMode> getDefaultExecutionMode() {
+            return MethodOrderer.super.getDefaultExecutionMode();
+        }
+    }
+
+    public static class ReverseClassOrder implements ClassOrderer {
+
+        private static final Comparator<ClassDescriptor> COMPARATOR =
+                Comparator.comparing((descriptor) -> descriptor.getTestClass().getName());
+
+        @Override
+        public void orderClasses(ClassOrdererContext context) {
+            context.getClassDescriptors().sort(COMPARATOR);
+            Collections.reverse(context.getClassDescriptors());
+        }
+    }
+}