maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tibordig...@apache.org
Subject [maven-surefire] branch 1564 updated: multiple tests are one parameterized test asserting debug logs with regex
Date Thu, 04 Oct 2018 20:02:28 GMT
This is an automated email from the ASF dual-hosted git repository.

tibordigana pushed a commit to branch 1564
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git


The following commit(s) were added to refs/heads/1564 by this push:
     new 702cf42  multiple tests are one parameterized test asserting debug logs with regex
702cf42 is described below

commit 702cf4222147b3ea2eb6c1cea5e6fa17886fb860
Author: Tibor17 <tibordigana@apache.org>
AuthorDate: Thu Oct 4 22:02:20 2018 +0200

    multiple tests are one parameterized test asserting debug logs with regex
---
 surefire-its/pom.xml                               |   5 +-
 .../maven/surefire/its/JUnitPlatformEnginesIT.java | 160 +++++++++++++++++++++
 .../apache/maven/surefire/its/JUnitPlatformIT.java | 145 ++-----------------
 .../apache/maven/surefire/its/fixture/IsRegex.java | 100 +++++++++++++
 .../surefire/its/fixture/OutputValidator.java      |  29 ++--
 .../Surefire1082ParallelJUnitParameterizedIT.java  |  61 +-------
 .../test/resources/junit-platform-1.0.0/pom.xml    |  60 --------
 .../test/resources/junit-platform-1.1.1/pom.xml    |  60 --------
 .../JUnitPlatform_1_1_1_Test.java                  |  37 -----
 .../test/resources/junit-platform-1.2.0/pom.xml    |  60 --------
 .../JUnitPlatform_1_2_0_Test.java                  |  37 -----
 .../test/resources/junit-platform-1.3.1/pom.xml    |  60 --------
 .../JUnitPlatform_1_3_1_Test.java                  |  37 -----
 .../JUnitPlatform_1_4_0_Test.java                  |  37 -----
 .../pom.xml                                        |  30 ++--
 .../java/junitplatform/JUnitPlatformTest.java}     |   4 +-
 16 files changed, 318 insertions(+), 604 deletions(-)

diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml
index 5ee30c9..6edc96d 100644
--- a/surefire-its/pom.xml
+++ b/surefire-its/pom.xml
@@ -97,6 +97,7 @@
         <artifactId>maven-failsafe-plugin</artifactId>
         <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due
to https://issues.apache.org/jira/browse/MRELEASE-799 -->
         <configuration>
+          <skipTests>false</skipTests>
           <jvm>${jdk.home}/bin/java</jvm>
           <runOrder>alphabetical</runOrder>
           <threadCount>1</threadCount>
@@ -104,7 +105,9 @@
           <forkMode>once</forkMode>
           <argLine>-server -Xmx64m -XX:+UseG1GC -XX:+TieredCompilation -XX:TieredStopAtLevel=1
-Djava.awt.headless=true</argLine>
           <includes>
