[SUREFIRE-1710] skipAfterFailureCount in JUnit5 provider

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

@@ -3054,30 +3054,43 @@ else if ( skipAfterFailureCount > 0 )
         {
             try
             {
-                Artifact testng = getTestNgArtifact();
-                if ( testng != null )
+                Artifact junit5 = getJUnit5Artifact();
+                if ( junit5 != null )
                 {
-                    VersionRange range = VersionRange.createFromVersionSpec( "[5.10,)" );
-                    if ( !range.containsVersion( new DefaultArtifactVersion( testng.getVersion() ) ) )
+                    VersionRange range = VersionRange.createFromVersionSpec( "[1.4.0,)" );
+                    if ( !range.containsVersion( new DefaultArtifactVersion( junit5.getVersion() ) ) )
                     {
                         throw new MojoFailureException(
-                            "Parameter \"skipAfterFailureCount\" expects TestNG Version 5.10 or higher. "
-                                + "java.lang.NoClassDefFoundError: org/testng/IInvokedMethodListener" );
+                            "Parameter \"skipAfterFailureCount\" expects JUnit5 Version 5.4.0 or higher." );
                     }
                 }
                 else
                 {
-                    // TestNG is dependent on JUnit
-                    Artifact junit = getJunitArtifact();
-                    if ( junit != null )
+                    Artifact testng = getTestNgArtifact();
+                    if ( testng != null )
                     {
-                        VersionRange range = VersionRange.createFromVersionSpec( "[4.0,)" );
-                        if ( !range.containsVersion( new DefaultArtifactVersion( junit.getVersion() ) ) )
+                        VersionRange range = VersionRange.createFromVersionSpec( "[5.10,)" );
+                        if ( !range.containsVersion( new DefaultArtifactVersion( testng.getVersion() ) ) )
                         {
                             throw new MojoFailureException(
-                                "Parameter \"skipAfterFailureCount\" expects JUnit Version 4.0 or higher. "
-                                    + "java.lang.NoSuchMethodError: "
-                                    + "org.junit.runner.notification.RunNotifier.pleaseStop()V" );
+                                "Parameter \"skipAfterFailureCount\" expects TestNG Version 5.10 or higher. "
+                                    + "java.lang.NoClassDefFoundError: org/testng/IInvokedMethodListener" );
+                        }
+                    }
+                    else
+                    {
+                        // TestNG is dependent on JUnit
+                        Artifact junit = getJunitArtifact();
+                        if ( junit != null )
+                        {
+                            VersionRange range = VersionRange.createFromVersionSpec( "[4.0,)" );
+                            if ( !range.containsVersion( new DefaultArtifactVersion( junit.getVersion() ) ) )
+                            {
+                                throw new MojoFailureException(
+                                    "Parameter \"skipAfterFailureCount\" expects JUnit Version 4.0 or higher. "
+                                        + "java.lang.NoSuchMethodError: "
+                                        + "org.junit.runner.notification.RunNotifier.pleaseStop()V" );
+                            }
                         }
                     }
                 }

maven-surefire-plugin/src/site/apt/examples/skip-after-failure.apt.vm

@@ -42,7 +42,7 @@ Skipping Tests After the Nth Failure or Error
 Prerequisite
 
  Use ${project.artifactId} 2.19 or higher, JUnit 4.0 or higher, or 
- TestNG 5.10 or higher.
+ TestNG 5.10 or higher, JUnit5 5.4.0 or higher.
 
  If version of TestNG is lower than 5.10 while the parameter 
  <<<skipAfterFailureCount>>> is set, the plugin fails with error:

pom.xml

@@ -296,12 +296,6 @@
         <groupId>org.powermock</groupId>
         <artifactId>powermock-reflect</artifactId>
         <version>${powermockVersion}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.objenesis</groupId>
-            <artifactId>objenesis</artifactId>
-          </exclusion>
-        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.javassist</groupId>

surefire-its/src/test/java/org/apache/maven/surefire/its/FailFastJUnit5IT.java

