Merge branch '__rultor'

Author: rultor

pom.xml

@@ -134,11 +134,6 @@
                 <artifactId>commons-lang3</artifactId>
                 <version>3.7</version>
             </dependency>
-            <!--
-            @todo #939:30min Upgrade to Junit5. Continue to upgrade to Junit5
-             updating qulice-maven-plugin sub-module and removing remaining
-             junit4 tags.
-            -->
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-api</artifactId>

qulice-checkstyle/src/test/resources/com/qulice/checkstyle/MissingJavadocTest.java

@@ -3,7 +3,7 @@
  */
 package foo;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Simple.

qulice-findbugs/src/test/java/com/qulice/findbugs/FindBugsValidatorTest.java

@@ -32,6 +32,7 @@
 import com.google.common.base.Joiner;
 import com.qulice.spi.Environment;
 import com.qulice.spi.ValidationException;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
@@ -59,24 +60,28 @@ public void passesCorrectFilesWithNoExceptions() throws Exception {
      * @throws Exception If something wrong happens inside
      */
     @Disabled
-    @org.junit.Test(expected = ValidationException.class)
+    @Test
     public void reportsIncorrectlyAddedThrows() throws Exception {
-        final byte[] bytecode = new BytecodeMocker()
-            .withSource(
-                Joiner.on("\n").join(
-                    "package test;",
-                    "final class Main {",
-                    "public void foo() throws InterruptedException {",
-                    "System.out.println(\"test\");",
-                    "}",
-                    "}"
-                )
-            )
-            .mock();
-        final Environment env = new Environment.Mock()
-            .withFile("target/classes/Main.class", bytecode)
-            .withDefaultClasspath();
-        new FindBugsValidator().validate(env);
+        Assertions.assertThrows(
+            ValidationException.class,
+            () -> {
+                final byte[] bytecode = new BytecodeMocker()
+                .withSource(
+                    Joiner.on("\n").join(
+                        "package test;",
+                        "final class Main {",
+                        "public void foo() throws InterruptedException {",
+                        "System.out.println(\"test\");",
+                        "}",
+                        "}"
+                    )
+                ).mock();
+                final Environment env = new Environment.Mock()
+                    .withFile("target/classes/Main.class", bytecode)
+                    .withDefaultClasspath();
+                new FindBugsValidator().validate(env);
+            }
+        );
     }
 
     /**
@@ -107,15 +112,21 @@ public void ignoresCorrectlyAddedThrows() throws Exception {
      * FindbugsValidator throw exception for invalid file.
      * @throws Exception If something wrong happens inside
      */
-    @org.junit.Test(expected = ValidationException.class)
+    @Test
     public void throwsExceptionOnViolation() throws Exception {
-        final byte[] bytecode = new BytecodeMocker()
-            .withSource("class Foo { public Foo clone() { return this; } }")
-            .mock();
-        final Environment env = new Environment.Mock()
-            .withFile("target/classes/Foo.class", bytecode)
-            .withDefaultClasspath();
-        new FindBugsValidator().validate(env);
+        Assertions.assertThrows(
+            ValidationException.class,
+            () -> {
+                final byte[] bytecode = new BytecodeMocker()
+                    .withSource(
+                        "class Foo { public Foo clone() { return this; } }"
+                    ).mock();
+                final Environment env = new Environment.Mock()
+                    .withFile("target/classes/Foo.class", bytecode)
+                    .withDefaultClasspath();
+                new FindBugsValidator().validate(env);
+            }
+        );
     }
 
     /**

qulice-maven-plugin/pom.xml

@@ -42,6 +42,12 @@
     <artifactId>qulice-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
     <name>qulice-maven-plugin</name>
+    <!--
+    @todo #1019:30min Upgrade to Junit5. Finish JUnit upgrade to JUnit5 by
+     upgrading it in qulice-maven-plugin submodules. Qulice-maven-plugin
+     presents some build error that does not trigger any bulid failure, so maybe
+     they must be corrected first.
+    -->
     <properties>
         <maven.version>3.0.5</maven.version>
     </properties>

qulice-pmd/src/test/resources/com/qulice/pmd/AllowAssertFail.java

@@ -1,14 +1,14 @@
 package com.qulice.pmd;
 
 import org.hamcrest.Matchers;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 public class AllowAssertFail {
 
     @Test
     public void prohibitPlainJunitAssertionsInTests() throws Exception {
         Matchers.assertThat("errorMessage", "expected", Matchers.is("actual"));
-        Assert.fail("fail test");
+        Assertions.fail("fail test");
     }
 }

qulice-pmd/src/test/resources/com/qulice/pmd/ExcessiveImports.java

@@ -13,8 +13,6 @@
 import org.apache.commons.io.IOUtils;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.Ignore;
-import org.junit.Test;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;

qulice-pmd/src/test/resources/com/qulice/pmd/PlainJUnitAssertionStaticImportBlock.java

@@ -1,7 +1,9 @@
 package com.qulice.pmd;
 
+import org.junit.jupiter.api.Test;
+
 import static org.junit.Assert.assertEquals;
-import org.junit.Test;
+
 
 public class PlainJUnitAssertionStaticImportBlock {
 

qulice-pmd/src/test/resources/com/qulice/pmd/PlainJUnitAssertionTestMethod.java

@@ -1,7 +1,7 @@
 package com.qulice.pmd;
 
 import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class PlainJUnitAssertionTestMethod {