This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch 3.0.0-M2
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit b9ad0cfe7822ee9b1ec1b98e3a768f0dd566a2e4
Author: Tibor17 <tibordig...@apache.org>
AuthorDate: Sun Nov 11 23:31:47 2018 +0100
[SUREFIRE-1596] Unnecessary check JAVA_RECENT == JAVA_1_7 in unit tests
---
.../plugin/surefire/AbstractSurefireMojoJava7PlusTest.java | 10 ----------
.../booterclient/ModularClasspathForkConfigurationTest.java | 13 +------------
.../java/org/apache/maven/surefire/JUnit4SuiteTest.java | 8 +-------
3 files changed, 2 insertions(+), 29 deletions(-)
diff --git
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java
index 9c240eb..f73124a 100644
---
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java
+++
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java
@@ -35,7 +35,6 @@ import
org.codehaus.plexus.languages.java.jpms.ResolvePathsRequest;
import org.codehaus.plexus.languages.java.jpms.ResolvePathsResult;
import org.codehaus.plexus.languages.java.jpms.ModuleNameSource;
import org.codehaus.plexus.logging.Logger;
-import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
@@ -51,11 +50,8 @@ import java.util.Set;
import static java.util.Arrays.asList;
import static java.util.Collections.singleton;
-import static org.apache.commons.lang3.JavaVersion.JAVA_1_7;
-import static org.apache.commons.lang3.JavaVersion.JAVA_RECENT;
import static
org.apache.maven.artifact.versioning.VersionRange.createFromVersion;
import static org.fest.assertions.Assertions.assertThat;
-import static org.junit.Assume.assumeTrue;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.times;
@@ -83,12 +79,6 @@ public class AbstractSurefireMojoJava7PlusTest
@Mock
private LocationManager locationManager;
- @BeforeClass
- public static void withJava7Plus()
- {
- assumeTrue( JAVA_RECENT.atLeast( JAVA_1_7 ) );
- }
-
@Test
public void shouldHaveStartupConfigForModularClasspath()
throws Exception
diff --git
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfigurationTest.java
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfigurationTest.java
index 491013a..04145d9 100644
---
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfigurationTest.java
+++
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfigurationTest.java
@@ -27,20 +27,16 @@ import org.apache.maven.surefire.booter.ForkedBooter;
import org.apache.maven.surefire.booter.ModularClasspath;
import org.apache.maven.surefire.booter.ModularClasspathConfiguration;
import org.apache.maven.surefire.booter.StartupConfiguration;
-import org.junit.Before;
import org.junit.Test;
import javax.annotation.Nonnull;
import java.io.File;
-import java.io.IOException;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Properties;
import static java.io.File.createTempFile;
-import static org.apache.commons.lang3.JavaVersion.JAVA_1_7;
-import static org.apache.commons.lang3.JavaVersion.JAVA_RECENT;
import static java.io.File.separator;
import static java.io.File.pathSeparator;
import static java.nio.charset.StandardCharsets.UTF_8;
@@ -48,7 +44,6 @@ import static java.nio.file.Files.readAllLines;
import static java.util.Arrays.asList;
import static java.util.Collections.singleton;
import static org.fest.assertions.Assertions.assertThat;
-import static org.junit.Assume.assumeTrue;
/**
* @author <a href="mailto:tibordig...@apache.org";>Tibor Digana (tibor17)</a>
@@ -56,12 +51,6 @@ import static org.junit.Assume.assumeTrue;
*/
public class ModularClasspathForkConfigurationTest
{
- @Before
- public void withJava7orHigher()
- {
- assumeTrue( JAVA_RECENT.atLeast( JAVA_1_7 ) );
- }
-
@Test
@SuppressWarnings( "ResultOfMethodCallIgnored" )
public void shouldCreateModularArgsFile() throws Exception
@@ -78,7 +67,7 @@ public class ModularClasspathForkConfigurationTest
{
@Nonnull
@Override
- String toModuleName( @Nonnull File moduleDescriptor ) throws
IOException
+ String toModuleName( @Nonnull File moduleDescriptor )
{
return "abc";
}
diff --git
a/maven-surefire-common/src/test/java/org/apache/maven/surefire/JUnit4SuiteTest.java
b/maven-surefire-common/src/test/java/org/apache/maven/surefire/JUnit4SuiteTest.java
index 728cef3..2ca1b39 100644
---
a/maven-surefire-common/src/test/java/org/apache/maven/surefire/JUnit4SuiteTest.java
+++
b/maven-surefire-common/src/test/java/org/apache/maven/surefire/JUnit4SuiteTest.java
@@ -51,9 +51,6 @@ import org.apache.maven.surefire.report.RunStatisticsTest;
import org.apache.maven.surefire.spi.SPITest;
import org.apache.maven.surefire.util.RelocatorTest;
-import static org.apache.commons.lang3.JavaVersion.JAVA_1_7;
-import static org.apache.commons.lang3.JavaVersion.JAVA_RECENT;
-
/**
* Adapt the JUnit4 tests which use only annotations to the JUnit3 test suite.
*
@@ -89,10 +86,7 @@ public class JUnit4SuiteTest extends TestCase
suite.addTest( new JUnit4TestAdapter( AbstractSurefireMojoTest.class )
);
suite.addTest( new JUnit4TestAdapter(
DefaultForkConfigurationTest.class ) );
suite.addTest( new JUnit4TestAdapter(
ModularClasspathForkConfigurationTest.class ) );
- if ( JAVA_RECENT.atLeast( JAVA_1_7 ) )
- {
- suite.addTest( new JUnit4TestAdapter(
AbstractSurefireMojoJava7PlusTest.class ) );
- }
+ suite.addTest( new JUnit4TestAdapter(
AbstractSurefireMojoJava7PlusTest.class ) );
suite.addTest( new JUnit4TestAdapter( ScannerUtilTest.class ) );
suite.addTest( new JUnit4TestAdapter( MojoMocklessTest.class ) );
return suite;
