Switch to JUnit 5

30 files changed, 134 insertions, 100 deletions

diff --git a/src/test/java/org/zwobble/mammoth/tests/MammothTests.java b/src/test/java/org/zwobble/mammoth/tests/MammothTests.java
index 0daa233..f491abd 100644
--- a/src/test/java/org/zwobble/mammoth/tests/MammothTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/MammothTests.java
@@ -1,6 +1,6 @@
 package org.zwobble.mammoth.tests;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.zwobble.mammoth.DocumentConverter;
 import org.zwobble.mammoth.Result;
 import org.zwobble.mammoth.images.ImageConverter;
@@ -17,8 +17,8 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.function.Function;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
 import static org.zwobble.mammoth.internal.util.Lists.list;
 import static org.zwobble.mammoth.internal.util.Maps.map;
 import static org.zwobble.mammoth.tests.ResultMatchers.isResult;
diff --git a/src/test/java/org/zwobble/mammoth/tests/conversion/DocumentToHtmlTests.java b/src/test/java/org/zwobble/mammoth/tests/conversion/DocumentToHtmlTests.java
index 123bd8e..4563572 100644
--- a/src/test/java/org/zwobble/mammoth/tests/conversion/DocumentToHtmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/conversion/DocumentToHtmlTests.java
@@ -1,7 +1,7 @@
 package org.zwobble.mammoth.tests.conversion;
 
 import org.hamcrest.Matcher;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.zwobble.mammoth.internal.conversion.DocumentToHtml;
 import org.zwobble.mammoth.internal.conversion.DocumentToHtmlOptions;
 import org.zwobble.mammoth.internal.documents.*;
diff --git a/src/test/java/org/zwobble/mammoth/tests/documents/StyleTests.java b/src/test/java/org/zwobble/mammoth/tests/documents/StyleTests.java
index 06f6eba..4713391 100644
--- a/src/test/java/org/zwobble/mammoth/tests/documents/StyleTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/documents/StyleTests.java
@@ -1,11 +1,11 @@
 package org.zwobble.mammoth.tests.documents;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.zwobble.mammoth.internal.documents.Style;
 
 import java.util.Optional;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class StyleTests {
     @Test
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
index 0695ece..27f7502 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
@@ -2,9 +2,10 @@ package org.zwobble.mammoth.tests.docx;
 
 import org.hamcrest.Matcher;
 import org.hamcrest.Matchers;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.DynamicTest;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestFactory;
 import org.zwobble.mammoth.internal.archives.Archive;
 import org.zwobble.mammoth.internal.archives.InMemoryArchive;
 import org.zwobble.mammoth.internal.documents.*;
@@ -17,7 +18,10 @@ import org.zwobble.mammoth.internal.xml.XmlNodes;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.function.Function;
 
 import static java.util.Arrays.asList;
@@ -25,6 +29,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 import static org.zwobble.mammoth.internal.documents.NoteReference.endnoteReference;
 import static org.zwobble.mammoth.internal.documents.NoteReference.footnoteReference;
+import static org.zwobble.mammoth.internal.util.Lists.eagerMap;
 import static org.zwobble.mammoth.internal.util.Lists.list;
 import static org.zwobble.mammoth.internal.util.Maps.map;
 import static org.zwobble.mammoth.internal.util.Streams.toByteArray;
@@ -149,25 +154,27 @@ public class BodyXmlTests {
             hasNumbering(Optional.empty()));
     }
 
