Move to JUnit 5

- first step simple tests

Author: slawekjaranowski

pom.xml

@@ -221,6 +221,16 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-testing</groupId>
       <artifactId>maven-plugin-testing-harness</artifactId>

src/test/java/org/codehaus/mojo/exec/LineRedirectOutputStreamTest.java

@@ -5,9 +5,11 @@
 import java.nio.charset.StandardCharsets;
 import java.util.function.Function;
 
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 public class LineRedirectOutputStreamTest {
 
@@ -26,9 +28,9 @@ public void givenExtendedUnicodeCharacterOutput_whenRedirectingWithIso8859Charse
     @Test
     public void givenExtendedUnicodeCharacterOutput_whenRedirectingWithCp1252_thenShouldDecodeProperly()
             throws IOException {
-        Assume.assumeTrue(
-                "The JVM does not contain the cp-1252 charset",
-                Charset.availableCharsets().containsKey("windows-1252"));
+        assumeTrue(
+                Charset.availableCharsets().containsKey("windows-1252"),
+                "The JVM does not contain the cp-1252 charset");
         internalTestForCharset(Charset.forName("windows-1252"));
     }
 
@@ -44,14 +46,14 @@ public void givenExtendedUnicodeCharacterOutput_whenRedirectingWithCharsetUnspec
         internalTestForCharset(sb -> new LineRedirectOutputStream(sb::append), Charset.defaultCharset());
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void givenNullCharset_whenInstantiating_thenShouldThrow() {
-        new LineRedirectOutputStream(new StringBuilder()::append, null);
+        assertThrows(NullPointerException.class, () -> new LineRedirectOutputStream(new StringBuilder()::append, null));
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void givenNullStringConsumer_whenInstantiating_thenShouldThrow() {
-        new LineRedirectOutputStream(null, Charset.defaultCharset());
+        assertThrows(NullPointerException.class, () -> new LineRedirectOutputStream(null, Charset.defaultCharset()));
     }
 
     private void internalTestForCharset(Charset charset) throws IOException {
@@ -72,6 +74,6 @@ private void internalTestForCharset(
 
         // The String to bytes to String is required here because StringCoding uses the Charset.defaultCharset()
         // internally so it would make the test fail when testing for different charsets.
-        Assert.assertEquals(new String(expectedString.getBytes(charset), charset), sb.toString());
+        assertEquals(new String(expectedString.getBytes(charset), charset), sb.toString());
     }
 }

src/test/java/org/codehaus/mojo/exec/URLClassLoaderBuilderTest.java

@@ -25,10 +25,10 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Paths;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static java.util.Arrays.asList;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Basic tests about the custom classloader we set to execute the project.
@@ -47,7 +47,7 @@ public void childFirst() throws Exception {
                         .build();
                 PrintStream tmpStderr = new PrintStream(stderr)) {
             System.setErr(tmpStderr);
-            assertEquals(tmpStderr, System.err);
+            assertEquals(System.err, tmpStderr);
             thread.setContextClassLoader(loader);
             Class<?> lf = loader.loadClass("org.slf4j.LoggerFactory");
             Object logger = lf.getMethod("getLogger", Class.class).invoke(null, String.class);