-            <include>org/apache/**/*IT*.java</include>
+            <include>org/apache/**/JUnitPlatformEnginesIT.java</include>
+            <include>org/apache/**/JUnitPlatformIT.java</include>
+            <include>org/apache/**/Surefire1082ParallelJUnitParameterizedIT.java</include>
           </includes>
           <!-- Pass current surefire version to the main suite so that it -->
           <!-- can forward to all integration test projects. SUREFIRE-513 -->
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java
new file mode 100644
index 0000000..42a2b63
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java
@@ -0,0 +1,160 @@
+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 org.apache.maven.it.VerificationException;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion;
+import static org.apache.maven.surefire.its.fixture.IsRegex.regex;
+import static org.fest.assertions.Assertions.assertThat;
+import static org.fest.util.Collections.set;
+import static org.hamcrest.CoreMatchers.startsWith;
+import static org.junit.Assert.assertThat;
+
+@RunWith( Parameterized.class )
+public class JUnitPlatformEnginesIT
+        extends SurefireJUnit4IntegrationTestCase
+{
+    @Parameter
+    public String platform;
+
+    @Parameter( 1 )
+    public String jupiter;
+
+    @Parameter( 2 )
+    public String opentest;
+
+    @Parameter( 3 )
+    public String apiguardian;
+
+    @Parameters(name = "{0}")
+    public static Iterable<Object[]> regexVersions()
+    {
+        ArrayList<Object[]> args = new ArrayList<Object[]>();
+        args.add( new Object[] { "1.0.0", "5.0.0", "1.0.0", "1.0.0" } );
+        args.add( new Object[] { "1.1.1", "5.1.1", "1.0.0", "1.0.0" } );
+        args.add( new Object[] { "1.2.0", "5.2.0", "1.1.0", "1.0.0" } );
+        args.add( new Object[] { "1.3.1", "5.3.1", "1.1.1", "1.0.0" } );
+        args.add( new Object[] { "1.4.0-SNAPSHOT", "5.4.0-SNAPSHOT", "1.1.1", "1.0.0" } );
+        return args;
+    }
+
+    @Before
+    public void setUp()
+    {
+        assumeJavaVersion( 1.8d );
+    }
+
+    @Test
+    public void testToRegex()
+    {
+        String regex = toRegex( ".[]()*" );
+        assertThat( regex )
+                .isEqualTo( "\\.\\[\\]\\(\\).*" );
+    }
+
+    @Test
+    public void platform() throws VerificationException
+    {
+        OutputValidator validator = unpack( "junit-platform", '-' + platform )
+                .sysProp( "jupiter.version", jupiter )
+                .addGoal( "-X" )
+                .executeTest()
+                .verifyErrorFree( 1 );
+
+        String testClasspath = "[DEBUG] test(compact) classpath:"
+                + "  test-classes"
+                + "  classes"
+                + "  junit-jupiter-engine-" + jupiter + ".jar"
+                + "  apiguardian-api-" + apiguardian + ".jar"
+                + "  junit-platform-engine-" + platform + ".jar"
+                + "  junit-platform-commons-" + platform + ".jar"
+                + "  opentest4j-" + opentest + ".jar"
+                + "  junit-jupiter-api-" + jupiter + ".jar";
+
+        List<String> lines = validator.loadLogLines( startsWith( "[DEBUG] test(compact)
classpath" ) );
+
+        assertThat( lines )
+                .hasSize( 1 );
+
+        String line = lines.get( 0 );
+
+        assertThat( set( line ), regex( toRegex( testClasspath ) ) );
+
+        String providerClasspath = "[DEBUG] provider(compact) classpath:"
+                + "  surefire-junit-platform-*.jar"
+                + "  junit-platform-launcher-1.3.1.jar"
+                + "  surefire-api-*.jar"
+                + "  surefire-logger-api-*.jar";
+
+        lines = validator.loadLogLines( startsWith( "[DEBUG] provider(compact) classpath"
) );
+
+        assertThat( lines )
+                .hasSize( 1 );
+
+        line = lines.get( 0 );
+
+        assertThat( set( line ), regex( toRegex( providerClasspath ) ) );
+
+        String bootClasspath = "[DEBUG] boot(compact) classpath:"
+                + "  surefire-booter-*.jar"
+                + "  surefire-api-*.jar"
+                + "  surefire-logger-api-*.jar"
+                + "  test-classes"
+                + "  classes"
+                + "  junit-jupiter-engine-" + jupiter + ".jar"
+                + "  apiguardian-api-" + apiguardian + ".jar"
+                + "  junit-platform-engine-" + platform + ".jar"
+                + "  junit-platform-commons-" + platform + ".jar"
+                + "  opentest4j-" + opentest + ".jar"
+                + "  junit-jupiter-api-" + jupiter + ".jar"
+                + "  surefire-junit-platform-*.jar"
+                + "  junit-platform-launcher-1.3.1.jar";
+
+        lines = validator.loadLogLines( startsWith( "[DEBUG] boot(compact) classpath" ) );
+
+        assertThat( lines )
+                .hasSize( 1 );
+
+        line = lines.get( 0 );
+
+        assertThat( set( line ), regex( toRegex( bootClasspath ) ) );
+    }
+
+    private static String toRegex(String text) {
+        return text.replaceAll( "\\.", "\\\\." )
+                .replaceAll( "\\[", "\\\\[" )
+                .replaceAll( "]", "\\\\]" )
+                .replaceAll( "\\(", "\\\\(" )
+                .replaceAll( "\\)", "\\\\)" )
+                .replaceAll( "\\*", ".*" );
+    }
+}
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java
index 527850e..6c8d29d 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformIT.java
@@ -19,20 +19,14 @@ package org.apache.maven.surefire.its;
  * under the License.
  */
 
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.surefire.its.fixture.OutputValidator;
 import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
 import org.junit.Before;
 import org.junit.Test;
 
 import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
 
 public class JUnitPlatformIT
-    extends SurefireJUnit4IntegrationTestCase
+        extends SurefireJUnit4IntegrationTestCase
 {
     @Before
     public void setUp()
@@ -43,149 +37,40 @@ public class JUnitPlatformIT
     @Test
     public void testJupiterEngine()
     {
-        unpack( "/junit-platform-engine-jupiter" ).executeTest().verifyErrorFree( 5 );
+        unpack( "/junit-platform-engine-jupiter" )
+                .executeTest()
+                .verifyErrorFree( 5 );
     }
 
     @Test
     public void testVintageEngine()
     {
-        unpack( "/junit-platform-engine-vintage" ).executeTest().verifyErrorFree( 1 );
+        unpack( "/junit-platform-engine-vintage" )
+                .executeTest()
+                .verifyErrorFree( 1 );
     }
 
     @Test
     public void testJQwikEngine()
     {
-        unpack( "/junit-platform-engine-jqwik" ).executeTest().verifyErrorFree( 1 );
+        unpack( "/junit-platform-engine-jqwik" )
+                .executeTest()
+                .verifyErrorFree( 1 );
     }
 
     @Test
     public void testMultipleEngines()
     {
-        unpack( "/junit-platform-multiple-engines" ).executeTest().verifyErrorFree( 7 );
-    }
-
-    @Test
-    public void testJUnitPlatform_1_0_0() throws VerificationException
-    {
-        Map<String, String> versions = new HashMap<String, String>();
-        versions.put("surefire", System.getProperty("surefire.version"));
-        versions.put("platform", "1.0.0");
-        versions.put("jupiter", "5.0.0");
-        versions.put("opentest", "1.0.0");
-        versions.put("apiguardian", "1.0.0");
-
-        unpackExecuteAndVerifyVersions(versions);
-    }
-
-    @Test
-    public void testJUnitPlatform_1_1_1() throws VerificationException
-    {
-        Map<String, String> versions = new HashMap<String, String>();
-        versions.put("surefire", System.getProperty("surefire.version"));
-        versions.put("platform", "1.1.1");
-        versions.put("jupiter", "5.1.1");
-        versions.put("opentest", "1.0.0");
-        versions.put("apiguardian", "1.0.0");
-
-        unpackExecuteAndVerifyVersions(versions);
-    }
-
-    @Test
-    public void testJUnitPlatform_1_2_0() throws VerificationException
-    {
-        Map<String, String> versions = new HashMap<String, String>();
-        versions.put("surefire", System.getProperty("surefire.version"));
-        versions.put("platform", "1.2.0");
-        versions.put("jupiter", "5.2.0");
-        versions.put("opentest", "1.1.0");
-        versions.put("apiguardian", "1.0.0");
-
-        unpackExecuteAndVerifyVersions(versions);
-    }
-
-    @Test
-    public void testJUnitPlatform_1_3_1() throws VerificationException
-    {
-        Map<String, String> versions = new HashMap<String, String>();
-        versions.put("surefire", System.getProperty("surefire.version"));
-        versions.put("platform", "1.3.1");
-        versions.put("jupiter", "5.3.1");
-        versions.put("opentest", "1.1.1");
-        versions.put("apiguardian", "1.0.0");
-
-        unpackExecuteAndVerifyVersions(versions);
-    }
-
-    @Test
-    public void testJUnitPlatform_SNAPSHOT() throws VerificationException
-    {
-        Map<String, String> versions = new HashMap<String, String>();
-        versions.put("surefire", System.getProperty("surefire.version"));
-        versions.put("platform", "1.4.0-SNAPSHOT");
-        versions.put("jupiter", "5.4.0-SNAPSHOT");
-        versions.put("opentest", "1.1.1");
-        versions.put("apiguardian", "1.0.0");
-
-        unpackExecuteAndVerifyVersions(versions);
+        unpack( "/junit-platform-multiple-engines" )
+                .executeTest()
+                .verifyErrorFree( 7 );
     }
 
     @Test
     public void testTags()
     {
-        unpack( "/junit-platform-tags" ).executeTest().verifyErrorFree( 2 );
-    }
-
-    private String replaceVersions( String pattern, Map<String, String> versions )
-    {
-        String result = pattern;
-        for(Map.Entry<String, String> entry : versions.entrySet()) {
-            result = result.replace("${" + entry.getKey() + "}", entry.getValue());
-        }
-        return result;
-    }
-
-    private void unpackExecuteAndVerifyVersions(Map<String, String> versions) throws
VerificationException
-    {
-        OutputValidator validator = unpack( "/junit-platform-" + versions.get("platform")
)
-                .addGoal( "-X" )
+        unpack( "/junit-platform-tags" )
                 .executeTest()
-                .verifyErrorFree( 1 );
-
-        String compactTestClasspathPattern = "[DEBUG] test(compact) classpath:"
-                + "  test-classes"
-                + "  classes"
-                + "  junit-jupiter-engine-${jupiter}.jar"
-                + "  apiguardian-api-${apiguardian}.jar"
-                + "  junit-platform-engine-${platform}.jar"
-                + "  junit-platform-commons-${platform}.jar"
-                + "  opentest4j-${opentest}.jar"
-                + "  junit-jupiter-api-${jupiter}.jar";
-        String expectedTestClasspath = replaceVersions( compactTestClasspathPattern, versions
);
-        validator.assertThatLogLine( containsString( expectedTestClasspath ), is( 1 ) );
-
-        String compactProviderClasspathPattern ="[DEBUG] provider(compact) classpath:"
-                + "  surefire-junit-platform-${surefire}.jar"
-                + "  junit-platform-launcher-1.3.1.jar"
-                + "  surefire-api-${surefire}.jar"
-                + "  surefire-logger-api-${surefire}.jar";
-        String expectedProviderClasspath = replaceVersions( compactProviderClasspathPattern,
versions );
-        validator.assertThatLogLine( containsString( expectedProviderClasspath ), is( 1 )
);
-
-        String compactBootClasspathPattern = "[DEBUG] boot(compact) classpath:"
-                + "  surefire-booter-${surefire}.jar"
-                + "  surefire-api-${surefire}.jar"
-                + "  surefire-logger-api-${surefire}.jar"
-                + "  test-classes"
-                + "  classes"
-                + "  junit-jupiter-engine-${jupiter}.jar"
-                + "  apiguardian-api-${apiguardian}.jar"
-                + "  junit-platform-engine-${platform}.jar"
-                + "  junit-platform-commons-${platform}.jar"
-                + "  opentest4j-${opentest}.jar"
-                + "  junit-jupiter-api-${jupiter}.jar"
-                + "  surefire-junit-platform-${surefire}.jar"
-                + "  junit-platform-launcher-1.3.1.jar";
-        String expectedBootClasspath = replaceVersions( compactBootClasspathPattern, versions
);
-        validator.assertThatLogLine( containsString( expectedBootClasspath ), is( 1 ) );
+                .verifyErrorFree( 2 );
     }
 }
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/IsRegex.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/IsRegex.java
new file mode 100644
index 0000000..09e8d0d
--- /dev/null
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/IsRegex.java
@@ -0,0 +1,100 @@
+package org.apache.maven.surefire.its.fixture;
+
+/*
+ * 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 org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Set;
+
+import static java.util.Collections.singleton;
+
+/**
+ * Java Hamcrest Matcher with Regex.
+ */
+public final class IsRegex
+        extends BaseMatcher<Set<String>>
+{
+    public static Matcher<Set<String>> regex( Set<String> expectedRegex
)
+    {
+        return new IsRegex( expectedRegex );
+    }
+
+    public static Matcher<Set<String>> regex( String expectedRegex )
+    {
+        return new IsRegex( expectedRegex );
+    }
+
+    private final Set<String> expectedRegex;
+
+    private IsRegex( String expectedRegex )
+    {
+        this.expectedRegex = singleton( expectedRegex );
+    }
+
+    private IsRegex( Set<String> expectedRegex )
+    {
+        this.expectedRegex = expectedRegex;
+    }
+
+    @Override
+    public boolean matches( Object o )
+    {
+        if ( o != null
+                && expectedRegex.size() == 1 ? isStringOrSet( o ) : isSet( o ) )
+        {
+            //noinspection unchecked
+            Set<String> actual = isSet( o ) ? ( Set<String> ) o : singleton(
( String ) o );
+            boolean matches = actual.size() == expectedRegex.size();
+            Iterator<String> regex = expectedRegex.iterator();
+            for ( String s : actual )
+            {
+                if ( s == null || !regex.hasNext() || !s.matches( regex.next() ) )
+                {
+                    matches = false;
+                }
+            }
+            return matches;
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+    @Override
+    public void describeTo( Description description )
+    {
+        description.appendValue( expectedRegex );
+    }
+
+    private static boolean isStringOrSet( Object o )
+    {
+        return o instanceof String || o instanceof Set;
+    }
+
+    private static boolean isSet( Object o )
+    {
+        return o instanceof Set;
+    }
+}
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java
index 882ed9c..56046f1 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java
@@ -22,7 +22,7 @@ package org.apache.maven.surefire.its.fixture;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.Charset;
-import java.util.Collection;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
@@ -39,9 +39,9 @@ import static org.hamcrest.MatcherAssert.assertThat;
  */
 public class OutputValidator
 {
-    protected final Verifier verifier;
+    final Verifier verifier;
 
-    protected final File baseDir;
+    private final File baseDir;
 
     public OutputValidator( Verifier verifier )
     {
@@ -93,14 +93,7 @@ public class OutputValidator
     public OutputValidator assertThatLogLine( Matcher<String> line, Matcher<Integer>
nTimes )
         throws VerificationException
     {
-        int counter = 0;
-        for ( String log : loadLogLines() )
-        {
-            if ( line.matches( log ) )
-            {
-                counter++;
-            }
-        }
+        int counter = loadLogLines( line ).size();
         assertThat( "log pattern does not match nTimes", counter, nTimes );
         return this;
     }
@@ -111,6 +104,20 @@ public class OutputValidator
         return verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false
);
     }
 
+    public List<String> loadLogLines( Matcher<String> line )
+            throws VerificationException
+    {
+        List<String> matchedLines = new ArrayList<String>();
+        for ( String log : loadLogLines() )
+        {
+            if ( line.matches( log ) )
+            {
+                matchedLines.add( log );
+            }
+        }
+        return matchedLines;
+    }
+
     public List<String> loadFile( File file, Charset charset )
     {
         //noinspection unchecked
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
index 2669b2f..2209061 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1082ParallelJUnitParameterizedIT.java
@@ -24,17 +24,15 @@ import org.apache.maven.surefire.its.fixture.OutputValidator;
 import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
 import org.apache.maven.surefire.its.fixture.SurefireLauncher;
 import org.apache.maven.surefire.its.fixture.TestFile;
-import org.hamcrest.BaseMatcher;
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
 import org.junit.Test;
 
 import java.nio.charset.Charset;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.Set;
 import java.util.TreeSet;
 
+import static org.apache.maven.surefire.its.fixture.IsRegex.regex;
+import static org.hamcrest.CoreMatchers.startsWith;
 import static org.hamcrest.core.AnyOf.anyOf;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.StringContains.containsString;
@@ -48,14 +46,7 @@ import static org.junit.Assert.assertThat;
 public class Surefire1082ParallelJUnitParameterizedIT
     extends SurefireJUnit4IntegrationTestCase
 {
-    private static Set<String> printOnlyTestLinesFromConsole( OutputValidator validator
)
-            throws VerificationException
-    {
-        return printOnlyTestLines( validator.loadLogLines() );
-    }
-
     private static Set<String> printOnlyTestLinesFromOutFile( OutputValidator validator
)
-            throws VerificationException
     {
         TestFile report = validator.getSurefireReportsFile( "jiras.surefire1082.Jira1082Test-output.txt"
);
         report.assertFileExists();
@@ -63,7 +54,6 @@ public class Surefire1082ParallelJUnitParameterizedIT
     }
 
     private static Set<String> printOnlyTestLines( Collection<String> logs )
-        throws VerificationException
     {
         Set<String> log = new TreeSet<String>();
         for ( String line : logs )
@@ -76,11 +66,6 @@ public class Surefire1082ParallelJUnitParameterizedIT
         return log;
     }
 
-    private static Matcher<Set<String>> regex( Set<String> r )
-    {
-        return new IsRegex( r );
-    }
-
     private static void assertParallelRun( Set<String> log )
     {
         assertThat( log.size(), is( 4 ) );
@@ -115,7 +100,7 @@ public class Surefire1082ParallelJUnitParameterizedIT
 
         validator.assertThatLogLine( containsString( "Running jiras.surefire1082.Jira1082Test"
), is( 1 ) );
 
-        Set<String> log = printOnlyTestLinesFromConsole( validator );
+        Set<String> log = new TreeSet<String>( validator.loadLogLines( startsWith(
"class jiras.surefire1082." ) ) );
         assertParallelRun( log );
     }
 
@@ -169,44 +154,4 @@ public class Surefire1082ParallelJUnitParameterizedIT
     {
         return unpack( "surefire-1082-parallel-junit-parameterized" );
     }
-
-    private static class IsRegex
-        extends BaseMatcher<Set<String>>
-    {
-        private final Set<String> expectedRegex;
-
-        IsRegex( Set<String> expectedRegex )
-        {
-            this.expectedRegex = expectedRegex;
-        }
-
-        @Override
-        public boolean matches( Object o )
-        {
-            if ( o != null && o instanceof Set )
-            {
-                Set<String> actual = (Set<String>) o;
-                boolean matches = actual.size() == expectedRegex.size();
-                Iterator<String> regex = expectedRegex.iterator();
-                for ( String s : actual )
-                {
-                    if ( s == null || !regex.hasNext() || !s.matches( regex.next() ) )
-                    {
-                        matches = false;
-                    }
-                }
-                return matches;
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        @Override
-        public void describeTo( Description description )
-        {
-            description.appendValue( expectedRegex );
-        }
-    }
 }
diff --git a/surefire-its/src/test/resources/junit-platform-1.0.0/pom.xml b/surefire-its/src/test/resources/junit-platform-1.0.0/pom.xml
deleted file mode 100644
index 1b6fd59..0000000
--- a/surefire-its/src/test/resources/junit-platform-1.0.0/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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>junit-platform-1.0.0</artifactId>
-    <version>1.0</version>
-    <name>Test for JUnit 5: Platform 1.0.0 + Jupiter 5.0.0</name>
-
-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
-
-    <!--
-        Declare "junit-jupiter-engine" dependency because the
-        Jupiter Engine is needed at test runtime. Artifacts
-        needed for test compilation, like "junit-jupiter-api",
-        are pulled-in via transitive dependency resolution.
-    -->
-    <dependencies>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.0.0</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire.version}</version>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/surefire-its/src/test/resources/junit-platform-1.1.1/pom.xml b/surefire-its/src/test/resources/junit-platform-1.1.1/pom.xml
deleted file mode 100644
index 2555d8b..0000000
--- a/surefire-its/src/test/resources/junit-platform-1.1.1/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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>junit-platform-1.1.1</artifactId>
-    <version>1.0</version>
-    <name>Test for JUnit 5: Platform 1.1.1 + Jupiter 5.1.1</name>
-
-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
-
-    <!--
-        Declare "junit-jupiter-engine" dependency because the
-        Jupiter Engine is needed at test runtime. Artifacts
-        needed for test compilation, like "junit-jupiter-api",
-        are pulled-in via transitive dependency resolution.
-    -->
-    <dependencies>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.1.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire.version}</version>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/surefire-its/src/test/resources/junit-platform-1.1.1/src/test/java/junitplatform_1_1_1/JUnitPlatform_1_1_1_Test.java
b/surefire-its/src/test/resources/junit-platform-1.1.1/src/test/java/junitplatform_1_1_1/JUnitPlatform_1_1_1_Test.java
deleted file mode 100644
index e1bc05e..0000000
--- a/surefire-its/src/test/resources/junit-platform-1.1.1/src/test/java/junitplatform_1_1_1/JUnitPlatform_1_1_1_Test.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package junitplatform_1_1_1;
-
-/*
- * 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 static org.junit.jupiter.api.Assertions.assertEquals;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInfo;
-
-class JUnitPlatform_1_1_1_Test
-{
-
-    @Test
-    void test(TestInfo info)
-    {
-        assertEquals( "test(TestInfo)", info.getDisplayName(), "display name mismatch" );
-    }
-
-
-}
diff --git a/surefire-its/src/test/resources/junit-platform-1.2.0/pom.xml b/surefire-its/src/test/resources/junit-platform-1.2.0/pom.xml
deleted file mode 100644
index 8bc5638..0000000
--- a/surefire-its/src/test/resources/junit-platform-1.2.0/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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>junit-platform-1.2.0</artifactId>
-    <version>1.0</version>
-    <name>Test for JUnit 5: Platform 1.2.0 + Jupiter 5.2.0</name>
-
-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
-
-    <!--
-        Declare "junit-jupiter-engine" dependency because the
-        Jupiter Engine is needed at test runtime. Artifacts
-        needed for test compilation, like "junit-jupiter-api",
-        are pulled-in via transitive dependency resolution.
-    -->
-    <dependencies>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.2.0</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire.version}</version>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/surefire-its/src/test/resources/junit-platform-1.2.0/src/test/java/junitplatform_1_2_0/JUnitPlatform_1_2_0_Test.java
b/surefire-its/src/test/resources/junit-platform-1.2.0/src/test/java/junitplatform_1_2_0/JUnitPlatform_1_2_0_Test.java
deleted file mode 100644
index c6ccbfc..0000000
--- a/surefire-its/src/test/resources/junit-platform-1.2.0/src/test/java/junitplatform_1_2_0/JUnitPlatform_1_2_0_Test.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package junitplatform_1_2_0;
-
-/*
- * 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 static org.junit.jupiter.api.Assertions.assertEquals;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInfo;
-
-class JUnitPlatform_1_2_0_Test
-{
-
-    @Test
-    void test(TestInfo info)
-    {
-        assertEquals( "test(TestInfo)", info.getDisplayName(), "display name mismatch" );
-    }
-
-
-}
diff --git a/surefire-its/src/test/resources/junit-platform-1.3.1/pom.xml b/surefire-its/src/test/resources/junit-platform-1.3.1/pom.xml
deleted file mode 100644
index f9574a7..0000000
--- a/surefire-its/src/test/resources/junit-platform-1.3.1/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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>junit-platform-1.3.1</artifactId>
-    <version>1.0</version>
-    <name>Test for JUnit 5: Platform 1.3.1 + Jupiter 5.3.1</name>
-
-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
-
-    <!--
-        Declare "junit-jupiter-engine" dependency because the
-        Jupiter Engine is needed at test runtime. Artifacts
-        needed for test compilation, like "junit-jupiter-api",
-        are pulled-in via transitive dependency resolution.
-    -->
-    <dependencies>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.3.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire.version}</version>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/surefire-its/src/test/resources/junit-platform-1.3.1/src/test/java/junitplatform_1_3_1/JUnitPlatform_1_3_1_Test.java
b/surefire-its/src/test/resources/junit-platform-1.3.1/src/test/java/junitplatform_1_3_1/JUnitPlatform_1_3_1_Test.java
deleted file mode 100644
index 1a54020..0000000
--- a/surefire-its/src/test/resources/junit-platform-1.3.1/src/test/java/junitplatform_1_3_1/JUnitPlatform_1_3_1_Test.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package junitplatform_1_3_1;
-
-/*
- * 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 static org.junit.jupiter.api.Assertions.assertEquals;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInfo;
-
-class JUnitPlatform_1_3_1_Test
-{
-
-    @Test
-    void test(TestInfo info)
-    {
-        assertEquals( "test(TestInfo)", info.getDisplayName(), "display name mismatch" );
-    }
-
-
-}
diff --git a/surefire-its/src/test/resources/junit-platform-1.4.0-SNAPSHOT/src/test/java/junitplatform_1_4_0/JUnitPlatform_1_4_0_Test.java
b/surefire-its/src/test/resources/junit-platform-1.4.0-SNAPSHOT/src/test/java/junitplatform_1_4_0/JUnitPlatform_1_4_0_Test.java
deleted file mode 100644
index 64c8951..0000000
--- a/surefire-its/src/test/resources/junit-platform-1.4.0-SNAPSHOT/src/test/java/junitplatform_1_4_0/JUnitPlatform_1_4_0_Test.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package junitplatform_1_3_1;
-
-/*
- * 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 static org.junit.jupiter.api.Assertions.assertEquals;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInfo;
-
-class JUnitPlatform_1_4_0_Test
-{
-
-    @Test
-    void test(TestInfo info)
-    {
-        assertEquals( "test(TestInfo)", info.getDisplayName(), "display name mismatch" );
-    }
-
-
-}
diff --git a/surefire-its/src/test/resources/junit-platform-1.4.0-SNAPSHOT/pom.xml b/surefire-its/src/test/resources/junit-platform/pom.xml
similarity index 90%
rename from surefire-its/src/test/resources/junit-platform-1.4.0-SNAPSHOT/pom.xml
rename to surefire-its/src/test/resources/junit-platform/pom.xml
index bde9ab3..02e5c00 100644
--- a/surefire-its/src/test/resources/junit-platform-1.4.0-SNAPSHOT/pom.xml
+++ b/surefire-its/src/test/resources/junit-platform/pom.xml
@@ -24,26 +24,15 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.apache.maven.plugins.surefire</groupId>
-    <artifactId>junit-platform-1.4.0-SNAPSHOT</artifactId>
+    <artifactId>junit-platform-1.0.0</artifactId>
     <version>1.0</version>
-    <name>Test for JUnit 5: Platform 1.4.0-SNAPSHOT + Jupiter 5.4.0-SNAPSHOT</name>
+    <name>Test for JUnit 5: Platform + Jupiter</name>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
-    <repositories>
-        <repository>
-            <id>oss-sonatype</id>
-            <name>oss-sonatype</name>
-            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <!--
         Declare "junit-jupiter-engine" dependency because the
         Jupiter Engine is needed at test runtime. Artifacts
@@ -54,7 +43,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.4.0-SNAPSHOT</version>
+            <version>${jupiter.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -68,4 +57,17 @@
             </plugin>
         </plugins>
     </build>
+
+    <repositories>
+        <repository>
+            <id>oss-sonatype</id>
+            <name>oss-sonatype</name>
+            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+        </repository>
+    </repositories>
 </project>
diff --git a/surefire-its/src/test/resources/junit-platform-1.0.0/src/test/java/junitplatform_1_0_0/JUnitPlatform_1_0_0_Test.java
b/surefire-its/src/test/resources/junit-platform/src/test/java/junitplatform/JUnitPlatformTest.java
similarity index 94%
rename from surefire-its/src/test/resources/junit-platform-1.0.0/src/test/java/junitplatform_1_0_0/JUnitPlatform_1_0_0_Test.java
rename to surefire-its/src/test/resources/junit-platform/src/test/java/junitplatform/JUnitPlatformTest.java
index 760d874..bf767d0 100644
--- a/surefire-its/src/test/resources/junit-platform-1.0.0/src/test/java/junitplatform_1_0_0/JUnitPlatform_1_0_0_Test.java
+++ b/surefire-its/src/test/resources/junit-platform/src/test/java/junitplatform/JUnitPlatformTest.java
@@ -1,4 +1,4 @@
-package junitplatform_1_0_0;
+package junitplatform;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
 
-class JUnitPlatform_1_0_0_Test
+class JUnitPlatformTest
 {
 
     @Test


Mime
View raw message