@@ -0,0 +1,61 @@
+package org.apache.maven.surefire.its;
+
+/*
+ * 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.
+ */
+
+import java.util.ArrayList;
+
+import org.junit.runners.Parameterized.Parameters;
+
+/**
+ *
+ */
+public class FailFastJUnit5IT
+    extends AbstractFailFastIT
+{
+
+    @Parameters( name = "{0}" )
+    @SuppressWarnings( "checkstyle:linelength" )
+    public static Iterable<Object[]> data()
+    {
+        /*
+         * reuseForks=false is not used because of race conditions between forks.
+         */
+        ArrayList<Object[]> args = new ArrayList<>();
+        //                        description
+        //                                             profile
+        //                                                       forkCount,
+        //                                                       fail-fast-count,
+        //                                                       reuseForks
+        //                                                                               total
+        //                                                                                    failures
+        //                                                                                            errors
+        //                                                                                                  skipped
+        //                                                                                                        pipes
+        args.add( new Object[] { "fc1", null,     props( 1, 3, true ),    5,   0,      3,    0, true } );
+        args.add( new Object[] { "fc2", null,     props( 2, 3, true ),    5,   0,      3,    0, true } );
+        return args;
+    }
+
+    @Override
+    protected String withProvider()
+    {
+        return "junit5";
+    }
+}

surefire-its/src/test/resources/fail-fast-junit5/pom.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.plugins.surefire</groupId>
+  <artifactId>fail-fast-junit5</artifactId>
+  <version>1.0</version>
+
+  <properties>
+    <maven.compiler.source>${java.specification.version}</maven.compiler.source>
+    <maven.compiler.target>${java.specification.version}</maven.compiler.target>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>5.8.2</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${surefire.version}</version>
+        <configuration>
+          <runOrder>alphabetical</runOrder>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

surefire-its/src/test/resources/fail-fast-junit5/src/test/java/pkg/ATest.java

@@ -0,0 +1,18 @@
+package pkg;
+
+import org.junit.jupiter.api.Test;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+public class ATest
+{
+    @Test
+    public void someMethod()
+        throws InterruptedException
+    {
+        MILLISECONDS.sleep( 1000L );
+        throw new RuntimeException( "assert \"foo\" == \"bar\"\n" +
+            "             |\n"
+            + "             false" );
+    }
+}

surefire-its/src/test/resources/fail-fast-junit5/src/test/java/pkg/BTest.java

@@ -0,0 +1,17 @@
+package pkg;
+
+import org.junit.jupiter.api.Test;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+public class BTest
+{
+    @Test
+    public void test()
+        throws InterruptedException
+    {
+        MILLISECONDS.sleep( 1000L );
+        throw new RuntimeException();
+    }
+
+}

surefire-its/src/test/resources/fail-fast-junit5/src/test/java/pkg/CTest.java

@@ -0,0 +1,16 @@
+package pkg;
+
+import org.junit.jupiter.api.Test;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+public class CTest
+{
+    @Test
+    public void test()
+        throws InterruptedException
+    {
+        MILLISECONDS.sleep( 1000L );
+    }
+
+}

surefire-its/src/test/resources/fail-fast-junit5/src/test/java/pkg/DTest.java

@@ -0,0 +1,16 @@
+package pkg;
+
+import org.junit.jupiter.api.Test;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+public class DTest
+{
+    @Test
+    public void test()
+        throws InterruptedException
+    {
+        MILLISECONDS.sleep( 1000L );
+    }
+
+}

surefire-its/src/test/resources/fail-fast-junit5/src/test/java/pkg/ETest.java

@@ -0,0 +1,12 @@
+package pkg;
+
+import org.junit.jupiter.api.Test;
+
+public class ETest
+{
+    @Test
+    public void test()
+    {
+    }
+
+}

surefire-providers/common-junit5/pom.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.maven.surefire</groupId>
+    <artifactId>surefire-providers</artifactId>
+    <version>3.0.0-M6-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>common-junit5</artifactId>
+  <name>Shared JUnit5 Provider Code</name>
+  <description>Shared JUnit5 Provider Code</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.4.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-reflect</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+</project>