# HG changeset patch # User aeubanks # Date 1557422909 25200 # Node ID 9db7c0f561a68e3d1a61ebfb445af5feb631c564 # Parent 258170da6d3a73f8fcb93fb6733fe0714b5ed5d7 8223652: Rename IPSupport.skipIfCurrentConfigurationIsInvalid() to IPSupport.throwSkippedExceptionIfNonOperational() Reviewed-by: dfuchs, chegar Contributed-by: aeubanks@google.com diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/DatagramSocket/UnreferencedDatagramSockets.java --- a/test/jdk/java/net/DatagramSocket/UnreferencedDatagramSockets.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/DatagramSocket/UnreferencedDatagramSockets.java Thu May 09 10:28:29 2019 -0700 @@ -106,7 +106,7 @@ } public static void main(String args[]) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); // Create and close a DatagramSocket to warm up the FD count for side effects. try (DatagramSocket s = new DatagramSocket(0)) { diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/IPSupport/MinimumPermissions.java --- a/test/jdk/java/net/IPSupport/MinimumPermissions.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/IPSupport/MinimumPermissions.java Thu May 09 10:28:29 2019 -0700 @@ -34,7 +34,7 @@ public class MinimumPermissions { public static void main(String[] args) { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); } } diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/Inet4Address/PingThis.java --- a/test/jdk/java/net/Inet4Address/PingThis.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/Inet4Address/PingThis.java Thu May 09 10:28:29 2019 -0700 @@ -48,7 +48,7 @@ if (System.getProperty("os.name").startsWith("Windows")) { return; } - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); List addrs = new ArrayList(); diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/InetAddress/GetLocalHostWithSM.java --- a/test/jdk/java/net/InetAddress/GetLocalHostWithSM.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/InetAddress/GetLocalHostWithSM.java Thu May 09 10:28:29 2019 -0700 @@ -44,7 +44,7 @@ public class GetLocalHostWithSM { public static void main(String[] args) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); // try setting the local hostname InetAddress localHost = InetAddress.getLocalHost(); diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/MulticastSocket/JoinLeave.java --- a/test/jdk/java/net/MulticastSocket/JoinLeave.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/MulticastSocket/JoinLeave.java Thu May 09 10:28:29 2019 -0700 @@ -43,7 +43,7 @@ public class JoinLeave { public static void main(String args[]) throws IOException { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); InetAddress ip4Group = InetAddress.getByName("224.80.80.80"); InetAddress ip6Group = InetAddress.getByName("ff02::a"); diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/MulticastSocket/Promiscuous.java --- a/test/jdk/java/net/MulticastSocket/Promiscuous.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/MulticastSocket/Promiscuous.java Thu May 09 10:28:29 2019 -0700 @@ -115,7 +115,7 @@ } public static void main(String args[]) throws IOException { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); String os = System.getProperty("os.name"); diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/MulticastSocket/SetGetNetworkInterfaceTest.java --- a/test/jdk/java/net/MulticastSocket/SetGetNetworkInterfaceTest.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/MulticastSocket/SetGetNetworkInterfaceTest.java Thu May 09 10:28:29 2019 -0700 @@ -42,7 +42,7 @@ public class SetGetNetworkInterfaceTest { public static void main(String[] args) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); NetworkConfiguration nc = NetworkConfiguration.probe(); try (MulticastSocket ms = new MulticastSocket()) { nc.multicastInterfaces(true).forEach(nif -> setGetNetworkInterface(ms, nif)); diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/MulticastSocket/Test.java --- a/test/jdk/java/net/MulticastSocket/Test.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/MulticastSocket/Test.java Thu May 09 10:28:29 2019 -0700 @@ -159,7 +159,7 @@ } public static void main(String args[]) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); Test t = new Test(); diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/MulticastSocket/UnreferencedMulticastSockets.java --- a/test/jdk/java/net/MulticastSocket/UnreferencedMulticastSockets.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/MulticastSocket/UnreferencedMulticastSockets.java Thu May 09 10:28:29 2019 -0700 @@ -107,7 +107,7 @@ } public static void main(String args[]) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); // Create and close a MulticastSocket to warm up the FD count for side effects. try (MulticastSocket s = new MulticastSocket(0)) { diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/NetworkInterface/NetworkInterfaceStreamTest.java --- a/test/jdk/java/net/NetworkInterface/NetworkInterfaceStreamTest.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/NetworkInterface/NetworkInterfaceStreamTest.java Thu May 09 10:28:29 2019 -0700 @@ -52,7 +52,7 @@ @BeforeTest void setup() { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); } @Test diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/NetworkInterface/Test.java --- a/test/jdk/java/net/NetworkInterface/Test.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/NetworkInterface/Test.java Thu May 09 10:28:29 2019 -0700 @@ -37,7 +37,7 @@ static final boolean isWindows = System.getProperty("os.name").startsWith("Windows"); public static void main(String args[]) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); Enumeration nifs = NetworkInterface.getNetworkInterfaces(); diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/ServerSocket/UnreferencedSockets.java --- a/test/jdk/java/net/ServerSocket/UnreferencedSockets.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/ServerSocket/UnreferencedSockets.java Thu May 09 10:28:29 2019 -0700 @@ -110,7 +110,7 @@ } public static void main(String args[]) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); // Create and close a ServerSocket to warm up the FD count for side effects. try (ServerSocket s = new ServerSocket(0)) { diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/Socket/AddressTest.java --- a/test/jdk/java/net/Socket/AddressTest.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/Socket/AddressTest.java Thu May 09 10:28:29 2019 -0700 @@ -155,7 +155,7 @@ } public static void main(String[] args) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); new AddressTest(); } } diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/Socket/B6210227.java --- a/test/jdk/java/net/Socket/B6210227.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/Socket/B6210227.java Thu May 09 10:28:29 2019 -0700 @@ -37,7 +37,7 @@ public class B6210227 { public static void main(String[] args) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); ServerSocket ss = new ServerSocket(0); int port = ss.getLocalPort(); diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/Socket/CloseAvailable.java --- a/test/jdk/java/net/Socket/CloseAvailable.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/Socket/CloseAvailable.java Thu May 09 10:28:29 2019 -0700 @@ -38,7 +38,7 @@ public class CloseAvailable { public static void main(String[] args) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); testClose(); diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/Socket/DeadlockTest.java --- a/test/jdk/java/net/Socket/DeadlockTest.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/Socket/DeadlockTest.java Thu May 09 10:28:29 2019 -0700 @@ -37,7 +37,7 @@ public class DeadlockTest { public static void main(String [] argv) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); ServerSocket ss = new ServerSocket(0); Socket clientSocket = new Socket(); diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/Socket/GetLocalAddress.java --- a/test/jdk/java/net/Socket/GetLocalAddress.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/Socket/GetLocalAddress.java Thu May 09 10:28:29 2019 -0700 @@ -41,7 +41,7 @@ static int port; public static void main(String args[]) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); testBindNull(); diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/Socket/HttpProxy.java --- a/test/jdk/java/net/Socket/HttpProxy.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/Socket/HttpProxy.java Thu May 09 10:28:29 2019 -0700 @@ -56,7 +56,7 @@ static final int SO_TIMEOUT = 15000; public static void main(String[] args) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); String host; int port; diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/Socket/InheritHandle.java --- a/test/jdk/java/net/Socket/InheritHandle.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/Socket/InheritHandle.java Thu May 09 10:28:29 2019 -0700 @@ -47,7 +47,7 @@ "bin" + File.separator + "java"; public static void main(String[] args) { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); if (args.length == 1) { doWait(); diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/Socket/InheritTimeout.java --- a/test/jdk/java/net/Socket/InheritTimeout.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/Socket/InheritTimeout.java Thu May 09 10:28:29 2019 -0700 @@ -94,7 +94,7 @@ } public static void main(String args[]) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); new InheritTimeout(); } } diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/Socket/LingerTest.java --- a/test/jdk/java/net/Socket/LingerTest.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/Socket/LingerTest.java Thu May 09 10:28:29 2019 -0700 @@ -107,7 +107,7 @@ } public static void main(String args[]) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); InetAddress loopback = InetAddress.getLoopbackAddress(); ServerSocket ss = new ServerSocket(0, 50, loopback); diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/Socket/LinkLocal.java --- a/test/jdk/java/net/Socket/LinkLocal.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/Socket/LinkLocal.java Thu May 09 10:28:29 2019 -0700 @@ -122,7 +122,7 @@ } public static void main(String args[]) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); /* * If an argument is provided ensure that it's diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/Socket/ProxyCons.java --- a/test/jdk/java/net/Socket/ProxyCons.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/Socket/ProxyCons.java Thu May 09 10:28:29 2019 -0700 @@ -80,7 +80,7 @@ } public static void main(String[] args) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); ProxyCons c = new ProxyCons(); c.test(); diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/Socket/RST.java --- a/test/jdk/java/net/Socket/RST.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/Socket/RST.java Thu May 09 10:28:29 2019 -0700 @@ -80,7 +80,7 @@ public static void main(String args[]) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); new RST(); } diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/Socket/ReadTimeout.java --- a/test/jdk/java/net/Socket/ReadTimeout.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/Socket/ReadTimeout.java Thu May 09 10:28:29 2019 -0700 @@ -36,7 +36,7 @@ public class ReadTimeout { public static void main(String args[]) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); InetAddress sin = null; Socket soc = null,soc1 = null; diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/Socket/RejectIPv6.java --- a/test/jdk/java/net/Socket/RejectIPv6.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/Socket/RejectIPv6.java Thu May 09 10:28:29 2019 -0700 @@ -39,7 +39,7 @@ public class RejectIPv6 { public static void main(String [] argv) throws Throwable { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); ServerSocket serverSocket = new ServerSocket(0); serverSocket.setSoTimeout(1000); diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/Socket/SetSoLinger.java --- a/test/jdk/java/net/Socket/SetSoLinger.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/Socket/SetSoLinger.java Thu May 09 10:28:29 2019 -0700 @@ -37,7 +37,7 @@ static final int LINGER = 65546; public static void main(String args[]) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); int value; InetAddress addr = InetAddress.getLocalHost(); diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/Socket/ShutdownInput.java --- a/test/jdk/java/net/Socket/ShutdownInput.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/Socket/ShutdownInput.java Thu May 09 10:28:29 2019 -0700 @@ -45,7 +45,7 @@ static boolean failed = false; public static void main(String args[]) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); InetAddress iaddr = InetAddress.getLocalHost(); diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/Socket/SocksConnectTimeout.java --- a/test/jdk/java/net/Socket/SocksConnectTimeout.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/Socket/SocksConnectTimeout.java Thu May 09 10:28:29 2019 -0700 @@ -50,7 +50,7 @@ static int failed, passed; public static void main(String[] args) { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); try { serverSocket = new ServerSocket(0); diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/Socket/TestAfterClose.java --- a/test/jdk/java/net/Socket/TestAfterClose.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/Socket/TestAfterClose.java Thu May 09 10:28:29 2019 -0700 @@ -40,7 +40,7 @@ static int failCount; public static void main(String[] args) { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); try { InetAddress loopback = InetAddress.getLoopbackAddress(); diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/Socket/TestClose.java --- a/test/jdk/java/net/Socket/TestClose.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/Socket/TestClose.java Thu May 09 10:28:29 2019 -0700 @@ -37,7 +37,7 @@ public class TestClose { public static void main(String[] args) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); ServerSocket ss; Socket s; diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/Socket/TestTcpNoDelay.java --- a/test/jdk/java/net/Socket/TestTcpNoDelay.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/Socket/TestTcpNoDelay.java Thu May 09 10:28:29 2019 -0700 @@ -37,7 +37,7 @@ public class TestTcpNoDelay { public static void main(String[] args) { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); try { Socket socket = new Socket(); diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/Socket/Timeout.java --- a/test/jdk/java/net/Socket/Timeout.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/Socket/Timeout.java Thu May 09 10:28:29 2019 -0700 @@ -35,7 +35,7 @@ public class Timeout { public static void main(String[] args) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); boolean success = false; ServerSocket sock = new ServerSocket(0); diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/Socket/TrafficClass.java --- a/test/jdk/java/net/Socket/TrafficClass.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/Socket/TrafficClass.java Thu May 09 10:28:29 2019 -0700 @@ -63,7 +63,7 @@ } public static void main(String args[]) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); DatagramSocket ds = new DatagramSocket(); testDatagramSocket(ds); diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/Socket/UrgentDataTest.java --- a/test/jdk/java/net/Socket/UrgentDataTest.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/Socket/UrgentDataTest.java Thu May 09 10:28:29 2019 -0700 @@ -53,7 +53,7 @@ } public static void main (String args[]) { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); try { UrgentDataTest test = new UrgentDataTest (); diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/Socket/asyncClose/AsyncClose.java --- a/test/jdk/java/net/Socket/asyncClose/AsyncClose.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/Socket/asyncClose/AsyncClose.java Thu May 09 10:28:29 2019 -0700 @@ -40,7 +40,7 @@ public class AsyncClose { public static void main(String args[]) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); AsyncCloseTest tests[] = { new Socket_getInputStream_read(), diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/Socket/asyncClose/BrokenPipe.java --- a/test/jdk/java/net/Socket/asyncClose/BrokenPipe.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/Socket/asyncClose/BrokenPipe.java Thu May 09 10:28:29 2019 -0700 @@ -55,7 +55,7 @@ } public static void main(String[] args) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); ServerSocket ss = new ServerSocket(0); Socket client = new Socket(InetAddress.getLocalHost(), diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/Socket/setReuseAddress/Basic.java --- a/test/jdk/java/net/Socket/setReuseAddress/Basic.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/Socket/setReuseAddress/Basic.java Thu May 09 10:28:29 2019 -0700 @@ -228,7 +228,7 @@ } public static void main(String args[]) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); new Basic(); } diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/Socket/setReuseAddress/Restart.java --- a/test/jdk/java/net/Socket/setReuseAddress/Restart.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/Socket/setReuseAddress/Restart.java Thu May 09 10:28:29 2019 -0700 @@ -49,7 +49,7 @@ */ public static void main(String args[]) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); ServerSocket ss = new ServerSocket(0); Socket s1 = null, s2 = null; diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/SocketInputStream/SocketClosedException.java --- a/test/jdk/java/net/SocketInputStream/SocketClosedException.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/SocketInputStream/SocketClosedException.java Thu May 09 10:28:29 2019 -0700 @@ -63,7 +63,7 @@ static Exception serverException = null; public static void main(String[] args) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); serverSocket = new ServerSocket(0); startServer(); try { diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/SocketInputStream/SocketTimeout.java --- a/test/jdk/java/net/SocketInputStream/SocketTimeout.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/SocketInputStream/SocketTimeout.java Thu May 09 10:28:29 2019 -0700 @@ -38,7 +38,7 @@ static final int TIMEOUT = 1000; public static void main(String args[]) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); InetAddress sin = InetAddress.getLocalHost(); Socket soc = null,soc1 = null; InputStream is = null; diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/SocketOption/ImmutableOptions.java --- a/test/jdk/java/net/SocketOption/ImmutableOptions.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/SocketOption/ImmutableOptions.java Thu May 09 10:28:29 2019 -0700 @@ -44,7 +44,7 @@ @BeforeTest void setupServerSocketFactory() throws IOException { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); ServerSocket.setSocketFactory(new ServerSocketImplFactory()); } diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/SocketOption/MinimumRcvBufferSize.java --- a/test/jdk/java/net/SocketOption/MinimumRcvBufferSize.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/SocketOption/MinimumRcvBufferSize.java Thu May 09 10:28:29 2019 -0700 @@ -36,7 +36,7 @@ public class MinimumRcvBufferSize { public static void main(String args[]) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); boolean error = false; ServerSocketChannel channel = ServerSocketChannel.open(); diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/SocketOption/OptionsTest.java --- a/test/jdk/java/net/SocketOption/OptionsTest.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/SocketOption/OptionsTest.java Thu May 09 10:28:29 2019 -0700 @@ -280,7 +280,7 @@ } public static void main(String args[]) throws Exception { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); doSocketTests(); doServerSocketTests(); doDgSocketTests(); diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/SocketOption/SupportedOptionsSet.java --- a/test/jdk/java/net/SocketOption/SupportedOptionsSet.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/SocketOption/SupportedOptionsSet.java Thu May 09 10:28:29 2019 -0700 @@ -44,7 +44,7 @@ public class SupportedOptionsSet { public static void main(String[] args) throws IOException { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); if (args[0].equals("first")) first(); diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/net/SocketOption/UnsupportedOptionsTest.java --- a/test/jdk/java/net/SocketOption/UnsupportedOptionsTest.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/net/SocketOption/UnsupportedOptionsTest.java Thu May 09 10:28:29 2019 -0700 @@ -72,7 +72,7 @@ } public static void main(String[] args) throws IOException { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); Socket s = new Socket(); ServerSocket ss = new ServerSocket(); diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/nio/channels/DatagramChannel/Disconnect.java --- a/test/jdk/java/nio/channels/DatagramChannel/Disconnect.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/nio/channels/DatagramChannel/Disconnect.java Thu May 09 10:28:29 2019 -0700 @@ -38,7 +38,7 @@ public class Disconnect { public static void main(String[] args) throws IOException { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); // test with default protocol family try (DatagramChannel dc = DatagramChannel.open()) { diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/nio/channels/DatagramChannel/MulticastSendReceiveTests.java --- a/test/jdk/java/nio/channels/DatagramChannel/MulticastSendReceiveTests.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/nio/channels/DatagramChannel/MulticastSendReceiveTests.java Thu May 09 10:28:29 2019 -0700 @@ -240,7 +240,7 @@ } public static void main(String[] args) throws IOException { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); NetworkConfiguration config = NetworkConfiguration.probe(); diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/nio/channels/DatagramChannel/Promiscuous.java --- a/test/jdk/java/nio/channels/DatagramChannel/Promiscuous.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/nio/channels/DatagramChannel/Promiscuous.java Thu May 09 10:28:29 2019 -0700 @@ -193,7 +193,7 @@ } public static void main(String[] args) throws IOException { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); String os = System.getProperty("os.name"); diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/nio/channels/DatagramChannel/UseDGWithIPv6.java --- a/test/jdk/java/nio/channels/DatagramChannel/UseDGWithIPv6.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/nio/channels/DatagramChannel/UseDGWithIPv6.java Thu May 09 10:28:29 2019 -0700 @@ -48,7 +48,7 @@ public static void main(String[] args) throws IOException { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); ByteBuffer data = ByteBuffer.wrap("TESTING DATA".getBytes()); DatagramChannel dgChannel = DatagramChannel.open(); diff -r 258170da6d3a -r 9db7c0f561a6 test/jdk/java/nio/channels/etc/PrintSupportedOptions.java --- a/test/jdk/java/nio/channels/etc/PrintSupportedOptions.java Sat May 11 01:17:18 2019 +0900 +++ b/test/jdk/java/nio/channels/etc/PrintSupportedOptions.java Thu May 09 10:28:29 2019 -0700 @@ -44,7 +44,7 @@ } public static void main(String[] args) throws IOException { - IPSupport.skipIfCurrentConfigurationIsInvalid(); + IPSupport.throwSkippedExceptionIfNonOperational(); test(() -> SocketChannel.open()); test(() -> ServerSocketChannel.open()); diff -r 258170da6d3a -r 9db7c0f561a6 test/lib/jdk/test/lib/net/IPSupport.java --- a/test/lib/jdk/test/lib/net/IPSupport.java Sat May 11 01:17:18 2019 +0900 +++ b/test/lib/jdk/test/lib/net/IPSupport.java Thu May 09 10:28:29 2019 -0700 @@ -123,9 +123,19 @@ } /** - * Throws a jtreg.SkippedException if the current networking configuration is invalid. + * Ensures that the platform supports the ability to create a + * minimally-operational socket whose protocol is either one of IPv4 + * or IPv6. + * + *

A minimally-operation socket is one that can be created and + * bound to an IP-specific loopback address. IP support is + * considered non-operational if a socket cannot be bound to either + * one of, an IPv4 loopback address, or the IPv6 loopback address. + * + * @throws SkippedException if the current networking configuration + * is non-operational */ - public static void skipIfCurrentConfigurationIsInvalid() throws SkippedException { + public static void throwSkippedExceptionIfNonOperational() throws SkippedException { if (!currentConfigurationIsValid()) { ByteArrayOutputStream os = new ByteArrayOutputStream(); PrintStream ps = new PrintStream(os);