[MSHARED-1249] Switch to JUnit 5

Author: slawekjaranowski

pom.xml

@@ -104,9 +104,9 @@
 
     <!-- testing support -->
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.13.2</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.9.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>

src/test/java/org/apache/maven/shared/dependency/analyzer/ClassFileVisitorUtilsTest.java

@@ -18,10 +18,10 @@
  */
 package org.apache.maven.shared.dependency.analyzer;
 
-import java.io.File;
-import java.io.FileOutputStream;
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -31,9 +31,8 @@
 import java.util.jar.JarOutputStream;
 import java.util.zip.ZipEntry;
 
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
@@ -44,36 +43,36 @@
  * @author <a href="mailto:[email protected]">Mark Hobson</a>
  * @see ClassFileVisitorUtils
  */
-public class ClassFileVisitorUtilsTest {
+class ClassFileVisitorUtilsTest {
+
+    @TempDir
+    private Path tempDir;
+
     private TestVisitor visitor = new TestVisitor();
 
     private static class TestVisitor implements ClassFileVisitor {
         final List<String> classNames = new ArrayList<>();
+
         final List<String> data = new ArrayList<>();
 
         @Override
         public void visitClass(String className, InputStream in) {
             classNames.add(className);
-            try {
-                List<String> lines = IOUtils.readLines(in, StandardCharsets.UTF_8);
-                data.addAll(lines);
-            } catch (IOException ex) {
-                throw new RuntimeException(ex);
-            }
+            BufferedReader reader = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8));
+            reader.lines().forEach(data::add);
         }
     }
 
     @Test
