Switch to junit 5

pom.xml

@@ -71,9 +71,9 @@ limitations under the License.
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.13.2</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <version>5.9.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

src/test/java/org/codehaus/plexus/util/xml/PrettyPrintXMLWriterTest.java

@@ -16,10 +16,6 @@
  * limitations under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
@@ -30,9 +26,14 @@
 import javax.swing.text.html.HTML.Tag;
 
 import org.codehaus.plexus.util.StringUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+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.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * Test of {@link org.codehaus.plexus.util.xml.PrettyPrintXMLWriter}
@@ -51,7 +52,7 @@ public class PrettyPrintXMLWriterTest
     /**
      * <p>setUp.</p>
      */
-    @Before
+    @BeforeEach
     public void setUp()
     {
         initWriter();
@@ -60,7 +61,7 @@ public void setUp()
     /**
      * <p>tearDown.</p>
      */
-    @After
+    @AfterEach
     public void tearDown()
     {
         writer = null;
@@ -161,18 +162,12 @@ public void testEscapeXmlAttribute()
     @Test
     public void testendElementAlreadyClosed()
     {
-        try
-        {
+        assertThrows(NoSuchElementException.class, () -> {
             writer.startElement( Tag.DIV.toString() );
             writer.addAttribute( "class", "someattribute" );
             writer.endElement(); // Tag.DIV closed
             writer.endElement(); // Tag.DIV already closed, and there is no other outer tag!
-            fail( "Should throw a NoSuchElementException" );
-        }
-        catch ( NoSuchElementException e )
-        {
-            assert ( true );
-        }
+        });
     }
 
     /**
@@ -190,16 +185,15 @@ public void testIssue51DetectJava7ConcatenationBug()
         File dir = new File( "target/test-xml" );
         if ( !dir.exists() )
         {
-            assertTrue( "cannot create directory test-xml", dir.mkdir() );
+            assertTrue( dir.mkdir(), "cannot create directory test-xml" );
         }
         File xmlFile = new File( dir, "test-issue-51.xml" );
-        OutputStreamWriter osw = new OutputStreamWriter( Files.newOutputStream( xmlFile.toPath() ), "UTF-8" );
-        writer = new PrettyPrintXMLWriter( osw );
 
         int iterations = 20000;
 
-        try
+        try ( OutputStreamWriter osw = new OutputStreamWriter( Files.newOutputStream( xmlFile.toPath() ), "UTF-8" ) )
         {
+            writer = new PrettyPrintXMLWriter( osw );
             for ( int i = 0; i < iterations; ++i )
             {
                 writer.startElement( Tag.DIV.toString() + i );
@@ -214,13 +208,6 @@ public void testIssue51DetectJava7ConcatenationBug()
         {
             fail( "Should not throw a NoSuchElementException" );
         }
-        finally
-        {
-            if ( osw != null )
-            {
-                osw.close();
-            }
-        }
     }
 
     private void writeXhtmlHead( XMLWriter writer )

src/test/java/org/codehaus/plexus/util/xml/XmlStreamReaderTest.java

@@ -23,8 +23,12 @@
 
 import org.codehaus.plexus.util.IOUtil;
 
-import junit.framework.ComparisonFailure;
-import junit.framework.TestCase;
+import org.junit.jupiter.api.Test;
+import org.opentest4j.AssertionFailedError;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * <p>XmlStreamReaderTest class.</p>
@@ -34,7 +38,6 @@
  * @since 3.4.0
  */
 public class XmlStreamReaderTest
-    extends TestCase
 {
     /** french */
     private static final String TEXT_LATIN1 = "eacute: \u00E9";
@@ -127,6 +130,7 @@ private static void checkXmlStreamReader( String text, String encoding, String e
      *
      * @throws java.io.IOException if any.
      */
+    @Test
     public void testNoXmlHeader()
         throws IOException
     {
@@ -140,6 +144,7 @@ public void testNoXmlHeader()
      *
      * @throws java.io.IOException if any.
      */
+    @Test
     public void testDefaultEncoding()
         throws IOException
     {
@@ -152,6 +157,7 @@ public void testDefaultEncoding()
      *
      * @throws java.io.IOException if any.
      */
+    @Test
     public void testUTF8Encoding()
         throws IOException
     {
@@ -164,6 +170,7 @@ public void testUTF8Encoding()
      *
      * @throws java.io.IOException if any.
      */
+    @Test
     public void testUTF16Encoding()
         throws IOException
     {
@@ -177,6 +184,7 @@ public void testUTF16Encoding()
      *
      * @throws java.io.IOException if any.
      */
+    @Test
     public void testUTF16BEEncoding()
         throws IOException
     {
@@ -188,6 +196,7 @@ public void testUTF16BEEncoding()
      *
      * @throws java.io.IOException if any.
      */
+    @Test
     public void testUTF16LEEncoding()
         throws IOException
     {
@@ -199,6 +208,7 @@ public void testUTF16LEEncoding()
      *
      * @throws java.io.IOException if any.
      */
+    @Test
     public void testLatin1Encoding()
         throws IOException
     {
@@ -210,6 +220,7 @@ public void testLatin1Encoding()
      *
      * @throws java.io.IOException if any.
      */
+    @Test
     public void testLatin7Encoding()
         throws IOException
     {
@@ -221,6 +232,7 @@ public void testLatin7Encoding()
      *
      * @throws java.io.IOException if any.
      */
+    @Test
     public void testLatin15Encoding()
         throws IOException
     {
@@ -232,6 +244,7 @@ public void testLatin15Encoding()
      *
      * @throws java.io.IOException if any.
      */
+    @Test
     public void testEUC_JPEncoding()
         throws IOException
     {
@@ -243,6 +256,7 @@ public void testEUC_JPEncoding()
      *
      * @throws java.io.IOException if any.
      */
+    @Test
     public void testEBCDICEncoding()
         throws IOException
     {
@@ -254,25 +268,23 @@ public void testEBCDICEncoding()
      *
      * @throws java.io.IOException if any.
      */
+    @Test
     public void testInappropriateEncoding()
         throws IOException
     {
-        try
-        {
-            checkXmlStreamReader( TEXT_UNICODE, "ISO-8859-2" );
-            fail( "Check should have failed, since some characters are not available in the specified encoding" );
-        }
-        catch ( ComparisonFailure cf )
-        {
-            // expected failure, since the encoding does not contain some characters
-        }
+        // expected failure, since the encoding does not contain some characters
+        assertThrows(AssertionFailedError.class, () ->
+                checkXmlStreamReader( TEXT_UNICODE, "ISO-8859-2" ),
+                "Check should have failed, since some characters are not available in the specified encoding"
+            );
     }
 
     /**
      * <p>testEncodingAttribute.</p>
      *
      * @throws java.io.IOException if any.
      */
+    @Test
     public void testEncodingAttribute()
         throws IOException
     {

src/test/java/org/codehaus/plexus/util/xml/XmlStreamWriterTest.java

@@ -1,7 +1,5 @@
 package org.codehaus.plexus.util.xml;
 
-import static org.junit.Assert.assertEquals;
-
 /*
  * Copyright The Codehaus Foundation.
  *
@@ -21,7 +19,9 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * <p>XmlStreamWriterTest class.</p>

src/test/java/org/codehaus/plexus/util/xml/XmlUtilTest.java

@@ -16,9 +16,6 @@
  * limitations under the License.
  */
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -30,7 +27,9 @@
 
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.StringUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Test the {@link org.codehaus.plexus.util.xml.XmlUtil} class.

src/test/java/org/codehaus/plexus/util/xml/XmlWriterUtilTest.java

@@ -16,17 +16,16 @@
  * limitations under the License.
  */
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
 import java.io.Writer;
 
 import org.codehaus.plexus.util.StringUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * <p>XmlWriterUtilTest class.</p>
@@ -48,7 +47,7 @@ public class XmlWriterUtilTest
      *
      * @throws java.lang.Exception if any.
      */
-    @Before
+    @BeforeEach
     public void setUp()
         throws Exception
     {
@@ -62,7 +61,7 @@ public void setUp()
      *
      * @throws java.lang.Exception if any.
      */
-    @After
+    @AfterEach
     public void tearDown()
         throws Exception
     {