[maven-surefire] branch SUREFIRE-1733 updated: IT failed on j7 and j8 because requires j9+

[ti...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/SUREFIRE-1733 by this push:
     new bcaaeb3  IT failed on j7 and j8 because requires j9+
bcaaeb3 is described below

commit bcaaeb3b89eb4d5f95ab836cfdc1f2b7bc407bd9
Author: tibordigana <ti...@apache.org>
AuthorDate: Fri May 22 11:20:45 2020 +0200

    IT failed on j7 and j8 because requires j9+
---
 .../maven/surefire/its/MultiModuleProjectWithJPMSIT.java   | 11 ++++++++---
 .../surefire/its/jiras/Surefire1570ModularFailsafeIT.java  | 14 +++++++++-----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/MultiModuleProjectWithJPMSIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/MultiModuleProjectWithJPMSIT.java
index d7bcae7..8b011ae 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/MultiModuleProjectWithJPMSIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/MultiModuleProjectWithJPMSIT.java
@@ -20,7 +20,6 @@ package org.apache.maven.surefire.its;
  */
 
 import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
 import org.junit.Test;
 
 import java.util.List;
@@ -32,12 +31,12 @@ import static org.hamcrest.Matchers.is;
 /**
  * Integration test for <a href="https://issues.apache.org/jira/browse/SUREFIRE-1733">SUREFIRE-1733</a>.
  */
-public class MultiModuleProjectWithJPMSIT extends SurefireJUnit4IntegrationTestCase
+public class MultiModuleProjectWithJPMSIT extends AbstractJigsawIT
 {
     @Test
     public void test() throws Exception
     {
-        OutputValidator validator = unpack( "maven-multimodule-project-with-jpms" )
+        OutputValidator validator = assumeJava9()
             .debugLogging()
             .executeVerify()
             .verifyErrorFreeLog()
@@ -62,4 +61,10 @@ public class MultiModuleProjectWithJPMSIT extends SurefireJUnit4IntegrationTestC
                 .contains( i++ == 0 ? "test-classes" : "com.foo.impl" );
         }
     }
+
+    @Override
+    protected String getProjectDirectoryName()
+    {
+        return "maven-multimodule-project-with-jpms";
+    }
 }
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1570ModularFailsafeIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1570ModularFailsafeIT.java
index eb1ff06..bb575b0 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1570ModularFailsafeIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1570ModularFailsafeIT.java
@@ -19,11 +19,10 @@ package org.apache.maven.surefire.its.jiras;
  * under the License.
  */
 
-import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.apache.maven.surefire.its.AbstractJigsawIT;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersion;
 import static org.apache.maven.surefire.its.fixture.HelperAssertions.assumeJavaVersionExcluded;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.is;
@@ -34,23 +33,28 @@ import static org.hamcrest.Matchers.is;
  */
 @SuppressWarnings( "checkstyle:magicnumber" )
 public class Surefire1570ModularFailsafeIT
-    extends SurefireJUnit4IntegrationTestCase
+    extends AbstractJigsawIT
 {
     @Before
     public void setUp()
     {
-        assumeJavaVersion( 9d );
         assumeJavaVersionExcluded( 11d );
     }
 
     @Test
     public void shouldRunWithJupiterApi() throws Exception
     {
-        unpack( "surefire-1570" )
+        assumeJava9()
             .debugLogging()
             .executeVerify()
             .verifyErrorFreeLog()
             .assertThatLogLine( containsString( "Lets see JDKModulePath" ), is( 2 ) )
             .assertThatLogLine( containsString( "Lets see JDKModulePath: null" ), is( 0 ) );
     }
+
+    @Override
+    protected String getProjectDirectoryName()
+    {
+        return "surefire-1570";
+    }
 }