-    public void testAcceptJar() throws IOException {
-        File file = File.createTempFile("test", ".jar");
-        file.deleteOnExit();
+    void testAcceptJar() throws IOException {
+        Path path = Files.createTempFile(tempDir, "test", ".jar");
 
-        try (JarOutputStream out = new JarOutputStream(new FileOutputStream(file))) {
+        try (JarOutputStream out = new JarOutputStream(Files.newOutputStream(path))) {
             addZipEntry(out, "a/b/c.class", "class a.b.c");
             addZipEntry(out, "x/y/z.class", "class x.y.z");
         }
 
-        ClassFileVisitorUtils.accept(file.toURI().toURL(), visitor);
+        ClassFileVisitorUtils.accept(path.toUri().toURL(), visitor);
 
         assertThat(visitor.classNames).contains("a.b.c");
         assertThat(visitor.classNames).contains("x.y.z");
@@ -82,22 +81,21 @@ public void testAcceptJar() throws IOException {
     }
 
     @Test
-    public void testAcceptJarWithNonClassEntry() throws IOException {
-        File file = File.createTempFile("test", ".jar");
-        file.deleteOnExit();
+    void testAcceptJarWithNonClassEntry() throws IOException {
+        Path path = Files.createTempFile(tempDir, "test", ".jar");
 
-        try (JarOutputStream out = new JarOutputStream(new FileOutputStream(file))) {
+        try (JarOutputStream out = new JarOutputStream(Files.newOutputStream(path))) {
             addZipEntry(out, "a/b/c.jpg", "jpeg a.b.c");
         }
 
-        ClassFileVisitorUtils.accept(file.toURI().toURL(), visitor);
+        ClassFileVisitorUtils.accept(path.toUri().toURL(), visitor);
 
         assertThat(visitor.classNames).isEmpty();
     }
 
     @Test
-    public void testAcceptDir() throws IOException {
-        Path dir = Files.createTempDirectory("d-a-test");
+    void testAcceptDir() throws IOException {
+        Path dir = Files.createTempDirectory(tempDir, "d-a-test");
 
         Path abDir = Files.createDirectories(dir.resolve("a/b"));
         writeToFile(abDir, "c.class", "class a.b.c");
@@ -107,34 +105,28 @@ public void testAcceptDir() throws IOException {
 
         ClassFileVisitorUtils.accept(dir.toUri().toURL(), visitor);
 
-        FileUtils.deleteDirectory(dir.toFile());
-
         assertThat(visitor.classNames).contains("a.b.c");
         assertThat(visitor.classNames).contains("x.y.z");
         assertThat(visitor.data).contains("class a.b.c");
         assertThat(visitor.data).contains("class x.y.z");
     }
 
     @Test
-    public void testAcceptDirWithNonClassFile() throws IOException {
-        Path dir = Files.createTempDirectory("d-a-test");
+    void testAcceptDirWithNonClassFile() throws IOException {
+        Path dir = Files.createTempDirectory(tempDir, "d-a-test");
 
         Path abDir = Files.createDirectories(dir.resolve("a/b"));
         writeToFile(abDir, "c.jpg", "jpeg a.b.c");
 
         ClassFileVisitorUtils.accept(dir.toUri().toURL(), visitor);
 
-        FileUtils.deleteDirectory(dir.toFile());
-
         assertThat(visitor.classNames).isEmpty();
     }
 
     @Test
-    public void testAcceptWithFile() throws IOException {
-        File file = File.createTempFile("test", ".class");
-        file.deleteOnExit();
-
-        URL url = file.toURI().toURL();
+    void testAcceptWithFile() throws IOException {
+        Path path = Files.createTempFile(tempDir, "test", ".class");
+        URL url = path.toUri().toURL();
 
         try {
             ClassFileVisitorUtils.accept(url, visitor);
@@ -145,7 +137,7 @@ public void testAcceptWithFile() throws IOException {
     }
 
     @Test
-    public void testAcceptWithUnsupportedScheme() throws IOException {
+    void testAcceptWithUnsupportedScheme() throws IOException {
         URL url = new URL("http://localhost/");
 
         try {

src/test/java/org/apache/maven/shared/dependency/analyzer/CollectorClassFileVisitorTest.java

@@ -21,8 +21,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -32,16 +32,16 @@
  * @author <a href="mailto:[email protected]">Mark Hobson</a>
  * @see CollectorClassFileVisitor
  */
-public class CollectorClassFileVisitorTest {
+class CollectorClassFileVisitorTest {
     private CollectorClassFileVisitor visitor;
 
-    @Before
-    public void setUp() {
+    @BeforeEach
+    void setUp() {
         visitor = new CollectorClassFileVisitor();
     }
 
     @Test
-    public void testVisitClass() {
+    void testVisitClass() {
         visitor.visitClass("a.b.c", null);
         visitor.visitClass("x.y.z", null);
 

src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzerTest.java

@@ -30,9 +30,9 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipException;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
@@ -43,27 +43,24 @@
  * @author <a href="mailto:[email protected]">Mark Hobson</a>
  * @see DefaultClassAnalyzer
  */
-public class DefaultClassAnalyzerTest {
+class DefaultClassAnalyzerTest {
+
+    @TempDir
+    private Path tempDir;
+
     private Path file;
 
-    @Before
-    public void setUp() throws IOException {
-        file = Files.createTempFile("test", ".jar");
+    @BeforeEach
+    void setUp() throws IOException {
+        file = Files.createTempFile(tempDir, "test", ".jar");
         try (JarOutputStream out = new JarOutputStream(new FileOutputStream(file.toFile()))) {
             addZipEntry(out, "a/b/c.class", "class a.b.c");
             addZipEntry(out, "x/y/z.class", "class x.y.z");
         }
     }
 
-    @After
-    public void cleanup() throws IOException {
-        if (file != null) {
-            Files.deleteIfExists(file);
-        }
-    }
-
     @Test
-    public void testAnalyzeWithJar() throws IOException {
+    void testAnalyzeWithJar() throws IOException {
         Set<String> expectedClasses = new HashSet<>();
         expectedClasses.add("a.b.c");
         expectedClasses.add("x.y.z");
@@ -75,7 +72,7 @@ public void testAnalyzeWithJar() throws IOException {
     }
 
     @Test
-    public void testAnalyzeBadJar() throws IOException {
+    void testAnalyzeBadJar() throws IOException {
         // to reproduce MDEP-143
         // corrupt the jar file by altering its contents
         ByteArrayOutputStream baos = new ByteArrayOutputStream(100);

src/test/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysisTest.java

@@ -25,7 +25,7 @@
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.DefaultArtifact;
 import org.apache.maven.artifact.versioning.VersionRange;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -35,9 +35,9 @@
  * @author <a href="mailto:[email protected]">Mark Hobson</a>
  * @see ProjectDependencyAnalysis
  */
-public class ProjectDependencyAnalysisTest {
+class ProjectDependencyAnalysisTest {
     @Test
-    public void testConstructor() {
+    void testConstructor() {
         Set<Artifact> usedDeclaredArtifacts = new HashSet<>();
         Set<Artifact> usedUndeclaredArtifacts = new HashSet<>();
         Set<Artifact> unusedDeclaredArtifacts = new HashSet<>();
@@ -52,7 +52,7 @@ public void testConstructor() {
     }
 
     @Test
-    public void ignoreNonCompileShouldFilterOnlyUnusedDeclare() {
+    void ignoreNonCompileShouldFilterOnlyUnusedDeclare() {
         Artifact artifactCompile = aTestArtifact("test1", Artifact.SCOPE_COMPILE);
         Artifact artifactProvided = aTestArtifact("test2", Artifact.SCOPE_PROVIDED);
         Artifact artifactTest = aTestArtifact("test3", Artifact.SCOPE_TEST);

src/test/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalyzerExceptionTest.java

@@ -18,7 +18,7 @@
  */
 package org.apache.maven.shared.dependency.analyzer;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -28,14 +28,14 @@
  * @author <a href="mailto:[email protected]">Mark Hobson</a>
  * @see ProjectDependencyAnalyzerException
  */
-public class ProjectDependencyAnalyzerExceptionTest {
+class ProjectDependencyAnalyzerExceptionTest {
     @Test
-    public void testConstructor() {
+    void testConstructor() {
         assertThat(new ProjectDependencyAnalyzerException("a")).hasMessage("a");
     }
 
     @Test
-    public void testConstructorWithThrowable() {
+    void testConstructorWithThrowable() {
         Throwable throwable = new Exception();
         ProjectDependencyAnalyzerException exception = new ProjectDependencyAnalyzerException("a", throwable);
 

src/test/java/org/apache/maven/shared/dependency/analyzer/asm/ASMDependencyAnalyzerTest.java

@@ -22,15 +22,15 @@
 import java.util.Set;
 
 import org.apache.maven.shared.dependency.analyzer.DependencyAnalyzer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class ASMDependencyAnalyzerTest {
+class ASMDependencyAnalyzerTest {
     private final DependencyAnalyzer analyzer = new ASMDependencyAnalyzer();
 
     @Test
-    public void test() throws Exception {
+    void test() throws Exception {
         URL jarUrl = this.getClass().getResource("/org/objectweb/asm/ClassReader.class");
         assertThat(jarUrl).isNotNull();
         String fileUrl =