Merge branch 'master' into 357

pom.xml

@@ -210,6 +210,24 @@ SOFTWARE.
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>5.5.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.5.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <version>5.5.2</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -235,6 +253,11 @@ SOFTWARE.
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.22.1</version>
+      </plugin>
     </plugins>
     <pluginManagement>
       <plugins>

src/test/java/org/jpeek/AppTest.java

@@ -38,7 +38,7 @@
 import org.cactoos.text.TextOf;
 import org.hamcrest.collection.IsEmptyIterable;
 import org.hamcrest.core.IsNot;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.llorllale.cactoos.matchers.Assertion;
 import org.llorllale.cactoos.matchers.IsTrue;
 
@@ -135,7 +135,7 @@ public void isXsdDocumented() throws IOException {
             elements,
             populated
         ).affirm();
-        for (final XML element: elements) {
+        for (final XML element : elements) {
             new Assertion<>(
                 String.format(
                     "element '%s' must have a documentation",

src/test/java/org/jpeek/DefaultBaseTest.java

@@ -28,7 +28,7 @@
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
 import org.hamcrest.Matchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.llorllale.cactoos.matchers.Assertion;
 
 /**

src/test/java/org/jpeek/IndexTest.java

@@ -29,8 +29,8 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import org.cactoos.text.TextOf;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.llorllale.cactoos.matchers.Assertion;
 
 /**
@@ -44,7 +44,7 @@ public final class IndexTest {
      */
     private String xml;
 
-    @Before
+    @BeforeEach
     public void setUp() throws IOException {
         final Path output = Files.createTempDirectory("").resolve("x2");
         final Path input = Paths.get(".");

src/test/java/org/jpeek/MainTest.java

@@ -29,7 +29,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import org.cactoos.Scalar;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.llorllale.cactoos.matchers.Assertion;
 import org.llorllale.cactoos.matchers.IsTrue;
 import org.llorllale.cactoos.matchers.Throws;
@@ -54,18 +54,30 @@ public void createsXmlReports() throws IOException {
         ).affirm();
     }
 
-    @Test(expected = ParameterException.class)
-    public void crashesIfInvalidInput() throws IOException {
-        Main.main("hello");
+    @Test
+    public void crashesIfInvalidInput() {
+        new Assertion<>(
+            "Must throw an exception if parameter is invalid",
+            () -> {
+                Main.main("hello");
+                return "";
+            }, new Throws<>(ParameterException.class)
+        ).affirm();
     }
 
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void crashesIfNoOverwriteAndTargetExists() throws IOException {
         final Path target = Files.createTempDirectory("");
-        Main.main(
-            "--sources", Paths.get(".").toString(),
-            "--target", target.toString()
-        );
+        new Assertion<>(
+            "Must throw an exception if target exists and no overwrite",
+            () -> {
+                Main.main(
+                    "--sources", Paths.get(".").toString(),
+                    "--target", target.toString()
+                );
+                return "";
+            }, new Throws<>(IllegalStateException.class)
+        ).affirm();
     }
 
     @Test

src/test/java/org/jpeek/MatrixTest.java

@@ -29,8 +29,8 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import org.cactoos.text.TextOf;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.llorllale.cactoos.matchers.Assertion;
 
 /**
@@ -44,7 +44,7 @@ public final class MatrixTest {
      */
     private String xml;
 
-    @Before
+    @BeforeEach
     public void setUp() throws IOException {
         final Path output = Files.createTempDirectory("").resolve("x2");
         final Path input = Paths.get(".");

src/test/java/org/jpeek/MetricsTest.java

@@ -49,20 +49,19 @@
  * @checkstyle JavadocVariableCheck (500 lines)
  * @checkstyle MagicNumberCheck (500 lines)
  * @todo #118:30min Add test for LCC with "IndirectlyRelatedPairs" and others.
- *  In "IndirectlyRelatedPairs" all methods exist in one transitive closure,
- *  so the result should be {@code 1d}.
- *  Also, all classes without transitive relations
- *  should have the same LCC metric as TCC metric.
- *  Before do it we have to fix puzzles in LCC.xml.
+ *  In "IndirectlyRelatedPairs" all methods exist in one transitive closure, so
+ *  the result should be {@code 1d}. Also, all classes without transitive
+ *  relations should have the same LCC metric as TCC metric. Before do it we have
+ *  to fix puzzles in LCC.xml.
+ * @todo #323:30min This test is fully written against JUnit 4 API.
+ *  Migrate this parametrized test to junit 5, so it won't import any classes from junit 4 anymore.
  */
 @RunWith(Parameterized.class)
-@SuppressWarnings(
-    {
-        "PMD.AvoidDuplicateLiterals",
-        "PMD.ExcessiveMethodLength",
-        "PMD.UseUnderscoresInNumericLiterals"
-    }
-)
+@SuppressWarnings({
+    "PMD.AvoidDuplicateLiterals",
+    "PMD.ExcessiveMethodLength",
+    "PMD.UseUnderscoresInNumericLiterals"
+})
 public final class MetricsTest {
 
     @Parameterized.Parameter
@@ -118,9 +117,9 @@ public static Collection<Object[]> targets() {
             new Object[] {"WithoutAttributes", "NHD", 0.0d},
             new Object[] {"OneMethodCreatesLambda", "NHD", 0.0d},
             new Object[] {"MethodsWithDiffParamTypes", "CCM", 0.0476d},
-            new Object[]{"Foo", "SCOM", 0.5d},
-            new Object[]{"MethodsWithDiffParamTypes", "SCOM", 0.2381d},
-            new Object[]{"OverloadMethods", "SCOM", 0.75d},
+            new Object[] {"Foo", "SCOM", 0.5d},
+            new Object[] {"MethodsWithDiffParamTypes", "SCOM", 0.2381d},
+            new Object[] {"OverloadMethods", "SCOM", 0.75d},
             new Object[] {"TwoCommonAttributes", "SCOM", 0.0d},
             new Object[] {"NoMethods", "SCOM", Double.NaN},
             new Object[] {"OneVoidMethodWithoutParams", "SCOM", 0.0d},

src/test/java/org/jpeek/ReportTest.java

@@ -30,7 +30,7 @@
 import java.nio.file.Path;
 import org.cactoos.text.TextOf;
 import org.jpeek.skeleton.Skeleton;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.llorllale.cactoos.matchers.Assertion;
 import org.llorllale.cactoos.matchers.IsTrue;
 import org.xembly.Directives;

src/test/java/org/jpeek/ReportWithStatisticsTest.java

@@ -29,7 +29,7 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.llorllale.cactoos.matchers.Assertion;
 
 /**

src/test/java/org/jpeek/package-info.java

@@ -26,5 +26,9 @@
  * Tests.
  *
  * @since 0.1
+ * @todo #323:30min Migrate the tests in the sub-packages: org.jpeek.metrics,
+ *  org.jpeek.skeleton and org.jpeek.web to junit 5, so they won't
+ *  import any classes from junit 4 anymore. Then, we should find a way to
+ *  exclude junit 4 from project dependecy, so they won't be imported anymore.
  */
 package org.jpeek;