-    public static class ComplexFieldsTests {
-        private static final String URI = "http://example.com";
-        private static final XmlElement BEGIN_COMPLEX_FIELD = element("w:r", list(
+    @Nested
+    public class ComplexFieldsTests {
+        private final String URI = "http://example.com";
+        private final XmlElement BEGIN_COMPLEX_FIELD = element("w:r", list(
             element("w:fldChar", map("w:fldCharType", "begin"))
         ));
-        private static final XmlElement SEPARATE_COMPLEX_FIELD = element("w:r", list(
+        private final XmlElement SEPARATE_COMPLEX_FIELD = element("w:r", list(
             element("w:fldChar", map("w:fldCharType", "separate"))
         ));
-        private static final XmlElement END_COMPLEX_FIELD = element("w:r", list(
+        private final XmlElement END_COMPLEX_FIELD = element("w:r", list(
             element("w:fldChar", map("w:fldCharType", "end"))
         ));
-        private static final XmlElement HYPERLINK_INSTRTEXT = element("w:instrText", list(
+        private final XmlElement HYPERLINK_INSTRTEXT = element("w:instrText", list(
             XmlNodes.text(" HYPERLINK \"" + URI + '"')
         ));
-        private static Matcher<DocumentElement> isEmptyHyperlinkedRun() {
+        private Matcher<DocumentElement> isEmptyHyperlinkedRun() {
             return isHyperlinkedRun(hasChildren());
         }
+
         @SafeVarargs
-        private static Matcher<DocumentElement> isHyperlinkedRun(Matcher<? super Hyperlink>... matchers) {
+        private final Matcher<DocumentElement> isHyperlinkedRun(Matcher<? super Hyperlink>... matchers) {
             return isRun(hasChildren(
                 allOf(
                     isHyperlink(hasHref(URI)),
@@ -465,61 +472,88 @@ public class BodyXmlTests {
             hasProperty("smallCaps", equalTo(true)));
     }
 
-    @RunWith(Parameterized.class)
-    public static class RunBooleanPropertyTests {
-        @Parameterized.Parameters(name = "propertyName: {0}, tagName: {1}")
-        public static Collection<Object[]> data() {
-            return list(new Object[][] {
-                {"bold", "w:b"},
-                {"underline", "w:u"},
-                {"italic", "w:i"},
-                {"strikethrough", "w:strike"},
-                {"smallCaps", "w:smallCaps"}
-            });
-        }
-
-        private final String propertyName;
-        private final String tagName;
+    @Nested
+    public class RunBooleanPropertyTests {
+        private class TestCase {
+            final String propertyName;
+            final String tagName;
 
-        public RunBooleanPropertyTests(String propertyName, String tagName) {
-            this.propertyName = propertyName;
-            this.tagName = tagName;
+            TestCase(String propertyName, String tagName) {
+                this.propertyName = propertyName;
+                this.tagName = tagName;
+            }
         }
 
-        @Test
-        public void runBooleanPropertyIsFalseIfElementIsPresentAndValIsFalse() {
-            XmlElement element = runXmlWithProperties(element(tagName, map("w:val", "false")));
+        private final List<TestCase> TEST_CASES = list(
+            new TestCase("bold", "w:b"),
+            new TestCase("underline", "w:u"),
+            new TestCase("italic", "w:i"),
+            new TestCase("strikethrough", "w:strike"),
+            new TestCase("smallCaps", "w:smallCaps")
+        );
 
-            assertThat(
-                readSuccess(bodyReader(), element),
-                hasProperty(propertyName, equalTo(false)));
+        @TestFactory
+        public List<DynamicTest> runBooleanPropertyIsFalseIfElementIsPresentAndValIsFalse() {
+            return eagerMap(TEST_CASES, testCase -> DynamicTest.dynamicTest(
+                testCase.propertyName + " property is false if " + testCase.tagName + " element is present and val is false",
+                () -> {
+                    XmlElement element = runXmlWithProperties(
+                        element(testCase.tagName, map("w:val", "false"))
+                    );
+
+                    assertThat(
+                        readSuccess(bodyReader(), element),
+                        hasProperty(testCase.propertyName, equalTo(false)));
+                })
+            );
         }
 
-        @Test
-        public void runBooleanPropertyIsFalseIfElementIsPresentAndValIs0() {
-            XmlElement element = runXmlWithProperties(element(tagName, map("w:val", "0")));
-
-            assertThat(
-                readSuccess(bodyReader(), element),
-                hasProperty(propertyName, equalTo(false)));
+        @TestFactory
+        public List<DynamicTest> runBooleanPropertyIsFalseIfElementIsPresentAndValIs0() {
+            return eagerMap(TEST_CASES, testCase -> DynamicTest.dynamicTest(
+                testCase.propertyName + " property is false if " + testCase.tagName + " element is present and val is 0",
+                () -> {
+                    XmlElement element = runXmlWithProperties(
+                        element(testCase.tagName, map("w:val", "0"))
+                    );
+
+                    assertThat(
+                        readSuccess(bodyReader(), element),
+                        hasProperty(testCase.propertyName, equalTo(false)));
+                })
+            );
         }
 
-        @Test
-        public void runBooleanPropertyIsFalseIfElementIsPresentAndValIsTrue() {
-            XmlElement element = runXmlWithProperties(element(tagName, map("w:val", "true")));
-
-            assertThat(
-                readSuccess(bodyReader(), element),
-                hasProperty(propertyName, equalTo(true)));
+        @TestFactory
+        public List<DynamicTest> runBooleanPropertyIsFalseIfElementIsPresentAndValIsTrue() {
+            return eagerMap(TEST_CASES, testCase -> DynamicTest.dynamicTest(
+                testCase.propertyName + " property is true if " + testCase.tagName + " element is present and val is true",
+                () -> {
+                    XmlElement element = runXmlWithProperties(
+                        element(testCase.tagName, map("w:val", "true"))
+                    );
+
+                    assertThat(
+                        readSuccess(bodyReader(), element),
+                        hasProperty(testCase.propertyName, equalTo(true)));
+                })
+            );
         }
 
-        @Test
-        public void runBooleanPropertyIsFalseIfElementIsPresentAndValIs1() {
-            XmlElement element = runXmlWithProperties(element(tagName, map("w:val", "1")));
-
-            assertThat(
-                readSuccess(bodyReader(), element),
-                hasProperty(propertyName, equalTo(true)));
+        @TestFactory
+        public List<DynamicTest> runBooleanPropertyIsFalseIfElementIsPresentAndValIs1() {
+            return eagerMap(TEST_CASES, testCase -> DynamicTest.dynamicTest(
+                testCase.propertyName + " property is false if " + testCase.tagName + " element is present and val is 1",
+                () -> {
+                    XmlElement element = runXmlWithProperties(
+                        element(testCase.tagName, map("w:val", "1"))
+                    );
+
+                    assertThat(
+                        readSuccess(bodyReader(), element),
+                        hasProperty(testCase.propertyName, equalTo(true)));
+                })
+            );
         }
     }
 
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/CommentXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/CommentXmlTests.java
index 0464866..9324619 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/CommentXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/CommentXmlTests.java
@@ -1,6 +1,6 @@
 package org.zwobble.mammoth.tests.docx;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.zwobble.mammoth.internal.documents.Comment;
 import org.zwobble.mammoth.internal.docx.CommentXmlReader;
 import org.zwobble.mammoth.internal.results.InternalResult;
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/ContentTypesXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/ContentTypesXmlTests.java
index b09431c..bd1c6be 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/ContentTypesXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/ContentTypesXmlTests.java
@@ -1,12 +1,12 @@
 package org.zwobble.mammoth.tests.docx;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.zwobble.mammoth.internal.docx.ContentTypes;
 import org.zwobble.mammoth.internal.xml.XmlElement;
 
 import java.util.Optional;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.zwobble.mammoth.internal.docx.ContentTypesXml.readContentTypesXmlElement;
 import static org.zwobble.mammoth.internal.util.Lists.list;
 import static org.zwobble.mammoth.internal.util.Maps.map;
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/DocumentXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/DocumentXmlTests.java
index 19f1a95..3aa6a62 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/DocumentXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/DocumentXmlTests.java
@@ -1,6 +1,6 @@
 package org.zwobble.mammoth.tests.docx;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.zwobble.mammoth.internal.documents.Document;
 import org.zwobble.mammoth.internal.documents.Note;
 import org.zwobble.mammoth.internal.documents.NoteType;
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/EmbeddedStyleMapTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/EmbeddedStyleMapTests.java
index 527debb..d973e78 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/EmbeddedStyleMapTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/EmbeddedStyleMapTests.java
@@ -1,6 +1,6 @@
 package org.zwobble.mammoth.tests.docx;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.zwobble.mammoth.internal.archives.Archives;
 import org.zwobble.mammoth.internal.archives.InMemoryArchive;
 import org.zwobble.mammoth.internal.archives.MutableArchive;
@@ -15,7 +15,7 @@ import java.io.IOException;
 import java.util.Optional;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.zwobble.mammoth.internal.util.Lists.list;
 import static org.zwobble.mammoth.internal.util.Maps.map;
 import static org.zwobble.mammoth.tests.DeepReflectionMatcher.deepEquals;
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/NotesXmlReaderTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/NotesXmlReaderTests.java
index 7c3670a..ad79169 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/NotesXmlReaderTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/NotesXmlReaderTests.java
@@ -1,6 +1,6 @@
 package org.zwobble.mammoth.tests.docx;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.zwobble.mammoth.internal.documents.Note;
 import org.zwobble.mammoth.internal.documents.NoteType;
 import org.zwobble.mammoth.internal.docx.BodyXmlReader;
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/NumberingXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/NumberingXmlTests.java
index e7ffbcc..12158a4 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/NumberingXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/NumberingXmlTests.java
@@ -1,12 +1,12 @@
 package org.zwobble.mammoth.tests.docx;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.zwobble.mammoth.internal.docx.Numbering;
 import org.zwobble.mammoth.internal.xml.XmlElement;
 
 import java.util.Optional;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.zwobble.mammoth.internal.docx.NumberingXml.readNumberingXmlElement;
 import static org.zwobble.mammoth.internal.util.Lists.list;
 import static org.zwobble.mammoth.internal.util.Maps.map;
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/OfficeXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/OfficeXmlTests.java
index 7adedbb..01f9784 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/OfficeXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/OfficeXmlTests.java
@@ -1,6 +1,6 @@
 package org.zwobble.mammoth.tests.docx;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.zwobble.mammoth.internal.docx.OfficeXml;
 import org.zwobble.mammoth.internal.xml.XmlElement;
 
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/RelationshipsTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/RelationshipsTests.java
index a8300df..c860ba1 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/RelationshipsTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/RelationshipsTests.java
@@ -1,9 +1,9 @@
 package org.zwobble.mammoth.tests.docx;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.zwobble.mammoth.internal.docx.Relationships;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.zwobble.mammoth.internal.util.Maps.map;
 import static org.zwobble.mammoth.tests.util.MammothAsserts.assertThrows;
 
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/RelationshipsXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/RelationshipsXmlTests.java
index 40ce85e..6313591 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/RelationshipsXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/RelationshipsXmlTests.java
@@ -1,10 +1,10 @@
 package org.zwobble.mammoth.tests.docx;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.zwobble.mammoth.internal.docx.Relationships;
 import org.zwobble.mammoth.internal.xml.XmlElement;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.zwobble.mammoth.internal.docx.RelationshipsXml.readRelationshipsXmlElement;
 import static org.zwobble.mammoth.internal.util.Lists.list;
 import static org.zwobble.mammoth.internal.util.Maps.map;
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/StylesXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/StylesXmlTests.java
index 84735b0..fc9a2cf 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/StylesXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/StylesXmlTests.java
@@ -1,12 +1,12 @@
 package org.zwobble.mammoth.tests.docx;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.zwobble.mammoth.internal.docx.Styles;
 import org.zwobble.mammoth.internal.xml.XmlElement;
 
 import java.util.Optional;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.zwobble.mammoth.internal.docx.StylesXml.readStylesXmlElement;
 import static org.zwobble.mammoth.internal.util.Lists.list;
 import static org.zwobble.mammoth.internal.util.Maps.map;
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/Uris.java b/src/test/java/org/zwobble/mammoth/tests/docx/Uris.java
index 36d4bcb..a631f7f 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/Uris.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/Uris.java
@@ -1,6 +1,6 @@
 package org.zwobble.mammoth.tests.docx;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
diff --git a/src/test/java/org/zwobble/mammoth/tests/html/HtmlCollapseTests.java b/src/test/java/org/zwobble/mammoth/tests/html/HtmlCollapseTests.java
index 4d2b5d3..f2aa615 100644
--- a/src/test/java/org/zwobble/mammoth/tests/html/HtmlCollapseTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/html/HtmlCollapseTests.java
@@ -1,6 +1,6 @@
 package org.zwobble.mammoth.tests.html;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.zwobble.mammoth.internal.html.Html;
 import org.zwobble.mammoth.tests.styles.parsing.HtmlElementBuilder;
 
diff --git a/src/test/java/org/zwobble/mammoth/tests/html/HtmlStripEmptyTests.java b/src/test/java/org/zwobble/mammoth/tests/html/HtmlStripEmptyTests.java
index a16dfb0..3a0efa1 100644
--- a/src/test/java/org/zwobble/mammoth/tests/html/HtmlStripEmptyTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/html/HtmlStripEmptyTests.java
@@ -1,6 +1,6 @@
 package org.zwobble.mammoth.tests.html;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.zwobble.mammoth.internal.html.Html;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/src/test/java/org/zwobble/mammoth/tests/html/HtmlWriteTests.java b/src/test/java/org/zwobble/mammoth/tests/html/HtmlWriteTests.java
index 2201cc2..f87350d 100644
--- a/src/test/java/org/zwobble/mammoth/tests/html/HtmlWriteTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/html/HtmlWriteTests.java
@@ -1,10 +1,10 @@
 package org.zwobble.mammoth.tests.html;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.zwobble.mammoth.internal.html.Html;
 import org.zwobble.mammoth.internal.html.HtmlNode;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.zwobble.mammoth.internal.util.Lists.list;
 import static org.zwobble.mammoth.internal.util.Maps.map;
 
diff --git a/src/test/java/org/zwobble/mammoth/tests/styles/BreakMatcherTests.java b/src/test/java/org/zwobble/mammoth/tests/styles/BreakMatcherTests.java
index f33ef72..f0d19e3 100644
--- a/src/test/java/org/zwobble/mammoth/tests/styles/BreakMatcherTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/styles/BreakMatcherTests.java
@@ -1,6 +1,6 @@
 package org.zwobble.mammoth.tests.styles;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.zwobble.mammoth.internal.documents.Break;
 import org.zwobble.mammoth.internal.styles.BreakMatcher;
 
diff --git a/src/test/java/org/zwobble/mammoth/tests/styles/EqualToStringMatcherTests.java b/src/test/java/org/zwobble/mammoth/tests/styles/EqualToStringMatcherTests.java
index 7168a24..14e7c50 100644
--- a/src/test/java/org/zwobble/mammoth/tests/styles/EqualToStringMatcherTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/styles/EqualToStringMatcherTests.java
@@ -1,6 +1,6 @@
 package org.zwobble.mammoth.tests.styles;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.zwobble.mammoth.internal.styles.EqualToStringMatcher;
 import org.zwobble.mammoth.internal.styles.StringMatcher;
 
diff --git a/src/test/java/org/zwobble/mammoth/tests/styles/ParagraphMatcherTests.java b/src/test/java/org/zwobble/mammoth/tests/styles/ParagraphMatcherTests.java
index 3f9a288..9ec58fc 100644
--- a/src/test/java/org/zwobble/mammoth/tests/styles/ParagraphMatcherTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/styles/ParagraphMatcherTests.java
@@ -1,6 +1,6 @@
 package org.zwobble.mammoth.tests.styles;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.zwobble.mammoth.internal.documents.NumberingLevel;
 import org.zwobble.mammoth.internal.documents.Paragraph;
 import org.zwobble.mammoth.internal.documents.Style;
@@ -8,8 +8,8 @@ import org.zwobble.mammoth.internal.styles.ParagraphMatcher;
 
 import java.util.Optional;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.zwobble.mammoth.tests.documents.DocumentElementMakers.*;
 
 public class ParagraphMatcherTests {
diff --git a/src/test/java/org/zwobble/mammoth/tests/styles/StartsWithStringMatcherTests.java b/src/test/java/org/zwobble/mammoth/tests/styles/StartsWithStringMatcherTests.java
index fd29da1..b0e4f43 100644
--- a/src/test/java/org/zwobble/mammoth/tests/styles/StartsWithStringMatcherTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/styles/StartsWithStringMatcherTests.java
@@ -1,6 +1,6 @@
 package org.zwobble.mammoth.tests.styles;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.zwobble.mammoth.internal.styles.StartsWithStringMatcher;
 import org.zwobble.mammoth.internal.styles.StringMatcher;
 
diff --git a/src/test/java/org/zwobble/mammoth/tests/styles/parsing/DocumentMatcherParsingTests.java b/src/test/java/org/zwobble/mammoth/tests/styles/parsing/DocumentMatcherParsingTests.java
index ebd27cd..2c86e7e 100644
--- a/src/test/java/org/zwobble/mammoth/tests/styles/parsing/DocumentMatcherParsingTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/styles/parsing/DocumentMatcherParsingTests.java
@@ -1,7 +1,7 @@
 package org.zwobble.mammoth.tests.styles.parsing;
 
 import org.hamcrest.Matcher;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.zwobble.mammoth.internal.styles.*;
 import org.zwobble.mammoth.internal.styles.parsing.DocumentMatcherParser;
 import org.zwobble.mammoth.internal.styles.parsing.StyleMappingTokeniser;
diff --git a/src/test/java/org/zwobble/mammoth/tests/styles/parsing/EscapeSequencesTests.java b/src/test/java/org/zwobble/mammoth/tests/styles/parsing/EscapeSequencesTests.java
index 8b76316..9c06086 100644
--- a/src/test/java/org/zwobble/mammoth/tests/styles/parsing/EscapeSequencesTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/styles/parsing/EscapeSequencesTests.java
@@ -1,9 +1,9 @@
 package org.zwobble.mammoth.tests.styles.parsing;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.zwobble.mammoth.internal.styles.parsing.EscapeSequences;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class EscapeSequencesTests {
     @Test
diff --git a/src/test/java/org/zwobble/mammoth/tests/styles/parsing/HtmlPathParsingTests.java b/src/test/java/org/zwobble/mammoth/tests/styles/parsing/HtmlPathParsingTests.java
index a9b19da..23cc730 100644
--- a/src/test/java/org/zwobble/mammoth/tests/styles/parsing/HtmlPathParsingTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/styles/parsing/HtmlPathParsingTests.java
@@ -1,6 +1,6 @@
 package org.zwobble.mammoth.tests.styles.parsing;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.zwobble.mammoth.internal.styles.HtmlPath;
 import org.zwobble.mammoth.internal.styles.parsing.HtmlPathParser;
 import org.zwobble.mammoth.internal.styles.parsing.StyleMappingTokeniser;
diff --git a/src/test/java/org/zwobble/mammoth/tests/styles/parsing/StyleMapParserTests.java b/src/test/java/org/zwobble/mammoth/tests/styles/parsing/StyleMapParserTests.java
index 9837479..a25c764 100644
--- a/src/test/java/org/zwobble/mammoth/tests/styles/parsing/StyleMapParserTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/styles/parsing/StyleMapParserTests.java
@@ -1,6 +1,6 @@
 package org.zwobble.mammoth.tests.styles.parsing;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.zwobble.mammoth.internal.styles.*;
 import org.zwobble.mammoth.internal.styles.parsing.StyleMapParser;
 
diff --git a/src/test/java/org/zwobble/mammoth/tests/styles/parsing/StyleMappingTokeniserTests.java b/src/test/java/org/zwobble/mammoth/tests/styles/parsing/StyleMappingTokeniserTests.java
index c767957..f70fd77 100644
--- a/src/test/java/org/zwobble/mammoth/tests/styles/parsing/StyleMappingTokeniserTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/styles/parsing/StyleMappingTokeniserTests.java
@@ -1,7 +1,7 @@
 package org.zwobble.mammoth.tests.styles.parsing;
 
 import org.hamcrest.Matcher;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.zwobble.mammoth.internal.styles.parsing.StyleMappingTokeniser;
 import org.zwobble.mammoth.internal.styles.parsing.Token;
 import org.zwobble.mammoth.internal.styles.parsing.TokenType;
diff --git a/src/test/java/org/zwobble/mammoth/tests/styles/parsing/TokenParserTests.java b/src/test/java/org/zwobble/mammoth/tests/styles/parsing/TokenParserTests.java
index aec1f17..d02bafe 100644
--- a/src/test/java/org/zwobble/mammoth/tests/styles/parsing/TokenParserTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/styles/parsing/TokenParserTests.java
@@ -1,6 +1,6 @@
 package org.zwobble.mammoth.tests.styles.parsing;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.zwobble.mammoth.internal.styles.parsing.Token;
 import org.zwobble.mammoth.internal.styles.parsing.TokenIterator;
 import org.zwobble.mammoth.internal.styles.parsing.TokenParser;
@@ -8,7 +8,7 @@ import org.zwobble.mammoth.internal.styles.parsing.TokenType;
 
 import java.util.Optional;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.zwobble.mammoth.internal.util.Lists.list;
 
 public class TokenParserTests {
diff --git a/src/test/java/org/zwobble/mammoth/tests/xml/XmlElementTests.java b/src/test/java/org/zwobble/mammoth/tests/xml/XmlElementTests.java
index f396b1b..f82b11e 100644
--- a/src/test/java/org/zwobble/mammoth/tests/xml/XmlElementTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/xml/XmlElementTests.java
@@ -1,10 +1,10 @@
 package org.zwobble.mammoth.tests.xml;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.zwobble.mammoth.internal.xml.XmlElement;
 import org.zwobble.mammoth.internal.xml.XmlNodes;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.zwobble.mammoth.tests.util.MammothAsserts.assertThrows;
 
 public class XmlElementTests {
diff --git a/src/test/java/org/zwobble/mammoth/tests/xml/XmlParserTests.java b/src/test/java/org/zwobble/mammoth/tests/xml/XmlParserTests.java
index 072482e..9e8370a 100644
--- a/src/test/java/org/zwobble/mammoth/tests/xml/XmlParserTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/xml/XmlParserTests.java
@@ -3,7 +3,7 @@ package org.zwobble.mammoth.tests.xml;
 import org.hamcrest.Matcher;
 import org.hamcrest.collection.IsEmptyIterable;
 import org.hamcrest.collection.IsIterableContainingInOrder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.zwobble.mammoth.internal.xml.NamespacePrefixes;
 import org.zwobble.mammoth.internal.xml.XmlElement;
 import org.zwobble.mammoth.internal.xml.XmlNode;