From 6e22b9cdcd6d8e637d1f87d2742656a2347cfaa8 Mon Sep 17 00:00:00 2001
From: Ben Asmussen <ben.asmussen@dataliquid.de>
Date: Mon, 9 Jun 2025 22:09:19 +0000
Subject: [PATCH] Migrate from JUnit 4 to JUnit 5

- Replace junit 4.13.2 with junit-jupiter 5.11.4
- Update @Test(expected=...) to assertThrows
- Add static import for assertThrows
- Update test structure for better readability

Closes #29
---
 pom.xml                                       |  6 +--
 .../dataliquid/commons/xml/DomUtilsTest.java  | 42 ++++++++-----------
 2 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/pom.xml b/pom.xml
index 500533d..1002ba0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,9 +73,9 @@
 			<scope>compile</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.11.4</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/src/test/java/com/dataliquid/commons/xml/DomUtilsTest.java b/src/test/java/com/dataliquid/commons/xml/DomUtilsTest.java
index d4e6ab6..5d7c9e2 100644
--- a/src/test/java/com/dataliquid/commons/xml/DomUtilsTest.java
+++ b/src/test/java/com/dataliquid/commons/xml/DomUtilsTest.java
@@ -54,7 +54,9 @@
 import javax.xml.xpath.XPathFactory;
 
 import org.apache.commons.io.IOUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import org.w3c.dom.Attr;
 import org.w3c.dom.CDATASection;
 import org.w3c.dom.Comment;
@@ -86,14 +88,14 @@ public void testParse()
         assertThat(document.getElementsByTagName("element").item(0).getTextContent(), equalTo("Value"));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testParseInvalid()
     {
         // Given
         String xml = "no xml content";
 
-        // When
-        DomUtils.parse(xml);
+        // When & Then
+        assertThrows(IllegalArgumentException.class, () -> DomUtils.parse(xml));
     }
 
     @Test
@@ -128,17 +130,14 @@ public void testParseWithoutNamespaceAware()
         assertThat(document.getElementsByTagName("element").item(0).getTextContent(), equalTo("Value"));
     }
 
-    @Test(expected = FileNotFoundException.class)
-    public void testParseFileNotFound() throws FileNotFoundException
+    @Test
+    public void testParseFileNotFound()
     {
         // Given
         File nonExistentFile = new File("path/to/nonexistent.xml");
 
-        // When
-        DomUtils.parse(nonExistentFile);
-
-        // Then
-        // Expecting FileNotFoundException to be thrown
+        // When & Then
+        assertThrows(FileNotFoundException.class, () -> DomUtils.parse(nonExistentFile));
     }
 
     @Test
@@ -157,17 +156,14 @@ public void testParseFile() throws FileNotFoundException
         assertThat(document.getElementsByTagName("element").item(0).getTextContent(), equalTo("Value"));
     }
 
-    @Test(expected = FileNotFoundException.class)
-    public void testParseFileWithNamespaceAwareNotFound() throws FileNotFoundException
+    @Test
+    public void testParseFileWithNamespaceAwareNotFound()
     {
         // Given
         File nonExistentFile = new File("path/to/nonexistent.xml");
 
-        // When
-        DomUtils.parse(nonExistentFile, true);
-
-        // Then
-        // Expecting FileNotFoundException to be thrown
+        // When & Then
+        assertThrows(FileNotFoundException.class, () -> DomUtils.parse(nonExistentFile, true));
     }
 
     @Test
@@ -1009,7 +1005,7 @@ public void testEnforceNoNamespaceMixes() throws Exception
         assertThat(rootElement2.getNamespaceURI(), is("http://example.com"));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testEnforceNoNamespaceMixesFails() throws Exception
     {
         // Given
@@ -1020,12 +1016,8 @@ public void testEnforceNoNamespaceMixesFails() throws Exception
         Element rootElement1 = document1.getDocumentElement();
         Element rootElement2 = document2.getDocumentElement();
 
-        // When
-        DomUtils.enforceNoNamespaceMixes(rootElement1, rootElement2);
-
-        // Then
-        assertThat(rootElement1.getNamespaceURI(), is("http://example.com"));
-        assertThat(rootElement2.getNamespaceURI(), is("http://example.org"));
+        // When & Then
+        assertThrows(IllegalArgumentException.class, () -> DomUtils.enforceNoNamespaceMixes(rootElement1, rootElement2));
     }
 
     @Test