You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2019/01/22 12:30:58 UTC

[maven-surefire] 02/02: renamed assumeJigsaw() to assumeJava9()

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

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

commit 9d4cff2d9d0a93ada784bd23d654635cdd20bab2
Author: tibordigana <ti...@apache.org>
AuthorDate: Tue Jan 22 13:24:43 2019 +0100

    renamed assumeJigsaw() to assumeJava9()
---
 .../test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java   | 2 +-
 .../src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java | 2 +-
 .../src/test/java/org/apache/maven/surefire/its/ModulePathIT.java   | 4 ++--
 .../org/apache/maven/surefire/its/jiras/Surefire1265Java9IT.java    | 2 +-
 .../its/jiras/Surefire1534ReuseForksFalseWithJavaModuleIT.java      | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java
index 67e835f..c8fb2d5 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/AbstractJigsawIT.java
@@ -47,7 +47,7 @@ public abstract class AbstractJigsawIT
 
     protected abstract String getProjectDirectoryName();
 
-    protected SurefireLauncher assumeJigsaw() throws IOException
+    protected SurefireLauncher assumeJava9() throws IOException
     {
         assumeTrue( "There's no JDK 9 provided.",
                           isJavaVersion9AtLeast() || EXT_JDK_HOME != null && isExtJavaVerion9AtLeast() );
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java
index 1ceebb0..0c7776d 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/Java9FullApiIT.java
@@ -45,7 +45,7 @@ public class Java9FullApiIT
     @Test
     public void shouldLoadMultipleJavaModules_JavaHome() throws Exception
     {
-        OutputValidator validator = assumeJigsaw()
+        OutputValidator validator = assumeJava9()
                                             .setForkJvm()
                                             .debugLogging()
                                             .execute( "verify" )
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/ModulePathIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/ModulePathIT.java
index dedd0db..a05ef72 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/ModulePathIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/ModulePathIT.java
@@ -32,7 +32,7 @@ public class ModulePathIT
     public void testModulePath()
             throws IOException
     {
-        assumeJigsaw()
+        assumeJava9()
                 .debugLogging()
                 .executeTest()
                 .verifyErrorFreeLog()
@@ -44,7 +44,7 @@ public class ModulePathIT
             throws IOException
     {
         suffix = " with spaces";
-        assumeJigsaw()
+        assumeJava9()
                 .debugLogging()
                 .executeTest()
                 .verifyErrorFreeLog()
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1265Java9IT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1265Java9IT.java
index 2e92805..c5d8071 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1265Java9IT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1265Java9IT.java
@@ -44,7 +44,7 @@ public class Surefire1265Java9IT
     @Test
     public void shouldRunInPluginJava9() throws IOException
     {
-        assumeJigsaw()
+        assumeJava9()
                 .executeTest()
                 .verifyErrorFree( 2 );
     }
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1534ReuseForksFalseWithJavaModuleIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1534ReuseForksFalseWithJavaModuleIT.java
index 82dde97..8ec8973 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1534ReuseForksFalseWithJavaModuleIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1534ReuseForksFalseWithJavaModuleIT.java
@@ -37,7 +37,7 @@ public class Surefire1534ReuseForksFalseWithJavaModuleIT
     public void testExecuteWithReuseForksFalseWithJavaModule()
             throws IOException
     {
-        OutputValidator validator = assumeJigsaw()
+        OutputValidator validator = assumeJava9()
                 .reuseForks( false )
                 .forkCount( 1 )
                 .executeTest();
@@ -57,7 +57,7 @@ public class Surefire1534ReuseForksFalseWithJavaModuleIT
     public void testExecuteWithReuseForksFalseWithJavaModuleWithFilter()
             throws IOException
     {
-        OutputValidator validator = assumeJigsaw()
+        OutputValidator validator = assumeJava9()
                 .reuseForks( false )
                 .forkCount( 1 )
                 .setTestToRun( "MainTest" )
@@ -78,7 +78,7 @@ public class Surefire1534ReuseForksFalseWithJavaModuleIT
     public void testExecuteWithZeroForkCountWithJavaModule()
             throws IOException
     {
-        OutputValidator validator = assumeJigsaw()
+        OutputValidator validator = assumeJava9()
                 .forkCount( 0 )
                 .executeTest();