minor items

Author: eric-milles

subprojects/groovy-jmx/src/test/groovy/groovy/jmx/builder/JmxClientConnectorFactoryTest.groovy

@@ -19,6 +19,7 @@
 package groovy.jmx.builder
 
 import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.Assumptions
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 
@@ -27,22 +28,29 @@ import javax.management.remote.rmi.RMIConnectorServer
 
 import static groovy.test.GroovyAssert.shouldFail
 
-class JmxClientConnectorFactoryTest {
-    def builder
-    int defaultPort = 10990
-    def rmi
+final class JmxClientConnectorFactoryTest {
+
+    private JmxBuilder builder
+    private Map rmi
 
     @BeforeEach
     void setUp() {
-        def hostAddress = getHostAddress()
-        println "hostAddress: ${hostAddress}"
-        System.setProperty("java.rmi.server.hostname", hostAddress)
-        builder = new JmxBuilder()
+        System.setProperty('java.rmi.server.hostname', hostAddress)
+
+        final int defaultPort = 10990
         rmi = JmxConnectorHelper.createRmiRegistry(defaultPort)
+
+        builder = new JmxBuilder()
+        try {
+            builder.getMBeanServer()
+        } catch (e) {
+            Assumptions.abort(e.getMessage())
+        }
     }
 
     @AfterEach
     void tearDown() {
+        System.clearProperty('java.rmi.server.hostname')
         JmxConnectorHelper.destroyRmiRegistry(rmi.registry)
     }
 
@@ -51,12 +59,9 @@ class JmxClientConnectorFactoryTest {
         RMIConnectorServer server = builder.serverConnector(port: rmi.port)
         server.start()
 
-        RMIConnector client = builder.clientConnector(
-                port: rmi.port
-        )
-
-        assert client
+        RMIConnector client = builder.clientConnector(port: rmi.port)
         client.connect()
+
         server.stop()
     }
 
@@ -74,34 +79,31 @@ class JmxClientConnectorFactoryTest {
     @Test
     void testJmxClientConnectorFailure() {
         shouldFail {
-            RMIConnector client = builder.clientConnector(
-                    port: 1099
-            )
-            assert client
+            RMIConnector client = builder.clientConnector(port: 1099)
             client.connect()
         }
     }
 
-    static String getHostAddress() {
+    //--------------------------------------------------------------------------
+
+    private static String getHostAddress() {
         try {
             Enumeration<NetworkInterface> allNetInterfaces = NetworkInterface.getNetworkInterfaces()
             while (allNetInterfaces.hasMoreElements()) {
-                NetworkInterface netInterface = (NetworkInterface) allNetInterfaces.nextElement()
+                NetworkInterface netInterface = allNetInterfaces.nextElement()
                 Enumeration<InetAddress> addresses = netInterface.getInetAddresses()
                 while (addresses.hasMoreElements()) {
                     InetAddress ip = (InetAddress) addresses.nextElement()
                     if (ip != null
                             && ip instanceof Inet4Address
                             && !ip.isLoopbackAddress()
-                            && ip.getHostAddress().indexOf(":") == -1) {
+                            && ip.getHostAddress().indexOf(':') == -1) {
                         return ip.getHostAddress()
                     }
                 }
             }
         } catch (Exception e) {
             e.printStackTrace()
         }
-        return null
     }
-
 }