For yegor256#939: Upgrade to Junit 5

paulodamaso · Jan 27, 2019 · 22b9fab · 22b9fab
1 parent 93f22f1
commit 22b9fab
Show file tree

Hide file tree

Showing 26 changed files with 116 additions and 57 deletions.
diff --git a/pom.xml b/pom.xml
@@ -134,6 +134,17 @@
                 <artifactId>commons-lang3</artifactId>
                 <version>3.7</version>
             </dependency>
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-api</artifactId>
+                <version>5.3.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-engine</artifactId>
+                <version>5.1.0</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <build>

diff --git a/qulice-ant/pom.xml b/qulice-ant/pom.xml
@@ -89,19 +89,26 @@
             <artifactId>jcabi-aspects</artifactId>
             <scope>provided</scope>
         </dependency>
-	<dependency>
-	    <groupId>org.apache.ant</groupId>
-	    <artifactId>ant</artifactId>
-	    <version>1.9.4</version>
-	</dependency>
+        <dependency>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant</artifactId>
+            <version>1.9.4</version>
+        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
-
             <plugin>
                 <artifactId>maven-invoker-plugin</artifactId>
                 <configuration combine.children="append">

diff --git a/qulice-ant/src/test/java/com/qulice/ant/AntEnvironmentTest.java b/qulice-ant/src/test/java/com/qulice/ant/AntEnvironmentTest.java
@@ -29,8 +29,8 @@
  */
 package com.qulice.ant;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test for AntEnvironment.
