commit 263759b709ac2ac9a7bd86d65cfd63b6955d66be
author tibordigana <tibordigana@apache.org> Thu May 21 22:05:14 2020 +0200
committer tibordigana <tibordigana@apache.org> Thu May 21 22:05:14 2020 +0200
tree 7185ca80392918d5434454ef91f12544d34b9f5b
parent 3eb875fc622bde42bff7d998d7d88f1a5c0a7232

recommended exclusion of j11 in Surefire1570ModularFailsafeIT - see similar issue https://issues.apache.org/jira/browse/MJAVADOC-610

surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java

diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java
index 7f7aa69..27f671b 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java
@@ -29,6 +29,7 @@
 import java.util.List;
 import java.util.Locale;
 
+import static java.lang.Double.parseDouble;
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertFalse;
 import static junit.framework.Assert.assertTrue;
@@ -180,15 +181,19 @@
     public static void assumeJavaVersion( double expectedVersion )
     {
         String thisVersion = System.getProperty( "java.specification.version" );
-        assumeTrue( "java.specification.version: " + thisVersion,
-                Double.parseDouble( thisVersion ) >= expectedVersion );
+        assumeTrue( "java.specification.version: " + thisVersion, parseDouble( thisVersion ) >= expectedVersion );
     }
 
     public static void assumeJavaMaxVersion( double expectedMaxVersion )
     {
         String thisVersion = System.getProperty( "java.specification.version" );
-        assumeTrue( "java.specification.version: " + thisVersion,
-            Double.parseDouble( thisVersion ) <= expectedMaxVersion );
+        assumeTrue( "java.specification.version: " + thisVersion, parseDouble( thisVersion ) <= expectedMaxVersion );
+    }
+
+    public static void assumeJavaVersionExcluded( double excludedVersion )
+    {
+        String thisVersion = System.getProperty( "java.specification.version" );
+        assumeTrue( "java.specification.version: " + thisVersion, parseDouble( thisVersion ) != excludedVersion );
     }
 
     public static String convertUnicodeToUTF8( String unicode )

surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1570ModularFailsafeIT.java

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 83d3d08..eb1ff06 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
@@ -24,6 +24,7 @@
 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;
 
@@ -39,6 +40,7 @@
     public void setUp()
     {
         assumeJavaVersion( 9d );
+        assumeJavaVersionExcluded( 11d );
     }
 
     @Test