8380824: java/net/DatagramSocket/SendReceiveMaxSize.java could also test the loopback interface

Author: dfuch

test/jdk/java/net/DatagramSocket/SendReceiveMaxSize.java

@@ -22,7 +22,7 @@
  */
 
 /*
- * @test
+ * @test id=default
  * @bug 8242885 8250886 8240901
  * @key randomness
  * @summary This test verifies that on macOS, the send buffer size is configured
@@ -34,13 +34,62 @@
  * @library /test/lib
  * @build jdk.test.lib.net.IPSupport
  * @run testng/othervm SendReceiveMaxSize
+ */
+/*
+ * @test id=preferIPv4Stack
+ * @key randomness
+ * @summary Check that it is possible to send and receive datagrams of
+ *          maximum size on macOS, using an IPv4 only socket.
+ * @library /test/lib
+ * @build jdk.test.lib.net.IPSupport
  * @run testng/othervm -Djava.net.preferIPv4Stack=true SendReceiveMaxSize
+ */
+/*
+ * @test id=preferIPv6Addresses
+ * @key randomness
+ * @summary Check that it is possible to send and receive datagrams of
+ *          maximum size on macOS, using a dual socket and prefering
+ *          IPv6 addresses.
+ * @library /test/lib
+ * @build jdk.test.lib.net.IPSupport
  * @run testng/othervm -Djava.net.preferIPv6Addresses=true SendReceiveMaxSize
  */
+/*
+ * @test id=preferLoopback
+ * @key randomness
+ * @summary Check that it is possible to send and receive datagrams of
+ *          maximum size on macOS, using a dual socket and the loopback
+ *          interface.
+ * @library /test/lib
+ * @build jdk.test.lib.net.IPSupport
+ * @run testng/othervm -Dtest.preferLoopback=true SendReceiveMaxSize
+ */
+/*
+ * @test id=preferIPv6Loopback
+ * @key randomness
+ * @summary Check that it is possible to send and receive datagrams of
+ *          maximum size on macOS, using a dual socket and the loopback
+ *          interface.
+ * @library /test/lib
+ * @build jdk.test.lib.net.IPSupport
+ * @run testng/othervm -Dtest.preferLoopback=true -Djava.net.preferIPv6Addresses=true SendReceiveMaxSize
+ */
+/*
+ * @test id=preferIPv4Loopback
+ * @key randomness
+ * @summary Check that it is possible to send and receive datagrams of
+ *          maximum size on macOS, using an IPv4 only socket and the
+ *          loopback interface
+ * @library /test/lib
+ * @build jdk.test.lib.net.IPSupport
+ * @run testng/othervm -Dtest.preferLoopback=true -Djava.net.preferIPv4Stack=true SendReceiveMaxSize
+ */
 
 import jdk.test.lib.RandomFactory;
 import jdk.test.lib.Platform;
 import jdk.test.lib.net.IPSupport;
+import jtreg.SkippedException;
+import org.testng.SkipException;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
@@ -61,6 +110,9 @@
 import static org.testng.Assert.expectThrows;
 
 public class SendReceiveMaxSize {
+
+    private final static boolean PREFER_LOOPBACK = Boolean.getBoolean("test.preferLoopback");
+
     private int BUF_LIMIT;
     private InetAddress HOST_ADDR;
     private final static int IPV4_SNDBUF = 65507;
@@ -75,8 +127,15 @@ public interface DatagramSocketSupplier {
 
     @BeforeTest
     public void setUp() throws IOException {
-        IPSupport.throwSkippedExceptionIfNonOperational();
-        HOST_ADDR = InetAddress.getLocalHost();
+        try {
+            // This method throws jtreg.SkippedException, which is
+            // interpreted as a test failure by testng
+            IPSupport.throwSkippedExceptionIfNonOperational();
+        } catch (SkippedException skip) {
+            // throws the appropriate TestNG SkipException
+            throw new SkipException(skip.getMessage());
+        }
+        HOST_ADDR = PREFER_LOOPBACK ? InetAddress.getLoopbackAddress() : InetAddress.getLocalHost();
         BUF_LIMIT = (HOST_ADDR instanceof Inet6Address) ? IPV6_SNDBUF : IPV4_SNDBUF;
         System.out.printf("Host address: %s, Buffer limit: %d%n", HOST_ADDR, BUF_LIMIT);
     }