Fix #139: convert JUnit4 to JUnit5

Author: cowtowncoder

pom.xml

@@ -74,11 +74,25 @@ JUG supports 3 original official UUID generation methods as well as later additi
         <scope>runtime</scope>
         <optional>true</optional>
     </dependency>
-    <!-- For testing, JUnit is needed -->
+    <!-- For testing, JUnit 5 is needed -->
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${version.junit}</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <version>${version.junit5}</version>
+      <scope>test</scope>
+    </dependency>
+    <!-- For JUnit 4 parameterized tests migration -->
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <version>${version.junit5}</version>
+      <scope>test</scope>
+    </dependency>
+    <!-- For Hamcrest matchers used in tests -->
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <version>2.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

release-notes/VERSION

@@ -8,6 +8,7 @@ Releases
 
 #124: TimeBasedEpochGenerator should prevent overflow
  (Chad P)
+#139: Upgrade tests from JUnit 4 to JUnit 5
 - Update to `oss-parent` v69
 
 5.1.1 (26-Sep-2025)

src/test/java/com/fasterxml/uuid/EgressInterfaceFinderTest.java

@@ -2,58 +2,61 @@
 
 import com.fasterxml.uuid.EgressInterfaceFinder.EgressResolutionException;
 import com.fasterxml.uuid.EgressInterfaceFinder.Finder;
-import junit.framework.TestCase;
+import org.junit.jupiter.api.Test;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.NetworkInterface;
 import java.net.UnknownHostException;
 
 import static com.fasterxml.uuid.EgressInterfaceFinder.DEFAULT_TIMEOUT_MILLIS;
+import static org.junit.jupiter.api.Assertions.*;
 
-public class EgressInterfaceFinderTest extends TestCase {
+public class EgressInterfaceFinderTest {
 
     private final EgressInterfaceFinder finder = new EgressInterfaceFinder();
 
+    @Test
     public void testUnspecifiedIPv4LocalAddress() throws UnknownHostException {
         EgressResolutionException ex = null;
         try {
             finder.fromLocalAddress(InetAddress.getByName("0.0.0.0"));
         } catch (EgressResolutionException e) {
             ex = e;
         }
-        assertNotNull("EgressResolutionException was not thrown", ex);
+        assertNotNull(ex, "EgressResolutionException was not thrown");
         String message = ex.getMessage();
-        assertTrue(String.format(
+        assertTrue(message.startsWith("local address"), String.format(
                         "message [%s] does not begin with \"local address\"",
-                        message),
-                message.startsWith("local address"));
+                        message));
         assertEquals(1, ex.getMessages().size());
     }
 
+    @Test
     public void testUnspecifiedIPv6LocalAddress() throws Exception {
         EgressResolutionException ex = null;
         try {
             finder.fromLocalAddress(InetAddress.getByName("::"));
         } catch (EgressResolutionException e) {
             ex = e;
         }
-        assertNotNull("EgressResolutionException was not thrown", ex);
+        assertNotNull(ex, "EgressResolutionException was not thrown");
         String message = ex.getMessage();
-        assertTrue(String.format(
+        assertTrue(message.startsWith("local address"), String.format(
                         "message [%s] does not begin with \"local address\"",
-                        message),
-                message.startsWith("local address"));
+                        message));
         assertEquals(1, ex.getMessages().size());
     }
 
+    @Test
     public void testFromLocalAddress() throws Exception {
         NetworkInterface anInterface =
                 NetworkInterface.getNetworkInterfaces().nextElement();
         InetAddress anAddress = anInterface.getInetAddresses().nextElement();
         assertEquals(anInterface, finder.fromLocalAddress(anAddress));
     }
 
+    @Test
     public void testFromIncorrectLocalAddress() throws Exception {
         EgressResolutionException ex = null;
         try {
@@ -62,15 +65,15 @@ public void testFromIncorrectLocalAddress() throws Exception {
         } catch (EgressResolutionException e) {
             ex = e;
         }
-        assertNotNull("EgressResolutionException was not thrown", ex);
+        assertNotNull(ex, "EgressResolutionException was not thrown");
         String message = ex.getMessage();
-        assertTrue(String.format(
+        assertTrue(message.startsWith("no interface found"), String.format(
                         "message [%s] does not begin with \"no interface found\"",
-                        message),
-                message.startsWith("no interface found"));
+                        message));
         assertEquals(1, ex.getMessages().size());
     }
 
+    @Test
     public void testFromRemoteDatagramSocketConnection() throws Exception {
         if (!System.getProperty("os.name").startsWith("Mac")) {
             String name = EgressInterfaceFinder.randomRootServerName();
@@ -79,22 +82,26 @@ public void testFromRemoteDatagramSocketConnection() throws Exception {
         }
     }
 
+    @Test
     public void testFromRemoteSocketConnection() throws Exception {
         String name = EgressInterfaceFinder.randomRootServerName();
         InetSocketAddress address = new InetSocketAddress(name, 53);
         finder.fromRemoteSocketConnection(DEFAULT_TIMEOUT_MILLIS, address);
     }
 
+    @Test
     public void testFromRemoteConnection() throws Exception {
         String name = EgressInterfaceFinder.randomRootServerName();
         InetSocketAddress address = new InetSocketAddress(name, 53);
         finder.fromRemoteConnection(DEFAULT_TIMEOUT_MILLIS, address);
     }
 
+    @Test
     public void testFromRootNameServerConnection() throws Exception {
         finder.fromRootNameserverConnection(DEFAULT_TIMEOUT_MILLIS);
     }
 
+    @Test
     public void testAggregateExceptions() {
         EgressResolutionException ex = null;
         final int[] counter = {0};
@@ -112,10 +119,11 @@ public NetworkInterface egressInterface()
         } catch (EgressResolutionException e) {
             ex = e;
         }
-        assertNotNull("EgressResolutionException was not thrown", ex);
+        assertNotNull(ex, "EgressResolutionException was not thrown");
         assertEquals(9, ex.getMessages().size());
     }
 
+    @Test
     public void testDefaultMechanisms() throws Exception {
         try {
             finder.egressInterface();