Don't setup network in tests that don't need it

6 files changed, 44 insertions, 39 deletions

diff --git a/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/jdisc/test/RemoteClient.java b/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/jdisc/test/RemoteClient.java
index c998f84ec5a..57d0abd980b 100644
--- a/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/jdisc/test/RemoteClient.java
+++ b/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/jdisc/test/RemoteClient.java
@@ -4,6 +4,7 @@ package com.yahoo.messagebus.jdisc.test;
 import com.yahoo.jrt.ListenFailedException;
 import com.yahoo.jrt.slobrok.server.Slobrok;
 import com.yahoo.messagebus.*;
+import com.yahoo.messagebus.network.local.LocalNetwork;
 import com.yahoo.messagebus.network.rpc.RPCNetwork;
 import com.yahoo.messagebus.network.rpc.RPCNetworkParams;
 import com.yahoo.messagebus.test.SimpleProtocol;
@@ -21,11 +22,13 @@ public class RemoteClient {
     private final ReplyQueue queue = new ReplyQueue();
     private final SourceSession session;
 
-    private RemoteClient(Slobrok slobrok, String slobrokId, Protocol protocol) {
+    private RemoteClient(Slobrok slobrok, String slobrokId, Protocol protocol, boolean network) {
         this.slobrok = slobrok;
         this.slobrokId = slobrok != null ? slobrok.configId() : slobrokId;
-        mbus = new MessageBus(new RPCNetwork(new RPCNetworkParams().setSlobrokConfigId(this.slobrokId)),
-                              new MessageBusParams().addProtocol(protocol));
+        mbus = network
+               ? new MessageBus(new RPCNetwork(new RPCNetworkParams().setSlobrokConfigId(this.slobrokId)),
+                                new MessageBusParams().addProtocol(protocol))
+               : new MessageBus(new LocalNetwork(), new MessageBusParams().addProtocol(protocol));
         session = mbus.createSourceSession(new SourceSessionParams().setThrottlePolicy(null).setReplyHandler(queue));
     }
 
@@ -49,16 +52,16 @@ public class RemoteClient {
         }
     }
 
-    public static RemoteClient newInstanceWithInternSlobrok() {
-        return new RemoteClient(newSlobrok(), null, new SimpleProtocol());
+    public static RemoteClient newInstanceWithInternSlobrok(boolean network) {
+        return new RemoteClient(newSlobrok(), null, new SimpleProtocol(), network);
     }
 
-    public static RemoteClient newInstanceWithExternSlobrok(String slobrokId) {
-        return new RemoteClient(null, slobrokId, new SimpleProtocol());
+    public static RemoteClient newInstanceWithExternSlobrok(String slobrokId, boolean network) {
+        return new RemoteClient(null, slobrokId, new SimpleProtocol(), network);
     }
 
-    public static RemoteClient newInstanceWithProtocolAndInternSlobrok(Protocol protocol) {
-        return new RemoteClient(newSlobrok(), null, protocol);
+    public static RemoteClient newInstanceWithProtocolAndInternSlobrok(Protocol protocol, boolean network) {
+        return new RemoteClient(newSlobrok(), null, protocol, network);
     }
 
     private static Slobrok newSlobrok() {
diff --git a/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/jdisc/test/ServerTestDriver.java b/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/jdisc/test/ServerTestDriver.java
index 266a26a7afb..e59db28e886 100644
--- a/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/jdisc/test/ServerTestDriver.java
+++ b/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/jdisc/test/ServerTestDriver.java
@@ -118,37 +118,38 @@ public class ServerTestDriver {
         return server;
     }
 
-    public static ServerTestDriver newInstance(RequestHandler requestHandler, Module... guiceModules) {
-        return new ServerTestDriver(RemoteClient.newInstanceWithInternSlobrok(), true, requestHandler,
+    public static ServerTestDriver newInstance(RequestHandler requestHandler, boolean network, Module... guiceModules) {
+        return new ServerTestDriver(RemoteClient.newInstanceWithInternSlobrok(network), true, requestHandler,
                                     new SimpleProtocol(), guiceModules);
     }
 
     public static ServerTestDriver newInstanceWithProtocol(Protocol protocol, RequestHandler requestHandler,
-                                                           Module... guiceModules)
+                                                           boolean network, Module... guiceModules)
     {
-        return new ServerTestDriver(RemoteClient.newInstanceWithInternSlobrok(), true, requestHandler, protocol,
+        return new ServerTestDriver(RemoteClient.newInstanceWithInternSlobrok(network), true, requestHandler, protocol,
                                     guiceModules);
     }
 
     public static ServerTestDriver newInstanceWithExternSlobrok(String slobrokId, RequestHandler requestHandler,
-                                                                Module... guiceModules)
+                                                                boolean network, Module... guiceModules)
     {
-        return new ServerTestDriver(RemoteClient.newInstanceWithExternSlobrok(slobrokId),
+        return new ServerTestDriver(RemoteClient.newInstanceWithExternSlobrok(slobrokId, network),
                                     true, requestHandler, new SimpleProtocol(), guiceModules);
     }
 
-    public static ServerTestDriver newInactiveInstance(Module... guiceModules) {
-        return new ServerTestDriver(RemoteClient.newInstanceWithInternSlobrok(), false, null,
+    public static ServerTestDriver newInactiveInstance(boolean network, Module... guiceModules) {
+        return new ServerTestDriver(RemoteClient.newInstanceWithInternSlobrok(network), false, null,
                                     new SimpleProtocol(), guiceModules);
     }
 
-    public static ServerTestDriver newInactiveInstanceWithProtocol(Protocol protocol, Module... guiceModules) {
-        return new ServerTestDriver(RemoteClient.newInstanceWithProtocolAndInternSlobrok(protocol), false, null,
+    public static ServerTestDriver newInactiveInstanceWithProtocol(Protocol protocol, boolean network, Module... guiceModules) {
+        return new ServerTestDriver(RemoteClient.newInstanceWithProtocolAndInternSlobrok(protocol, network), false, null,
                                     protocol, guiceModules);
     }
 
-    public static ServerTestDriver newUnboundInstance(Module... guiceModules) {
-        return new ServerTestDriver(RemoteClient.newInstanceWithInternSlobrok(), true, null,
+    public static ServerTestDriver newUnboundInstance(boolean network, Module... guiceModules) {
+        return new ServerTestDriver(RemoteClient.newInstanceWithInternSlobrok(network), true, null,
                                     new SimpleProtocol(), guiceModules);
     }
+
 }
diff --git a/jdisc_messagebus_service/src/test/java/com/yahoo/messagebus/jdisc/MbusServerTestCase.java b/jdisc_messagebus_service/src/test/java/com/yahoo/messagebus/jdisc/MbusServerTestCase.java
index f20eeb6abaa..17bd3556b17 100644
--- a/jdisc_messagebus_service/src/test/java/com/yahoo/messagebus/jdisc/MbusServerTestCase.java
+++ b/jdisc_messagebus_service/src/test/java/com/yahoo/messagebus/jdisc/MbusServerTestCase.java
@@ -45,7 +45,7 @@ public class MbusServerTestCase {
 
     @Test
     public void requireThatNoBindingSetSelectedExceptionIsCaught() {
-        ServerTestDriver driver = ServerTestDriver.newUnboundInstance(new MySelector(null));
+        ServerTestDriver driver = ServerTestDriver.newUnboundInstance(true, new MySelector(null));
         assertTrue(driver.sendMessage(new SimpleMessage("foo")));
         assertNotNull(driver.awaitErrors(ErrorCode.APP_FATAL_ERROR));
         assertTrue(driver.close());
@@ -53,7 +53,7 @@ public class MbusServerTestCase {
 
     @Test
     public void requireThatBindingSetNotFoundExceptionIsCaught() {
-        ServerTestDriver driver = ServerTestDriver.newUnboundInstance(new MySelector("foo"));
+        ServerTestDriver driver = ServerTestDriver.newUnboundInstance(true, new MySelector("foo"));
         assertTrue(driver.sendMessage(new SimpleMessage("bar")));
         assertNotNull(driver.awaitErrors(ErrorCode.APP_FATAL_ERROR));
         assertTrue(driver.close());
@@ -61,7 +61,7 @@ public class MbusServerTestCase {
 
     @Test
     public void requireThatContainerNotReadyExceptionIsCaught() {
-        ServerTestDriver driver = ServerTestDriver.newInactiveInstance();
+        ServerTestDriver driver = ServerTestDriver.newInactiveInstance(true);
         assertTrue(driver.sendMessage(new SimpleMessage("foo")));
         assertNotNull(driver.awaitErrors(ErrorCode.APP_FATAL_ERROR));
         assertTrue(driver.close());
@@ -69,7 +69,7 @@ public class MbusServerTestCase {
 
     @Test
     public void requireThatBindingNotFoundExceptionIsCaught() {
-        ServerTestDriver driver = ServerTestDriver.newUnboundInstance();
+        ServerTestDriver driver = ServerTestDriver.newUnboundInstance(true);
         assertTrue(driver.sendMessage(new SimpleMessage("foo")));
         assertNotNull(driver.awaitErrors(ErrorCode.APP_FATAL_ERROR));
         assertTrue(driver.close());
@@ -77,7 +77,7 @@ public class MbusServerTestCase {
 
     @Test
     public void requireThatRequestDeniedExceptionIsCaught() {
-        ServerTestDriver driver = ServerTestDriver.newInstance(MyRequestHandler.newRequestDenied());
+        ServerTestDriver driver = ServerTestDriver.newInstance(MyRequestHandler.newRequestDenied(), true);
         assertTrue(driver.sendMessage(new SimpleMessage("foo")));
         assertNotNull(driver.awaitErrors(ErrorCode.APP_FATAL_ERROR));
         assertTrue(driver.close());
@@ -86,7 +86,7 @@ public class MbusServerTestCase {
     @Test
     public void requireThatRequestResponseWorks() {
         MyRequestHandler requestHandler = MyRequestHandler.newInstance();
-        ServerTestDriver driver = ServerTestDriver.newInstance(requestHandler);
+        ServerTestDriver driver = ServerTestDriver.newInstance(requestHandler, true);
         assertTrue(driver.sendMessage(new SimpleMessage("foo")));
 
         assertNotNull(requestHandler.awaitRequest());
@@ -99,7 +99,7 @@ public class MbusServerTestCase {
     @Test
     public void requireThatRequestIsMbus() {
         MyRequestHandler requestHandler = MyRequestHandler.newInstance();
-        ServerTestDriver driver = ServerTestDriver.newInstance(requestHandler);
+        ServerTestDriver driver = ServerTestDriver.newInstance(requestHandler, true);
         assertTrue(driver.sendMessage(new SimpleMessage("foo")));
 
         Request request = requestHandler.awaitRequest();
@@ -116,7 +116,7 @@ public class MbusServerTestCase {
     @Test
     public void requireThatReplyInsideMbusResponseIsUsed() {
         MyRequestHandler requestHandler = MyRequestHandler.newInstance();
-        ServerTestDriver driver = ServerTestDriver.newInstance(requestHandler);
+        ServerTestDriver driver = ServerTestDriver.newInstance(requestHandler, true);
         assertTrue(driver.sendMessage(new SimpleMessage("foo")));
 
         assertNotNull(requestHandler.awaitRequest());
@@ -134,7 +134,7 @@ public class MbusServerTestCase {
     @Test
     public void requireThatNonMbusResponseCausesEmptyReply() {
         MyRequestHandler requestHandler = MyRequestHandler.newInstance();
-        ServerTestDriver driver = ServerTestDriver.newInstance(requestHandler);
+        ServerTestDriver driver = ServerTestDriver.newInstance(requestHandler, false);
         assertTrue(driver.sendMessage(new SimpleMessage("foo")));
 
         assertNotNull(requestHandler.awaitRequest());
@@ -147,7 +147,7 @@ public class MbusServerTestCase {
     @Test
     public void requireThatMbusRequestContentCallsCompletion() throws InterruptedException {
         MyRequestHandler requestHandler = MyRequestHandler.newInstance();
-        ServerTestDriver driver = ServerTestDriver.newInstance(requestHandler);
+        ServerTestDriver driver = ServerTestDriver.newInstance(requestHandler, true);
         assertTrue(driver.sendMessage(new SimpleMessage("foo")));
 
         assertNotNull(requestHandler.awaitRequest());
@@ -162,9 +162,9 @@ public class MbusServerTestCase {
     }
 
     @Test
-    public void requireThatResponseContentDoesNotSupportWrite() throws InterruptedException {
+    public void requireThatResponseContentDoesNotSupportWrite() {
         MyRequestHandler requestHandler = MyRequestHandler.newInstance();
-        ServerTestDriver driver = ServerTestDriver.newInstance(requestHandler);
+        ServerTestDriver driver = ServerTestDriver.newInstance(requestHandler, true);
         assertTrue(driver.sendMessage(new SimpleMessage("foo")));
 
         assertNotNull(requestHandler.awaitRequest());
@@ -198,7 +198,7 @@ public class MbusServerTestCase {
 
     private static void assertError(List<Integer> expectedErrors, int responseStatus, int... responseErrors) {
         MyRequestHandler requestHandler = MyRequestHandler.newInstance();
-        ServerTestDriver driver = ServerTestDriver.newInstance(requestHandler);
+        ServerTestDriver driver = ServerTestDriver.newInstance(requestHandler, true);
         assertTrue(driver.sendMessage(new SimpleMessage("foo")));
 
         assertNotNull(requestHandler.awaitRequest());
diff --git a/jdisc_messagebus_service/src/test/java/com/yahoo/messagebus/jdisc/test/ServerTestDriverTestCase.java b/jdisc_messagebus_service/src/test/java/com/yahoo/messagebus/jdisc/test/ServerTestDriverTestCase.java
index 6ede2bb3f33..f6ae2335d12 100644
--- a/jdisc_messagebus_service/src/test/java/com/yahoo/messagebus/jdisc/test/ServerTestDriverTestCase.java
+++ b/jdisc_messagebus_service/src/test/java/com/yahoo/messagebus/jdisc/test/ServerTestDriverTestCase.java
@@ -17,17 +17,18 @@ public class ServerTestDriverTestCase {
 
     @Test
     public void requireThatFactoryMethodsWork() throws ListenFailedException {
-        ServerTestDriver driver = ServerTestDriver.newInstance(new NonWorkingRequestHandler());
+        ServerTestDriver driver = ServerTestDriver.newInstance(new NonWorkingRequestHandler(), false);
         assertNotNull(driver);
         assertTrue(driver.close());
 
-        driver = ServerTestDriver.newInstanceWithProtocol(new SimpleProtocol(), new NonWorkingRequestHandler());
+        driver = ServerTestDriver.newInstanceWithProtocol(new SimpleProtocol(), new NonWorkingRequestHandler(), false);
         assertNotNull(driver);
         assertTrue(driver.close());
 
         Slobrok slobrok = new Slobrok();
-        driver = ServerTestDriver.newInstanceWithExternSlobrok(slobrok.configId(), new NonWorkingRequestHandler());
+        driver = ServerTestDriver.newInstanceWithExternSlobrok(slobrok.configId(), new NonWorkingRequestHandler(), false);
         assertNotNull(driver);
         assertTrue(driver.close());
     }
+
 }
diff --git a/jdisc_messagebus_service/src/test/java/com/yahoo/messagebus/shared/SharedDestinationSessionTestCase.java b/jdisc_messagebus_service/src/test/java/com/yahoo/messagebus/shared/SharedDestinationSessionTestCase.java
index 7226fdf8d85..78e79da4b9f 100644
--- a/jdisc_messagebus_service/src/test/java/com/yahoo/messagebus/shared/SharedDestinationSessionTestCase.java
+++ b/jdisc_messagebus_service/src/test/java/com/yahoo/messagebus/shared/SharedDestinationSessionTestCase.java
@@ -95,7 +95,7 @@ public class SharedDestinationSessionTestCase {
 
     @Test
     public void requireThatSessionCanSendReply() throws InterruptedException {
-        RemoteClient client = RemoteClient.newInstanceWithInternSlobrok();
+        RemoteClient client = RemoteClient.newInstanceWithInternSlobrok(true);
         MessageQueue queue = new MessageQueue();
         DestinationSessionParams params = new DestinationSessionParams().setMessageHandler(queue);
         SharedDestinationSession session = newDestinationSession(client.slobrokId(), params);
diff --git a/jdisc_messagebus_service/src/test/java/com/yahoo/messagebus/shared/SharedIntermediateSessionTestCase.java b/jdisc_messagebus_service/src/test/java/com/yahoo/messagebus/shared/SharedIntermediateSessionTestCase.java
index ee3c5c993db..87958415149 100644
--- a/jdisc_messagebus_service/src/test/java/com/yahoo/messagebus/shared/SharedIntermediateSessionTestCase.java
+++ b/jdisc_messagebus_service/src/test/java/com/yahoo/messagebus/shared/SharedIntermediateSessionTestCase.java
@@ -131,7 +131,7 @@ public class SharedIntermediateSessionTestCase {
 
     @Test
     public void requireThatSessionCanSendReply() throws InterruptedException {
-        RemoteClient client = RemoteClient.newInstanceWithInternSlobrok();
+        RemoteClient client = RemoteClient.newInstanceWithInternSlobrok(true);
         MessageQueue queue = new MessageQueue();
         IntermediateSessionParams params = new IntermediateSessionParams().setMessageHandler(queue);
         SharedIntermediateSession session = newIntermediateSession(client.slobrokId(), params, true);