Improving defaults

Author: scottf

src/test/java/io/nats/NatsRunnerUtilsTest.java

@@ -19,10 +19,9 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 public class NatsRunnerUtilsTest extends TestBase {
-
     @Test
     public void testGetNatsLocalhostUri() {
-        assertEquals("nats://localhost:1234", getNatsLocalhostUri(1234));
+        assertEquals(natsLocalHostFromDefault(1234), getNatsLocalhostUri(1234));
     }
 
     @Test
@@ -32,7 +31,7 @@ public void testGetNatsUri() {
 
     @Test
     public void testGetLocalhostUri() {
-        assertEquals("schema://localhost:1234", getLocalhostUri("schema", 1234));
+        assertEquals(localHostFromDefault("schema", 1234), getLocalhostUri("schema", 1234));
     }
 
     @Test

src/test/java/io/nats/TestBase.java

@@ -33,6 +33,22 @@ public class TestBase {
         setDefaultOutputLevel(Level.WARNING);
     }
 
+    public static String localHostFromDefaultNoPort(String schema) {
+        return schema + "://" + getDefaultLocalhostHost().host;
+    }
+
+    public static String localHostFromDefault(String schema, int port) {
+        return localHostFromDefaultNoPort(schema) + ":" + port;
+    }
+
+    public static String natsLocalHostFromDefaultNoPort() {
+        return "nats://" + getDefaultLocalhostHost().host;
+    }
+
+    public static String natsLocalHostFromDefault(int port) {
+        return natsLocalHostFromDefaultNoPort() + ":" + port;
+    }
+
     protected void validateBasics(NatsServerRunner runner, boolean debug, boolean jetStream) throws IOException {
         validateCommandLine(runner, debug, jetStream);
         validateHostAndPort(runner);
@@ -51,7 +67,7 @@ protected void validateCommandLine(NatsServerRunner runner, boolean debug, boole
     protected void validateHostAndPort(NatsServerRunner server) {
         assertTrue(server.getPort() > 0);
         assertTrue(server.getPort() != 1234);
-        assertTrue(server.getURI().startsWith("nats://" + getDefaultLocalhostHost().host));
+        assertTrue(server.getURI().startsWith(natsLocalHostFromDefaultNoPort()));
     }
 
     protected void validateConfigLines(NatsServerRunner runner) throws IOException {