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

2 files changed, 25 insertions, 21 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);
     }
+
 }