8381616: Refactor various java/net/*Socket*/ TestNG tests to use JUnit

Reviewed-by: alanb

Author: dfuch

test/jdk/java/net/DatagramSocketImpl/TestCreate.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,9 @@
  * @test
  * @bug 8238231
  * @summary test that DatagramSocket calls java.net.DatagramSocketImpl::create
- * @run testng/othervm TestCreate
+ * @run junit/othervm ${test.main.class}
  */
 
-import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.net.DatagramPacket;
@@ -44,7 +43,9 @@
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
-import static org.testng.Assert.assertTrue;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class TestCreate {
 

test/jdk/java/net/DatagramSocketImpl/TestDefaultBehavior.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
  * @test
  * @bug 8224477
  * @summary Basic test for java.net.DatagramSocketImpl default behavior
- * @run testng TestDefaultBehavior
+ * @run junit ${test.main.class}
  */
 
 import java.io.IOException;
@@ -36,11 +36,13 @@
 import java.net.SocketAddress;
 import java.net.SocketOption;
 import java.util.Set;
-import org.testng.annotations.Test;
 import static java.lang.Boolean.*;
 import static java.net.StandardSocketOptions.*;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.expectThrows;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 
 public class TestDefaultBehavior {
 
@@ -51,21 +53,21 @@ public class TestDefaultBehavior {
     public void datagramSocketImpl() {
         CustomDatagramSocketImpl dsi = new CustomDatagramSocketImpl();
 
-        assertEquals(dsi.supportedOptions().size(), 0);
-
-        expectThrows(NPE, () -> dsi.setOption(null, null));
-        expectThrows(NPE, () -> dsi.setOption(null, 1));
-        expectThrows(UOE, () -> dsi.setOption(SO_RCVBUF, 100));
-        expectThrows(UOE, () -> dsi.setOption(SO_KEEPALIVE, TRUE));
-        expectThrows(UOE, () -> dsi.setOption(SO_KEEPALIVE, FALSE));
-        expectThrows(UOE, () -> dsi.setOption(FAKE_SOCK_OPT, TRUE));
-        expectThrows(UOE, () -> dsi.setOption(FAKE_SOCK_OPT, FALSE));
-        expectThrows(UOE, () -> dsi.setOption(SO_KEEPALIVE, TRUE));
-
-        expectThrows(NPE, () -> dsi.getOption(null));
-        expectThrows(UOE, () -> dsi.getOption(SO_RCVBUF));
-        expectThrows(UOE, () -> dsi.getOption(SO_KEEPALIVE));
-        expectThrows(UOE, () -> dsi.getOption(FAKE_SOCK_OPT));
+        assertEquals(0, dsi.supportedOptions().size());
+
+        assertThrows(NPE, () -> dsi.setOption(null, null));
+        assertThrows(NPE, () -> dsi.setOption(null, 1));
+        assertThrows(UOE, () -> dsi.setOption(SO_RCVBUF, 100));
+        assertThrows(UOE, () -> dsi.setOption(SO_KEEPALIVE, TRUE));
+        assertThrows(UOE, () -> dsi.setOption(SO_KEEPALIVE, FALSE));
+        assertThrows(UOE, () -> dsi.setOption(FAKE_SOCK_OPT, TRUE));
+        assertThrows(UOE, () -> dsi.setOption(FAKE_SOCK_OPT, FALSE));
+        assertThrows(UOE, () -> dsi.setOption(SO_KEEPALIVE, TRUE));
+
+        assertThrows(NPE, () -> dsi.getOption(null));
+        assertThrows(UOE, () -> dsi.getOption(SO_RCVBUF));
+        assertThrows(UOE, () -> dsi.getOption(SO_KEEPALIVE));
+        assertThrows(UOE, () -> dsi.getOption(FAKE_SOCK_OPT));
     }
 
     static final SocketOption<Boolean> FAKE_SOCK_OPT = new SocketOption<>() {

test/jdk/java/net/MulticastSocket/Constructor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2026, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,15 +24,15 @@
 /* @test
  * @bug 8243999
  * @summary Checks to ensure that Multicast constructors behave as expected
- * @run testng Constructor
+ * @run junit ${test.main.class}
  */
 
-import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.net.MulticastSocket;
 
-import static org.testng.Assert.assertTrue;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class Constructor {
     @Test

test/jdk/java/net/MulticastSocket/IPMulticastIF.java

@@ -27,44 +27,41 @@
 import java.net.NetworkInterface;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 import jdk.test.lib.NetworkConfiguration;
-import org.testng.SkipException;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import static jdk.test.lib.net.IPSupport.diagnoseConfigurationIssue;
 import static java.lang.String.format;
 import static java.lang.System.out;
 import static java.net.StandardSocketOptions.IP_MULTICAST_IF;
 import static java.util.stream.Collectors.toList;
-import static jdk.test.lib.net.IPSupport.diagnoseConfigurationIssue;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @test
  * @bug 8236441
  * @summary Bound MulticastSocket fails when setting outbound interface on Windows
  * @library /test/lib
- * @run testng IPMulticastIF
- * @run testng/othervm -Djava.net.preferIPv4Stack=true IPMulticastIF
- * @run testng/othervm -Djava.net.preferIPv6Addresses=true IPMulticastIF
- * @run testng/othervm -Djava.net.preferIPv6Addresses=true -Djava.net.preferIPv4Stack=true IPMulticastIF
+ * @run junit ${test.main.class}
+ * @run junit/othervm -Djava.net.preferIPv4Stack=true ${test.main.class}
+ * @run junit/othervm -Djava.net.preferIPv6Addresses=true ${test.main.class}
+ * @run junit/othervm -Djava.net.preferIPv6Addresses=true -Djava.net.preferIPv4Stack=true ${test.main.class}
  */
 public class IPMulticastIF {
 
-    @BeforeTest
-    public void sanity() {
-        Optional<String> configurationIssue = diagnoseConfigurationIssue();
-        configurationIssue.map(SkipException::new).ifPresent(x -> {
-            throw x;
-        });
+    @BeforeAll
+    public static void sanity() {
+        diagnoseConfigurationIssue().ifPresent(Assumptions::abort);
         NetworkConfiguration.printSystemConfiguration(out);
     }
 
-    @DataProvider(name = "scenarios")
-    public Object[][] positive() throws Exception {
+    public static Object[][] positive() throws Exception {
         List<InetAddress> addrs = List.of(InetAddress.getLocalHost(),
                                           InetAddress.getLoopbackAddress());
         List<Object[]> list = new ArrayList<>();
@@ -81,8 +78,7 @@ public Object[][] positive() throws Exception {
         return list.stream().toArray(Object[][]::new);
     }
 
-    @DataProvider(name = "interfaces")
-    public Object[][] interfaces() throws Exception {
+    public static Object[][] interfaces() throws Exception {
         List<Object[]> list = new ArrayList<>();
         NetworkConfiguration nc = NetworkConfiguration.probe();
         nc.multicastInterfaces(true)
@@ -92,65 +88,69 @@ public Object[][] interfaces() throws Exception {
         return list.stream().toArray(Object[][]::new);
     }
 
-    @Test(dataProvider = "scenarios")
+    @ParameterizedTest
+    @MethodSource("positive")
     public void testSetGetInterfaceBound(InetSocketAddress bindAddr, NetworkInterface nif)
         throws Exception
     {
         out.println(format("\n\n--- testSetGetInterfaceBound bindAddr=[%s], nif=[%s]", bindAddr, nif));
         try (MulticastSocket ms = new MulticastSocket(bindAddr)) {
             ms.setNetworkInterface(nif);
             NetworkInterface msNetIf = ms.getNetworkInterface();
-            assertEquals(msNetIf, nif);
+            assertEquals(nif, msNetIf);
         }
     }
 
-    @Test(dataProvider = "interfaces")
+    @ParameterizedTest
+    @MethodSource("interfaces")
     public void testSetGetInterfaceUnbound(NetworkInterface nif)
         throws Exception
     {
         out.println(format("\n\n--- testSetGetInterfaceUnbound nif=[%s]", nif));
         try (MulticastSocket ms = new MulticastSocket()) {
             ms.setNetworkInterface(nif);
             NetworkInterface msNetIf = ms.getNetworkInterface();
-            assertEquals(msNetIf, nif);
+            assertEquals(nif, msNetIf);
         }
     }
 
-    @Test(dataProvider = "scenarios")
+    @ParameterizedTest
+    @MethodSource("positive")
     public void testSetGetOptionBound(InetSocketAddress bindAddr, NetworkInterface nif)
         throws Exception
     {
         out.println(format("\n\n--- testSetGetOptionBound bindAddr=[%s], nif=[%s]", bindAddr, nif));
         try (MulticastSocket ms = new MulticastSocket(bindAddr)) {
             ms.setOption(IP_MULTICAST_IF, nif);
             NetworkInterface msNetIf = ms.getOption(IP_MULTICAST_IF);
-            assertEquals(msNetIf, nif);
+            assertEquals(nif, msNetIf);
         }
     }
 
-    @Test(dataProvider = "interfaces")
+    @ParameterizedTest
+    @MethodSource("interfaces")
     public void testSetGetOptionUnbound(NetworkInterface nif)
         throws Exception
     {
         out.println(format("\n\n--- testSetGetOptionUnbound nif=[%s]", nif));
         try (MulticastSocket ms = new MulticastSocket()) {
             ms.setOption(IP_MULTICAST_IF, nif);
             NetworkInterface msNetIf = ms.getOption(IP_MULTICAST_IF);
-            assertEquals(msNetIf, nif);
+            assertEquals(nif, msNetIf);
         }
     }
 
     // -- get without set
 
-    @DataProvider(name = "bindAddresses")
-    public Object[][] bindAddresses() throws Exception {
+    public static Object[][] bindAddresses() throws Exception {
         return new Object[][] {
             { new InetSocketAddress(InetAddress.getLocalHost(), 0)       },
             { new InetSocketAddress(InetAddress.getLoopbackAddress(), 0) },
         };
     }
 
-    @Test(dataProvider = "bindAddresses")
+    @ParameterizedTest
+    @MethodSource("bindAddresses")
     public void testGetInterfaceBound(InetSocketAddress bindAddr)
         throws Exception
     {
@@ -168,29 +168,30 @@ public void testGetInterfaceUnbound() throws Exception {
         }
     }
 
-    @Test(dataProvider = "bindAddresses")
+    @ParameterizedTest
+    @MethodSource("bindAddresses")
     public void testGetOptionBound(InetSocketAddress bindAddr)
         throws Exception
     {
         out.println(format("\n\n--- testGetOptionBound bindAddr=[%s]", bindAddr));
         try (MulticastSocket ms = new MulticastSocket(bindAddr)) {
-            assertEquals(ms.getOption(IP_MULTICAST_IF), null);
+            assertEquals(null, ms.getOption(IP_MULTICAST_IF));
         }
     }
 
     @Test
     public void testGetOptionUnbound() throws Exception {
         out.println("\n\n--- testGetOptionUnbound ");
         try (MulticastSocket ms = new MulticastSocket()) {
-            assertEquals(ms.getOption(IP_MULTICAST_IF), null);
+            assertEquals(null, ms.getOption(IP_MULTICAST_IF));
         }
     }
 
     // Asserts that the placeholder NetworkInterface has a single InetAddress
     // that represent any local address.
     static void assertPlaceHolder(NetworkInterface nif) {
         List<InetAddress> addrs = nif.inetAddresses().collect(toList());
-        assertEquals(addrs.size(), 1);
+        assertEquals(1, addrs.size());
         assertTrue(addrs.get(0).isAnyLocalAddress());
     }
 }