Address Tibors comments from #153
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/05b42861 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/05b42861 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/05b42861 Branch: refs/heads/junit5 Commit: 05b42861b856a123fde83a31ab47f0c8d70b9fc7 Parents: 59d3239 Author: Benedikt Ritter <[email protected]> Authored: Sat Aug 19 11:53:50 2017 +0200 Committer: Benedikt Ritter <[email protected]> Committed: Sat Aug 19 11:53:50 2017 +0200 ---------------------------------------------------------------------- .../org/apache/maven/plugin/surefire/AbstractSurefireMojo.java | 4 ++-- .../src/test/resources/junit-plattform/pom.xml | 2 +- .../src/test/java/junitplattform/BasicTest.java | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/05b42861/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java index d8c59a1..dd05e05 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java @@ -1431,12 +1431,12 @@ public abstract class AbstractSurefireMojo private boolean isJunit47Compatible( Artifact artifact ) { - return dependencyResolver.isWithinVersionSpec( artifact, "[4.7,4.12.0)" ); + return dependencyResolver.isWithinVersionSpec( artifact, "[4.7,)" ); } private boolean isAnyJunit4( Artifact artifact ) { - return dependencyResolver.isWithinVersionSpec( artifact, "[4.0,4.12.0)" ); + return dependencyResolver.isWithinVersionSpec( artifact, "[4.0,)" ); } private boolean isJunitJupiter( Artifact artifact ) http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/05b42861/surefire-integration-tests/src/test/resources/junit-plattform/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/junit-plattform/pom.xml b/surefire-integration-tests/src/test/resources/junit-plattform/pom.xml index 44105ee..4f6027c 100644 --- a/surefire-integration-tests/src/test/resources/junit-plattform/pom.xml +++ b/surefire-integration-tests/src/test/resources/junit-plattform/pom.xml @@ -20,7 +20,7 @@ <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/maven-v4_0_0.xsd";> + 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> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/05b42861/surefire-integration-tests/src/test/resources/junit-plattform/src/test/java/junitplattform/BasicTest.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/junit-plattform/src/test/java/junitplattform/BasicTest.java b/surefire-integration-tests/src/test/resources/junit-plattform/src/test/java/junitplattform/BasicTest.java index 3f03bdd..91acaa9 100644 --- a/surefire-integration-tests/src/test/resources/junit-plattform/src/test/java/junitplattform/BasicTest.java +++ b/surefire-integration-tests/src/test/resources/junit-plattform/src/test/java/junitplattform/BasicTest.java @@ -29,9 +29,9 @@ import org.junit.jupiter.api.Test; public class BasicTest { - private boolean setUpCalled = false; + private boolean setUpCalled; - private static boolean tearDownCalled = false; + private static boolean tearDownCalled; @BeforeEach public void setUp() @@ -59,7 +59,7 @@ public class BasicTest @AfterAll public static void oneTimeTearDown() { - + assertTrue( tearDownCalled ); } }
