Converted tests to JUnit 5

Author: kimble

build.gradle

@@ -62,7 +62,8 @@ jacocoTestReport {
 dependencies {
     implementation 'com.google.guava:guava:28.0-jre'
 
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.2'
     testImplementation 'org.assertj:assertj-core:3.13.2'
 }
 
@@ -76,6 +77,10 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
     from javadoc.destinationDir
 }
 
+test {
+    useJUnitPlatform()
+}
+
 artifacts {
     archives sourcesJar, javadocJar
 }

src/test/java/com/developerb/nmxmlp/AbstractNXTest.java

@@ -17,7 +17,7 @@
 
 import com.google.common.io.ByteSource;
 import com.google.common.io.Resources;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
 
 import java.net.URL;
 
@@ -26,7 +26,7 @@ public abstract class AbstractNXTest {
 
     private NX nx;
 
-    @Before
+    @BeforeEach
     public final void initialize() {
         this.nx = new NX();
         withNx(nx);

src/test/java/com/developerb/nmxmlp/AttributeTest.java

@@ -15,21 +15,26 @@
  */
 package com.developerb.nmxmlp;
 
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
 
 import java.nio.charset.StandardCharsets;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 
-public class AttributeTest extends AbstractNXTest {
+class AttributeTest extends AbstractNXTest {
 
     private final String xml = "<root><person firstName='Nasse' lastName='Nøff' age='10' /></root>";
 
 
     @Test
-    public void removeAttribute() {
+    void removeAttribute() {
         NX.Cursor root = parse(xml);
         NX.Cursor person = root.to("person");
 
@@ -41,7 +46,7 @@ public void removeAttribute() {
     }
 
     @Test
-    public void hasAttr() {
+    void hasAttr() {
         NX.Cursor root = parse(xml);
         NX.Cursor person = root.to("person");
 
@@ -51,7 +56,7 @@ public void hasAttr() {
     }
 
     @Test
-    public void readingAttributeAsText() {
+    void readingAttributeAsText() {
         NX.Cursor root = parse(xml);
         NX.Cursor person = root.to("person");
 
@@ -60,7 +65,7 @@ public void readingAttributeAsText() {
     }
 
     @Test
-    public void attemptingToGetMissingAttributeShouldThrowException() {
+    void attemptingToGetMissingAttributeShouldThrowException() {
         NX.Cursor root = parse(xml);
         NX.Cursor person = root.to("person");
 
@@ -76,7 +81,7 @@ public void attemptingToGetMissingAttributeShouldThrowException() {
     }
 
     @Test
-    public void textContentOfMissingAttributeShouldBeNull() {
+    void textContentOfMissingAttributeShouldBeNull() {
         NX.Cursor root = parse(xml);
         NX.Cursor person = root.to("person");
 
@@ -85,7 +90,7 @@ public void textContentOfMissingAttributeShouldBeNull() {
     }
 
     @Test
-    public void updatingTextOfMissingAttributeShouldDoNothing() {
+    void updatingTextOfMissingAttributeShouldDoNothing() {
         NX.Cursor root = parse(xml);
         NX.Cursor person = root.to("person");
 
@@ -94,7 +99,7 @@ public void updatingTextOfMissingAttributeShouldDoNothing() {
     }
 
     @Test
-    public void mapAttributeTextUsingFunction() {
+    void mapAttributeTextUsingFunction() {
         NX.Cursor root = parse(xml);
         NX.Cursor person = root.to("person");
 
@@ -106,7 +111,7 @@ public void mapAttributeTextUsingFunction() {
     }
 
     @Test
-    public void mapAttributeTextUsingMethodReference() {
+    void mapAttributeTextUsingMethodReference() {
         NX.Cursor root = parse(xml);
         NX.Cursor person = root.to("person");
 
@@ -118,7 +123,7 @@ public void mapAttributeTextUsingMethodReference() {
     }
 
     @Test
-    public void mapMissingOptionalAttributeReturnsNull() {
+    void mapMissingOptionalAttributeReturnsNull() {
         NX.Cursor root = parse(xml);
         NX.Cursor person = root.to("person");
 

src/test/java/com/developerb/nmxmlp/DataExtractionTest.java

@@ -15,14 +15,14 @@
  */
 package com.developerb.nmxmlp;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class DataExtractionTest extends AbstractNXTest {
+class DataExtractionTest extends AbstractNXTest {
 
     private final String peopleXml = "<people>" +
             "<person><name>Nasse Nøff</name><age>5</age></person>" +
@@ -36,31 +36,31 @@ public class DataExtractionTest extends AbstractNXTest {
 
 
     @Test
-    public void simpleDataExtraction() throws Exception {
+    void simpleDataExtraction() {
         NX.Cursor person = parse(personXml);
 
         assertEquals("Nasse Nøff", person.to("name").text());
         assertEquals(5, (int) person.to("age").extract(Integer.class));
     }
 
     @Test
-    public void extractDouble() throws Exception {
+    void extractDouble() {
         NX.Cursor root = parse("<root><double>3.14159265</double></root>");
         Double extracted = root.to("double").extract(Double.class);
 
         assertEquals(extracted, extracted, 0.00001);
     }
 
     @Test
-    public void extractFloat() throws Exception {
+    void extractFloat() {
         NX.Cursor root = parse("<root><float>3.14159265</float></root>");
         Float extracted = root.to("float").extract(Float.class);
 
         assertEquals(extracted, extracted, 0.00001);
     }
 
     @Test
-    public void extractLong() throws Exception {
+    void extractLong() {
         NX.Cursor root = parse("<root><long>314159265</long></root>");
         Long extracted = root.to("long").extract(Long.class);
 
@@ -70,14 +70,14 @@ public void extractLong() throws Exception {
     }
 
     @Test
-    public void countElements() throws Exception {
+    void countElements() {
         NX.Cursor people = parse(peopleXml);
 
         assertEquals(2, people.count("person"));
     }
 
     @Test
-    public void extractSingleObject() throws Exception {
+    void extractSingleObject() {
         NX.Cursor person = parse(personXml);
 
         NX.Extractor<Person> extractor = new PersonExtractor();
@@ -88,7 +88,7 @@ public void extractSingleObject() throws Exception {
     }
 
     @Test
-    public void extractObjectCollection() throws Exception {
+    void extractObjectCollection() {
         NX.Cursor person = parse(peopleXml);
 
         NX.Extractor<Person> extractor = new PersonExtractor();
@@ -105,8 +105,8 @@ public void extractObjectCollection() throws Exception {
 
     static class Person {
 
-        public final String name;
-        public final int age;
+        final String name;
+        final int age;
 
         Person(String name, int age) {
             this.name = name;

src/test/java/com/developerb/nmxmlp/DataInsertTest.java

@@ -15,19 +15,19 @@
  */
 package com.developerb.nmxmlp;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class DataInsertTest extends AbstractNXTest {
+class DataInsertTest extends AbstractNXTest {
 
     @Test
-    public void insertCollectionNoNamespaces() throws NX.Ex {
+    void insertCollectionNoNamespaces() throws NX.Ex {
         NX.Cursor peopleCursor = parse("<people><person name='Prototype' /></people>");
 
         List<Person> people = Arrays.asList (
@@ -45,7 +45,7 @@ public void insertCollectionNoNamespaces() throws NX.Ex {
     }
 
     @Test
-    public void insertNamespacedSvg() throws NX.Ex {
+    void insertNamespacedSvg() throws NX.Ex {
         NX.Cursor cursor = parseResource("svg/simple-svg.xhtml");
         NX.Cursor svg = cursor.to("body").to("svg");
 
@@ -65,7 +65,7 @@ public void insertNamespacedSvg() throws NX.Ex {
     }
 
     @Test
-    public void updateSingleNodeTreeFromObject() throws Exception {
+    void updateSingleNodeTreeFromObject() throws Exception {
         NX.Cursor soapEnvelope = parseResource("soap/soap-request.xml");
 
         NX.Cursor requestHeader = soapEnvelope.to("header", "requestHeader");
@@ -79,7 +79,7 @@ public void updateSingleNodeTreeFromObject() throws Exception {
 
 
     @Test
-    public void insertedElementsInConnectionShouldBePositionedInTheSamePlaceAsThePrototypeElement() throws NX.Ex {
+    void insertedElementsInConnectionShouldBePositionedInTheSamePlaceAsThePrototypeElement() throws NX.Ex {
         NX.Cursor root = parse("<root><repeatMe /><fixed>should-not-move</fixed></root>");
 
         root.insertCollection("repeatMe", Arrays.asList("hei", "på", "deg"), NX.Cursor::text);
@@ -90,7 +90,7 @@ public void insertedElementsInConnectionShouldBePositionedInTheSamePlaceAsThePro
     }
 
     @Test
-    public void insertCollectionMissingPrototypeNode() {
+    void insertCollectionMissingPrototypeNode() {
         NX.Cursor peopleCursor = parse("<people><person name='Prototype' /></people>");
         Iterable<String> pirates = Arrays.asList("Sabeltann", "Sortebill");
 

src/test/java/com/developerb/nmxmlp/DumpXmlTest.java

@@ -15,37 +15,38 @@
  */
 package com.developerb.nmxmlp;
 
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
 
 import static com.developerb.nmxmlp.NX.Feature.DUMP_INDENTED_XML;
 import static com.developerb.nmxmlp.NX.Feature.DUMP_WITHOUT_XML_DECLARATION;
 import static java.nio.charset.StandardCharsets.ISO_8859_1;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class DumpXmlTest extends AbstractNXTest {
+class DumpXmlTest extends AbstractNXTest {
 
     private String xml = "<a><b><c>value</c></b></a>";
 
     @Test
-    public void dumpXmlWithoutXmlDeclaration() {
+    void dumpXmlWithoutXmlDeclaration() {
         NX nx = new NX();
         NX.Cursor root = nx.from(xml);
 
         assertEquals("<a><b><c>value</c></b></a>", root.dumpXml(UTF_8, DUMP_WITHOUT_XML_DECLARATION));
     }
 
     @Test
-    public void dumpXmlFromChildNode() {
+    void dumpXmlFromChildNode() {
         NX nx = new NX();
         NX.Cursor root = nx.from(xml);
 
         assertEquals("<b><c>value</c></b>", root.to("b").dumpXml(UTF_8, DUMP_WITHOUT_XML_DECLARATION));
     }
 
     @Test
-    public void dumpIndentedXml() {
+    void dumpIndentedXml() {
         NX nx = new NX();
         NX.Cursor root = nx.from(xml);
 
@@ -57,14 +58,14 @@ public void dumpIndentedXml() {
     }
 
     @Test
-    public void dumpXmlWithXmlDeclaration() {
+    void dumpXmlWithXmlDeclaration() {
         NX.Cursor root = parse(xml);
 
         assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?><a><b><c>value</c></b></a>", root.dumpXml(UTF_8));
     }
 
     @Test
-    public void dumpXmlLatin1() {
+    void dumpXmlLatin1() {
         NX.Cursor root = parse(xml);
 
         String utf8 = root.dumpXml(UTF_8);

src/test/java/com/developerb/nmxmlp/ErrorHandlingTest.java

@@ -15,17 +15,17 @@
  */
 package com.developerb.nmxmlp;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 
-public class ErrorHandlingTest extends AbstractNXTest {
+class ErrorHandlingTest extends AbstractNXTest {
 
     private final String xml = "<root><person firstName='Nasse' lastName='Nøff' age='10' /></root>";
 
     @Test
-    public void attemptToNavigateToMissingNodeResultsInExceptionWithHelpfulMessage() {
+    void attemptToNavigateToMissingNodeResultsInExceptionWithHelpfulMessage() {
         NX.Cursor cursor = parse(xml);
 
         try {