@@ -45,7 +45,7 @@ public class AntEnvironmentTest {
      * @throws Exception If something wrong happens inside
      */
     @Test
-    @Ignore
+    @Disabled
     @SuppressWarnings("PMD.UncommentedEmptyMethodBody")
     public void buildsClassloader() throws Exception {
     }
@@ -55,7 +55,7 @@ public void buildsClassloader() throws Exception {
      * @throws Exception If something wrong happens inside
      */
     @Test
-    @Ignore
+    @Disabled
     @SuppressWarnings("PMD.UncommentedEmptyMethodBody")
     public void returnsFiles() throws Exception {
     }
@@ -65,7 +65,7 @@ public void returnsFiles() throws Exception {
      * @throws Exception If something wrong happens inside
      */
     @Test
-    @Ignore
+    @Disabled
     @SuppressWarnings("PMD.UncommentedEmptyMethodBody")
     public void excludesFiles() throws Exception {
     }

diff --git a/qulice-checkstyle/pom.xml b/qulice-checkstyle/pom.xml
@@ -94,6 +94,14 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

diff --git a/qulice-checkstyle/src/test/java/com/qulice/checkstyle/ChecksTest.java b/qulice-checkstyle/src/test/java/com/qulice/checkstyle/ChecksTest.java
@@ -45,8 +45,9 @@
 import org.apache.commons.lang3.StringUtils;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.ParameterResolver;
 import org.junit.runners.Parameterized;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
@@ -57,7 +58,7 @@
  * Integration test case for all checkstyle checks.
  * @since 0.3
  */
-@RunWith(Parameterized.class)
+@ExtendWith(ParameterResolver.class)
 public final class ChecksTest {
 
     /**

diff --git a/qulice-checkstyle/src/test/java/com/qulice/checkstyle/CheckstyleValidatorTest.java b/qulice-checkstyle/src/test/java/com/qulice/checkstyle/CheckstyleValidatorTest.java
@@ -46,9 +46,9 @@
 import org.hamcrest.Matchers;
 import org.hamcrest.TypeSafeMatcher;
 import org.hamcrest.collection.IsIterableContainingInOrder;
-import org.junit.Ignore;
 import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test case for {@link CheckstyleValidator} class.
@@ -430,7 +430,7 @@ public void allowsOnlyProperlyOrderedAtClauses() throws Exception {
      * @throws Exception If something wrong happens inside
      */
     @Test
-    @Ignore
+    @Disabled
     public void passesWindowsEndsOfLineWithoutException() throws Exception {
         this.validate("WindowsEol.java", false, "LICENSE found:");
     }
@@ -444,7 +444,7 @@ public void passesWindowsEndsOfLineWithoutException() throws Exception {
      *  correctly. (see changes done in #61)
      */
     @Test
-    @Ignore
+    @Disabled
     public void testWindowsEndsOfLineWithLinuxSources() throws Exception {
         this.runValidation("WindowsEolLinux.java", false);
     }
@@ -689,7 +689,7 @@ public void allowsUppercaseAbbreviationExceptions() throws Exception {
      *  being placed at end of lines. Correct this behavior and uncomment test
      *  below.
      */
-    @Ignore
+    @Disabled
     @Test
     public void checkLambdaAndGenericsAtEndOfLine() throws Exception {
         this.runValidation("ValidLambdaAndGenericsAtEndOfLine.java", true);

diff --git a/qulice-findbugs/pom.xml b/qulice-findbugs/pom.xml
@@ -173,6 +173,14 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

diff --git a/qulice-findbugs/src/test/java/com/qulice/findbugs/FindBugsValidatorTest.java b/qulice-findbugs/src/test/java/com/qulice/findbugs/FindBugsValidatorTest.java
@@ -33,7 +33,7 @@
 import com.qulice.spi.Environment;
 import com.qulice.spi.ValidationException;
 import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test case for {@link FindBugsValidator}.
@@ -59,7 +59,7 @@ public void passesCorrectFilesWithNoExceptions() throws Exception {
      * @throws Exception If something wrong happens inside
      */
     @Ignore
-    @Test(expected = ValidationException.class)
+    @org.junit.Test(expected = ValidationException.class)
     public void reportsIncorrectlyAddedThrows() throws Exception {
         final byte[] bytecode = new BytecodeMocker()
             .withSource(
@@ -107,7 +107,7 @@ public void ignoresCorrectlyAddedThrows() throws Exception {
      * FindbugsValidator throw exception for invalid file.
      * @throws Exception If something wrong happens inside
      */
-    @Test(expected = ValidationException.class)
+    @org.junit.Test(expected = ValidationException.class)
     public void throwsExceptionOnViolation() throws Exception {
         final byte[] bytecode = new BytecodeMocker()
             .withSource("class Foo { public Foo clone() { return this; } }")

diff --git a/qulice-maven-plugin/pom.xml b/qulice-maven-plugin/pom.xml
@@ -178,12 +178,6 @@
             <artifactId>maven-plugin-testing-harness</artifactId>
             <version>3.1.0</version>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>junit</groupId>
-                    <artifactId>junit</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
@@ -224,6 +218,14 @@
             <version>5.0.0.Final</version>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

diff --git a/qulice-maven-plugin/src/test/java/com/qulice/maven/CheckMojoTest.java b/qulice-maven-plugin/src/test/java/com/qulice/maven/CheckMojoTest.java
@@ -35,7 +35,7 @@
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.context.Context;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 /**

diff --git a/qulice-maven-plugin/src/test/java/com/qulice/maven/DefaultMavenEnvironmentTest.java b/qulice-maven-plugin/src/test/java/com/qulice/maven/DefaultMavenEnvironmentTest.java
@@ -34,7 +34,7 @@
 import org.apache.maven.project.MavenProject;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 /**

diff --git a/qulice-maven-plugin/src/test/java/com/qulice/maven/DefaultValidatorsProviderTest.java b/qulice-maven-plugin/src/test/java/com/qulice/maven/DefaultValidatorsProviderTest.java
@@ -32,7 +32,7 @@
 import com.qulice.spi.Environment;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test case for {@link ValidatorsProvider} class.

diff --git a/qulice-maven-plugin/src/test/java/com/qulice/maven/DependenciesValidatorTest.java b/qulice-maven-plugin/src/test/java/com/qulice/maven/DependenciesValidatorTest.java
@@ -39,7 +39,7 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.shared.dependency.analyzer.ProjectDependencyAnalysis;
 import org.apache.maven.shared.dependency.analyzer.ProjectDependencyAnalyzer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 /**
@@ -89,7 +89,7 @@ public void passesIfNoDependencyProblemsFound() throws Exception {
      * DependencyValidator can catch dependency problems.
      * @throws Exception If something wrong happens inside
      */
-    @Test(expected = ValidationException.class)
+    @org.junit.Test(expected = ValidationException.class)
     public void catchesDependencyProblemsAndThrowsException() throws Exception {
         final ProjectDependencyAnalysis analysis =
             Mockito.mock(ProjectDependencyAnalysis.class);

diff --git a/qulice-maven-plugin/src/test/java/com/qulice/maven/PomXpathValidatorTest.java b/qulice-maven-plugin/src/test/java/com/qulice/maven/PomXpathValidatorTest.java
@@ -35,7 +35,7 @@
 import org.apache.commons.io.FileUtils;
 import org.cactoos.io.ResourceOf;
 import org.cactoos.text.TextOf;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test case for {@link PomXpathValidator} class.

diff --git a/qulice-maven-plugin/src/test/java/com/qulice/maven/SvnPropertiesValidatorTest.java b/qulice-maven-plugin/src/test/java/com/qulice/maven/SvnPropertiesValidatorTest.java
@@ -29,7 +29,8 @@
  */
 package com.qulice.maven;
 
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
 
 /**
  * Test case for {@link SvnPropertiesValidator}.

diff --git a/qulice-pmd/pom.xml b/qulice-pmd/pom.xml
@@ -86,6 +86,14 @@
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

diff --git a/qulice-pmd/src/test/java/com/qulice/pmd/LocalVariableCouldBeFinalRuleTest.java b/qulice-pmd/src/test/java/com/qulice/pmd/LocalVariableCouldBeFinalRuleTest.java
@@ -31,7 +31,7 @@
 
 import org.hamcrest.core.IsEqual;
 import org.hamcrest.core.StringStartsWith;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test case for LocalVariableCouldBeFinal.

diff --git a/qulice-pmd/src/test/java/com/qulice/pmd/PmdDisabledRulesTest.java b/qulice-pmd/src/test/java/com/qulice/pmd/PmdDisabledRulesTest.java
@@ -32,15 +32,16 @@
 import java.util.Arrays;
 import java.util.Collection;
 import org.hamcrest.Matchers;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.ParameterResolver;
 import org.junit.runners.Parameterized;
 
 /**
  * Tests for disabled rules.
  * @since 0.16
  */
-@RunWith(Parameterized.class)
+@ExtendWith(ParameterResolver.class)
 public final class PmdDisabledRulesTest {
 
     /**

diff --git a/qulice-pmd/src/test/java/com/qulice/pmd/PmdEmptyTest.java b/qulice-pmd/src/test/java/com/qulice/pmd/PmdEmptyTest.java
@@ -30,7 +30,7 @@
 package com.qulice.pmd;
 
 import org.hamcrest.Matchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test case for {@link PmdValidator} class.

diff --git a/qulice-pmd/src/test/java/com/qulice/pmd/PmdValidatorTest.java b/qulice-pmd/src/test/java/com/qulice/pmd/PmdValidatorTest.java
@@ -41,7 +41,7 @@
 import org.hamcrest.Matchers;
 import org.hamcrest.core.IsEqual;
 import org.hamcrest.core.IsNot;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test case for {@link PmdValidator} class.

diff --git a/qulice-pmd/src/test/java/com/qulice/pmd/UnusedImportsRuleTest.java b/qulice-pmd/src/test/java/com/qulice/pmd/UnusedImportsRuleTest.java
@@ -31,7 +31,7 @@
 
 import org.hamcrest.core.IsEqual;
 import org.hamcrest.core.StringStartsWith;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test case for LocalVariableCouldBeFinal.