diff options
author | Jon Bratseth <bratseth@gmail.com> | 2020-11-09 11:43:49 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2020-11-09 11:43:49 +0100 |
commit | 4b4bf97486eb4d5c23686ad201c1e8471deb4d72 (patch) | |
tree | a0bc8498a37740d6ce610db841e25b59efcda106 /jdisc_messagebus_service/src/test/java/com/yahoo/messagebus | |
parent | 80842490ca57f640bafb3b43beb8c3b7f6dd7186 (diff) |
Don't setup network in tests that don't need it
Diffstat (limited to 'jdisc_messagebus_service/src/test/java/com/yahoo/messagebus')
2 files changed, 31 insertions, 24 deletions
diff --git a/jdisc_messagebus_service/src/test/java/com/yahoo/messagebus/jdisc/MbusServerConformanceTest.java b/jdisc_messagebus_service/src/test/java/com/yahoo/messagebus/jdisc/MbusServerConformanceTest.java index 71cbc422d9b..bf89f3869ed 100644 --- a/jdisc_messagebus_service/src/test/java/com/yahoo/messagebus/jdisc/MbusServerConformanceTest.java +++ b/jdisc_messagebus_service/src/test/java/com/yahoo/messagebus/jdisc/MbusServerConformanceTest.java @@ -581,17 +581,17 @@ public class MbusServerConformanceTest extends ServerProviderConformanceTest { new DestinationSessionParams()); } - TestRunner(final MessageBusParams mbusParams, final DestinationSessionParams sessionParams) { + TestRunner(MessageBusParams mbusParams, DestinationSessionParams sessionParams) { this.mbus = new SharedMessageBus(new MessageBus(new LocalNetwork(wire), mbusParams)); this.session = mbus.newDestinationSession(sessionParams); } - TestRunner setRequestTimeout(final long timeout, final TimeUnit unit) { + TestRunner setRequestTimeout(long timeout, TimeUnit unit) { timeoutMillis = unit.toMillis(timeout); return this; } - TestRunner expectError(final Matcher<Integer> matcher) { + TestRunner expectError(Matcher<Integer> matcher) { assertThat(successExpected, is(false)); expectedError = matcher; return this; @@ -620,12 +620,12 @@ public class MbusServerConformanceTest extends ServerProviderConformanceTest { } @Override - public MyClient newClient(final MbusServer server) throws Throwable { + public MyClient newClient(MbusServer server) throws Throwable { return new MyClient(wire, server.connectionSpec()); } @Override - public Reply executeRequest(final MyClient client, final boolean withRequestContent) throws Throwable { + public Reply executeRequest(MyClient client, boolean withRequestContent) throws Throwable { // This protocol doesn't have the concept of "request content", so if we are asked to send any, it's a bug. assertThat(withRequestContent, is(false)); @@ -647,7 +647,7 @@ public class MbusServerConformanceTest extends ServerProviderConformanceTest { } @Override - public void validateResponse(final Reply reply) throws Throwable { + public void validateResponse(Reply reply) throws Throwable { final String trace = String.valueOf(reply.getTrace()); if (expectedError != null) { assertThat(reply.hasErrors(), is(true)); @@ -673,7 +673,7 @@ public class MbusServerConformanceTest extends ServerProviderConformanceTest { final Route route; final SourceSession session; - MyClient(final LocalWire wire, final String connectionSpec) { + MyClient(LocalWire wire, String connectionSpec) { this.mbus = new MessageBus(new LocalNetwork(wire), new MessageBusParams().addProtocol(new SimpleProtocol())); this.session = mbus.createSourceSession(new SourceSessionParams().setReplyHandler(this)); @@ -687,7 +687,7 @@ public class MbusServerConformanceTest extends ServerProviderConformanceTest { } @Override - public void handleReply(final Reply reply) { + public void handleReply(Reply reply) { replies.addLast(reply); } } 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 3b063d148e6..ee3c5c993db 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 @@ -8,6 +8,8 @@ import com.yahoo.messagebus.jdisc.test.MessageQueue; import com.yahoo.messagebus.jdisc.test.RemoteClient; import com.yahoo.messagebus.jdisc.test.RemoteServer; import com.yahoo.messagebus.jdisc.test.ReplyQueue; +import com.yahoo.messagebus.network.local.LocalNetwork; +import com.yahoo.messagebus.network.local.LocalWire; import com.yahoo.messagebus.network.rpc.RPCNetworkParams; import com.yahoo.messagebus.routing.Route; import com.yahoo.messagebus.test.SimpleMessage; @@ -26,7 +28,7 @@ public class SharedIntermediateSessionTestCase { @Test public void requireThatMessageHandlerCanBeAccessed() { - SharedIntermediateSession session = newIntermediateSession(); + SharedIntermediateSession session = newIntermediateSession(false); assertNull(session.getMessageHandler()); MessageQueue handler = new MessageQueue(); @@ -36,7 +38,7 @@ public class SharedIntermediateSessionTestCase { @Test public void requireThatMessageHandlerCanOnlyBeSetOnce() { - SharedIntermediateSession session = newIntermediateSession(); + SharedIntermediateSession session = newIntermediateSession(false); session.setMessageHandler(new MessageQueue()); try { session.setMessageHandler(new MessageQueue()); @@ -49,7 +51,7 @@ public class SharedIntermediateSessionTestCase { @Test public void requireThatMessageHandlerIsCalled() throws InterruptedException { - SharedIntermediateSession session = newIntermediateSession(); + SharedIntermediateSession session = newIntermediateSession(false); MessageQueue queue = new MessageQueue(); session.setMessageHandler(queue); session.handleMessage(new SimpleMessage("foo")); @@ -59,7 +61,7 @@ public class SharedIntermediateSessionTestCase { @Test public void requireThatSessionRepliesIfMessageHandlerIsNull() throws InterruptedException { - SharedIntermediateSession session = newIntermediateSession(); + SharedIntermediateSession session = newIntermediateSession(false); Message msg = new SimpleMessage("foo"); ReplyQueue queue = new ReplyQueue(); msg.pushHandler(queue); @@ -76,7 +78,8 @@ public class SharedIntermediateSessionTestCase { Slobrok slobrok = new Slobrok(); try { newIntermediateSession(slobrok.configId(), - new IntermediateSessionParams().setReplyHandler(new ReplyQueue())); + new IntermediateSessionParams().setReplyHandler(new ReplyQueue()), + false); fail(); } catch (IllegalArgumentException e) { assertEquals("Reply handler must be null.", e.getMessage()); @@ -85,21 +88,20 @@ public class SharedIntermediateSessionTestCase { @Test public void requireThatSessionIsClosedOnDestroy() { - SharedIntermediateSession session = newIntermediateSession(); + SharedIntermediateSession session = newIntermediateSession(false); session.release(); assertFalse("IntermediateSession not destroyed by release().", session.session().destroy()); } @Test public void requireThatMbusIsReleasedOnDestroy() { - Slobrok slobrok = null; try { - slobrok = new Slobrok(); + new Slobrok(); } catch (ListenFailedException e) { fail(); } - RPCNetworkParams netParams = new RPCNetworkParams().setSlobrokConfigId(slobrok.configId()); - SharedMessageBus mbus = SharedMessageBus.newInstance(new MessageBusParams(), netParams); + SharedMessageBus mbus = new SharedMessageBus(new MessageBus(new LocalNetwork(new LocalWire()), new MessageBusParams())); + SharedIntermediateSession session = mbus.newIntermediateSession(new IntermediateSessionParams()); mbus.release(); session.release(); @@ -110,7 +112,8 @@ public class SharedIntermediateSessionTestCase { public void requireThatSessionCanSendMessage() throws InterruptedException { RemoteServer server = RemoteServer.newInstanceWithInternSlobrok(); SharedIntermediateSession session = newIntermediateSession(server.slobrokId(), - new IntermediateSessionParams()); + new IntermediateSessionParams(), + true); ReplyQueue queue = new ReplyQueue(); Message msg = new SimpleMessage("foo").setRoute(Route.parse(server.connectionSpec())); msg.setTimeReceivedNow(); @@ -131,7 +134,7 @@ public class SharedIntermediateSessionTestCase { RemoteClient client = RemoteClient.newInstanceWithInternSlobrok(); MessageQueue queue = new MessageQueue(); IntermediateSessionParams params = new IntermediateSessionParams().setMessageHandler(queue); - SharedIntermediateSession session = newIntermediateSession(client.slobrokId(), params); + SharedIntermediateSession session = newIntermediateSession(client.slobrokId(), params, true); Route route = Route.parse(session.connectionSpec()); assertTrue(client.sendMessage(new SimpleMessage("foo").setRoute(route)).isAccepted()); @@ -146,20 +149,24 @@ public class SharedIntermediateSessionTestCase { client.close(); } - private static SharedIntermediateSession newIntermediateSession() { + private static SharedIntermediateSession newIntermediateSession(boolean network) { Slobrok slobrok = null; try { slobrok = new Slobrok(); } catch (ListenFailedException e) { fail(); } - return newIntermediateSession(slobrok.configId(), new IntermediateSessionParams()); + return newIntermediateSession(slobrok.configId(), new IntermediateSessionParams(), network); } - private static SharedIntermediateSession newIntermediateSession(String slobrokId, IntermediateSessionParams params) { + private static SharedIntermediateSession newIntermediateSession(String slobrokId, + IntermediateSessionParams params, + boolean network) { RPCNetworkParams netParams = new RPCNetworkParams().setSlobrokConfigId(slobrokId); MessageBusParams mbusParams = new MessageBusParams().addProtocol(new SimpleProtocol()); - SharedMessageBus mbus = SharedMessageBus.newInstance(mbusParams, netParams); + SharedMessageBus mbus = network + ? SharedMessageBus.newInstance(mbusParams, netParams) + : new SharedMessageBus(new MessageBus(new LocalNetwork(new LocalWire()), mbusParams)); SharedIntermediateSession session = mbus.newIntermediateSession(params); mbus.release(); return session; |