diff options
Diffstat (limited to 'messagebus/src/test/java')
39 files changed, 923 insertions, 969 deletions
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/ChokeTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/ChokeTestCase.java index 6d50fc769be..a8a1fc33284 100755 --- a/messagebus/src/test/java/com/yahoo/messagebus/ChokeTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/ChokeTestCase.java @@ -10,16 +10,13 @@ import com.yahoo.messagebus.routing.Route; import com.yahoo.messagebus.test.Receptor; import com.yahoo.messagebus.test.SimpleMessage; import com.yahoo.messagebus.test.SimpleProtocol; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.*; /** * @author Simon Thoresen Hult @@ -31,7 +28,7 @@ public class ChokeTestCase { SourceSession srcSession; DestinationSession dstSession; - @Before + @BeforeEach public void setUp() throws ListenFailedException { slobrok = new Slobrok(); dstServer = new TestServer(new MessageBusParams().addProtocol(new SimpleProtocol()), @@ -44,7 +41,7 @@ public class ChokeTestCase { assertTrue(srcServer.waitSlobrok("dst/session", 1)); } - @After + @AfterEach public void tearDown() { slobrok.stop(); dstSession.destroy(); @@ -55,7 +52,7 @@ public class ChokeTestCase { @Test @SuppressWarnings("deprecation") - public void testMaxCount() { + void testMaxCount() { int max = 10; dstServer.mb.setMaxPendingCount(max); List<Message> lst = new ArrayList<>(); @@ -67,11 +64,11 @@ public class ChokeTestCase { } assertTrue(srcSession.send(createMessage("msg"), Route.parse("dst/session")).isAccepted()); if (i < max) { - Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); + Message msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60); assertNotNull(msg); lst.add(msg); } else { - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); assertEquals(1, reply.getNumErrors()); assertEquals(ErrorCode.SESSION_BUSY, reply.getError(0).getCode()); @@ -81,13 +78,13 @@ public class ChokeTestCase { Message msg = lst.remove(0); dstSession.acknowledge(msg); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); assertFalse(reply.hasErrors()); assertNotNull(msg = reply.getMessage()); assertTrue(srcSession.send(msg, Route.parse("dst/session")).isAccepted()); - assertNotNull(msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60)); + assertNotNull(msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60)); lst.add(msg); } while (!lst.isEmpty()) { @@ -95,7 +92,7 @@ public class ChokeTestCase { Message msg = lst.remove(0); dstSession.acknowledge(msg); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); assertFalse(reply.hasErrors()); } @@ -104,7 +101,7 @@ public class ChokeTestCase { @Test @SuppressWarnings("deprecation") - public void testMaxSize() { + void testMaxSize() { int size = createMessage("msg").getApproxSize(); int max = size * 10; dstServer.mb.setMaxPendingSize(max); @@ -117,11 +114,11 @@ public class ChokeTestCase { } assertTrue(srcSession.send(createMessage("msg"), Route.parse("dst/session")).isAccepted()); if (i < max) { - Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); + Message msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60); assertNotNull(msg); lst.add(msg); } else { - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); assertEquals(1, reply.getNumErrors()); assertEquals(ErrorCode.SESSION_BUSY, reply.getError(0).getCode()); @@ -131,13 +128,13 @@ public class ChokeTestCase { Message msg = lst.remove(0); dstSession.acknowledge(msg); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); assertFalse(reply.hasErrors()); assertNotNull(msg = reply.getMessage()); assertTrue(srcSession.send(msg, Route.parse("dst/session")).isAccepted()); - assertNotNull(msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60)); + assertNotNull(msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60)); lst.add(msg); } while (!lst.isEmpty()) { @@ -145,7 +142,7 @@ public class ChokeTestCase { Message msg = lst.remove(0); dstSession.acknowledge(msg); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); assertFalse(reply.hasErrors()); } diff --git a/messagebus/src/test/java/com/yahoo/messagebus/ConfigAgentTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/ConfigAgentTestCase.java index a32175ff414..ad8e8a7c94e 100755 --- a/messagebus/src/test/java/com/yahoo/messagebus/ConfigAgentTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/ConfigAgentTestCase.java @@ -4,26 +4,24 @@ package com.yahoo.messagebus; import com.yahoo.config.subscription.ConfigSet; import com.yahoo.config.subscription.ConfigURI; import com.yahoo.messagebus.routing.RoutingSpec; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; +import java.io.File; import java.util.concurrent.TimeUnit; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * @author Simon Thoresen Hult */ public class ConfigAgentTestCase { - @Rule - public TemporaryFolder tmpFolder = new TemporaryFolder(); + @TempDir + public File tmpFolder; @Test - public void testRoutingConfig() throws InterruptedException { + void testRoutingConfig() throws InterruptedException { LocalHandler handler = new LocalHandler(); assertFalse(testHalf(handler.spec)); assertFalse(testFull(handler.spec)); diff --git a/messagebus/src/test/java/com/yahoo/messagebus/DynamicThrottlePolicyTest.java b/messagebus/src/test/java/com/yahoo/messagebus/DynamicThrottlePolicyTest.java index 9307396ceab..8f9ed2323d7 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/DynamicThrottlePolicyTest.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/DynamicThrottlePolicyTest.java @@ -3,7 +3,7 @@ package com.yahoo.messagebus; import com.yahoo.messagebus.test.SimpleMessage; import com.yahoo.messagebus.test.SimpleReply; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayDeque; import java.util.Collections; @@ -16,7 +16,7 @@ import java.util.stream.IntStream; import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toUnmodifiableList; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * These tests are based on a simulated server, the {@link MockServer} below. @@ -37,7 +37,7 @@ public class DynamicThrottlePolicyTest { } @Test - public void singlePolicyWithSmallWindows() { + void singlePolicyWithSmallWindows() { long operations = 1_000_000; int numberOfWorkers = 1; int maximumTasksPerWorker = 16; @@ -48,8 +48,8 @@ public class DynamicThrottlePolicyTest { CustomTimer timer = new CustomTimer(); DynamicThrottlePolicy policy = new DynamicThrottlePolicy(timer).setMinWindowSize(1) - .setWindowSizeIncrement(0.1) - .setResizeRate(100); + .setWindowSizeIncrement(0.1) + .setResizeRate(100); Summary summary = run(operations, workPerSuccess, numberOfWorkers, maximumTasksPerWorker, workerParallelism, timer, policy); double minMaxPending = numberOfWorkers * workerParallelism; @@ -66,8 +66,8 @@ public class DynamicThrottlePolicyTest { CustomTimer timer = new CustomTimer(); DynamicThrottlePolicy policy = new DynamicThrottlePolicy(timer).setMinWindowSize(1) - .setWindowSizeIncrement(0.1) - .setResizeRate(100); + .setWindowSizeIncrement(0.1) + .setResizeRate(100); Summary summary = run(operations, workPerSuccess, numberOfWorkers, maximumTasksPerWorker, workerParallelism, timer, policy); double maxMaxPending = numberOfWorkers * maximumTasksPerWorker; @@ -82,8 +82,8 @@ public class DynamicThrottlePolicyTest { CustomTimer timer = new CustomTimer(); DynamicThrottlePolicy policy = new DynamicThrottlePolicy(timer).setMinWindowSize(1) - .setWindowSizeIncrement(0.1) - .setResizeRate(100); + .setWindowSizeIncrement(0.1) + .setResizeRate(100); Summary summary = run(operations, workPerSuccess, numberOfWorkers, maximumTasksPerWorker, workerParallelism, timer, policy); double minMaxPending = numberOfWorkers * workerParallelism; @@ -96,7 +96,7 @@ public class DynamicThrottlePolicyTest { /** Sort of a dummy test, as the conditions are perfect. In a more realistic scenario, below, the algorithm needs luck to climb this high. */ @Test - public void singlePolicySingleWorkerWithIncreasingParallelism() { + void singlePolicySingleWorkerWithIncreasingParallelism() { for (int exponent = 0; exponent < 4; exponent++) { CustomTimer timer = new CustomTimer(); DynamicThrottlePolicy policy = new DynamicThrottlePolicy(timer); @@ -119,7 +119,7 @@ public class DynamicThrottlePolicyTest { /** A more realistic test, where throughput gradually flattens with increasing window size, and with more variance in throughput. */ @Test - public void singlePolicyIncreasingWorkersWithNoParallelism() { + void singlePolicyIncreasingWorkersWithNoParallelism() { for (int exponent = 0; exponent < 4; exponent++) { CustomTimer timer = new CustomTimer(); DynamicThrottlePolicy policy = new DynamicThrottlePolicy(timer); @@ -149,7 +149,7 @@ public class DynamicThrottlePolicyTest { } @Test - public void twoWeightedPoliciesWithUnboundedTaskQueue() { + void twoWeightedPoliciesWithUnboundedTaskQueue() { for (int repeat = 0; repeat < 3; repeat++) { long operations = 1_000_000; int workPerSuccess = 6 + (int) (30 * Math.random()); @@ -173,7 +173,7 @@ public class DynamicThrottlePolicyTest { } @Test - public void tenPoliciesVeryParallelServerWithShortTaskQueue() { + void tenPoliciesVeryParallelServerWithShortTaskQueue() { for (int repeat = 0; repeat < 2; repeat++) { long operations = 1_000_000; int workPerSuccess = 6; @@ -183,11 +183,11 @@ public class DynamicThrottlePolicyTest { CustomTimer timer = new CustomTimer(); int p = 10; DynamicThrottlePolicy[] policies = IntStream.range(0, p) - .mapToObj(j -> new DynamicThrottlePolicy(timer) - .setWeight((j + 1.0) / p) - .setWindowSizeIncrement(5) - .setMinWindowSize(1)) - .toArray(DynamicThrottlePolicy[]::new); + .mapToObj(j -> new DynamicThrottlePolicy(timer) + .setWeight((j + 1.0) / p) + .setWindowSizeIncrement(5) + .setMinWindowSize(1)) + .toArray(DynamicThrottlePolicy[]::new); Summary summary = run(operations, workPerSuccess, numberOfWorkers, maximumTasksPerWorker, workerParallelism, timer, policies); double minMaxPending = numberOfWorkers * workerParallelism; @@ -198,8 +198,8 @@ public class DynamicThrottlePolicyTest { double imperfectionFactor = 1.6; // Actual shares are not distributed perfectly proportionally to weights, but close enough. assertInRange(minMaxPending * expectedShare / imperfectionFactor, - summary.averageWindows[j], - maxMaxPending * expectedShare * imperfectionFactor); + summary.averageWindows[j], + maxMaxPending * expectedShare * imperfectionFactor); } assertInRange(1.0, summary.inefficiency, 1.05); assertInRange(0, summary.waste, 0.1); @@ -208,8 +208,8 @@ public class DynamicThrottlePolicyTest { static void assertInRange(double lower, double actual, double upper) { System.err.printf("%10.4f <= %10.4f <= %10.4f\n", lower, actual, upper); - assertTrue(actual + " should be not be smaller than " + lower, lower <= actual); - assertTrue(actual + " should be not be greater than " + upper, upper >= actual); + assertTrue(lower <= actual, actual + " should be not be smaller than " + lower); + assertTrue(upper >= actual, actual + " should be not be greater than " + upper); } private Summary run(long operations, int workPerSuccess, int numberOfWorkers, int maximumTasksPerWorker, diff --git a/messagebus/src/test/java/com/yahoo/messagebus/ErrorTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/ErrorTestCase.java index 82696d839d9..26e3661a137 100755 --- a/messagebus/src/test/java/com/yahoo/messagebus/ErrorTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/ErrorTestCase.java @@ -7,11 +7,11 @@ import com.yahoo.messagebus.routing.RoutingTableSpec; import com.yahoo.messagebus.test.Receptor; import com.yahoo.messagebus.test.SimpleMessage; import com.yahoo.messagebus.test.SimpleProtocol; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * @author Simon Thoresen Hult @@ -19,7 +19,7 @@ import static org.junit.Assert.*; public class ErrorTestCase { @Test - public void requireThatAccessorsWork() { + void requireThatAccessorsWork() { Error err = new Error(69, "foo"); assertEquals(69, err.getCode()); assertEquals("foo", err.getMessage()); @@ -31,7 +31,7 @@ public class ErrorTestCase { } @Test - public void requireThatErrorIsPropagated() throws Exception { + void requireThatErrorIsPropagated() throws Exception { RoutingTableSpec table = new RoutingTableSpec(SimpleProtocol.NAME); table.addHop("itr", "test/itr/session", Arrays.asList("test/itr/session")); table.addHop("dst", "test/dst/session", Arrays.asList("test/dst/session")); @@ -89,8 +89,9 @@ public class ErrorTestCase { src.destroy(); slobrok.stop(); } + @Test - public void testErrorCodeCategorization() { + void testErrorCodeCategorization() { assertTrue(ErrorCode.isFatal(ErrorCode.FATAL_ERROR)); assertFalse(ErrorCode.isTransient(ErrorCode.FATAL_ERROR)); assertTrue(ErrorCode.isMBusError(ErrorCode.FATAL_ERROR)); diff --git a/messagebus/src/test/java/com/yahoo/messagebus/MessageBusTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/MessageBusTestCase.java index 69a5401a27e..314d8558735 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/MessageBusTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/MessageBusTestCase.java @@ -14,24 +14,24 @@ import com.yahoo.messagebus.routing.test.CustomPolicyFactory; import com.yahoo.messagebus.test.Receptor; import com.yahoo.messagebus.test.SimpleMessage; import com.yahoo.messagebus.test.SimpleProtocol; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.net.UnknownHostException; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class MessageBusTestCase { @Test - public void requireThatBucketSequencingWithResenderEnabledCausesError() throws ListenFailedException { + void requireThatBucketSequencingWithResenderEnabledCausesError() throws ListenFailedException { Slobrok slobrok = new Slobrok(); TestServer server = new TestServer(new MessageBusParams() - .addProtocol(new SimpleProtocol()) - .setRetryPolicy(new RetryTransientErrorsPolicy()), - new RPCNetworkParams() - .setSlobrokConfigId(slobrok.configId())); + .addProtocol(new SimpleProtocol()) + .setRetryPolicy(new RetryTransientErrorsPolicy()), + new RPCNetworkParams() + .setSlobrokConfigId(slobrok.configId())); Receptor receptor = new Receptor(); SourceSession session = server.mb.createSourceSession( new SourceSessionParams().setTimeout(600.0).setReplyHandler(receptor)); @@ -51,7 +51,7 @@ public class MessageBusTestCase { } @Test - public void testConnectionSpec() throws ListenFailedException, UnknownHostException { + void testConnectionSpec() throws ListenFailedException, UnknownHostException { // Setup servers and sessions. Slobrok slobrok = new Slobrok(); List<TestServer> servers = new ArrayList<>(); @@ -84,28 +84,28 @@ public class MessageBusTestCase { assertTrue(src.send(msg, Route.parse(route.toString())).isAccepted()); for (IntermediateSession itr : sessions) { // Received using session name. - assertNotNull(msg = ((Receptor)itr.getMessageHandler()).getMessage(60)); + assertNotNull(msg = ((Receptor) itr.getMessageHandler()).getMessage(60)); itr.forward(msg); // Received using connection spec. - assertNotNull(msg = ((Receptor)itr.getMessageHandler()).getMessage(60)); + assertNotNull(msg = ((Receptor) itr.getMessageHandler()).getMessage(60)); itr.forward(msg); } - assertNotNull(msg = ((Receptor)dst.getMessageHandler()).getMessage(60)); + assertNotNull(msg = ((Receptor) dst.getMessageHandler()).getMessage(60)); dst.acknowledge(msg); - for (int i = sessions.size(); --i >= 0;) { + for (int i = sessions.size(); --i >= 0; ) { IntermediateSession itr = sessions.get(i); // Received for connection spec. - Reply reply = ((Receptor)itr.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) itr.getReplyHandler()).getReply(60); assertNotNull(reply); itr.forward(reply); // Received for session name. - assertNotNull(reply = ((Receptor)itr.getReplyHandler()).getReply(60)); + assertNotNull(reply = ((Receptor) itr.getReplyHandler()).getReply(60)); itr.forward(reply); } - assertNotNull(((Receptor)src.getReplyHandler()).getReply(60)); + assertNotNull(((Receptor) src.getReplyHandler()).getReply(60)); // Cleanup. for (IntermediateSession session : sessions) { @@ -118,13 +118,13 @@ public class MessageBusTestCase { } @Test - public void testRoutingPolicyCache() throws ListenFailedException, UnknownHostException { + void testRoutingPolicyCache() throws ListenFailedException, UnknownHostException { Slobrok slobrok = new Slobrok(); String config = "slobrok[1]\nslobrok[0].connectionspec \"" + new Spec("localhost", slobrok.port()).toString() + "\"\n"; SimpleProtocol protocol = new SimpleProtocol(); protocol.addPolicyFactory("Custom", new CustomPolicyFactory()); MessageBus bus = new MessageBus(new RPCNetwork(new RPCNetworkParams().setSlobrokConfigId("raw:" + config)), - new MessageBusParams().addProtocol(protocol)); + new MessageBusParams().addProtocol(protocol)); RoutingPolicy all = bus.getRoutingPolicy(SimpleProtocol.NAME, "Custom", null); assertNotNull(all); diff --git a/messagebus/src/test/java/com/yahoo/messagebus/MessengerTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/MessengerTestCase.java index 5bfb36f194b..cacbd08ab1c 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/MessengerTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/MessengerTestCase.java @@ -1,12 +1,12 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.messagebus; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Simon Thoresen Hult @@ -14,7 +14,7 @@ import static org.junit.Assert.assertTrue; public class MessengerTestCase { @Test - public void requireThatSyncWithSelfDoesNotCauseDeadLock() throws InterruptedException { + void requireThatSyncWithSelfDoesNotCauseDeadLock() throws InterruptedException { final Messenger msn = new Messenger(); msn.start(); @@ -35,14 +35,14 @@ public class MessengerTestCase { } @Test - public void requireThatTaskIsExecuted() throws InterruptedException { + void requireThatTaskIsExecuted() throws InterruptedException { Messenger msn = new Messenger(); msn.start(); assertTrue(tryMessenger(msn)); } @Test - public void requireThatRunExceptionIsCaught() throws InterruptedException { + void requireThatRunExceptionIsCaught() throws InterruptedException { Messenger msn = new Messenger(); msn.start(); msn.enqueue(new Messenger.Task() { @@ -60,7 +60,7 @@ public class MessengerTestCase { } @Test - public void requireThatDestroyExceptionIsCaught() throws InterruptedException { + void requireThatDestroyExceptionIsCaught() throws InterruptedException { Messenger msn = new Messenger(); msn.start(); msn.enqueue(new Messenger.Task() { @@ -78,7 +78,7 @@ public class MessengerTestCase { } @Test - public void requireThatRunAndDestroyExceptionsAreCaught() throws InterruptedException { + void requireThatRunAndDestroyExceptionsAreCaught() throws InterruptedException { Messenger msn = new Messenger(); msn.start(); msn.enqueue(new Messenger.Task() { diff --git a/messagebus/src/test/java/com/yahoo/messagebus/ProtocolRepositoryTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/ProtocolRepositoryTestCase.java index af2b4148a3c..c587550a2f5 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/ProtocolRepositoryTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/ProtocolRepositoryTestCase.java @@ -4,9 +4,9 @@ package com.yahoo.messagebus; import com.yahoo.messagebus.routing.RoutingContext; import com.yahoo.messagebus.routing.RoutingPolicy; import com.yahoo.messagebus.test.SimpleProtocol; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * @author Simon Thoresen Hult @@ -14,7 +14,7 @@ import static org.junit.Assert.*; public class ProtocolRepositoryTestCase { @Test - public void requireThatPolicyCanBeNull() { + void requireThatPolicyCanBeNull() { ProtocolRepository repo = new ProtocolRepository(); SimpleProtocol protocol = new SimpleProtocol(); repo.putProtocol(protocol); @@ -22,7 +22,7 @@ public class ProtocolRepositoryTestCase { } @Test - public void requireThatPolicyCanBeCreated() { + void requireThatPolicyCanBeCreated() { ProtocolRepository repo = new ProtocolRepository(); SimpleProtocol protocol = new SimpleProtocol(); protocol.addPolicyFactory("Custom", new MyFactory()); @@ -31,7 +31,7 @@ public class ProtocolRepositoryTestCase { } @Test - public void requireThatPolicyIsCached() { + void requireThatPolicyIsCached() { ProtocolRepository repo = new ProtocolRepository(); SimpleProtocol protocol = new SimpleProtocol(); protocol.addPolicyFactory("Custom", new MyFactory()); @@ -46,7 +46,7 @@ public class ProtocolRepositoryTestCase { } @Test - public void requireThatPolicyParamIsPartOfCacheKey() { + void requireThatPolicyParamIsPartOfCacheKey() { ProtocolRepository repo = new ProtocolRepository(); SimpleProtocol protocol = new SimpleProtocol(); protocol.addPolicyFactory("Custom", new MyFactory()); @@ -61,7 +61,7 @@ public class ProtocolRepositoryTestCase { } @Test - public void requireThatCreatePolicyExceptionIsCaught() { + void requireThatCreatePolicyExceptionIsCaught() { ProtocolRepository repo = new ProtocolRepository(); SimpleProtocol protocol = new SimpleProtocol(); protocol.addPolicyFactory("Custom", new SimpleProtocol.PolicyFactory() { diff --git a/messagebus/src/test/java/com/yahoo/messagebus/RateThrottlingTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/RateThrottlingTestCase.java index f52cb1df2fe..5e579f5d622 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/RateThrottlingTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/RateThrottlingTestCase.java @@ -2,15 +2,15 @@ package com.yahoo.messagebus; import com.yahoo.messagebus.test.SimpleMessage; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; public class RateThrottlingTestCase { @Test - public void testPending() { + void testPending() { CustomTimer timer = new CustomTimer(); RateThrottlingPolicy policy = new RateThrottlingPolicy(5.0, timer); policy.setMaxPendingCount(200); @@ -35,7 +35,7 @@ public class RateThrottlingTestCase { } @Test - public void testRates() { + void testRates() { assertEquals(10, getActualRate(0.1), 1); assertEquals(1000, getActualRate(10), 100); assertEquals(500, getActualRate(5), 50); diff --git a/messagebus/src/test/java/com/yahoo/messagebus/RoutableTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/RoutableTestCase.java index ca60bb8024c..9802a7099d8 100755 --- a/messagebus/src/test/java/com/yahoo/messagebus/RoutableTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/RoutableTestCase.java @@ -8,22 +8,18 @@ import com.yahoo.messagebus.routing.Route; import com.yahoo.messagebus.test.Receptor; import com.yahoo.messagebus.test.SimpleMessage; import com.yahoo.messagebus.test.SimpleReply; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.net.UnknownHostException; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class RoutableTestCase { private final double delta = 0.00000001; @Test - public void testMessageContext() throws ListenFailedException { + void testMessageContext() throws ListenFailedException { Slobrok slobrok = new Slobrok(); TestServer srcServer = new TestServer("src", null, slobrok, null); TestServer dstServer = new TestServer("dst", null, slobrok, null); @@ -39,10 +35,10 @@ public class RoutableTestCase { msg.setContext(context); assertTrue(srcSession.send(msg, "dst/session", true).isAccepted()); - assertNotNull(msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60)); + assertNotNull(msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60)); dstSession.acknowledge(msg); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); assertSame(reply.getContext(), context); @@ -54,7 +50,7 @@ public class RoutableTestCase { } @Test - public void testMessageSwapState() { + void testMessageSwapState() { Message foo = new SimpleMessage("foo"); Route fooRoute = Route.parse("foo"); foo.setRoute(fooRoute); @@ -80,7 +76,7 @@ public class RoutableTestCase { } @Test - public void testReplySwapState() { + void testReplySwapState() { Reply foo = new SimpleReply("foo"); Message fooMsg = new SimpleMessage("foo"); foo.setMessage(fooMsg); @@ -104,7 +100,7 @@ public class RoutableTestCase { } @Test - public void testMessageDiscard() { + void testMessageDiscard() { Receptor handler = new Receptor(); Message msg = new SimpleMessage("foo"); msg.pushHandler(handler); @@ -114,7 +110,7 @@ public class RoutableTestCase { } @Test - public void testReplyDiscard() { + void testReplyDiscard() { Receptor handler = new Receptor(); Message msg = new SimpleMessage("foo"); msg.pushHandler(handler); diff --git a/messagebus/src/test/java/com/yahoo/messagebus/SendProxyTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/SendProxyTestCase.java index b51fc2da3de..2cce53c51e1 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/SendProxyTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/SendProxyTestCase.java @@ -13,18 +13,15 @@ import com.yahoo.messagebus.test.Receptor; import com.yahoo.messagebus.test.SimpleMessage; import com.yahoo.messagebus.test.SimpleProtocol; import com.yahoo.messagebus.test.SimpleReply; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.logging.Handler; import java.util.logging.LogRecord; import java.util.logging.Logger; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * @author Simon Thoresen Hult @@ -36,7 +33,7 @@ public class SendProxyTestCase { SourceSession srcSession; DestinationSession dstSession; - @Before + @BeforeEach public void setUp() throws ListenFailedException { slobrok = new Slobrok(); dstServer = new TestServer(new MessageBusParams().addProtocol(new SimpleProtocol()), @@ -49,7 +46,7 @@ public class SendProxyTestCase { assertTrue(srcServer.waitSlobrok("dst/session", 1)); } - @After + @AfterEach public void tearDown() { slobrok.stop(); dstSession.destroy(); @@ -59,7 +56,7 @@ public class SendProxyTestCase { } @Test - public void testTraceByLogLevel() { + void testTraceByLogLevel() { Logger log = Logger.getLogger(SendProxy.class.getName()); LogHandler logHandler = new LogHandler(); log.addHandler(logHandler); @@ -77,17 +74,17 @@ public class SendProxyTestCase { sendMessage(0, new Error(ErrorCode.FATAL_ERROR, "err")); assertEquals("Trace for reply with error(s):\n" + - "<trace>\n" + - " <trace>\n" + - " Sending message (version ${VERSION}) from client to 'dst/session' with x seconds timeout.\n" + - " <trace>\n" + - " Message (type 1) received at 'dst' for session 'session'.\n" + - " [FATAL_ERROR @ localhost]: err\n" + - " Sending reply (version ${VERSION}) from 'dst'.\n" + - " </trace>\n" + - " Reply (type 2) received at client.\n" + - " </trace>\n" + - "</trace>\n", logHandler.trace); + "<trace>\n" + + " <trace>\n" + + " Sending message (version ${VERSION}) from client to 'dst/session' with x seconds timeout.\n" + + " <trace>\n" + + " Message (type 1) received at 'dst' for session 'session'.\n" + + " [FATAL_ERROR @ localhost]: err\n" + + " Sending reply (version ${VERSION}) from 'dst'.\n" + + " </trace>\n" + + " Reply (type 2) received at client.\n" + + " </trace>\n" + + "</trace>\n", logHandler.trace); logHandler.trace = null; log.setLevel(Level.FINEST); @@ -96,16 +93,16 @@ public class SendProxyTestCase { sendMessage(0, null); assertEquals("Trace for reply:\n" + - "<trace>\n" + - " <trace>\n" + - " Sending message (version ${VERSION}) from client to 'dst/session' with x seconds timeout.\n" + - " <trace>\n" + - " Message (type 1) received at 'dst' for session 'session'.\n" + - " Sending reply (version ${VERSION}) from 'dst'.\n" + - " </trace>\n" + - " Reply (type 0) received at client.\n" + - " </trace>\n" + - "</trace>\n", logHandler.trace); + "<trace>\n" + + " <trace>\n" + + " Sending message (version ${VERSION}) from client to 'dst/session' with x seconds timeout.\n" + + " <trace>\n" + + " Message (type 1) received at 'dst' for session 'session'.\n" + + " Sending reply (version ${VERSION}) from 'dst'.\n" + + " </trace>\n" + + " Reply (type 0) received at client.\n" + + " </trace>\n" + + "</trace>\n", logHandler.trace); logHandler.trace = null; sendMessage(1, new Error(ErrorCode.FATAL_ERROR, "err")); @@ -113,17 +110,17 @@ public class SendProxyTestCase { sendMessage(0, new Error(ErrorCode.FATAL_ERROR, "err")); assertEquals("Trace for reply with error(s):\n" + - "<trace>\n" + - " <trace>\n" + - " Sending message (version ${VERSION}) from client to 'dst/session' with x seconds timeout.\n" + - " <trace>\n" + - " Message (type 1) received at 'dst' for session 'session'.\n" + - " [FATAL_ERROR @ localhost]: err\n" + - " Sending reply (version ${VERSION}) from 'dst'.\n" + - " </trace>\n" + - " Reply (type 2) received at client.\n" + - " </trace>\n" + - "</trace>\n", logHandler.trace); + "<trace>\n" + + " <trace>\n" + + " Sending message (version ${VERSION}) from client to 'dst/session' with x seconds timeout.\n" + + " <trace>\n" + + " Message (type 1) received at 'dst' for session 'session'.\n" + + " [FATAL_ERROR @ localhost]: err\n" + + " Sending reply (version ${VERSION}) from 'dst'.\n" + + " </trace>\n" + + " Reply (type 2) received at client.\n" + + " </trace>\n" + + "</trace>\n", logHandler.trace); logHandler.trace = null; } diff --git a/messagebus/src/test/java/com/yahoo/messagebus/SequencerTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/SequencerTestCase.java index 07de8f238bc..c3166a578b5 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/SequencerTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/SequencerTestCase.java @@ -2,14 +2,12 @@ package com.yahoo.messagebus; import com.yahoo.messagebus.test.SimpleMessage; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedList; import java.util.Queue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * @author Simon Thoresen Hult @@ -17,7 +15,7 @@ import static org.junit.Assert.assertTrue; public class SequencerTestCase { @Test - public void testSyncNone() { + void testSyncNone() { TestQueue src = new TestQueue(); TestQueue dst = new TestQueue(); QueueSender sender = new QueueSender(dst); @@ -49,7 +47,7 @@ public class SequencerTestCase { } @Test - public void testSyncId() { + void testSyncId() { TestQueue src = new TestQueue(); TestQueue dst = new TestQueue(); QueueSender sender = new QueueSender(dst); diff --git a/messagebus/src/test/java/com/yahoo/messagebus/SimpleTripTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/SimpleTripTestCase.java index f13749ae213..0f930c51152 100755 --- a/messagebus/src/test/java/com/yahoo/messagebus/SimpleTripTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/SimpleTripTestCase.java @@ -11,11 +11,9 @@ import com.yahoo.messagebus.test.Receptor; import com.yahoo.messagebus.test.SimpleMessage; import com.yahoo.messagebus.test.SimpleProtocol; import com.yahoo.messagebus.test.SimpleReply; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * @author Simon Thoresen Hult @@ -23,32 +21,32 @@ import static org.junit.Assert.assertTrue; public class SimpleTripTestCase { @Test - public void testSimpleTrip() throws ListenFailedException { + void testSimpleTrip() throws ListenFailedException { Slobrok slobrok = new Slobrok(); TestServer server = new TestServer(new MessageBusParams().addProtocol(new SimpleProtocol()), - new RPCNetworkParams() - .setIdentity(new Identity("srv")) - .setSlobrokConfigId(TestServer.getSlobrokConfig(slobrok))); + new RPCNetworkParams() + .setIdentity(new Identity("srv")) + .setSlobrokConfigId(TestServer.getSlobrokConfig(slobrok))); DestinationSession dst = server.mb.createDestinationSession(new DestinationSessionParams().setName("session").setMessageHandler(new Receptor())); SourceSession src = server.mb.createSourceSession( new SourceSessionParams().setTimeout(600.0).setReplyHandler(new Receptor())); assertTrue(server.waitSlobrok("srv/session", 1)); assertTrue(src.send(new SimpleMessage("msg"), Route.parse("srv/session")).isAccepted()); - Message msg = ((Receptor)dst.getMessageHandler()).getMessage(60); + Message msg = ((Receptor) dst.getMessageHandler()).getMessage(60); assertNotNull(msg); assertEquals(SimpleProtocol.NAME, msg.getProtocol()); assertEquals(SimpleProtocol.MESSAGE, msg.getType()); - assertEquals("msg", ((SimpleMessage)msg).getValue()); + assertEquals("msg", ((SimpleMessage) msg).getValue()); Reply reply = new SimpleReply("reply"); reply.swapState(msg); dst.reply(reply); - assertNotNull(reply = ((Receptor)src.getReplyHandler()).getReply(60)); + assertNotNull(reply = ((Receptor) src.getReplyHandler()).getReply(60)); assertEquals(SimpleProtocol.NAME, reply.getProtocol()); assertEquals(SimpleProtocol.REPLY, reply.getType()); - assertEquals("reply", ((SimpleReply)reply).getValue()); + assertEquals("reply", ((SimpleReply) reply).getValue()); src.destroy(); dst.destroy(); diff --git a/messagebus/src/test/java/com/yahoo/messagebus/ThrottlerTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/ThrottlerTestCase.java index c308380dbb2..045dc1177db 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/ThrottlerTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/ThrottlerTestCase.java @@ -10,16 +10,13 @@ import com.yahoo.messagebus.test.Receptor; import com.yahoo.messagebus.test.SimpleMessage; import com.yahoo.messagebus.test.SimpleProtocol; import com.yahoo.messagebus.test.SimpleReply; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.Arrays; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * @author Simon Thoresen Hult @@ -29,7 +26,7 @@ public class ThrottlerTestCase { Slobrok slobrok; TestServer src, dst; - @Before + @BeforeEach public void setUp() throws ListenFailedException { RoutingTableSpec table = new RoutingTableSpec(SimpleProtocol.NAME); table.addHop("dst", "test/dst/session", Arrays.asList("test/dst/session")); @@ -39,7 +36,7 @@ public class ThrottlerTestCase { dst = new TestServer("test/dst", table, slobrok, null); } - @After + @AfterEach public void tearDown() { dst.destroy(); src.destroy(); @@ -47,7 +44,7 @@ public class ThrottlerTestCase { } @Test - public void testMaxCount() { + void testMaxCount() { // Prepare a source session with throttle enabled. SourceSessionParams params = new SourceSessionParams().setTimeout(600.0); StaticThrottlePolicy policy = new StaticThrottlePolicy(); @@ -71,7 +68,7 @@ public class ThrottlerTestCase { // Acknowledge one message at a time, then attempt to send two more. for (int i = 0; i < 10; i++) { assertTrue(dst_q.waitSize(policy.getMaxPendingCount(), 60)); - dst_s.acknowledge((Message)dst_q.dequeue()); + dst_s.acknowledge((Message) dst_q.dequeue()); assertNotNull(src_rr.getReply(60)); assertTrue(src_s.send(new SimpleMessage("msg"), "test").isAccepted()); @@ -80,7 +77,7 @@ public class ThrottlerTestCase { assertTrue(dst_q.waitSize(policy.getMaxPendingCount(), 60)); while (!dst_q.isEmpty()) { - dst_s.acknowledge((Message)dst_q.dequeue()); + dst_s.acknowledge((Message) dst_q.dequeue()); } src_s.close(); @@ -88,7 +85,7 @@ public class ThrottlerTestCase { } @Test - public void testMaxSize() { + void testMaxSize() { // Prepare a source session with throttle enabled. SourceSessionParams params = new SourceSessionParams().setTimeout(600.0); StaticThrottlePolicy policy = new StaticThrottlePolicy(); @@ -110,17 +107,17 @@ public class ThrottlerTestCase { assertTrue(dst_q.waitSize(2, 60)); assertFalse(src_s.send(new SimpleMessage("1"), "test").isAccepted()); - dst_s.acknowledge((Message)dst_q.dequeue()); + dst_s.acknowledge((Message) dst_q.dequeue()); assertNotNull(src_rr.getReply(60)); assertFalse(src_s.send(new SimpleMessage("1"), "test").isAccepted()); - dst_s.acknowledge((Message)dst_q.dequeue()); + dst_s.acknowledge((Message) dst_q.dequeue()); assertNotNull(src_rr.getReply(60)); assertTrue(src_s.send(new SimpleMessage("12"), "test").isAccepted()); assertTrue(dst_q.waitSize(1, 60)); assertFalse(src_s.send(new SimpleMessage("1"), "test").isAccepted()); - dst_s.acknowledge((Message)dst_q.dequeue()); + dst_s.acknowledge((Message) dst_q.dequeue()); assertNotNull(src_rr.getReply(60)); // Close sessions. @@ -129,12 +126,12 @@ public class ThrottlerTestCase { } @Test - public void testDynamicWindowSize() { + void testDynamicWindowSize() { CustomTimer timer = new CustomTimer(); DynamicThrottlePolicy policy = new DynamicThrottlePolicy(timer); policy.setWindowSizeIncrement(5) - .setResizeRate(1); + .setResizeRate(1); double windowSize = getWindowSize(policy, timer, 100); assertTrue(windowSize >= 90 && windowSize <= 105); @@ -153,13 +150,13 @@ public class ThrottlerTestCase { } @Test - public void testIdleTimePeriod() { + void testIdleTimePeriod() { CustomTimer timer = new CustomTimer(); DynamicThrottlePolicy policy = new DynamicThrottlePolicy(timer); policy.setWindowSizeIncrement(5) - .setMinWindowSize(1) - .setResizeRate(1); + .setMinWindowSize(1) + .setResizeRate(1); double windowSize = getWindowSize(policy, timer, 100); assertTrue(windowSize >= 90 && windowSize <= 110); @@ -180,20 +177,20 @@ public class ThrottlerTestCase { } @Test - public void testMinWindowSize() { + void testMinWindowSize() { CustomTimer timer = new CustomTimer(); DynamicThrottlePolicy policy = new DynamicThrottlePolicy(timer); policy.setWindowSizeIncrement(5) - .setResizeRate(1) - .setMinWindowSize(150); + .setResizeRate(1) + .setMinWindowSize(150); double windowSize = getWindowSize(policy, timer, 200); assertTrue(windowSize >= 150 && windowSize <= 210); } @Test - public void testMaxWindowSize() { + void testMaxWindowSize() { CustomTimer timer = new CustomTimer(); DynamicThrottlePolicy policy = new DynamicThrottlePolicy(timer); diff --git a/messagebus/src/test/java/com/yahoo/messagebus/TimeoutTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/TimeoutTestCase.java index a834b27156a..3957b7de985 100755 --- a/messagebus/src/test/java/com/yahoo/messagebus/TimeoutTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/TimeoutTestCase.java @@ -10,14 +10,14 @@ import com.yahoo.messagebus.routing.Route; import com.yahoo.messagebus.test.Receptor; import com.yahoo.messagebus.test.SimpleMessage; import com.yahoo.messagebus.test.SimpleProtocol; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.net.UnknownHostException; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Simon Thoresen Hult @@ -43,12 +43,12 @@ public class TimeoutTestCase { new SourceSessionParams().setTimeout(600.0).setReplyHandler(new Receptor())); } - @Before + @BeforeEach public void waitForSlobrokRegistration() { assertTrue(srcServer.waitSlobrok("dst/session", 1)); } - @After + @AfterEach public void destroyResources() { slobrok.stop(); dstSession.destroy(); @@ -63,17 +63,17 @@ public class TimeoutTestCase { } @Test - public void requireThatMessageCanTimeout() throws ListenFailedException, UnknownHostException { + void requireThatMessageCanTimeout() throws ListenFailedException, UnknownHostException { srcSession.setTimeout(1); assertSend(srcSession, newMessage(), "dst/session"); - assertTimeout(((Receptor)srcSession.getReplyHandler()).getReply(60)); + assertTimeout(((Receptor) srcSession.getReplyHandler()).getReply(60)); } @Test - public void requireThatZeroTimeoutMeansImmediateTimeout() throws ListenFailedException, UnknownHostException { + void requireThatZeroTimeoutMeansImmediateTimeout() throws ListenFailedException, UnknownHostException { srcSession.setTimeout(0); assertSend(srcSession, newMessage(), "dst/session"); - assertTimeout(((Receptor)srcSession.getReplyHandler()).getReply(60)); + assertTimeout(((Receptor) srcSession.getReplyHandler()).getReply(60)); } private static void assertSend(SourceSession session, Message msg, String route) { @@ -82,7 +82,7 @@ public class TimeoutTestCase { private static void assertTimeout(Reply reply) { assertNotNull(reply); - assertTrue(reply.getTrace().toString(), hasError(reply, ErrorCode.TIMEOUT)); + assertTrue(hasError(reply, ErrorCode.TIMEOUT), reply.getTrace().toString()); } private static Message newMessage() { diff --git a/messagebus/src/test/java/com/yahoo/messagebus/TraceTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/TraceTestCase.java index 7408079b7ac..2a6534a9445 100755 --- a/messagebus/src/test/java/com/yahoo/messagebus/TraceTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/TraceTestCase.java @@ -1,10 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.messagebus; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * @author Simon Thoresen Hult @@ -12,7 +11,7 @@ import static org.junit.Assert.assertTrue; public class TraceTestCase { @Test - public void testEncodeDecode() { + void testEncodeDecode() { assertEquals("()", TraceNode.decode("").encode()); assertEquals("()", TraceNode.decode("[xyz").encode()); assertEquals("([xyz][])", TraceNode.decode("[xyz][]").encode()); @@ -25,12 +24,12 @@ public class TraceTestCase { assertEquals("([])", TraceNode.decode("([])").encode()); assertTrue(TraceNode.decode("").isEmpty()); - assertTrue(!TraceNode.decode("([note])").isEmpty()); + assertFalse(TraceNode.decode("([note])").isEmpty()); String str = "([[17/Jun/2009:09:02:30 +0200\\] Message (type 1) received at 'dst' for session 'session'.]" + - "[[17/Jun/2009:09:02:30 +0200\\] [APP_TRANSIENT_ERROR @ localhost\\]: err1]" + - "[[17/Jun/2009:09:02:30 +0200\\] Sending reply (version 4.2) from 'dst'.])"; + "[[17/Jun/2009:09:02:30 +0200\\] [APP_TRANSIENT_ERROR @ localhost\\]: err1]" + + "[[17/Jun/2009:09:02:30 +0200\\] Sending reply (version 4.2) from 'dst'.])"; System.out.println(TraceNode.decode(str).toString()); assertEquals(str, TraceNode.decode(str).encode()); @@ -40,7 +39,7 @@ public class TraceTestCase { assertTrue(t.isRoot()); assertTrue(t.isStrict()); - assertTrue(!t.isLeaf()); + assertFalse(t.isLeaf()); assertEquals(4, t.getNumChildren()); { @@ -55,8 +54,8 @@ public class TraceTestCase { } { TraceNode c = t.getChild(2); - assertTrue(!c.isLeaf()); - assertTrue(!c.isStrict()); + assertFalse(c.isLeaf()); + assertFalse(c.isStrict()); assertEquals(1, c.getNumChildren()); { TraceNode d = c.getChild(0); @@ -66,12 +65,12 @@ public class TraceTestCase { } { TraceNode c = t.getChild(3); - assertTrue(!c.isStrict()); + assertFalse(c.isStrict()); assertEquals(2, c.getNumChildren()); { TraceNode d = c.getChild(0); assertTrue(d.isStrict()); - assertTrue(!d.isLeaf()); + assertFalse(d.isLeaf()); assertEquals(1, d.getNumChildren()); { TraceNode e = d.getChild(0); @@ -85,7 +84,7 @@ public class TraceTestCase { assertEquals(1, d.getNumChildren()); { TraceNode e = d.getChild(0); - assertTrue(!e.isStrict()); + assertFalse(e.isStrict()); assertEquals(1, e.getNumChildren()); { TraceNode f = e.getChild(0); @@ -98,7 +97,7 @@ public class TraceTestCase { } @Test - public void testReservedChars() { + void testReservedChars() { TraceNode t = new TraceNode(); t.addChild("abc(){}[]\\xyz"); assertEquals("abc(){}[]\\xyz", t.getChild(0).getNote()); @@ -108,7 +107,7 @@ public class TraceTestCase { TraceNode t2 = new TraceNode(); assertTrue(t2.isEmpty()); t2.swap(t); - assertTrue(!t2.isEmpty()); + assertFalse(t2.isEmpty()); assertEquals("abc(){}[]\\xyz", t2.getChild(0).getNote()); assertEquals("([abc(){}[\\]\\\\xyz])", t2.encode()); t2.clear(); @@ -117,7 +116,7 @@ public class TraceTestCase { } @Test - public void testAdd() { + void testAdd() { TraceNode t1 = TraceNode.decode("([x])"); TraceNode t2 = TraceNode.decode("([y])"); TraceNode t3 = TraceNode.decode("([z])"); @@ -137,14 +136,14 @@ public class TraceTestCase { } @Test - public void testStrict() { + void testStrict() { assertEquals("{}", TraceNode.decode("()").setStrict(false).encode()); assertEquals("{[x]}", TraceNode.decode("([x])").setStrict(false).encode()); assertEquals("{[x][y]}", TraceNode.decode("([x][y])").setStrict(false).encode()); } @Test - public void testTraceLevel() { + void testTraceLevel() { Trace t = new Trace(); t.setLevel(4); assertEquals(4, t.getLevel()); @@ -171,7 +170,7 @@ public class TraceTestCase { } @Test - public void testCompact() { + void testCompact() { assertEquals("()", TraceNode.decode("()").compact().encode()); assertEquals("()", TraceNode.decode("(())").compact().encode()); assertEquals("()", TraceNode.decode("(()())").compact().encode()); @@ -201,7 +200,7 @@ public class TraceTestCase { } @Test - public void testSort() { + void testSort() { assertEquals("([b][a][c])", TraceNode.decode("([b][a][c])").sort().encode()); assertEquals("({[a][b][c]})", TraceNode.decode("({[b][a][c]})").sort().encode()); assertEquals("(([c][a])([b]))", TraceNode.decode("(([c][a])([b]))").sort().encode()); @@ -211,7 +210,7 @@ public class TraceTestCase { } @Test - public void testNormalize() { + void testNormalize() { TraceNode t1 = TraceNode.decode("({([a][b]{[x][y]([p][q])})([c][d])([e][f])})"); TraceNode t2 = TraceNode.decode("({([a][b]{[y][x]([p][q])})([c][d])([e][f])})"); TraceNode t3 = TraceNode.decode("({([a][b]{[y]([p][q])[x]})([c][d])([e][f])})"); @@ -224,13 +223,13 @@ public class TraceTestCase { assertEquals("({([a][b]{[x][y]([p][q])})([c][d])([e][f])})", t1.compact().encode()); - assertTrue(!t1.compact().encode().equals(t2.compact().encode())); - assertTrue(!t1.compact().encode().equals(t3.compact().encode())); - assertTrue(!t1.compact().encode().equals(t4.compact().encode())); - assertTrue(!t1.compact().encode().equals(t5.compact().encode())); - assertTrue(!t1.compact().encode().equals(tx.compact().encode())); - assertTrue(!t1.compact().encode().equals(ty.compact().encode())); - assertTrue(!t1.compact().encode().equals(tz.compact().encode())); + assertNotEquals(t1.compact().encode(), t2.compact().encode()); + assertNotEquals(t1.compact().encode(), t3.compact().encode()); + assertNotEquals(t1.compact().encode(), t4.compact().encode()); + assertNotEquals(t1.compact().encode(), t5.compact().encode()); + assertNotEquals(t1.compact().encode(), tx.compact().encode()); + assertNotEquals(t1.compact().encode(), ty.compact().encode()); + assertNotEquals(t1.compact().encode(), tz.compact().encode()); System.out.println("1: " + t1.normalize().encode()); System.out.println("2: " + t2.normalize().encode()); @@ -240,19 +239,19 @@ public class TraceTestCase { System.out.println("x: " + tx.normalize().encode()); System.out.println("y: " + ty.normalize().encode()); System.out.println("z: " + tz.normalize().encode()); - assertTrue(t1.normalize().encode().equals(t2.normalize().encode())); - assertTrue(t1.normalize().encode().equals(t3.normalize().encode())); - assertTrue(t1.normalize().encode().equals(t4.normalize().encode())); - assertTrue(t1.normalize().encode().equals(t5.normalize().encode())); - assertTrue(!t1.normalize().encode().equals(tx.normalize().encode())); - assertTrue(!t1.normalize().encode().equals(ty.normalize().encode())); - assertTrue(!t1.normalize().encode().equals(tz.normalize().encode())); + assertEquals(t1.normalize().encode(), t2.normalize().encode()); + assertEquals(t1.normalize().encode(), t3.normalize().encode()); + assertEquals(t1.normalize().encode(), t4.normalize().encode()); + assertEquals(t1.normalize().encode(), t5.normalize().encode()); + assertNotEquals(t1.normalize().encode(), tx.normalize().encode()); + assertNotEquals(t1.normalize().encode(), ty.normalize().encode()); + assertNotEquals(t1.normalize().encode(), tz.normalize().encode()); assertEquals("({([c][d])([e][f])([a][b]{[x][y]([p][q])})})", t1.normalize().encode()); } @Test - public void testTraceDump() { + void testTraceDump() { { Trace big = new Trace(); TraceNode b1 = new TraceNode(); @@ -283,17 +282,17 @@ public class TraceTestCase { assertEquals("...\n", s1.toString(0)); assertEquals("<trace>\n...\n", s1.toString(1)); assertEquals("<trace>\n" + // 8 8 - " <trace>\n" + // 12 20 - " test\n" + // 13 33 - "...\n", s1.toString(33)); + " <trace>\n" + // 12 20 + " test\n" + // 13 33 + "...\n", s1.toString(33)); assertEquals("<trace>\n" + // 8 8 - " test\n" + // 9 17 - " test\n" + // 9 26 - "...\n", s2.toString(26)); + " test\n" + // 9 17 + " test\n" + // 9 26 + "...\n", s2.toString(26)); assertEquals("<trace>\n" + // 8 8 - " test\n" + // 9 17 - " test\n" + // 9 26 - "</trace>\n", s2.toString(27)); + " test\n" + // 9 17 + " test\n" + // 9 26 + "</trace>\n", s2.toString(27)); assertEquals(s2.toString(27), s2.toString()); } } diff --git a/messagebus/src/test/java/com/yahoo/messagebus/TraceTripTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/TraceTripTestCase.java index cc3e689e33e..e8d2fd72a47 100755 --- a/messagebus/src/test/java/com/yahoo/messagebus/TraceTripTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/TraceTripTestCase.java @@ -8,14 +8,15 @@ import com.yahoo.messagebus.routing.RoutingTableSpec; import com.yahoo.messagebus.test.Receptor; import com.yahoo.messagebus.test.SimpleMessage; import com.yahoo.messagebus.test.SimpleProtocol; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.net.UnknownHostException; import java.util.Arrays; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Simon Thoresen Hult @@ -27,7 +28,7 @@ public class TraceTripTestCase { TestServer pxy; TestServer dst; - @Before + @BeforeEach public void setUp() throws ListenFailedException { RoutingTableSpec table = new RoutingTableSpec(SimpleProtocol.NAME) .addHop("pxy", "test/pxy/session", Arrays.asList("test/pxy/session")) @@ -40,7 +41,7 @@ public class TraceTripTestCase { dst = new TestServer("test/dst", table, slobrok, null); } - @After + @AfterEach public void tearDown() { dst.destroy(); pxy.destroy(); @@ -49,7 +50,7 @@ public class TraceTripTestCase { } @Test - public void testTrip() { + void testTrip() { Receptor src_rr = new Receptor(); SourceSession src_s = src.mb.createSourceSession(src_rr); @@ -66,18 +67,18 @@ public class TraceTripTestCase { src_s.send(msg, "test"); Reply reply = src_rr.getReply(60); reply.getTrace().trace(1, "Client reply", false); - assertTrue(reply.getNumErrors() == 0); + assertEquals(reply.getNumErrors(), 0); TraceNode t = new TraceNode() - .addChild("Client message") - .addChild("Proxy message") - .addChild("Server message") - .addChild("Server reply") - .addChild("Proxy reply") - .addChild("Client reply"); + .addChild("Client message") + .addChild("Proxy message") + .addChild("Server message") + .addChild("Server reply") + .addChild("Proxy reply") + .addChild("Client reply"); System.out.println("reply: " + reply.getTrace().getRoot().encode()); System.out.println("want : " + t.encode()); - assertTrue(reply.getTrace().getRoot().encode().equals(t.encode())); + assertEquals(reply.getTrace().getRoot().encode(), t.encode()); } private static class Proxy implements MessageHandler, ReplyHandler { diff --git a/messagebus/src/test/java/com/yahoo/messagebus/network/IdentityTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/network/IdentityTestCase.java index 4309d17a407..5d2ca40df1a 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/network/IdentityTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/network/IdentityTestCase.java @@ -1,10 +1,10 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.messagebus.network; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * @author Simon Thoresen Hult @@ -12,14 +12,14 @@ import static org.junit.Assert.assertNotNull; public class IdentityTestCase { @Test - public void requireThatAccessorsWork() { + void requireThatAccessorsWork() { Identity id = new Identity("foo"); assertNotNull(id.getHostname()); assertEquals("foo", id.getServicePrefix()); } @Test - public void requireThatCopyConstructorWorks() { + void requireThatCopyConstructorWorks() { Identity lhs = new Identity("foo"); Identity rhs = new Identity(lhs); assertEquals(lhs.getHostname(), rhs.getHostname()); diff --git a/messagebus/src/test/java/com/yahoo/messagebus/network/NetworkMultiplexerTest.java b/messagebus/src/test/java/com/yahoo/messagebus/network/NetworkMultiplexerTest.java index 58145bb4f25..60da1b49d90 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/network/NetworkMultiplexerTest.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/network/NetworkMultiplexerTest.java @@ -9,7 +9,7 @@ import com.yahoo.messagebus.test.SimpleMessage; import com.yahoo.messagebus.test.SimpleProtocol; import com.yahoo.text.Utf8Array; import com.yahoo.text.Utf8String; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.HashMap; @@ -19,10 +19,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.*; /** * @author jonmv @@ -30,7 +27,7 @@ import static org.junit.Assert.fail; public class NetworkMultiplexerTest { @Test - public void testShared() { + void testShared() { MockNetwork net = new MockNetwork(); MockOwner owner1 = new MockOwner(); MockOwner owner2 = new MockOwner(); @@ -95,7 +92,7 @@ public class NetworkMultiplexerTest { } @Test - public void testDedicated() { + void testDedicated() { MockNetwork net = new MockNetwork(); MockOwner owner = new MockOwner(); NetworkMultiplexer dedicated = NetworkMultiplexer.dedicated(net); diff --git a/messagebus/src/test/java/com/yahoo/messagebus/network/local/LocalNetworkTest.java b/messagebus/src/test/java/com/yahoo/messagebus/network/local/LocalNetworkTest.java index b3fec784d38..60618744c83 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/network/local/LocalNetworkTest.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/network/local/LocalNetworkTest.java @@ -24,15 +24,13 @@ import com.yahoo.messagebus.routing.Route; import com.yahoo.messagebus.test.SimpleMessage; import com.yahoo.messagebus.test.SimpleProtocol; import com.yahoo.messagebus.test.SimpleReply; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.concurrent.BlockingDeque; import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.TimeUnit; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * @author Simon Thoresen Hult @@ -40,7 +38,7 @@ import static org.junit.Assert.assertTrue; public class LocalNetworkTest { @Test - public void requireThatLocalNetworkCanSendAndReceive() throws InterruptedException { + void requireThatLocalNetworkCanSendAndReceive() throws InterruptedException { final LocalWire wire = new LocalWire(); final Server serverA = new Server(wire); @@ -54,29 +52,29 @@ public class LocalNetworkTest { Message msg = new SimpleMessage("foo"); msg.setRoute(new Route().addHop(Hop.parse(intermediate.getConnectionSpec())) - .addHop(Hop.parse(destination.getConnectionSpec()))); + .addHop(Hop.parse(destination.getConnectionSpec()))); assertTrue(source.send(msg).isAccepted()); msg = serverB.messages.poll(60, TimeUnit.SECONDS); assertTrue(msg instanceof SimpleMessage); - assertEquals("foo", ((SimpleMessage)msg).getValue()); + assertEquals("foo", ((SimpleMessage) msg).getValue()); intermediate.forward(msg); msg = serverC.messages.poll(60, TimeUnit.SECONDS); assertTrue(msg instanceof SimpleMessage); - assertEquals("foo", ((SimpleMessage)msg).getValue()); + assertEquals("foo", ((SimpleMessage) msg).getValue()); Reply reply = new SimpleReply("bar"); reply.swapState(msg); destination.reply(reply); reply = serverB.replies.poll(60, TimeUnit.SECONDS); assertTrue(reply instanceof SimpleReply); - assertEquals("bar", ((SimpleReply)reply).getValue()); + assertEquals("bar", ((SimpleReply) reply).getValue()); intermediate.forward(reply); reply = serverA.replies.poll(60, TimeUnit.SECONDS); assertTrue(reply instanceof SimpleReply); - assertEquals("bar", ((SimpleReply)reply).getValue()); + assertEquals("bar", ((SimpleReply) reply).getValue()); serverA.mbus.destroy(); serverB.mbus.destroy(); @@ -84,7 +82,7 @@ public class LocalNetworkTest { } @Test - public void requireThatUnknownServiceRepliesWithNoAddressForService() throws InterruptedException { + void requireThatUnknownServiceRepliesWithNoAddressForService() throws InterruptedException { final Server server = new Server(new LocalWire()); final SourceSession source = server.newSourceSession(); @@ -97,7 +95,7 @@ public class LocalNetworkTest { } @Test - public void requireThatBlockingSendTimeOutInSendQ() throws InterruptedException { + void requireThatBlockingSendTimeOutInSendQ() throws InterruptedException { final LocalWire wire = new LocalWire(); final Server serverA = new Server(wire); @@ -124,24 +122,24 @@ public class LocalNetworkTest { assertEquals(ErrorCode.TIMEOUT, res.getError().getCode()); assertTrue(res.getError().getMessage().endsWith("Timed out in sendQ")); long end = SystemTimer.INSTANCE.milliTime(); - assertTrue(end >= start+TIMEOUT); - assertTrue(end < start+5*TIMEOUT); + assertTrue(end >= start + TIMEOUT); + assertTrue(end < start + 5 * TIMEOUT); msg = serverB.messages.poll(60, TimeUnit.SECONDS); assertTrue(msg instanceof SimpleMessage); - assertEquals("foo", ((SimpleMessage)msg).getValue()); + assertEquals("foo", ((SimpleMessage) msg).getValue()); intermediate.forward(msg); msg = serverC.messages.poll(60, TimeUnit.SECONDS); assertTrue(msg instanceof SimpleMessage); - assertEquals("foo", ((SimpleMessage)msg).getValue()); + assertEquals("foo", ((SimpleMessage) msg).getValue()); Reply reply = new SimpleReply("bar"); reply.swapState(msg); destination.reply(reply); reply = serverB.replies.poll(60, TimeUnit.SECONDS); assertTrue(reply instanceof SimpleReply); - assertEquals("bar", ((SimpleReply)reply).getValue()); + assertEquals("bar", ((SimpleReply) reply).getValue()); intermediate.forward(reply); reply = serverA.replies.poll(60, TimeUnit.SECONDS); @@ -150,7 +148,7 @@ public class LocalNetworkTest { reply = serverA.replies.poll(60, TimeUnit.SECONDS); assertTrue(reply instanceof SimpleReply); - assertEquals("bar", ((SimpleReply)reply).getValue()); + assertEquals("bar", ((SimpleReply) reply).getValue()); serverA.mbus.destroy(); serverB.mbus.destroy(); diff --git a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/BasicNetworkTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/BasicNetworkTestCase.java index 4134e352757..ffe15a7da29 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/BasicNetworkTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/BasicNetworkTestCase.java @@ -13,16 +13,14 @@ import com.yahoo.messagebus.test.Receptor; import com.yahoo.messagebus.test.SimpleMessage; import com.yahoo.messagebus.test.SimpleProtocol; import com.yahoo.messagebus.test.SimpleReply; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.net.UnknownHostException; import java.util.Arrays; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** @@ -35,7 +33,7 @@ public class BasicNetworkTestCase { TestServer pxy; TestServer dst; - @Before + @BeforeEach public void setUp() throws ListenFailedException { RoutingTableSpec table = new RoutingTableSpec(SimpleProtocol.NAME); table.addHop("pxy", "test/pxy/session", Arrays.asList("test/pxy/session")); @@ -47,7 +45,7 @@ public class BasicNetworkTestCase { dst = new TestServer("test/dst", table, slobrok, null); } - @After + @AfterEach public void tearDown() { dst.destroy(); pxy.destroy(); @@ -56,7 +54,7 @@ public class BasicNetworkTestCase { } @Test - public void testNetwork() { + void testNetwork() { // set up receptors Receptor src_rr = new Receptor(); Receptor pxy_mr = new Receptor(); @@ -126,7 +124,7 @@ public class BasicNetworkTestCase { } @Test - public void testTimeoutsFollowMessage() { + void testTimeoutsFollowMessage() { SourceSessionParams params = new SourceSessionParams().setTimeout(600.0); SourceSession ss = src.mb.createSourceSession(new Receptor(), params); DestinationSession ds = dst.mb.createDestinationSession("session", true, new Receptor()); @@ -138,24 +136,24 @@ public class BasicNetworkTestCase { long now = SystemTimer.INSTANCE.milliTime(); assertTrue(ss.send(msg, Route.parse("dst")).isAccepted()); - assertNotNull(msg = ((Receptor)ds.getMessageHandler()).getMessage(60)); + assertNotNull(msg = ((Receptor) ds.getMessageHandler()).getMessage(60)); assertTrue(msg.getTimeReceived() >= now); assertTrue(params.getTimeout() * 1000 >= msg.getTimeRemaining()); ds.acknowledge(msg); - assertNotNull(((Receptor)ss.getReplyHandler()).getReply(60)); + assertNotNull(((Receptor) ss.getReplyHandler()).getReply(60)); // Test default timeouts being overwritten. msg = new SimpleMessage("msg"); msg.getTrace().setLevel(9); - msg.setTimeRemaining(2 * (long)(params.getTimeout() * 1000)); + msg.setTimeRemaining(2 * (long) (params.getTimeout() * 1000)); assertTrue(ss.send(msg, Route.parse("dst")).isAccepted()); - assertNotNull(msg = ((Receptor)ds.getMessageHandler()).getMessage(60)); + assertNotNull(msg = ((Receptor) ds.getMessageHandler()).getMessage(60)); assertTrue(params.getTimeout() * 1000 < msg.getTimeRemaining()); ds.acknowledge(msg); - assertNotNull(((Receptor)ss.getReplyHandler()).getReply(60)); + assertNotNull(((Receptor) ss.getReplyHandler()).getReply(60)); ss.destroy(); ds.destroy(); diff --git a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/LoadBalanceTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/LoadBalanceTestCase.java index 8ade06335f5..0856fb09318 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/LoadBalanceTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/LoadBalanceTestCase.java @@ -9,12 +9,12 @@ import com.yahoo.messagebus.network.rpc.test.TestServer; import com.yahoo.messagebus.routing.Route; import com.yahoo.messagebus.test.QueueAdapter; import com.yahoo.messagebus.test.SimpleMessage; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.net.UnknownHostException; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author havardpe @@ -22,7 +22,7 @@ import static org.junit.Assert.assertTrue; public class LoadBalanceTestCase { @Test - public void testLoadBalance() throws ListenFailedException { + void testLoadBalance() throws ListenFailedException { Slobrok slobrok = new Slobrok(); TestServer src = new TestServer("src", null, slobrok, null); TestServer dst1 = new TestServer("dst/1", null, slobrok, null); @@ -32,14 +32,14 @@ public class LoadBalanceTestCase { // set up handlers final QueueAdapter sq = new QueueAdapter(); SourceSession ss = src.mb.createSourceSession(new SourceSessionParams().setTimeout(600.0).setThrottlePolicy(null) - .setReplyHandler(new ReplyHandler() { - @Override - public void handleReply(Reply reply) { - System.out.println(Thread.currentThread().getName() + ": Reply '" + - ((SimpleMessage)reply.getMessage()).getValue() + "' received at source."); - sq.handleReply(reply); - } - })); + .setReplyHandler(new ReplyHandler() { + @Override + public void handleReply(Reply reply) { + System.out.println(Thread.currentThread().getName() + ": Reply '" + + ((SimpleMessage) reply.getMessage()).getValue() + "' received at source."); + sq.handleReply(reply); + } + })); SimpleDestination h1 = new SimpleDestination(dst1.mb, dst1.net.getIdentity()); SimpleDestination h2 = new SimpleDestination(dst2.mb, dst2.net.getIdentity()); SimpleDestination h3 = new SimpleDestination(dst3.mb, dst3.net.getIdentity()); diff --git a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/RPCNetworkTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/RPCNetworkTestCase.java index 0c42c592624..e8ea5f60715 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/RPCNetworkTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/RPCNetworkTestCase.java @@ -17,12 +17,12 @@ import com.yahoo.messagebus.routing.Route; import com.yahoo.messagebus.routing.RoutingPolicy; import com.yahoo.messagebus.test.Receptor; import com.yahoo.text.Utf8String; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.PrintWriter; import java.io.StringWriter; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * @author Simon Thoresen Hult @@ -30,12 +30,12 @@ import static org.junit.Assert.*; public class RPCNetworkTestCase { @Test - public void requireThatProtocolEncodeExceptionIsCaught() throws Exception { + void requireThatProtocolEncodeExceptionIsCaught() throws Exception { RuntimeException e = new RuntimeException(); Slobrok slobrok = new Slobrok(); TestServer server = new TestServer(new MessageBusParams().addProtocol(MyProtocol.newEncodeException(e)), - new RPCNetworkParams().setSlobrokConfigId(slobrok.configId())); + new RPCNetworkParams().setSlobrokConfigId(slobrok.configId())); Receptor receptor = new Receptor(); SourceSession src = server.mb.createSourceSession( new SourceSessionParams().setTimeout(600.0).setReplyHandler(receptor)); @@ -50,7 +50,7 @@ public class RPCNetworkTestCase { e.printStackTrace(new PrintWriter(expected)); String actual = reply.getError(0).toString(); - assertTrue(actual, actual.contains(expected.toString())); + assertTrue(actual.contains(expected.toString()), actual); } private static class MyMessage extends Message { diff --git a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/SendAdapterTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/SendAdapterTestCase.java index 437be44ea25..c4cbf8ce6fb 100755 --- a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/SendAdapterTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/SendAdapterTestCase.java @@ -21,18 +21,15 @@ import com.yahoo.messagebus.test.Receptor; import com.yahoo.messagebus.test.SimpleMessage; import com.yahoo.messagebus.test.SimpleProtocol; import com.yahoo.messagebus.test.SimpleReply; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.net.UnknownHostException; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** @@ -53,7 +50,7 @@ public class SendAdapterTestCase { DestinationSession dstSession; TestProtocol srcProtocol, itrProtocol, dstProtocol; - @Before + @BeforeEach public void setUp() throws ListenFailedException, UnknownHostException { slobrok = new Slobrok(); dstServer = new TestServer( @@ -74,7 +71,7 @@ public class SendAdapterTestCase { assertTrue(srcServer.waitSlobrok("*/session", 2)); } - @After + @AfterEach public void tearDown() { slobrok.stop(); dstSession.destroy(); @@ -92,16 +89,16 @@ public class SendAdapterTestCase { //////////////////////////////////////////////////////////////////////////////// @Test - public void requireCorrectVersionSelection() { - assertNull(srcServer.net.getSendAdapter(new Version(4,999))); - assertNull(srcServer.net.getSendAdapter(new Version(5,0))); - assertNull(srcServer.net.getSendAdapter(new Version(6,148))); - assertTrue(srcServer.net.getSendAdapter(new Version(6,149)) instanceof RPCSendV2); - assertTrue(srcServer.net.getSendAdapter(new Version(9,9999)) instanceof RPCSendV2); + void requireCorrectVersionSelection() { + assertNull(srcServer.net.getSendAdapter(new Version(4, 999))); + assertNull(srcServer.net.getSendAdapter(new Version(5, 0))); + assertNull(srcServer.net.getSendAdapter(new Version(6, 148))); + assertTrue(srcServer.net.getSendAdapter(new Version(6, 149)) instanceof RPCSendV2); + assertTrue(srcServer.net.getSendAdapter(new Version(9, 9999)) instanceof RPCSendV2); } @Test - public void requireThatMessagesCanBeSentAcrossAllSupportedVersions() { + void requireThatMessagesCanBeSentAcrossAllSupportedVersions() { List<Version> versions = Arrays.asList( new Version(6, 149), new Version(9, 999) diff --git a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/ServiceAddressTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/ServiceAddressTestCase.java index bbf1b827c87..af039dc46cb 100755 --- a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/ServiceAddressTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/ServiceAddressTestCase.java @@ -6,17 +6,14 @@ import com.yahoo.jrt.Spec; import com.yahoo.jrt.slobrok.api.Mirror; import com.yahoo.jrt.slobrok.server.Slobrok; import com.yahoo.messagebus.network.Identity; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.net.UnknownHostException; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * @author Simon Thoresen Hult @@ -26,7 +23,7 @@ public class ServiceAddressTestCase { private Slobrok slobrok; private RPCNetwork network; - @Before + @BeforeEach public void setUp() throws ListenFailedException, UnknownHostException { slobrok = new Slobrok(); network = new RPCNetwork(new RPCNetworkParams() @@ -35,14 +32,14 @@ public class ServiceAddressTestCase { new Spec("localhost", slobrok.port()).toString() + "\"\n")); } - @After + @AfterEach public void tearDown() { network.shutdown(); slobrok.stop(); } @Test - public void testAddrServiceAddress() { + void testAddrServiceAddress() { assertNullAddress("tcp"); assertNullAddress("tcp/"); assertNullAddress("tcp/localhost"); @@ -56,7 +53,7 @@ public class ServiceAddressTestCase { } @Test - public void testNameServiceAddress() { + void testNameServiceAddress() { network.unregisterSession("session"); assertTrue(waitSlobrok("foo/session", 0)); assertNullAddress("foo/session"); diff --git a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/ServicePoolTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/ServicePoolTestCase.java index 4bb39e99a48..ed085c73b54 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/ServicePoolTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/ServicePoolTestCase.java @@ -4,10 +4,9 @@ package com.yahoo.messagebus.network.rpc; import com.yahoo.jrt.ListenFailedException; import com.yahoo.jrt.slobrok.server.Slobrok; import com.yahoo.messagebus.network.rpc.test.TestServer; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * @author Simon Thoresen Hult @@ -15,7 +14,7 @@ import static org.junit.Assert.assertTrue; public class ServicePoolTestCase { @Test - public void testMaxSize() throws ListenFailedException { + void testMaxSize() throws ListenFailedException { Slobrok slobrok = new Slobrok(); RPCNetwork net = new RPCNetwork(new RPCNetworkParams().setSlobrokConfigId(TestServer.getSlobrokConfig(slobrok))); RPCServicePool pool = new RPCServicePool(net, 2); @@ -23,30 +22,30 @@ public class ServicePoolTestCase { pool.resolve("foo"); assertEquals(1, pool.getSize()); assertTrue(pool.hasService("foo")); - assertTrue(!pool.hasService("bar")); - assertTrue(!pool.hasService("baz")); + assertFalse(pool.hasService("bar")); + assertFalse(pool.hasService("baz")); pool.resolve("foo"); assertEquals(1, pool.getSize()); assertTrue(pool.hasService("foo")); - assertTrue(!pool.hasService("bar")); - assertTrue(!pool.hasService("baz")); + assertFalse(pool.hasService("bar")); + assertFalse(pool.hasService("baz")); pool.resolve("bar"); assertEquals(2, pool.getSize()); assertTrue(pool.hasService("foo")); assertTrue(pool.hasService("bar")); - assertTrue(!pool.hasService("baz")); + assertFalse(pool.hasService("baz")); pool.resolve("baz"); assertEquals(2, pool.getSize()); - assertTrue(!pool.hasService("foo")); + assertFalse(pool.hasService("foo")); assertTrue(pool.hasService("bar")); assertTrue(pool.hasService("baz")); pool.resolve("bar"); assertEquals(2, pool.getSize()); - assertTrue(!pool.hasService("foo")); + assertFalse(pool.hasService("foo")); assertTrue(pool.hasService("bar")); assertTrue(pool.hasService("baz")); @@ -54,7 +53,7 @@ public class ServicePoolTestCase { assertEquals(2, pool.getSize()); assertTrue(pool.hasService("foo")); assertTrue(pool.hasService("bar")); - assertTrue(!pool.hasService("baz")); + assertFalse(pool.hasService("baz")); slobrok.stop(); } diff --git a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/SlobrokTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/SlobrokTestCase.java index 931fed596e5..35dad077809 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/SlobrokTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/SlobrokTestCase.java @@ -7,15 +7,15 @@ import com.yahoo.jrt.Spec; import com.yahoo.jrt.slobrok.api.Mirror; import com.yahoo.jrt.slobrok.server.Slobrok; import com.yahoo.messagebus.network.Identity; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; /** @@ -81,7 +81,7 @@ public class SlobrokTestCase { assertTrue(false); } - @Before + @BeforeEach public void setUp() throws ListenFailedException { slobrok = new Slobrok(); String slobrokCfgId = "raw:slobrok[1]\nslobrok[0].connectionspec \"" + new Spec("localhost", slobrok.port()).toString() + "\"\n"; @@ -93,7 +93,7 @@ public class SlobrokTestCase { port3 = net3.getPort(); } - @After + @AfterEach public void tearDown() { net3.shutdown(); net2.shutdown(); @@ -102,7 +102,7 @@ public class SlobrokTestCase { } @Test - public void testSlobrok() { + void testSlobrok() { net1.registerSession("foo"); net2.registerSession("foo"); net2.registerSession("bar"); @@ -111,43 +111,43 @@ public class SlobrokTestCase { net3.registerSession("baz"); check(net1, "*/*/*", new Res() - .add("net/a/foo", net1.getConnectionSpec()) - .add("net/b/foo", net2.getConnectionSpec()) - .add("net/b/bar", net2.getConnectionSpec()) - .add("net/c/foo", net3.getConnectionSpec()) - .add("net/c/bar", net3.getConnectionSpec()) - .add("net/c/baz", net3.getConnectionSpec()).toArray()); + .add("net/a/foo", net1.getConnectionSpec()) + .add("net/b/foo", net2.getConnectionSpec()) + .add("net/b/bar", net2.getConnectionSpec()) + .add("net/c/foo", net3.getConnectionSpec()) + .add("net/c/bar", net3.getConnectionSpec()) + .add("net/c/baz", net3.getConnectionSpec()).toArray()); check(net2, "*/*/*", new Res() - .add("net/a/foo", net1.getConnectionSpec()) - .add("net/b/foo", net2.getConnectionSpec()) - .add("net/b/bar", net2.getConnectionSpec()) - .add("net/c/foo", net3.getConnectionSpec()) - .add("net/c/bar", net3.getConnectionSpec()) - .add("net/c/baz", net3.getConnectionSpec()).toArray()); + .add("net/a/foo", net1.getConnectionSpec()) + .add("net/b/foo", net2.getConnectionSpec()) + .add("net/b/bar", net2.getConnectionSpec()) + .add("net/c/foo", net3.getConnectionSpec()) + .add("net/c/bar", net3.getConnectionSpec()) + .add("net/c/baz", net3.getConnectionSpec()).toArray()); check(net3, "*/*/*", new Res() - .add("net/a/foo", net1.getConnectionSpec()) - .add("net/b/foo", net2.getConnectionSpec()) - .add("net/b/bar", net2.getConnectionSpec()) - .add("net/c/foo", net3.getConnectionSpec()) - .add("net/c/bar", net3.getConnectionSpec()) - .add("net/c/baz", net3.getConnectionSpec()).toArray()); + .add("net/a/foo", net1.getConnectionSpec()) + .add("net/b/foo", net2.getConnectionSpec()) + .add("net/b/bar", net2.getConnectionSpec()) + .add("net/c/foo", net3.getConnectionSpec()) + .add("net/c/bar", net3.getConnectionSpec()) + .add("net/c/baz", net3.getConnectionSpec()).toArray()); net2.unregisterSession("bar"); net3.unregisterSession("bar"); net3.unregisterSession("baz"); check(net1, "*/*/*", new Res() - .add("net/a/foo", net1.getConnectionSpec()) - .add("net/b/foo", net2.getConnectionSpec()) - .add("net/c/foo", net3.getConnectionSpec()).toArray()); + .add("net/a/foo", net1.getConnectionSpec()) + .add("net/b/foo", net2.getConnectionSpec()) + .add("net/c/foo", net3.getConnectionSpec()).toArray()); check(net2, "*/*/*", new Res() - .add("net/a/foo", net1.getConnectionSpec()) - .add("net/b/foo", net2.getConnectionSpec()) - .add("net/c/foo", net3.getConnectionSpec()).toArray()); + .add("net/a/foo", net1.getConnectionSpec()) + .add("net/b/foo", net2.getConnectionSpec()) + .add("net/c/foo", net3.getConnectionSpec()).toArray()); check(net3, "*/*/*", new Res() - .add("net/a/foo", net1.getConnectionSpec()) - .add("net/b/foo", net2.getConnectionSpec()) - .add("net/c/foo", net3.getConnectionSpec()).toArray()); + .add("net/a/foo", net1.getConnectionSpec()) + .add("net/b/foo", net2.getConnectionSpec()) + .add("net/c/foo", net3.getConnectionSpec()).toArray()); } } diff --git a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/TargetPoolTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/TargetPoolTestCase.java index 4dde73ad8c5..afeaa1304a1 100755 --- a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/TargetPoolTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/TargetPoolTestCase.java @@ -7,17 +7,14 @@ import com.yahoo.jrt.Transport; import com.yahoo.jrt.slobrok.server.Slobrok; import com.yahoo.concurrent.Timer; import com.yahoo.messagebus.network.rpc.test.TestServer; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.*; /** * @author Simon Thoresen Hult @@ -28,14 +25,14 @@ public class TargetPoolTestCase { private List<TestServer> servers; private Supervisor orb; - @Before + @BeforeEach public void setUp() throws ListenFailedException { slobrok = new Slobrok(); servers = new ArrayList<>(); orb = new Supervisor(new Transport()); } - @After + @AfterEach public void tearDown() { slobrok.stop(); for (TestServer server : servers) { @@ -45,7 +42,7 @@ public class TargetPoolTestCase { } @Test - public void testConnectionCycling() { + void testConnectionCycling() { // Necessary setup to be able to resolve targets. RPCServiceAddress adr1 = registerServer(); @@ -75,8 +72,9 @@ public class TargetPoolTestCase { target3.subRef(); target4.subRef(); } + @Test - public void testConnectionExpire() { + void testConnectionExpire() { // Necessary setup to be able to resolve targets. RPCServiceAddress adr1 = registerServer(); RPCServiceAddress adr2 = registerServer(); @@ -87,9 +85,12 @@ public class TargetPoolTestCase { // Assert that all connections expire. RPCTarget target; - assertNotNull(target = pool.getTarget(orb, adr1)); target.subRef(); - assertNotNull(target = pool.getTarget(orb, adr2)); target.subRef(); - assertNotNull(target = pool.getTarget(orb, adr3)); target.subRef(); + assertNotNull(target = pool.getTarget(orb, adr1)); + target.subRef(); + assertNotNull(target = pool.getTarget(orb, adr2)); + target.subRef(); + assertNotNull(target = pool.getTarget(orb, adr3)); + target.subRef(); assertEquals(3, pool.size()); for (int i = 0; i < 10; ++i) { pool.flushTargets(false); @@ -100,20 +101,26 @@ public class TargetPoolTestCase { assertEquals(0, pool.size()); // Assert that only idle connections expire. - assertNotNull(target = pool.getTarget(orb, adr1)); target.subRef(); - assertNotNull(target = pool.getTarget(orb, adr2)); target.subRef(); - assertNotNull(target = pool.getTarget(orb, adr3)); target.subRef(); + assertNotNull(target = pool.getTarget(orb, adr1)); + target.subRef(); + assertNotNull(target = pool.getTarget(orb, adr2)); + target.subRef(); + assertNotNull(target = pool.getTarget(orb, adr3)); + target.subRef(); assertEquals(3, pool.size()); timer.millis += 444; pool.flushTargets(false); assertEquals(3, pool.size()); - assertNotNull(target = pool.getTarget(orb, adr2)); target.subRef(); - assertNotNull(target = pool.getTarget(orb, adr3)); target.subRef(); + assertNotNull(target = pool.getTarget(orb, adr2)); + target.subRef(); + assertNotNull(target = pool.getTarget(orb, adr3)); + target.subRef(); assertEquals(3, pool.size()); timer.millis += 444; pool.flushTargets(false); assertEquals(2, pool.size()); - assertNotNull(target = pool.getTarget(orb, adr3)); target.subRef(); + assertNotNull(target = pool.getTarget(orb, adr3)); + target.subRef(); timer.millis += 444; pool.flushTargets(false); assertEquals(1, pool.size()); diff --git a/messagebus/src/test/java/com/yahoo/messagebus/routing/AdvancedRoutingTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/routing/AdvancedRoutingTestCase.java index 3e6f345fb93..37024456878 100755 --- a/messagebus/src/test/java/com/yahoo/messagebus/routing/AdvancedRoutingTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/routing/AdvancedRoutingTestCase.java @@ -20,16 +20,13 @@ import com.yahoo.messagebus.routing.test.CustomPolicyFactory; import com.yahoo.messagebus.test.Receptor; import com.yahoo.messagebus.test.SimpleMessage; import com.yahoo.messagebus.test.SimpleProtocol; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.net.UnknownHostException; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * @author Simon Thoresen Hult @@ -41,7 +38,7 @@ public class AdvancedRoutingTestCase { SourceSession srcSession; DestinationSession dstFoo, dstBar, dstBaz; - @Before + @BeforeEach public void setUp() throws ListenFailedException { slobrok = new Slobrok(); dstServer = new TestServer(new MessageBusParams().addProtocol(new SimpleProtocol()), @@ -56,7 +53,7 @@ public class AdvancedRoutingTestCase { assertTrue(srcServer.waitSlobrok("dst/*", 3)); } - @After + @AfterEach public void tearDown() { slobrok.stop(); dstFoo.destroy(); @@ -68,53 +65,53 @@ public class AdvancedRoutingTestCase { } @Test - public void testAdvanced() { + void testAdvanced() { SimpleProtocol protocol = new SimpleProtocol(); protocol.addPolicyFactory("Custom", new CustomPolicyFactory(false, ErrorCode.NO_ADDRESS_FOR_SERVICE)); srcServer.mb.putProtocol(protocol); srcServer.setupRouting(new RoutingTableSpec(SimpleProtocol.NAME) - .addHop(new HopSpec("bar", "dst/bar")) - .addHop(new HopSpec("baz", "dst/baz")) - .addRoute(new RouteSpec("baz").addHop("baz"))); + .addHop(new HopSpec("bar", "dst/bar")) + .addHop(new HopSpec("baz", "dst/baz")) + .addRoute(new RouteSpec("baz").addHop("baz"))); Message msg = new SimpleMessage("msg"); msg.getTrace().setLevel(9); assertTrue(srcSession.send(msg, Route.parse("[Custom:" + dstFoo.getConnectionSpec() + ",bar,route:baz,dst/cox,?dst/unknown]")).isAccepted()); // Initial send. - assertNotNull(msg = ((Receptor)dstFoo.getMessageHandler()).getMessage(60)); + assertNotNull(msg = ((Receptor) dstFoo.getMessageHandler()).getMessage(60)); dstFoo.acknowledge(msg); - assertNotNull(msg = ((Receptor)dstBar.getMessageHandler()).getMessage(60)); + assertNotNull(msg = ((Receptor) dstBar.getMessageHandler()).getMessage(60)); Reply reply = new EmptyReply(); reply.swapState(msg); reply.addError(new Error(ErrorCode.TRANSIENT_ERROR, "bar")); dstBar.reply(reply); - assertNotNull(msg = ((Receptor)dstBaz.getMessageHandler()).getMessage(60)); + assertNotNull(msg = ((Receptor) dstBaz.getMessageHandler()).getMessage(60)); reply = new EmptyReply(); reply.swapState(msg); reply.addError(new Error(ErrorCode.TRANSIENT_ERROR, "baz1")); dstBaz.reply(reply); // First retry. - assertNull(((Receptor)dstFoo.getMessageHandler()).getMessage(0)); - assertNotNull(msg = ((Receptor)dstBar.getMessageHandler()).getMessage(60)); + assertNull(((Receptor) dstFoo.getMessageHandler()).getMessage(0)); + assertNotNull(msg = ((Receptor) dstBar.getMessageHandler()).getMessage(60)); dstBar.acknowledge(msg); - assertNotNull(msg = ((Receptor)dstBaz.getMessageHandler()).getMessage(60)); + assertNotNull(msg = ((Receptor) dstBaz.getMessageHandler()).getMessage(60)); reply = new EmptyReply(); reply.swapState(msg); reply.addError(new Error(ErrorCode.TRANSIENT_ERROR, "baz2")); dstBaz.reply(reply); // Second retry. - assertNull(((Receptor)dstFoo.getMessageHandler()).getMessage(0)); - assertNull(((Receptor)dstBar.getMessageHandler()).getMessage(0)); - assertNotNull(msg = ((Receptor)dstBaz.getMessageHandler()).getMessage(60)); + assertNull(((Receptor) dstFoo.getMessageHandler()).getMessage(0)); + assertNull(((Receptor) dstBar.getMessageHandler()).getMessage(0)); + assertNotNull(msg = ((Receptor) dstBaz.getMessageHandler()).getMessage(60)); reply = new EmptyReply(); reply.swapState(msg); reply.addError(new Error(ErrorCode.FATAL_ERROR, "baz3")); dstBaz.reply(reply); // Done. - reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); System.out.println(reply.getTrace()); assertEquals(2, reply.getNumErrors()); diff --git a/messagebus/src/test/java/com/yahoo/messagebus/routing/ResenderTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/routing/ResenderTestCase.java index 375b247d286..3bc607f169b 100755 --- a/messagebus/src/test/java/com/yahoo/messagebus/routing/ResenderTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/routing/ResenderTestCase.java @@ -19,15 +19,11 @@ import com.yahoo.messagebus.network.rpc.test.TestServer; import com.yahoo.messagebus.test.Receptor; import com.yahoo.messagebus.test.SimpleMessage; import com.yahoo.messagebus.test.SimpleProtocol; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * @author Simon Thoresen Hult @@ -40,7 +36,7 @@ public class ResenderTestCase { DestinationSession dstSession; RetryTransientErrorsPolicy retryPolicy; - @Before + @BeforeEach public void setUp() throws ListenFailedException { slobrok = new Slobrok(); dstServer = new TestServer(new MessageBusParams().addProtocol(new SimpleProtocol()), @@ -55,7 +51,7 @@ public class ResenderTestCase { assertTrue(srcServer.waitSlobrok("dst/session", 1)); } - @After + @AfterEach public void tearDown() { slobrok.stop(); dstSession.destroy(); @@ -65,94 +61,94 @@ public class ResenderTestCase { } @Test - public void testRetryTag() { + void testRetryTag() { assertTrue(srcSession.send(createMessage("msg"), Route.parse("dst/session")).isAccepted()); - Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); + Message msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60); assertNotNull(msg); for (int i = 0; i < 5; ++i) { assertEquals(i, msg.getRetry()); assertEquals(true, msg.getRetryEnabled()); replyFromDestination(msg, ErrorCode.APP_TRANSIENT_ERROR, 0); - assertNotNull(msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60)); + assertNotNull(msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60)); } dstSession.acknowledge(msg); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); assertFalse(reply.hasErrors()); - assertNull(((Receptor)dstSession.getMessageHandler()).getMessage(0)); + assertNull(((Receptor) dstSession.getMessageHandler()).getMessage(0)); System.out.println(reply.getTrace()); } @Test - public void testRetryEnabledTag() { + void testRetryEnabledTag() { Message msg = createMessage("msg"); msg.setRetryEnabled(false); assertTrue(srcSession.send(msg, Route.parse("dst/session")).isAccepted()); - assertNotNull(msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60)); + assertNotNull(msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60)); assertEquals(false, msg.getRetryEnabled()); replyFromDestination(msg, ErrorCode.APP_TRANSIENT_ERROR, 0); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); assertTrue(reply.hasErrors()); - assertNull(((Receptor)dstSession.getMessageHandler()).getMessage(0)); + assertNull(((Receptor) dstSession.getMessageHandler()).getMessage(0)); System.out.println(reply.getTrace()); } @Test - public void testTransientError() { + void testTransientError() { assertTrue(srcSession.send(createMessage("msg"), Route.parse("dst/session")).isAccepted()); - Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); + Message msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60); assertNotNull(msg); replyFromDestination(msg, ErrorCode.APP_TRANSIENT_ERROR, 0); - assertNotNull(msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60)); + assertNotNull(msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60)); replyFromDestination(msg, ErrorCode.APP_FATAL_ERROR, 0); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); assertTrue(reply.hasFatalErrors()); - assertNull(((Receptor)dstSession.getMessageHandler()).getMessage(0)); + assertNull(((Receptor) dstSession.getMessageHandler()).getMessage(0)); } @Test - public void testFatalError() { + void testFatalError() { assertTrue(srcSession.send(createMessage("msg"), Route.parse("dst/session")).isAccepted()); - Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); + Message msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60); assertNotNull(msg); replyFromDestination(msg, ErrorCode.APP_FATAL_ERROR, 0); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); assertTrue(reply.hasFatalErrors()); - assertNull(((Receptor)dstSession.getMessageHandler()).getMessage(0)); + assertNull(((Receptor) dstSession.getMessageHandler()).getMessage(0)); } @Test - public void testDisableRetry() { + void testDisableRetry() { retryPolicy.setEnabled(false); assertTrue(srcSession.send(createMessage("msg"), Route.parse("dst/session")).isAccepted()); - Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); + Message msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60); assertNotNull(msg); replyFromDestination(msg, ErrorCode.APP_TRANSIENT_ERROR, 0); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); assertTrue(reply.hasErrors()); - assertTrue(!reply.hasFatalErrors()); - assertNull(((Receptor)dstSession.getMessageHandler()).getMessage(0)); + assertFalse(reply.hasFatalErrors()); + assertNull(((Receptor) dstSession.getMessageHandler()).getMessage(0)); } @Test - public void testRetryDelay() { + void testRetryDelay() { retryPolicy.setBaseDelay(0.01); assertTrue(srcSession.send(createMessage("msg"), Route.parse("dst/session")).isAccepted()); - Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); + Message msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60); assertNotNull(msg); for (int i = 0; i < 5; ++i) { replyFromDestination(msg, ErrorCode.APP_TRANSIENT_ERROR, -1); - assertNotNull(msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60)); + assertNotNull(msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60)); } replyFromDestination(msg, ErrorCode.APP_FATAL_ERROR, 0); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); assertTrue(reply.hasFatalErrors()); - assertNull(((Receptor)dstSession.getMessageHandler()).getMessage(0)); + assertNull(((Receptor) dstSession.getMessageHandler()).getMessage(0)); String trace = reply.getTrace().toString(); assertTrue(trace.contains("retry 1 in 0.0")); @@ -163,19 +159,19 @@ public class ResenderTestCase { } @Test - public void testRequestRetryDelay() { + void testRequestRetryDelay() { assertTrue(srcSession.send(createMessage("msg"), Route.parse("dst/session")).isAccepted()); - Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); + Message msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60); assertNotNull(msg); for (int i = 0; i < 5; ++i) { replyFromDestination(msg, ErrorCode.APP_TRANSIENT_ERROR, i / 50.0); - assertNotNull(msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60)); + assertNotNull(msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60)); } replyFromDestination(msg, ErrorCode.APP_FATAL_ERROR, 0); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); assertTrue(reply.hasFatalErrors()); - assertNull(((Receptor)dstSession.getMessageHandler()).getMessage(0)); + assertNull(((Receptor) dstSession.getMessageHandler()).getMessage(0)); String trace = reply.getTrace().toString(); System.out.println(trace); diff --git a/messagebus/src/test/java/com/yahoo/messagebus/routing/RetryPolicyTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/routing/RetryPolicyTestCase.java index 5095de0b2e7..6d3790e1407 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/routing/RetryPolicyTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/routing/RetryPolicyTestCase.java @@ -2,11 +2,9 @@ package com.yahoo.messagebus.routing; import com.yahoo.messagebus.ErrorCode; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * @author Simon Thoresen Hult @@ -15,12 +13,12 @@ public class RetryPolicyTestCase { private static final double SMALL = 0.00000000000000000001; @Test - public void testSimpleRetryPolicy() { + void testSimpleRetryPolicy() { RetryTransientErrorsPolicy policy = new RetryTransientErrorsPolicy(); assertEquals(0.0, policy.getRetryDelay(0), SMALL); assertEquals(0.0, policy.getRetryDelay(1), SMALL); for (int i = 2; i < 15; i++) { - assertEquals(0.001*(1 << (i-1)), policy.getRetryDelay(i), SMALL); + assertEquals(0.001 * (1 << (i - 1)), policy.getRetryDelay(i), SMALL); } assertEquals(10.0, policy.getRetryDelay(15), SMALL); assertEquals(10.0, policy.getRetryDelay(20), SMALL); diff --git a/messagebus/src/test/java/com/yahoo/messagebus/routing/RouteParserTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/routing/RouteParserTestCase.java index 20fc66825d7..aef61a05263 100755 --- a/messagebus/src/test/java/com/yahoo/messagebus/routing/RouteParserTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/routing/RouteParserTestCase.java @@ -1,11 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.messagebus.routing; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * @author Simon Thoresen Hult @@ -13,7 +11,7 @@ import static org.junit.Assert.assertTrue; public class RouteParserTestCase { @Test - public void testHopParser() { + void testHopParser() { Hop hop = Hop.parse("foo"); assertNotNull(hop); assertEquals(1, hop.getNumDirectives()); @@ -34,45 +32,45 @@ public class RouteParserTestCase { assertNotNull(hop = Hop.parse("[Extern:tcp/localhost:3619;foo/bar]")); assertEquals(1, hop.getNumDirectives()); - assertPolicyDirective(hop.getDirective(0), "Extern","tcp/localhost:3619;foo/bar"); + assertPolicyDirective(hop.getDirective(0), "Extern", "tcp/localhost:3619;foo/bar"); assertNotNull(hop = Hop.parse("[AND:foo bar]")); assertEquals(1, hop.getNumDirectives()); - assertPolicyDirective(hop.getDirective(0), "AND","foo bar"); + assertPolicyDirective(hop.getDirective(0), "AND", "foo bar"); assertNotNull(hop = Hop.parse("[DocumentRouteSelector:raw:route[2]\n" + - "route[0].name \"foo\"\n" + - "route[0].selector \"testdoc\"\n" + - "route[0].feed \"myfeed\"\n" + - "route[1].name \"bar\"\n" + - "route[1].selector \"other\"\n" + - "route[1].feed \"myfeed\"\n" + - "]")); + "route[0].name \"foo\"\n" + + "route[0].selector \"testdoc\"\n" + + "route[0].feed \"myfeed\"\n" + + "route[1].name \"bar\"\n" + + "route[1].selector \"other\"\n" + + "route[1].feed \"myfeed\"\n" + + "]")); assertEquals(1, hop.getNumDirectives()); assertPolicyDirective(hop.getDirective(0), "DocumentRouteSelector", - "raw:route[2]\n" + - "route[0].name \"foo\"\n" + - "route[0].selector \"testdoc\"\n" + - "route[0].feed \"myfeed\"\n" + - "route[1].name \"bar\"\n" + - "route[1].selector \"other\"\n" + - "route[1].feed \"myfeed\""); + "raw:route[2]\n" + + "route[0].name \"foo\"\n" + + "route[0].selector \"testdoc\"\n" + + "route[0].feed \"myfeed\"\n" + + "route[1].name \"bar\"\n" + + "route[1].selector \"other\"\n" + + "route[1].feed \"myfeed\""); assertNotNull(hop = Hop.parse("[DocumentRouteSelector:raw:route[1]\n" + - "route[0].name \"docproc/cluster.foo\"\n" + - "route[0].selector \"testdoc\"\n" + - "route[0].feed \"myfeed\"" + - "]")); + "route[0].name \"docproc/cluster.foo\"\n" + + "route[0].selector \"testdoc\"\n" + + "route[0].feed \"myfeed\"" + + "]")); assertEquals(1, hop.getNumDirectives()); assertPolicyDirective(hop.getDirective(0), "DocumentRouteSelector", - "raw:route[1]\n" + - "route[0].name \"docproc/cluster.foo\"\n" + - "route[0].selector \"testdoc\"\n" + - "route[0].feed \"myfeed\""); + "raw:route[1]\n" + + "route[0].name \"docproc/cluster.foo\"\n" + + "route[0].selector \"testdoc\"\n" + + "route[0].feed \"myfeed\""); } @Test - public void testHopParserErrors() { + void testHopParserErrors() { assertError(Hop.parse(""), "Failed to parse empty string."); assertError(Hop.parse("[foo"), "Unterminated '[' in '[foo'"); assertError(Hop.parse("foo/[bar]]"), "Unexpected token ']' in 'foo/[bar]]'"); @@ -80,7 +78,7 @@ public class RouteParserTestCase { } @Test - public void testShortRoute() { + void testShortRoute() { Route shortRoute = Route.parse("c"); assertNotNull(shortRoute); assertEquals(1, shortRoute.getNumHops()); @@ -91,7 +89,7 @@ public class RouteParserTestCase { } @Test - public void testShortHops() { + void testShortHops() { Route shortRoute = Route.parse("a b c"); assertNotNull(shortRoute); assertEquals(3, shortRoute.getNumHops()); @@ -102,7 +100,7 @@ public class RouteParserTestCase { } @Test - public void testRouteParser() { + void testRouteParser() { Route route = Route.parse("foo bar/baz"); assertNotNull(route); assertEquals(2, route.getNumHops()); @@ -126,7 +124,7 @@ public class RouteParserTestCase { } @Test - public void testRouteParserErrors() { + void testRouteParserErrors() { assertError(Route.parse(""), "Failed to parse empty string."); assertError(Route.parse("foo [bar"), "Unterminated '[' in '[bar'"); assertError(Route.parse("foo bar/[baz]]"), "Unexpected token ']' in 'bar/[baz]]'"); diff --git a/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingContextTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingContextTestCase.java index 2efbc0724d7..42a6b244508 100755 --- a/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingContextTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingContextTestCase.java @@ -11,17 +11,17 @@ import com.yahoo.messagebus.network.rpc.test.TestServer; import com.yahoo.messagebus.test.Receptor; import com.yahoo.messagebus.test.SimpleMessage; import com.yahoo.messagebus.test.SimpleProtocol; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Simon Thoresen Hult @@ -35,7 +35,7 @@ public class RoutingContextTestCase { SourceSession srcSession; DestinationSession dstSession; - @Before + @BeforeEach public void setUp() throws ListenFailedException { slobrok = new Slobrok(); dstServer = new TestServer(new MessageBusParams().addProtocol(new SimpleProtocol()), @@ -48,7 +48,7 @@ public class RoutingContextTestCase { assertTrue(srcServer.waitSlobrok("dst/session", 1)); } - @After + @AfterEach public void tearDown() { slobrok.stop(); dstSession.destroy(); @@ -58,7 +58,7 @@ public class RoutingContextTestCase { } @Test - public void testSingleDirective() { + void testSingleDirective() { SimpleProtocol protocol = new SimpleProtocol(); protocol.addPolicyFactory("Custom", new CustomPolicyFactory( false, @@ -68,10 +68,10 @@ public class RoutingContextTestCase { srcServer.setupRouting(new RoutingTableSpec(SimpleProtocol.NAME) .addRoute(new RouteSpec("myroute").addHop("myhop")) .addHop(new HopSpec("myhop", "[Custom]") - .addRecipient("foo").addRecipient("bar").addRecipient("baz/cox"))); + .addRecipient("foo").addRecipient("bar").addRecipient("baz/cox"))); for (int i = 0; i < 2; ++i) { assertTrue(srcSession.send(createMessage("msg"), "myroute").isAccepted()); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(TIMEOUT_SECS); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(TIMEOUT_SECS); assertNotNull(reply); System.out.println(reply.getTrace()); assertFalse(reply.hasErrors()); @@ -79,7 +79,7 @@ public class RoutingContextTestCase { } @Test - public void testMoreDirectives() { + void testMoreDirectives() { SimpleProtocol protocol = new SimpleProtocol(); protocol.addPolicyFactory("Custom", new CustomPolicyFactory( false, @@ -89,12 +89,12 @@ public class RoutingContextTestCase { srcServer.setupRouting(new RoutingTableSpec(SimpleProtocol.NAME) .addRoute(new RouteSpec("myroute").addHop("myhop")) .addHop(new HopSpec("myhop", "foo/[Custom]/baz") - .addRecipient("foo").addRecipient("foo/bar") - .addRecipient("foo/bar0/baz").addRecipient("foo/bar1/baz") - .addRecipient("foo/bar/baz/cox"))); + .addRecipient("foo").addRecipient("foo/bar") + .addRecipient("foo/bar0/baz").addRecipient("foo/bar1/baz") + .addRecipient("foo/bar/baz/cox"))); for (int i = 0; i < 2; ++i) { assertTrue(srcSession.send(createMessage("msg"), "myroute").isAccepted()); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(TIMEOUT_SECS); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(TIMEOUT_SECS); assertNotNull(reply); System.out.println(reply.getTrace()); assertFalse(reply.hasErrors()); @@ -102,7 +102,7 @@ public class RoutingContextTestCase { } @Test - public void testRecipientsRemain() { + void testRecipientsRemain() { SimpleProtocol protocol = new SimpleProtocol(); protocol.addPolicyFactory("First", new CustomPolicyFactory(true, Arrays.asList("foo/bar"), Arrays.asList("foo/[Second]"))); protocol.addPolicyFactory("Second", new CustomPolicyFactory(false, Arrays.asList("foo/bar"), Arrays.asList("foo/bar"))); @@ -110,10 +110,10 @@ public class RoutingContextTestCase { srcServer.setupRouting(new RoutingTableSpec(SimpleProtocol.NAME) .addRoute(new RouteSpec("myroute").addHop("myhop")) .addHop(new HopSpec("myhop", "[First]/[Second]") - .addRecipient("foo/bar"))); + .addRecipient("foo/bar"))); for (int i = 0; i < 2; ++i) { assertTrue(srcSession.send(createMessage("msg"), "myroute").isAccepted()); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(TIMEOUT_SECS); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(TIMEOUT_SECS); assertNotNull(reply); System.out.println(reply.getTrace()); assertFalse(reply.hasErrors()); @@ -121,15 +121,15 @@ public class RoutingContextTestCase { } @Test - public void testToString() { + void testToString() { assertEquals("node : null, directive: 1, errors: [], selectOnRetry: true context: null", new RoutingContext(null, 1).toString()); } @Test - public void testConstRoute() { + void testConstRoute() { SimpleProtocol protocol = new SimpleProtocol(); protocol.addPolicyFactory("DocumentRouteSelector", - new CustomPolicyFactory(true, Arrays.asList("dst"), Arrays.asList("dst"))); + new CustomPolicyFactory(true, Arrays.asList("dst"), Arrays.asList("dst"))); srcServer.mb.putProtocol(protocol); srcServer.setupRouting(new RoutingTableSpec(SimpleProtocol.NAME) .addRoute(new RouteSpec("default").addHop("indexing")) @@ -137,10 +137,10 @@ public class RoutingContextTestCase { .addHop(new HopSpec("dst", "dst/session"))); for (int i = 0; i < 2; ++i) { assertTrue(srcSession.send(createMessage("msg"), Route.parse("route:default")).isAccepted()); - Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(TIMEOUT_SECS); + Message msg = ((Receptor) dstSession.getMessageHandler()).getMessage(TIMEOUT_SECS); assertNotNull(msg); dstSession.acknowledge(msg); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(TIMEOUT_SECS); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(TIMEOUT_SECS); assertNotNull(reply); System.out.println(reply.getTrace()); assertFalse(reply.hasErrors()); diff --git a/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingSpecTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingSpecTestCase.java index 0f492e65421..28dcadf1896 100755 --- a/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingSpecTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingSpecTestCase.java @@ -3,16 +3,14 @@ package com.yahoo.messagebus.routing; import com.yahoo.messagebus.ConfigAgent; import com.yahoo.messagebus.ConfigHandler; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * @author Simon Thoresen Hult @@ -20,7 +18,7 @@ import static org.junit.Assert.assertTrue; public class RoutingSpecTestCase { @Test - public void testConfig() { + void testConfig() { assertConfig(new RoutingSpec()); assertConfig(new RoutingSpec().addTable(new RoutingTableSpec("mytable1"))); assertConfig(new RoutingSpec().addTable(new RoutingTableSpec("mytable1") @@ -42,239 +40,239 @@ public class RoutingSpecTestCase { .addRoute(new RouteSpec("myroute12").addHop("myhop1").addHop("myhop2"))) .addTable(new RoutingTableSpec("mytable2"))); assertEquals("routingtable[2]\n" + - "routingtable[0].protocol \"mytable1\"\n" + - "routingtable[1].protocol \"mytable2\"\n" + - "routingtable[1].hop[3]\n" + - "routingtable[1].hop[0].name \"myhop1\"\n" + - "routingtable[1].hop[0].selector \"myselector1\"\n" + - "routingtable[1].hop[1].name \"myhop2\"\n" + - "routingtable[1].hop[1].selector \"myselector2\"\n" + - "routingtable[1].hop[1].ignoreresult true\n" + - "routingtable[1].hop[2].name \"myhop1\"\n" + - "routingtable[1].hop[2].selector \"myselector3\"\n" + - "routingtable[1].hop[2].recipient[2]\n" + - "routingtable[1].hop[2].recipient[0] \"myrecipient1\"\n" + - "routingtable[1].hop[2].recipient[1] \"myrecipient2\"\n" + - "routingtable[1].route[1]\n" + - "routingtable[1].route[0].name \"myroute1\"\n" + - "routingtable[1].route[0].hop[1]\n" + - "routingtable[1].route[0].hop[0] \"myhop1\"\n", - new RoutingSpec() - .addTable(new RoutingTableSpec("mytable1")) - .addTable(new RoutingTableSpec("mytable2") - .addHop(new HopSpec("myhop1", "myselector1")) - .addHop(new HopSpec("myhop2", "myselector2").setIgnoreResult(true)) - .addHop(new HopSpec("myhop1", "myselector3") - .addRecipient("myrecipient1") - .addRecipient("myrecipient2")) - .addRoute(new RouteSpec("myroute1").addHop("myhop1"))).toString()); + "routingtable[0].protocol \"mytable1\"\n" + + "routingtable[1].protocol \"mytable2\"\n" + + "routingtable[1].hop[3]\n" + + "routingtable[1].hop[0].name \"myhop1\"\n" + + "routingtable[1].hop[0].selector \"myselector1\"\n" + + "routingtable[1].hop[1].name \"myhop2\"\n" + + "routingtable[1].hop[1].selector \"myselector2\"\n" + + "routingtable[1].hop[1].ignoreresult true\n" + + "routingtable[1].hop[2].name \"myhop1\"\n" + + "routingtable[1].hop[2].selector \"myselector3\"\n" + + "routingtable[1].hop[2].recipient[2]\n" + + "routingtable[1].hop[2].recipient[0] \"myrecipient1\"\n" + + "routingtable[1].hop[2].recipient[1] \"myrecipient2\"\n" + + "routingtable[1].route[1]\n" + + "routingtable[1].route[0].name \"myroute1\"\n" + + "routingtable[1].route[0].hop[1]\n" + + "routingtable[1].route[0].hop[0] \"myhop1\"\n", + new RoutingSpec() + .addTable(new RoutingTableSpec("mytable1")) + .addTable(new RoutingTableSpec("mytable2") + .addHop(new HopSpec("myhop1", "myselector1")) + .addHop(new HopSpec("myhop2", "myselector2").setIgnoreResult(true)) + .addHop(new HopSpec("myhop1", "myselector3") + .addRecipient("myrecipient1") + .addRecipient("myrecipient2")) + .addRoute(new RouteSpec("myroute1").addHop("myhop1"))).toString()); } @Test - public void testApplicationSpec() { + void testApplicationSpec() { assertApplicationSpec(Arrays.asList("foo"), - Arrays.asList("foo", - "*")); + Arrays.asList("foo", + "*")); assertApplicationSpec(Arrays.asList("foo/bar"), - Arrays.asList("foo/bar", - "foo/*", - "*/bar", - "*/*")); + Arrays.asList("foo/bar", + "foo/*", + "*/bar", + "*/*")); assertApplicationSpec(Arrays.asList("foo/0/baz", - "foo/1/baz", - "foo/2/baz"), - Arrays.asList("foo/0/baz", - "foo/1/baz", - "foo/2/baz", - "foo/0/*", - "foo/1/*", - "foo/2/*", - "foo/*/baz", - "*/0/baz", - "*/1/baz", - "*/2/baz", - "foo/*/*", - "*/0/*", - "*/1/*", - "*/2/*", - "*/*/baz", - "*/*/*")); + "foo/1/baz", + "foo/2/baz"), + Arrays.asList("foo/0/baz", + "foo/1/baz", + "foo/2/baz", + "foo/0/*", + "foo/1/*", + "foo/2/*", + "foo/*/baz", + "*/0/baz", + "*/1/baz", + "*/2/baz", + "foo/*/*", + "*/0/*", + "*/1/*", + "*/2/*", + "*/*/baz", + "*/*/*")); } @Test - public void testVeriyfOk() { + void testVeriyfOk() { assertVerifyOk(new RoutingSpec().addTable(new RoutingTableSpec("mytable") .addHop(new HopSpec("hop1", "myservice1"))), - new ApplicationSpec().addService("mytable", "myservice1")); + new ApplicationSpec().addService("mytable", "myservice1")); assertVerifyOk(new RoutingSpec().addTable(new RoutingTableSpec("mytable") .addRoute(new RouteSpec("route1").addHop("myservice1"))), - new ApplicationSpec().addService("mytable", "myservice1")); + new ApplicationSpec().addService("mytable", "myservice1")); assertVerifyOk(new RoutingSpec().addTable(new RoutingTableSpec("mytable") .addHop(new HopSpec("hop1", "myservice1")) .addRoute(new RouteSpec("route1").addHop("hop1"))), - new ApplicationSpec().addService("mytable", "myservice1")); + new ApplicationSpec().addService("mytable", "myservice1")); assertVerifyOk(new RoutingSpec().addTable(new RoutingTableSpec("mytable") .addHop(new HopSpec("hop1", "route:route2")) .addHop(new HopSpec("hop2", "myservice1")) .addRoute(new RouteSpec("route1").addHop("hop1")) .addRoute(new RouteSpec("route2").addHop("hop2"))), - new ApplicationSpec().addService("mytable", "myservice1")); + new ApplicationSpec().addService("mytable", "myservice1")); assertVerifyOk(new RoutingSpec().addTable(new RoutingTableSpec("mytable") .addHop(new HopSpec("myhop1", "foo/[bar]/baz").addRecipient("foo/0/baz").addRecipient("foo/1/baz"))), - new ApplicationSpec() - .addService("mytable", "foo/0/baz") - .addService("mytable", "foo/1/baz")); + new ApplicationSpec() + .addService("mytable", "foo/0/baz") + .addService("mytable", "foo/1/baz")); } @Test - public void testVerifyToggle() { + void testVerifyToggle() { assertVerifyOk(new RoutingSpec(false) - .addTable(new RoutingTableSpec("mytable")) - .addTable(new RoutingTableSpec("mytable")), - new ApplicationSpec()); + .addTable(new RoutingTableSpec("mytable")) + .addTable(new RoutingTableSpec("mytable")), + new ApplicationSpec()); assertVerifyOk(new RoutingSpec().addTable(new RoutingTableSpec("mytable", false) .addHop(new HopSpec("foo", "bar")) .addHop(new HopSpec("foo", "baz"))), - new ApplicationSpec()); + new ApplicationSpec()); assertVerifyOk(new RoutingSpec().addTable(new RoutingTableSpec("mytable") .addHop(new HopSpec("foo", "", false))), - new ApplicationSpec()); + new ApplicationSpec()); assertVerifyOk(new RoutingSpec().addTable(new RoutingTableSpec("mytable") .addRoute(new RouteSpec("foo", false))), - new ApplicationSpec()); + new ApplicationSpec()); } @Test - public void testVerifyFail() { + void testVerifyFail() { // Duplicate table. assertVerifyFail(new RoutingSpec() - .addTable(new RoutingTableSpec("mytable")) - .addTable(new RoutingTableSpec("mytable")), - new ApplicationSpec(), - Arrays.asList("Routing table 'mytable' is defined 2 times.")); + .addTable(new RoutingTableSpec("mytable")) + .addTable(new RoutingTableSpec("mytable")), + new ApplicationSpec(), + Arrays.asList("Routing table 'mytable' is defined 2 times.")); // Duplicate hop. assertVerifyFail(new RoutingSpec().addTable(new RoutingTableSpec("mytable") .addHop(new HopSpec("foo", "bar")) .addHop(new HopSpec("foo", "baz"))), - new ApplicationSpec() - .addService("mytable", "bar") - .addService("mytable", "baz"), - Arrays.asList("Hop 'foo' in routing table 'mytable' is defined 2 times.")); + new ApplicationSpec() + .addService("mytable", "bar") + .addService("mytable", "baz"), + Arrays.asList("Hop 'foo' in routing table 'mytable' is defined 2 times.")); // Duplicate route. assertVerifyFail(new RoutingSpec().addTable(new RoutingTableSpec("mytable") .addRoute(new RouteSpec("foo").addHop("bar")) .addRoute(new RouteSpec("foo").addHop("baz"))), - new ApplicationSpec() - .addService("mytable", "bar") - .addService("mytable", "baz"), - Arrays.asList("Route 'foo' in routing table 'mytable' is defined 2 times.")); + new ApplicationSpec() + .addService("mytable", "bar") + .addService("mytable", "baz"), + Arrays.asList("Route 'foo' in routing table 'mytable' is defined 2 times.")); // Empty hop. assertVerifyFail(new RoutingSpec().addTable(new RoutingTableSpec("mytable") .addHop(new HopSpec("foo", ""))), - new ApplicationSpec(), - Arrays.asList("For hop 'foo' in routing table 'mytable'; Failed to parse empty string.")); + new ApplicationSpec(), + Arrays.asList("For hop 'foo' in routing table 'mytable'; Failed to parse empty string.")); // Empty route. assertVerifyFail(new RoutingSpec().addTable(new RoutingTableSpec("mytable") .addRoute(new RouteSpec("foo"))), - new ApplicationSpec(), - Arrays.asList("Route 'foo' in routing table 'mytable' has no hops.")); + new ApplicationSpec(), + Arrays.asList("Route 'foo' in routing table 'mytable' has no hops.")); // Hop error. assertVerifyFail(new RoutingSpec().addTable(new RoutingTableSpec("mytable") .addHop(new HopSpec("foo", "bar/baz cox"))), - new ApplicationSpec(), - Arrays.asList("For hop 'foo' in routing table 'mytable'; Failed to completely parse 'bar/baz cox'.")); + new ApplicationSpec(), + Arrays.asList("For hop 'foo' in routing table 'mytable'; Failed to completely parse 'bar/baz cox'.")); // Hop error in recipient. assertVerifyFail(new RoutingSpec().addTable(new RoutingTableSpec("mytable") .addHop(new HopSpec("foo", "[bar]").addRecipient("bar/baz cox"))), - new ApplicationSpec(), - Arrays.asList("For recipient 'bar/baz cox' in hop 'foo' in routing table 'mytable'; Failed to completely parse 'bar/baz cox'.")); + new ApplicationSpec(), + Arrays.asList("For recipient 'bar/baz cox' in hop 'foo' in routing table 'mytable'; Failed to completely parse 'bar/baz cox'.")); // Hop error in route. assertVerifyFail(new RoutingSpec().addTable(new RoutingTableSpec("mytable") .addRoute(new RouteSpec("foo").addHop("bar/baz cox"))), - new ApplicationSpec(), - Arrays.asList("For hop 1 in route 'foo' in routing table 'mytable'; Failed to completely parse 'bar/baz cox'.")); + new ApplicationSpec(), + Arrays.asList("For hop 1 in route 'foo' in routing table 'mytable'; Failed to completely parse 'bar/baz cox'.")); // Hop not found. assertVerifyFail(new RoutingSpec().addTable(new RoutingTableSpec("mytable") .addRoute(new RouteSpec("foo").addHop("bar"))), - new ApplicationSpec(), - Arrays.asList("Hop 1 in route 'foo' in routing table 'mytable' references 'bar' which is neither a service, a route nor another hop.")); + new ApplicationSpec(), + Arrays.asList("Hop 1 in route 'foo' in routing table 'mytable' references 'bar' which is neither a service, a route nor another hop.")); // Mismatched recipient. assertVerifyFail(new RoutingSpec().addTable(new RoutingTableSpec("mytable") .addHop(new HopSpec("foo", "bar/[baz]/cox").addRecipient("cox/0/bar"))), - new ApplicationSpec(), - Arrays.asList("Selector 'bar/[baz]/cox' does not match recipient 'cox/0/bar' in hop 'foo' in routing table 'mytable'.")); + new ApplicationSpec(), + Arrays.asList("Selector 'bar/[baz]/cox' does not match recipient 'cox/0/bar' in hop 'foo' in routing table 'mytable'.")); // Route not found. assertVerifyFail(new RoutingSpec().addTable(new RoutingTableSpec("mytable") .addHop(new HopSpec("foo", "route:bar"))), - new ApplicationSpec(), - Arrays.asList("Hop 'foo' in routing table 'mytable' references route 'bar' which does not exist.")); + new ApplicationSpec(), + Arrays.asList("Hop 'foo' in routing table 'mytable' references route 'bar' which does not exist.")); // Route not found in route. assertVerifyFail(new RoutingSpec().addTable(new RoutingTableSpec("mytable") .addRoute(new RouteSpec("foo").addHop("route:bar"))), - new ApplicationSpec(), - Arrays.asList("Hop 1 in route 'foo' in routing table 'mytable' references route 'bar' which does not exist.")); + new ApplicationSpec(), + Arrays.asList("Hop 1 in route 'foo' in routing table 'mytable' references route 'bar' which does not exist.")); // Service not found. assertVerifyFail(new RoutingSpec().addTable(new RoutingTableSpec("mytable") .addHop(new HopSpec("foo", "bar/baz"))), - new ApplicationSpec(), - Arrays.asList("Hop 'foo' in routing table 'mytable' references 'bar/baz' which is neither a service, a route nor another hop.")); + new ApplicationSpec(), + Arrays.asList("Hop 'foo' in routing table 'mytable' references 'bar/baz' which is neither a service, a route nor another hop.")); // Unexpected recipient. assertVerifyFail(new RoutingSpec().addTable(new RoutingTableSpec("mytable") .addHop(new HopSpec("foo", "bar").addRecipient("baz"))), - new ApplicationSpec() - .addService("mytable", "bar") - .addService("mytable", "baz"), - Arrays.asList("Hop 'foo' in routing table 'mytable' has recipients but no policy directive.")); + new ApplicationSpec() + .addService("mytable", "bar") + .addService("mytable", "baz"), + Arrays.asList("Hop 'foo' in routing table 'mytable' has recipients but no policy directive.")); // Multiple errors. assertVerifyFail(new RoutingSpec() - .addTable(new RoutingTableSpec("mytable")) - .addTable(new RoutingTableSpec("mytable") - .addHop(new HopSpec("hop1", "bar")) - .addHop(new HopSpec("hop1", "baz")) - .addHop(new HopSpec("hop2", "")) - .addHop(new HopSpec("hop3", "bar/baz cox")) - .addHop(new HopSpec("hop4", "[bar]").addRecipient("bar/baz cox")) - .addHop(new HopSpec("hop5", "bar/[baz]/cox").addRecipient("cox/0/bar")) - .addHop(new HopSpec("hop6", "route:route69")) - .addHop(new HopSpec("hop7", "bar/baz")) - .addHop(new HopSpec("hop8", "bar").addRecipient("baz")) - .addRoute(new RouteSpec("route1").addHop("bar")) - .addRoute(new RouteSpec("route1").addHop("baz")) - .addRoute(new RouteSpec("route2").addHop("")) - .addRoute(new RouteSpec("route3").addHop("bar/baz cox")) - .addRoute(new RouteSpec("route4").addHop("hop69")) - .addRoute(new RouteSpec("route5").addHop("route:route69"))), - new ApplicationSpec() - .addService("mytable", "bar") - .addService("mytable", "baz"), - Arrays.asList("Routing table 'mytable' is defined 2 times.", - "For hop 'hop2' in routing table 'mytable'; Failed to parse empty string.", - "For hop 'hop3' in routing table 'mytable'; Failed to completely parse 'bar/baz cox'.", - "For hop 1 in route 'route2' in routing table 'mytable'; Failed to parse empty string.", - "For hop 1 in route 'route3' in routing table 'mytable'; Failed to completely parse 'bar/baz cox'.", - "For recipient 'bar/baz cox' in hop 'hop4' in routing table 'mytable'; Failed to completely parse 'bar/baz cox'.", - "Hop 'hop1' in routing table 'mytable' is defined 2 times.", - "Hop 'hop6' in routing table 'mytable' references route 'route69' which does not exist.", - "Hop 'hop7' in routing table 'mytable' references 'bar/baz' which is neither a service, a route nor another hop.", - "Hop 'hop8' in routing table 'mytable' has recipients but no policy directive.", - "Hop 1 in route 'route4' in routing table 'mytable' references 'hop69' which is neither a service, a route nor another hop.", - "Hop 1 in route 'route5' in routing table 'mytable' references route 'route69' which does not exist.", - "Route 'route1' in routing table 'mytable' is defined 2 times.", - "Selector 'bar/[baz]/cox' does not match recipient 'cox/0/bar' in hop 'hop5' in routing table 'mytable'.")); + .addTable(new RoutingTableSpec("mytable")) + .addTable(new RoutingTableSpec("mytable") + .addHop(new HopSpec("hop1", "bar")) + .addHop(new HopSpec("hop1", "baz")) + .addHop(new HopSpec("hop2", "")) + .addHop(new HopSpec("hop3", "bar/baz cox")) + .addHop(new HopSpec("hop4", "[bar]").addRecipient("bar/baz cox")) + .addHop(new HopSpec("hop5", "bar/[baz]/cox").addRecipient("cox/0/bar")) + .addHop(new HopSpec("hop6", "route:route69")) + .addHop(new HopSpec("hop7", "bar/baz")) + .addHop(new HopSpec("hop8", "bar").addRecipient("baz")) + .addRoute(new RouteSpec("route1").addHop("bar")) + .addRoute(new RouteSpec("route1").addHop("baz")) + .addRoute(new RouteSpec("route2").addHop("")) + .addRoute(new RouteSpec("route3").addHop("bar/baz cox")) + .addRoute(new RouteSpec("route4").addHop("hop69")) + .addRoute(new RouteSpec("route5").addHop("route:route69"))), + new ApplicationSpec() + .addService("mytable", "bar") + .addService("mytable", "baz"), + Arrays.asList("Routing table 'mytable' is defined 2 times.", + "For hop 'hop2' in routing table 'mytable'; Failed to parse empty string.", + "For hop 'hop3' in routing table 'mytable'; Failed to completely parse 'bar/baz cox'.", + "For hop 1 in route 'route2' in routing table 'mytable'; Failed to parse empty string.", + "For hop 1 in route 'route3' in routing table 'mytable'; Failed to completely parse 'bar/baz cox'.", + "For recipient 'bar/baz cox' in hop 'hop4' in routing table 'mytable'; Failed to completely parse 'bar/baz cox'.", + "Hop 'hop1' in routing table 'mytable' is defined 2 times.", + "Hop 'hop6' in routing table 'mytable' references route 'route69' which does not exist.", + "Hop 'hop7' in routing table 'mytable' references 'bar/baz' which is neither a service, a route nor another hop.", + "Hop 'hop8' in routing table 'mytable' has recipients but no policy directive.", + "Hop 1 in route 'route4' in routing table 'mytable' references 'hop69' which is neither a service, a route nor another hop.", + "Hop 1 in route 'route5' in routing table 'mytable' references route 'route69' which does not exist.", + "Route 'route1' in routing table 'mytable' is defined 2 times.", + "Selector 'bar/[baz]/cox' does not match recipient 'cox/0/bar' in hop 'hop5' in routing table 'mytable'.")); } private static void assertVerifyOk(RoutingSpec routing, ApplicationSpec app) { @@ -297,7 +295,7 @@ public class RoutingSpecTestCase { ConfigStore store = new ConfigStore(); ConfigAgent subscriber = new ConfigAgent("raw:" + routing.toString(), store); subscriber.subscribe(); - assertTrue(store.routing.equals(routing)); + assertEquals(store.routing, routing); } private static void assertApplicationSpec(List<String> services, List<String> patterns) { diff --git a/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingTestCase.java index 2640fbc8db3..db5dce04af0 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/routing/RoutingTestCase.java @@ -23,11 +23,11 @@ import com.yahoo.messagebus.routing.test.CustomPolicyFactory; import com.yahoo.messagebus.test.Receptor; import com.yahoo.messagebus.test.SimpleMessage; import com.yahoo.messagebus.test.SimpleProtocol; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.net.UnknownHostException; import java.util.ArrayList; @@ -36,11 +36,7 @@ import java.util.List; import java.util.logging.Logger; import java.util.logging.Level; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * @author havardpe @@ -60,7 +56,7 @@ public class RoutingTestCase { String sessName = "session"; String dstSessName = "dst/session"; - @BeforeClass + @BeforeAll public static void commonSetup() throws ListenFailedException { slobrok = new Slobrok(); dstServer = new TestServer("dst", null, slobrok, new SimpleProtocol()); @@ -70,7 +66,7 @@ public class RoutingTestCase { slobrok); } - @AfterClass + @AfterAll public static void commonTeardown() { dstServer.destroy(); srcServer.destroy(); @@ -80,7 +76,7 @@ public class RoutingTestCase { slobrok = null; } - @Before + @BeforeEach public void setUp() throws ListenFailedException, UnknownHostException { // reset some params: retryPolicy.setEnabled(true); @@ -99,7 +95,7 @@ public class RoutingTestCase { assertTrue(srcServer.waitSlobrok(dstSessName, 1)); } - @After + @AfterEach public void tearDown() { dstSession.destroy(); srcSession.destroy(); @@ -108,10 +104,10 @@ public class RoutingTestCase { } @Test - public void requireThatNullRouteIsCaught() { + void requireThatNullRouteIsCaught() { log.log(Level.INFO, "Starting: requireThatNullRouteIsCaught"); assertTrue(srcSession.send(createMessage("msg")).isAccepted()); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); System.out.println(reply.getTrace()); assertEquals(1, reply.getNumErrors()); @@ -120,10 +116,10 @@ public class RoutingTestCase { } @Test - public void requireThatEmptyRouteIsCaught() { + void requireThatEmptyRouteIsCaught() { log.log(Level.INFO, "Starting: requireThatEmptyRouteIsCaught"); assertTrue(srcSession.send(createMessage("msg"), new Route()).isAccepted()); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); System.out.println(reply.getTrace()); assertEquals(1, reply.getNumErrors()); @@ -132,15 +128,15 @@ public class RoutingTestCase { } @Test - public void requireThatHopNameIsExpanded() { + void requireThatHopNameIsExpanded() { log.log(Level.INFO, "Starting: requireThatHopNameIsExpanded"); srcServer.setupRouting(new RoutingTableSpec(SimpleProtocol.NAME) - .addHop(new HopSpec("dst", dstSessName))); + .addHop(new HopSpec("dst", dstSessName))); assertTrue(srcSession.send(createMessage("msg"), Route.parse("dst")).isAccepted()); - Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); + Message msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60); assertNotNull(msg); dstSession.acknowledge(msg); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); System.out.println(reply.getTrace()); assertFalse(reply.hasErrors()); @@ -148,16 +144,16 @@ public class RoutingTestCase { } @Test - public void requireThatRouteDirectiveWorks() { + void requireThatRouteDirectiveWorks() { log.log(Level.INFO, "Starting: requireThatRouteDirectiveWorks"); srcServer.setupRouting(new RoutingTableSpec(SimpleProtocol.NAME) - .addRoute(new RouteSpec("dst").addHop(dstSessName)) - .addHop(new HopSpec("dir", "route:dst"))); + .addRoute(new RouteSpec("dst").addHop(dstSessName)) + .addHop(new HopSpec("dir", "route:dst"))); assertTrue(srcSession.send(createMessage("msg"), Route.parse("dir")).isAccepted()); - Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); + Message msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60); assertNotNull(msg); dstSession.acknowledge(msg); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); System.out.println(reply.getTrace()); assertFalse(reply.hasErrors()); @@ -165,15 +161,15 @@ public class RoutingTestCase { } @Test - public void requireThatRouteNameIsExpanded() { + void requireThatRouteNameIsExpanded() { log.log(Level.INFO, "Starting: requireThatRouteNameIsExpanded"); srcServer.setupRouting(new RoutingTableSpec(SimpleProtocol.NAME) - .addRoute(new RouteSpec("dst").addHop(dstSessName))); + .addRoute(new RouteSpec("dst").addHop(dstSessName))); assertTrue(srcSession.send(createMessage("msg"), Route.parse("dst")).isAccepted()); - Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); + Message msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60); assertNotNull(msg); dstSession.acknowledge(msg); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); System.out.println(reply.getTrace()); assertFalse(reply.hasErrors()); @@ -181,13 +177,13 @@ public class RoutingTestCase { } @Test - public void requireThatHopResolutionOverflowIsCaught() { + void requireThatHopResolutionOverflowIsCaught() { log.log(Level.INFO, "Starting: requireThatHopResolutionOverflowIsCaught"); srcServer.setupRouting(new RoutingTableSpec(SimpleProtocol.NAME) - .addHop(new HopSpec("foo", "bar")) - .addHop(new HopSpec("bar", "foo"))); + .addHop(new HopSpec("foo", "bar")) + .addHop(new HopSpec("bar", "foo"))); assertTrue(srcSession.send(createMessage("msg"), Route.parse("foo")).isAccepted()); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); System.out.println(reply.getTrace()); assertEquals(1, reply.getNumErrors()); @@ -196,12 +192,12 @@ public class RoutingTestCase { } @Test - public void requireThatRouteResolutionOverflowIsCaught() { + void requireThatRouteResolutionOverflowIsCaught() { log.log(Level.INFO, "Starting: requireThatRouteResolutionOverflowIsCaught"); srcServer.setupRouting(new RoutingTableSpec(SimpleProtocol.NAME) - .addRoute(new RouteSpec("foo").addHop("route:foo"))); + .addRoute(new RouteSpec("foo").addHop("route:foo"))); assertTrue(srcSession.send(createMessage("msg"), "foo").isAccepted()); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); System.out.println(reply.getTrace()); assertEquals(1, reply.getNumErrors()); @@ -210,18 +206,18 @@ public class RoutingTestCase { } @Test - public void requireThatRouteExpansionOnlyReplacesFirstHop() { + void requireThatRouteExpansionOnlyReplacesFirstHop() { log.log(Level.INFO, "Starting: requireThatRouteExpansionOnlyReplacesFirstHop"); srcServer.setupRouting(new RoutingTableSpec(SimpleProtocol.NAME) - .addRoute(new RouteSpec("foo").addHop(dstSessName).addHop("bar"))); + .addRoute(new RouteSpec("foo").addHop(dstSessName).addHop("bar"))); assertTrue(srcSession.send(createMessage("msg"), Route.parse("route:foo baz")).isAccepted()); - Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); + Message msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60); assertNotNull(msg); assertEquals(2, msg.getRoute().getNumHops()); assertEquals("bar", msg.getRoute().getHop(0).toString()); assertEquals("baz", msg.getRoute().getHop(1).toString()); dstSession.acknowledge(msg); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); System.out.println(reply.getTrace()); assertFalse(reply.hasErrors()); @@ -229,12 +225,12 @@ public class RoutingTestCase { } @Test - public void requireThatErrorDirectiveWorks() { + void requireThatErrorDirectiveWorks() { log.log(Level.INFO, "Starting: requireThatErrorDirectiveWorks"); Route route = Route.parse("foo/bar/baz"); route.getHop(0).setDirective(1, new ErrorDirective("err")); assertTrue(srcSession.send(createMessage("msg"), route).isAccepted()); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); System.out.println(reply.getTrace()); assertEquals(1, reply.getNumErrors()); @@ -244,7 +240,7 @@ public class RoutingTestCase { } @Test - public void requireThatIllegalSelectIsCaught() { + void requireThatIllegalSelectIsCaught() { log.log(Level.INFO, "Starting: requireThatIllegalSelectIsCaught"); SimpleProtocol protocol = new SimpleProtocol(); protocol.addPolicyFactory("Custom", new CustomPolicyFactory()); @@ -252,7 +248,7 @@ public class RoutingTestCase { Route route = Route.parse("[Custom: ]"); assertNotNull(route); assertTrue(srcSession.send(createMessage("msg"), route).isAccepted()); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); System.out.println(reply.getTrace()); assertEquals(1, reply.getNumErrors()); @@ -261,13 +257,13 @@ public class RoutingTestCase { } @Test - public void requireThatEmptySelectIsCaught() { + void requireThatEmptySelectIsCaught() { log.log(Level.INFO, "Starting: requireThatEmptySelectIsCaught"); SimpleProtocol protocol = new SimpleProtocol(); protocol.addPolicyFactory("Custom", new CustomPolicyFactory()); srcServer.mb.putProtocol(protocol); assertTrue(srcSession.send(createMessage("msg"), Route.parse("[Custom]")).isAccepted()); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); System.out.println(reply.getTrace()); assertEquals(1, reply.getNumErrors()); @@ -276,16 +272,16 @@ public class RoutingTestCase { } @Test - public void requireThatPolicySelectWorks() { + void requireThatPolicySelectWorks() { log.log(Level.INFO, "Starting: requireThatPolicySelectWorks"); SimpleProtocol protocol = new SimpleProtocol(); protocol.addPolicyFactory("Custom", new CustomPolicyFactory()); srcServer.mb.putProtocol(protocol); - assertTrue(srcSession.send(createMessage("msg"), Route.parse("[Custom:"+dstSessName+"]")).isAccepted()); - Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); + assertTrue(srcSession.send(createMessage("msg"), Route.parse("[Custom:" + dstSessName + "]")).isAccepted()); + Message msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60); assertNotNull(msg); dstSession.acknowledge(msg); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); System.out.println(reply.getTrace()); assertFalse(reply.hasErrors()); @@ -293,110 +289,110 @@ public class RoutingTestCase { } @Test - public void requireThatTransientErrorsAreRetried() { + void requireThatTransientErrorsAreRetried() { log.log(Level.INFO, "Starting: requireThatTransientErrorsAreRetried"); assertTrue(srcSession.send(createMessage("msg"), Route.parse(dstSessName)).isAccepted()); - Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); + Message msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60); assertNotNull(msg); Reply reply = new EmptyReply(); reply.swapState(msg); reply.addError(new Error(ErrorCode.APP_TRANSIENT_ERROR, "err1")); dstSession.reply(reply); - assertNotNull(msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60)); + assertNotNull(msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60)); reply = new EmptyReply(); reply.swapState(msg); reply.addError(new Error(ErrorCode.APP_TRANSIENT_ERROR, "err2")); dstSession.reply(reply); - assertNotNull(msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60)); + assertNotNull(msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60)); dstSession.acknowledge(msg); - assertNotNull(reply = ((Receptor)srcSession.getReplyHandler()).getReply(60)); + assertNotNull(reply = ((Receptor) srcSession.getReplyHandler()).getReply(60)); System.out.println(reply.getTrace()); assertFalse(reply.hasErrors()); assertTrace(Arrays.asList("[APP_TRANSIENT_ERROR @ localhost]: err1", - "-[APP_TRANSIENT_ERROR @ localhost]: err1", - "[APP_TRANSIENT_ERROR @ localhost]: err2", - "-[APP_TRANSIENT_ERROR @ localhost]: err2"), - reply.getTrace()); + "-[APP_TRANSIENT_ERROR @ localhost]: err1", + "[APP_TRANSIENT_ERROR @ localhost]: err2", + "-[APP_TRANSIENT_ERROR @ localhost]: err2"), + reply.getTrace()); log.log(Level.INFO, "Finished: requireThatTransientErrorsAreRetried"); } @Test - public void requireThatTransientErrorsAreRetriedWithPolicy() { + void requireThatTransientErrorsAreRetriedWithPolicy() { log.log(Level.INFO, "Starting: requireThatTransientErrorsAreRetriedWithPolicy"); SimpleProtocol protocol = new SimpleProtocol(); protocol.addPolicyFactory("Custom", new CustomPolicyFactory()); srcServer.mb.putProtocol(protocol); - assertTrue(srcSession.send(createMessage("msg"), Route.parse("[Custom:"+dstSessName+"]")).isAccepted()); - Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); + assertTrue(srcSession.send(createMessage("msg"), Route.parse("[Custom:" + dstSessName + "]")).isAccepted()); + Message msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60); assertNotNull(msg); Reply reply = new EmptyReply(); reply.swapState(msg); reply.addError(new Error(ErrorCode.APP_TRANSIENT_ERROR, "err1")); dstSession.reply(reply); - assertNotNull(msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60)); + assertNotNull(msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60)); reply = new EmptyReply(); reply.swapState(msg); reply.addError(new Error(ErrorCode.APP_TRANSIENT_ERROR, "err2")); dstSession.reply(reply); - assertNotNull(msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60)); + assertNotNull(msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60)); dstSession.acknowledge(msg); - assertNotNull(reply = ((Receptor)srcSession.getReplyHandler()).getReply(60)); + assertNotNull(reply = ((Receptor) srcSession.getReplyHandler()).getReply(60)); System.out.println(reply.getTrace()); assertFalse(reply.hasErrors()); assertTrace(Arrays.asList("Source session accepted a 3 byte message. 1 message(s) now pending.", - "Running routing policy 'Custom'.", - "Selecting ["+dstSessName+"].", - "Component '"+dstSessName+"' selected by policy 'Custom'.", - "Resolving '"+dstSessName+"'.", - "Sending message (version ${VERSION}) from client to '"+dstSessName+"'", - "Message (type 1) received at 'dst' for session '"+sessName+"'.", - "[APP_TRANSIENT_ERROR @ localhost]: err1", - "Sending reply (version ${VERSION}) from 'dst'.", - "Reply (type 0) received at client.", - "Routing policy 'Custom' merging replies.", - "Merged ["+dstSessName+"].", - "Message scheduled for retry 1 in 0.0 seconds.", - "Resender resending message.", - "Running routing policy 'Custom'.", - "Selecting ["+dstSessName+"].", - "Component '"+dstSessName+"' selected by policy 'Custom'.", - "Resolving '"+dstSessName+"'.", - "Sending message (version ${VERSION}) from client to '"+dstSessName+"'", - "Message (type 1) received at 'dst' for session '"+sessName+"'.", - "[APP_TRANSIENT_ERROR @ localhost]: err2", - "Sending reply (version ${VERSION}) from 'dst'.", - "Reply (type 0) received at client.", - "Routing policy 'Custom' merging replies.", - "Merged ["+dstSessName+"].", - "Message scheduled for retry 2 in 0.0 seconds.", - "Resender resending message.", - "Running routing policy 'Custom'.", - "Selecting ["+dstSessName+"].", - "Component '"+dstSessName+"' selected by policy 'Custom'.", - "Resolving '"+dstSessName+"'.", - "Sending message (version ${VERSION}) from client to '"+dstSessName+"'", - "Message (type 1) received at 'dst' for session '"+sessName+"'.", - "Sending reply (version ${VERSION}) from 'dst'.", - "Reply (type 0) received at client.", - "Routing policy 'Custom' merging replies.", - "Merged ["+dstSessName+"].", - "Source session received reply. 0 message(s) now pending."), - reply.getTrace()); + "Running routing policy 'Custom'.", + "Selecting [" + dstSessName + "].", + "Component '" + dstSessName + "' selected by policy 'Custom'.", + "Resolving '" + dstSessName + "'.", + "Sending message (version ${VERSION}) from client to '" + dstSessName + "'", + "Message (type 1) received at 'dst' for session '" + sessName + "'.", + "[APP_TRANSIENT_ERROR @ localhost]: err1", + "Sending reply (version ${VERSION}) from 'dst'.", + "Reply (type 0) received at client.", + "Routing policy 'Custom' merging replies.", + "Merged [" + dstSessName + "].", + "Message scheduled for retry 1 in 0.0 seconds.", + "Resender resending message.", + "Running routing policy 'Custom'.", + "Selecting [" + dstSessName + "].", + "Component '" + dstSessName + "' selected by policy 'Custom'.", + "Resolving '" + dstSessName + "'.", + "Sending message (version ${VERSION}) from client to '" + dstSessName + "'", + "Message (type 1) received at 'dst' for session '" + sessName + "'.", + "[APP_TRANSIENT_ERROR @ localhost]: err2", + "Sending reply (version ${VERSION}) from 'dst'.", + "Reply (type 0) received at client.", + "Routing policy 'Custom' merging replies.", + "Merged [" + dstSessName + "].", + "Message scheduled for retry 2 in 0.0 seconds.", + "Resender resending message.", + "Running routing policy 'Custom'.", + "Selecting [" + dstSessName + "].", + "Component '" + dstSessName + "' selected by policy 'Custom'.", + "Resolving '" + dstSessName + "'.", + "Sending message (version ${VERSION}) from client to '" + dstSessName + "'", + "Message (type 1) received at 'dst' for session '" + sessName + "'.", + "Sending reply (version ${VERSION}) from 'dst'.", + "Reply (type 0) received at client.", + "Routing policy 'Custom' merging replies.", + "Merged [" + dstSessName + "].", + "Source session received reply. 0 message(s) now pending."), + reply.getTrace()); log.log(Level.INFO, "Finished: requireThatTransientErrorsAreRetriedWithPolicy"); } @Test - public void requireThatRetryCanBeDisabled() { + void requireThatRetryCanBeDisabled() { log.log(Level.INFO, "Starting: requireThatRetryCanBeDisabled"); retryPolicy.setEnabled(false); assertTrue(srcSession.send(createMessage("msg"), Route.parse(dstSessName)).isAccepted()); - Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); + Message msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60); assertNotNull(msg); Reply reply = new EmptyReply(); reply.swapState(msg); reply.addError(new Error(ErrorCode.APP_TRANSIENT_ERROR, "err")); dstSession.reply(reply); - reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); System.out.println(reply.getTrace()); assertEquals(1, reply.getNumErrors()); @@ -405,120 +401,120 @@ public class RoutingTestCase { } @Test - public void requireThatRetryCallsSelect() { + void requireThatRetryCallsSelect() { log.log(Level.INFO, "Starting: requireThatRetryCallsSelect"); SimpleProtocol protocol = new SimpleProtocol(); protocol.addPolicyFactory("Custom", new CustomPolicyFactory()); srcServer.mb.putProtocol(protocol); - assertTrue(srcSession.send(createMessage("msg"), Route.parse("[Custom:"+dstSessName+"]")).isAccepted()); - Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); + assertTrue(srcSession.send(createMessage("msg"), Route.parse("[Custom:" + dstSessName + "]")).isAccepted()); + Message msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60); assertNotNull(msg); Reply reply = new EmptyReply(); reply.swapState(msg); reply.addError(new Error(ErrorCode.APP_TRANSIENT_ERROR, "err")); dstSession.reply(reply); - assertNotNull(msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60)); + assertNotNull(msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60)); dstSession.acknowledge(msg); - assertNotNull(reply = ((Receptor)srcSession.getReplyHandler()).getReply(60)); + assertNotNull(reply = ((Receptor) srcSession.getReplyHandler()).getReply(60)); System.out.println(reply.getTrace()); assertFalse(reply.hasErrors()); - assertTrace(Arrays.asList("Selecting ["+dstSessName+"].", - "[APP_TRANSIENT_ERROR @ localhost]", - "-[APP_TRANSIENT_ERROR @ localhost]", - "Merged ["+dstSessName+"].", - "Selecting ["+dstSessName+"].", - "Sending reply", - "Merged ["+dstSessName+"]."), - reply.getTrace()); + assertTrace(Arrays.asList("Selecting [" + dstSessName + "].", + "[APP_TRANSIENT_ERROR @ localhost]", + "-[APP_TRANSIENT_ERROR @ localhost]", + "Merged [" + dstSessName + "].", + "Selecting [" + dstSessName + "].", + "Sending reply", + "Merged [" + dstSessName + "]."), + reply.getTrace()); log.log(Level.INFO, "Finished: requireThatRetryCallsSelect"); } @Test - public void requireThatPolicyCanDisableReselectOnRetry() { + void requireThatPolicyCanDisableReselectOnRetry() { log.log(Level.INFO, "Starting: requireThatPolicyCanDisableReselectOnRetry"); SimpleProtocol protocol = new SimpleProtocol(); protocol.addPolicyFactory("Custom", new CustomPolicyFactory(false)); srcServer.mb.putProtocol(protocol); - assertTrue(srcSession.send(createMessage("msg"), Route.parse("[Custom:"+dstSessName+"]")).isAccepted()); - Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); + assertTrue(srcSession.send(createMessage("msg"), Route.parse("[Custom:" + dstSessName + "]")).isAccepted()); + Message msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60); assertNotNull(msg); Reply reply = new EmptyReply(); reply.swapState(msg); reply.addError(new Error(ErrorCode.APP_TRANSIENT_ERROR, "err")); dstSession.reply(reply); - assertNotNull(msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60)); + assertNotNull(msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60)); dstSession.acknowledge(msg); - assertNotNull(reply = ((Receptor)srcSession.getReplyHandler()).getReply(60)); + assertNotNull(reply = ((Receptor) srcSession.getReplyHandler()).getReply(60)); System.out.println(reply.getTrace()); assertFalse(reply.hasErrors()); - assertTrace(Arrays.asList("Selecting ["+dstSessName+"].", - "[APP_TRANSIENT_ERROR @ localhost]", - "-[APP_TRANSIENT_ERROR @ localhost]", - "Merged ["+dstSessName+"].", - "-Selecting ["+dstSessName+"].", - "Sending reply", - "Merged ["+dstSessName+"]."), - reply.getTrace()); + assertTrace(Arrays.asList("Selecting [" + dstSessName + "].", + "[APP_TRANSIENT_ERROR @ localhost]", + "-[APP_TRANSIENT_ERROR @ localhost]", + "Merged [" + dstSessName + "].", + "-Selecting [" + dstSessName + "].", + "Sending reply", + "Merged [" + dstSessName + "]."), + reply.getTrace()); log.log(Level.INFO, "Finished: requireThatPolicyCanDisableReselectOnRetry"); } @Test - public void requireThatPolicyCanConsumeErrors() { + void requireThatPolicyCanConsumeErrors() { log.log(Level.INFO, "Starting: requireThatPolicyCanConsumeErrors"); SimpleProtocol protocol = new SimpleProtocol(); protocol.addPolicyFactory("Custom", new CustomPolicyFactory(true, ErrorCode.NO_ADDRESS_FOR_SERVICE)); srcServer.mb.putProtocol(protocol); retryPolicy.setEnabled(false); - assertTrue(srcSession.send(createMessage("msg"), Route.parse("[Custom:"+dstSessName+",dst/unknown]")).isAccepted()); - Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); + assertTrue(srcSession.send(createMessage("msg"), Route.parse("[Custom:" + dstSessName + ",dst/unknown]")).isAccepted()); + Message msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60); assertNotNull(msg); dstSession.acknowledge(msg); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); System.out.println(reply.getTrace()); assertEquals(1, reply.getNumErrors()); assertEquals(ErrorCode.NO_ADDRESS_FOR_SERVICE, reply.getError(0).getCode()); - assertTrace(Arrays.asList("Selecting ["+dstSessName+", dst/unknown].", - "[NO_ADDRESS_FOR_SERVICE @ localhost]", - "Sending reply", - "Merged ["+dstSessName+", dst/unknown]."), - reply.getTrace()); + assertTrace(Arrays.asList("Selecting [" + dstSessName + ", dst/unknown].", + "[NO_ADDRESS_FOR_SERVICE @ localhost]", + "Sending reply", + "Merged [" + dstSessName + ", dst/unknown]."), + reply.getTrace()); log.log(Level.INFO, "Finished: requireThatPolicyCanConsumeErrors"); } @Test - public void requireThatPolicyOnlyConsumesDeclaredErrors() { + void requireThatPolicyOnlyConsumesDeclaredErrors() { log.log(Level.INFO, "Starting: requireThatPolicyOnlyConsumesDeclaredErrors"); SimpleProtocol protocol = new SimpleProtocol(); protocol.addPolicyFactory("Custom", new CustomPolicyFactory()); srcServer.mb.putProtocol(protocol); retryPolicy.setEnabled(false); assertTrue(srcSession.send(createMessage("msg"), Route.parse("[Custom:dst/unknown]")).isAccepted()); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); System.out.println(reply.getTrace()); assertEquals(1, reply.getNumErrors()); assertEquals(ErrorCode.NO_ADDRESS_FOR_SERVICE, reply.getError(0).getCode()); assertTrace(Arrays.asList("Selecting [dst/unknown].", - "[NO_ADDRESS_FOR_SERVICE @ localhost]", - "Merged [dst/unknown]."), - reply.getTrace()); + "[NO_ADDRESS_FOR_SERVICE @ localhost]", + "Merged [dst/unknown]."), + reply.getTrace()); log.log(Level.INFO, "Finished: requireThatPolicyOnlyConsumesDeclaredErrors"); } @Test - public void requireThatPolicyCanExpandToPolicy() { + void requireThatPolicyCanExpandToPolicy() { log.log(Level.INFO, "Starting: requireThatPolicyCanExpandToPolicy"); SimpleProtocol protocol = new SimpleProtocol(); protocol.addPolicyFactory("Custom", new CustomPolicyFactory(true, ErrorCode.NO_ADDRESS_FOR_SERVICE)); srcServer.mb.putProtocol(protocol); retryPolicy.setEnabled(false); assertTrue(srcSession.send(createMessage("msg"), - Route.parse("[Custom:[Custom:"+dstSessName+"],[Custom:dst/unknown]]")).isAccepted()); - Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); + Route.parse("[Custom:[Custom:" + dstSessName + "],[Custom:dst/unknown]]")).isAccepted()); + Message msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60); assertNotNull(msg); dstSession.acknowledge(msg); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); System.out.println(reply.getTrace()); assertEquals(1, reply.getNumErrors()); @@ -527,7 +523,7 @@ public class RoutingTestCase { } @Test - public void requireThatReplyCanBeRemovedFromChildNodes() { + void requireThatReplyCanBeRemovedFromChildNodes() { log.log(Level.INFO, "Starting: requireThatReplyCanBeRemovedFromChildNodes"); SimpleProtocol protocol = new SimpleProtocol(); protocol.addPolicyFactory("Custom", new SimpleProtocol.PolicyFactory() { @@ -535,32 +531,32 @@ public class RoutingTestCase { @Override public RoutingPolicy create(String param) { return new RemoveReplyPolicy(true, - Arrays.asList(ErrorCode.NO_ADDRESS_FOR_SERVICE), - CustomPolicyFactory.parseRoutes(param), - 0); + Arrays.asList(ErrorCode.NO_ADDRESS_FOR_SERVICE), + CustomPolicyFactory.parseRoutes(param), + 0); } }); srcServer.mb.putProtocol(protocol); retryPolicy.setEnabled(false); assertTrue(srcSession.send(createMessage("msg"), - Route.parse("[Custom:[Custom:"+dstSessName+"],[Custom:dst/unknown]]")).isAccepted()); - Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); + Route.parse("[Custom:[Custom:" + dstSessName + "],[Custom:dst/unknown]]")).isAccepted()); + Message msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60); assertNotNull(msg); dstSession.acknowledge(msg); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); System.out.println(reply.getTrace()); assertFalse(reply.hasErrors()); assertTrace(Arrays.asList("[NO_ADDRESS_FOR_SERVICE @ localhost]", - "-[NO_ADDRESS_FOR_SERVICE @ localhost]", - "Sending message", - "-Sending message"), - reply.getTrace()); + "-[NO_ADDRESS_FOR_SERVICE @ localhost]", + "Sending message", + "-Sending message"), + reply.getTrace()); log.log(Level.INFO, "Finished: requireThatReplyCanBeRemovedFromChildNodes"); } @Test - public void requireThatSetReplyWorks() { + void requireThatSetReplyWorks() { log.log(Level.INFO, "Starting: requireThatSetReplyWorks"); SimpleProtocol protocol = new SimpleProtocol(); protocol.addPolicyFactory("Select", new CustomPolicyFactory(true, ErrorCode.APP_FATAL_ERROR)); @@ -574,11 +570,11 @@ public class RoutingTestCase { srcServer.mb.putProtocol(protocol); retryPolicy.setEnabled(false); assertTrue( - srcSession.send(createMessage("msg"), Route.parse("[Select:[SetReply:foo],"+dstSessName+"]")).isAccepted()); - Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); + srcSession.send(createMessage("msg"), Route.parse("[Select:[SetReply:foo]," + dstSessName + "]")).isAccepted()); + Message msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60); assertNotNull(msg); dstSession.acknowledge(msg); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); System.out.println(reply.getTrace()); assertEquals(1, reply.getNumErrors()); @@ -588,7 +584,7 @@ public class RoutingTestCase { } @Test - public void requireThatReplyCanBeReusedOnRetry() { + void requireThatReplyCanBeReusedOnRetry() { log.log(Level.INFO, "Starting: requireThatReplyCanBeReusedOnRetry"); SimpleProtocol protocol = new SimpleProtocol(); protocol.addPolicyFactory("ReuseReply", new SimpleProtocol.PolicyFactory() { @@ -596,8 +592,8 @@ public class RoutingTestCase { @Override public RoutingPolicy create(String param) { return new ReuseReplyPolicy(false, - Arrays.asList(ErrorCode.APP_FATAL_ERROR), - CustomPolicyFactory.parseRoutes(param)); + Arrays.asList(ErrorCode.APP_FATAL_ERROR), + CustomPolicyFactory.parseRoutes(param)); } }); protocol.addPolicyFactory("SetReply", new SimpleProtocol.PolicyFactory() { @@ -605,29 +601,29 @@ public class RoutingTestCase { @Override public RoutingPolicy create(String param) { return new SetReplyPolicy(false, - Arrays.asList(ErrorCode.APP_FATAL_ERROR), - param); + Arrays.asList(ErrorCode.APP_FATAL_ERROR), + param); } }); srcServer.mb.putProtocol(protocol); assertTrue(srcSession.send(createMessage("msg"), - Route.parse("[ReuseReply:[SetReply:foo],"+dstSessName+"]")).isAccepted()); - Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); + Route.parse("[ReuseReply:[SetReply:foo]," + dstSessName + "]")).isAccepted()); + Message msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60); assertNotNull(msg); Reply reply = new EmptyReply(); reply.swapState(msg); reply.addError(new Error(ErrorCode.APP_TRANSIENT_ERROR, "dst")); dstSession.reply(reply); - assertNotNull(msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60)); + assertNotNull(msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60)); dstSession.acknowledge(msg); - assertNotNull(reply = ((Receptor)srcSession.getReplyHandler()).getReply(60)); + assertNotNull(reply = ((Receptor) srcSession.getReplyHandler()).getReply(60)); System.out.println(reply.getTrace()); assertFalse(reply.hasErrors()); log.log(Level.INFO, "Finished: requireThatReplyCanBeReusedOnRetry"); } @Test - public void requireThatReplyCanBeRemovedAndRetried() { + void requireThatReplyCanBeRemovedAndRetried() { log.log(Level.INFO, "Starting: requireThatReplyCanBeRemovedAndRetried"); SimpleProtocol protocol = new SimpleProtocol(); protocol.addPolicyFactory("RemoveReply", new SimpleProtocol.PolicyFactory() { @@ -635,9 +631,9 @@ public class RoutingTestCase { @Override public RoutingPolicy create(String param) { return new RemoveReplyPolicy(false, - Arrays.asList(ErrorCode.APP_TRANSIENT_ERROR), - CustomPolicyFactory.parseRoutes(param), - 0); + Arrays.asList(ErrorCode.APP_TRANSIENT_ERROR), + CustomPolicyFactory.parseRoutes(param), + 0); } }); protocol.addPolicyFactory("SetReply", new SimpleProtocol.PolicyFactory() { @@ -645,71 +641,71 @@ public class RoutingTestCase { @Override public RoutingPolicy create(String param) { return new SetReplyPolicy(false, - Arrays.asList(ErrorCode.APP_TRANSIENT_ERROR, ErrorCode.APP_FATAL_ERROR), - param); + Arrays.asList(ErrorCode.APP_TRANSIENT_ERROR, ErrorCode.APP_FATAL_ERROR), + param); } }); srcServer.mb.putProtocol(protocol); assertTrue(srcSession - .send(createMessage("msg"), Route.parse("[RemoveReply:[SetReply:foo],"+dstSessName+"]")).isAccepted()); - Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); + .send(createMessage("msg"), Route.parse("[RemoveReply:[SetReply:foo]," + dstSessName + "]")).isAccepted()); + Message msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60); assertNotNull(msg); dstSession.acknowledge(msg); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); System.out.println(reply.getTrace()); assertEquals(1, reply.getNumErrors()); assertEquals(ErrorCode.APP_FATAL_ERROR, reply.getError(0).getCode()); assertEquals("foo", reply.getError(0).getMessage()); assertTrace(Arrays.asList("Resolving '[SetReply:foo]'.", - "Resolving '"+dstSessName+"'.", - "Resender resending message.", - "Resolving '"+dstSessName+"'.", - "Resolving '[SetReply:foo]'."), - reply.getTrace()); + "Resolving '" + dstSessName + "'.", + "Resender resending message.", + "Resolving '" + dstSessName + "'.", + "Resolving '[SetReply:foo]'."), + reply.getTrace()); log.log(Level.INFO, "Finished: requireThatReplyCanBeRemovedAndRetried"); } @Test - public void requireThatIgnoreResultWorks() { + void requireThatIgnoreResultWorks() { log.log(Level.INFO, "Starting: requireThatIgnoreResultWorks"); - assertTrue(srcSession.send(createMessage("msg"), Route.parse("?"+dstSessName)).isAccepted()); - Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); + assertTrue(srcSession.send(createMessage("msg"), Route.parse("?" + dstSessName)).isAccepted()); + Message msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60); assertNotNull(msg); Reply reply = new EmptyReply(); reply.swapState(msg); reply.addError(new Error(ErrorCode.APP_FATAL_ERROR, "dst")); dstSession.reply(reply); - assertNotNull(reply = ((Receptor)srcSession.getReplyHandler()).getReply(60)); + assertNotNull(reply = ((Receptor) srcSession.getReplyHandler()).getReply(60)); System.out.println(reply.getTrace()); assertFalse(reply.hasErrors()); - assertTrace(Arrays.asList("Not waiting for a reply from '"+dstSessName+"'."), - reply.getTrace()); + assertTrace(Arrays.asList("Not waiting for a reply from '" + dstSessName + "'."), + reply.getTrace()); log.log(Level.INFO, "Finished: requireThatIgnoreResultWorks"); } @Test - public void requireThatIgnoreResultCanBeSetInHopBlueprint() { + void requireThatIgnoreResultCanBeSetInHopBlueprint() { log.log(Level.INFO, "Starting: requireThatIgnoreResultCanBeSetInHopBlueprint"); srcServer.setupRouting(new RoutingTableSpec(SimpleProtocol.NAME) - .addHop(new HopSpec("foo", dstSessName).setIgnoreResult(true))); + .addHop(new HopSpec("foo", dstSessName).setIgnoreResult(true))); assertTrue(srcSession.send(createMessage("msg"), Route.parse("foo")).isAccepted()); - Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); + Message msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60); assertNotNull(msg); Reply reply = new EmptyReply(); reply.swapState(msg); reply.addError(new Error(ErrorCode.APP_FATAL_ERROR, "dst")); dstSession.reply(reply); - assertNotNull(reply = ((Receptor)srcSession.getReplyHandler()).getReply(60)); + assertNotNull(reply = ((Receptor) srcSession.getReplyHandler()).getReply(60)); System.out.println(reply.getTrace()); assertFalse(reply.hasErrors()); - assertTrace(Arrays.asList("Not waiting for a reply from '"+dstSessName+"'."), - reply.getTrace()); + assertTrace(Arrays.asList("Not waiting for a reply from '" + dstSessName + "'."), + reply.getTrace()); log.log(Level.INFO, "Finished: requireThatIgnoreResultCanBeSetInHopBlueprint"); } @Test - public void requireThatIgnoreFlagPersistsThroughHopLookup() { + void requireThatIgnoreFlagPersistsThroughHopLookup() { log.log(Level.INFO, "Starting: requireThatIgnoreFlagPersistsThroughHopLookup"); setupRouting(new RoutingTableSpec(SimpleProtocol.NAME).addHop(new HopSpec("foo", "dst/unknown"))); assertSend("?foo"); @@ -718,7 +714,7 @@ public class RoutingTestCase { } @Test - public void requireThatIgnoreFlagPersistsThroughRouteLookup() { + void requireThatIgnoreFlagPersistsThroughRouteLookup() { log.log(Level.INFO, "Starting: requireThatIgnoreFlagPersistsThroughRouteLookup"); setupRouting(new RoutingTableSpec(SimpleProtocol.NAME).addRoute(new RouteSpec("foo").addHop("dst/unknown"))); assertSend("?foo"); @@ -727,7 +723,7 @@ public class RoutingTestCase { } @Test - public void requireThatIgnoreFlagPersistsThroughPolicySelect() { + void requireThatIgnoreFlagPersistsThroughPolicySelect() { log.log(Level.INFO, "Starting: requireThatIgnoreFlagPersistsThroughPolicySelect"); setupPolicy("Custom", MyPolicy.newSelectAndMerge("dst/unknown")); assertSend("?[Custom]"); @@ -736,10 +732,10 @@ public class RoutingTestCase { } @Test - public void requireThatIgnoreFlagIsSerializedWithMessage() { + void requireThatIgnoreFlagIsSerializedWithMessage() { log.log(Level.INFO, "Starting: requireThatIgnoreFlagIsSerializedWithMessage"); - assertSend(dstSessName+" foo ?bar"); - Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); + assertSend(dstSessName + " foo ?bar"); + Message msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60); assertNotNull(msg); Route route = msg.getRoute(); assertEquals(2, route.getNumHops()); @@ -755,7 +751,7 @@ public class RoutingTestCase { } @Test - public void requireThatIgnoreFlagDoesNotInterfere() { + void requireThatIgnoreFlagDoesNotInterfere() { log.log(Level.INFO, "Starting: requireThatIgnoreFlagDoesNotInterfere"); setupPolicy("Custom", MyPolicy.newSelectAndMerge(dstSessName)); assertSend("?[Custom]"); @@ -764,7 +760,7 @@ public class RoutingTestCase { } @Test - public void requireThatEmptySelectionCanBeIgnored() { + void requireThatEmptySelectionCanBeIgnored() { log.log(Level.INFO, "Starting: requireThatEmptySelectionCanBeIgnored"); setupPolicy("Custom", MyPolicy.newEmptySelection()); assertSend("?[Custom]"); @@ -773,7 +769,7 @@ public class RoutingTestCase { } @Test - public void requireThatSelectErrorCanBeIgnored() { + void requireThatSelectErrorCanBeIgnored() { log.log(Level.INFO, "Starting: requireThatSelectErrorCanBeIgnored"); setupPolicy("Custom", MyPolicy.newSelectError(ErrorCode.APP_FATAL_ERROR, "foo")); assertSend("?[Custom]"); @@ -782,7 +778,7 @@ public class RoutingTestCase { } @Test - public void requireThatSelectExceptionCanBeIgnored() { + void requireThatSelectExceptionCanBeIgnored() { log.log(Level.INFO, "Starting: requireThatSelectExceptionCanBeIgnored"); setupPolicy("Custom", MyPolicy.newSelectException(new RuntimeException())); assertSend("?[Custom]"); @@ -791,7 +787,7 @@ public class RoutingTestCase { } @Test - public void requireThatSelectAndThrowCanBeIgnored() { + void requireThatSelectAndThrowCanBeIgnored() { log.log(Level.INFO, "Starting: requireThatSelectAndThrowCanBeIgnored"); setupPolicy("Custom", MyPolicy.newSelectAndThrow(dstSessName, new RuntimeException())); assertSend("?[Custom]"); @@ -800,7 +796,7 @@ public class RoutingTestCase { } @Test - public void requireThatEmptyMergeCanBeIgnored() { + void requireThatEmptyMergeCanBeIgnored() { log.log(Level.INFO, "Starting: requireThatEmptyMergeCanBeIgnored"); setupPolicy("Custom", MyPolicy.newEmptyMerge(dstSessName)); assertSend("?[Custom]"); @@ -810,7 +806,7 @@ public class RoutingTestCase { } @Test - public void requireThatMergeErrorCanBeIgnored() { + void requireThatMergeErrorCanBeIgnored() { log.log(Level.INFO, "Starting: requireThatMergeErrorCanBeIgnored"); setupPolicy("Custom", MyPolicy.newMergeError(dstSessName, ErrorCode.APP_FATAL_ERROR, "foo")); assertSend("?[Custom]"); @@ -820,7 +816,7 @@ public class RoutingTestCase { } @Test - public void requireThatMergeExceptionCanBeIgnored() { + void requireThatMergeExceptionCanBeIgnored() { log.log(Level.INFO, "Starting: requireThatMergeExceptionCanBeIgnored"); setupPolicy("Custom", MyPolicy.newMergeException(dstSessName, new RuntimeException())); assertSend("?[Custom]"); @@ -830,7 +826,7 @@ public class RoutingTestCase { } @Test - public void requireThatMergeAndThrowCanBeIgnored() { + void requireThatMergeAndThrowCanBeIgnored() { log.log(Level.INFO, "Starting: requireThatMergeAndThrowCanBeIgnored"); setupPolicy("Custom", MyPolicy.newMergeAndThrow(dstSessName, new RuntimeException())); assertSend("?[Custom]"); @@ -840,7 +836,7 @@ public class RoutingTestCase { } @Test - public void requireThatAllocServiceAddressCanBeIgnored() { + void requireThatAllocServiceAddressCanBeIgnored() { log.log(Level.INFO, "Starting: requireThatAllocServiceAddressCanBeIgnored"); assertSend("?dst/unknown"); assertTrace("Ignoring errors in reply."); @@ -848,7 +844,7 @@ public class RoutingTestCase { } @Test - public void requireThatDepthLimitCanBeIgnored() { + void requireThatDepthLimitCanBeIgnored() { log.log(Level.INFO, "Starting: requireThatDepthLimitCanBeIgnored"); setupPolicy("Custom", MyPolicy.newSelectAndMerge("[Custom]")); assertSend("?[Custom]"); @@ -857,21 +853,21 @@ public class RoutingTestCase { } @Test - public void requireThatRouteCanBeEmptyInDestination() { + void requireThatRouteCanBeEmptyInDestination() { log.log(Level.INFO, "Starting: requireThatRouteCanBeEmptyInDestination"); assertTrue(srcSession.send(createMessage("msg"), Route.parse(dstSessName)).isAccepted()); - Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); + Message msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60); assertNotNull(msg); assertNull(msg.getRoute()); dstSession.acknowledge(msg); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); System.out.println(reply.getTrace()); log.log(Level.INFO, "Finished: requireThatRouteCanBeEmptyInDestination"); } @Test - public void requireThatOnlyActiveNodesAreAborted() { + void requireThatOnlyActiveNodesAreAborted() { log.log(Level.INFO, "Starting: requireThatOnlyActiveNodesAreAborted"); SimpleProtocol protocol = new SimpleProtocol(); protocol.addPolicyFactory("Custom", new CustomPolicyFactory(false)); @@ -880,16 +876,16 @@ public class RoutingTestCase { @Override public RoutingPolicy create(String param) { return new SetReplyPolicy(false, - Arrays.asList(ErrorCode.APP_TRANSIENT_ERROR, - ErrorCode.APP_TRANSIENT_ERROR, - ErrorCode.APP_FATAL_ERROR), - param); + Arrays.asList(ErrorCode.APP_TRANSIENT_ERROR, + ErrorCode.APP_TRANSIENT_ERROR, + ErrorCode.APP_FATAL_ERROR), + param); } }); srcServer.mb.putProtocol(protocol); assertTrue(srcSession.send(createMessage("msg"), - Route.parse("[Custom:[SetReply:foo],?bar,"+dstSessName+"]")).isAccepted()); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Route.parse("[Custom:[SetReply:foo],?bar," + dstSessName + "]")).isAccepted()); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); System.out.println(reply.getTrace()); assertEquals(2, reply.getNumErrors()); @@ -899,12 +895,12 @@ public class RoutingTestCase { } @Test - public void requireThatTimeoutWorks() { + void requireThatTimeoutWorks() { log.log(Level.INFO, "Starting: requireThatTimeoutWorks"); retryPolicy.setBaseDelay(0.01); srcSession.setTimeout(0.5); assertTrue(srcSession.send(createMessage("msg"), Route.parse("dst/unknown")).isAccepted()); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); System.out.println(reply.getTrace()); assertEquals(2, reply.getNumErrors()); @@ -914,10 +910,10 @@ public class RoutingTestCase { } @Test - public void requireThatUnknownPolicyIsCaught() { + void requireThatUnknownPolicyIsCaught() { log.log(Level.INFO, "Starting: requireThatUnknownPolicyIsCaught"); assertTrue(srcSession.send(createMessage("msg"), Route.parse("[Unknown]")).isAccepted()); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); System.out.println(reply.getTrace()); assertEquals(1, reply.getNumErrors()); @@ -950,13 +946,13 @@ public class RoutingTestCase { } @Test - public void requireThatSelectExceptionIsCaught() { + void requireThatSelectExceptionIsCaught() { log.log(Level.INFO, "Starting: requireThatSelectExceptionIsCaught"); SimpleProtocol protocol = new SimpleProtocol(); protocol.addPolicyFactory("Custom", exceptionOnSelectThrowingMockFactory()); srcServer.mb.putProtocol(protocol); assertTrue(srcSession.send(createMessage("msg"), Route.parse("[Custom]")).isAccepted()); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); System.out.println(reply.getTrace()); assertEquals(1, reply.getNumErrors()); @@ -966,12 +962,12 @@ public class RoutingTestCase { } @Test - public void selectExceptionIncludesStackTraceInMessage() { + void selectExceptionIncludesStackTraceInMessage() { SimpleProtocol protocol = new SimpleProtocol(); protocol.addPolicyFactory("Custom", exceptionOnSelectThrowingMockFactory()); srcServer.mb.putProtocol(protocol); assertTrue(srcSession.send(createMessage("msg"), Route.parse("[Custom]")).isAccepted()); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertEquals(ErrorCode.POLICY_ERROR, reply.getError(0).getCode()); // Attempting any sort of full matching of the stack trace is brittle, so // simplify by assuming any message which mentions the source file of the @@ -980,7 +976,7 @@ public class RoutingTestCase { } @Test - public void requireThatMergeExceptionIsCaught() { + void requireThatMergeExceptionIsCaught() { log.log(Level.INFO, "Starting: requireThatMergeExceptionIsCaught"); SimpleProtocol protocol = new SimpleProtocol(); protocol.addPolicyFactory("Custom", new SimpleProtocol.PolicyFactory() { @@ -1008,10 +1004,10 @@ public class RoutingTestCase { }); srcServer.mb.putProtocol(protocol); assertTrue(srcSession.send(createMessage("msg"), Route.parse("[Custom]")).isAccepted()); - Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); + Message msg = ((Receptor) dstSession.getMessageHandler()).getMessage(60); assertNotNull(msg); dstSession.acknowledge(msg); - Reply reply = ((Receptor)srcSession.getReplyHandler()).getReply(60); + Reply reply = ((Receptor) srcSession.getReplyHandler()).getReply(60); assertNotNull(reply); System.out.println(reply.getTrace()); assertEquals(1, reply.getNumErrors()); @@ -1066,11 +1062,11 @@ public class RoutingTestCase { String line = expected.get(i).replaceFirst("\\$\\{VERSION\\}", Vtag.currentVersion.toString()); if (line.charAt(0) == '-') { String str = line.substring(1); - assertTrue("Line " + i + " '" + str + "' not expected.", - actual.indexOf(str, pos + 1) < 0); + assertTrue(actual.indexOf(str, pos + 1) < 0, + "Line " + i + " '" + str + "' not expected."); } else { pos = actual.indexOf(line, pos + 1); - assertTrue("Line " + i + " '" + line + "' missing.", pos >= 0); + assertTrue(pos >= 0, "Line " + i + " '" + line + "' missing."); } } } diff --git a/messagebus/src/test/java/com/yahoo/messagebus/test/QueueAdapterTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/test/QueueAdapterTestCase.java index 3147587aa96..f23a4325d79 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/test/QueueAdapterTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/test/QueueAdapterTestCase.java @@ -4,11 +4,11 @@ package com.yahoo.messagebus.test; import com.yahoo.messagebus.Message; import com.yahoo.messagebus.Reply; import com.yahoo.text.Utf8String; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.concurrent.atomic.AtomicReference; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * @author Simon Thoresen Hult @@ -19,7 +19,7 @@ public class QueueAdapterTestCase { private static final int WAIT_FOREVER = 60; @Test - public void requireThatAccessorsWork() { + void requireThatAccessorsWork() { QueueAdapter queue = new QueueAdapter(); assertTrue(queue.isEmpty()); assertEquals(0, queue.size()); @@ -39,7 +39,7 @@ public class QueueAdapterTestCase { } @Test - public void requireThatSizeCanBeWaitedFor() { + void requireThatSizeCanBeWaitedFor() { final QueueAdapter queue = new QueueAdapter(); assertTrue(queue.waitSize(0, NO_WAIT)); assertFalse(queue.waitSize(1, NO_WAIT)); @@ -64,7 +64,7 @@ public class QueueAdapterTestCase { } @Test - public void requireThatWaitCanBeInterrupted() throws InterruptedException { + void requireThatWaitCanBeInterrupted() throws InterruptedException { final QueueAdapter queue = new QueueAdapter(); final AtomicReference<Boolean> result = new AtomicReference<>(); Thread thread = new Thread() { diff --git a/messagebus/src/test/java/com/yahoo/messagebus/test/ReceptorTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/test/ReceptorTestCase.java index 2e60f68eb43..59a93df17ed 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/test/ReceptorTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/test/ReceptorTestCase.java @@ -4,12 +4,12 @@ package com.yahoo.messagebus.test; import com.yahoo.messagebus.Message; import com.yahoo.messagebus.Reply; import com.yahoo.text.Utf8String; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * @author Simon Thoresen Hult @@ -17,7 +17,7 @@ import static org.junit.Assert.*; public class ReceptorTestCase { @Test - public void requireThatAccessorsWork() { + void requireThatAccessorsWork() { Receptor receptor = new Receptor(); assertNull(receptor.getMessage(0)); Message msg = new MyMessage(); @@ -30,7 +30,7 @@ public class ReceptorTestCase { } @Test - public void requireThatMessagesAndRepliesAreTrackedIndividually() { + void requireThatMessagesAndRepliesAreTrackedIndividually() { Receptor receptor = new Receptor(); receptor.handleMessage(new MyMessage()); receptor.handleReply(new MyReply()); @@ -44,7 +44,7 @@ public class ReceptorTestCase { } @Test - public void requireThatMessagesCanBeWaitedFor() { + void requireThatMessagesCanBeWaitedFor() { final Receptor receptor = new Receptor(); Thread thread = new Thread() { @@ -63,7 +63,7 @@ public class ReceptorTestCase { } @Test - public void requireThatMessageWaitCanBeInterrupted() throws InterruptedException { + void requireThatMessageWaitCanBeInterrupted() throws InterruptedException { final Receptor receptor = new Receptor(); final CountDownLatch latch = new CountDownLatch(1); Thread thread = new Thread() { @@ -80,7 +80,7 @@ public class ReceptorTestCase { } @Test - public void requireThatRepliesCanBeWaitedFor() { + void requireThatRepliesCanBeWaitedFor() { final Receptor receptor = new Receptor(); Thread thread = new Thread() { @@ -99,7 +99,7 @@ public class ReceptorTestCase { } @Test - public void requireThatReplyWaitCanBeInterrupted() throws InterruptedException { + void requireThatReplyWaitCanBeInterrupted() throws InterruptedException { final Receptor receptor = new Receptor(); final CountDownLatch latch = new CountDownLatch(1); Thread thread = new Thread() { diff --git a/messagebus/src/test/java/com/yahoo/messagebus/test/SimpleMessageTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/test/SimpleMessageTestCase.java index 217f5347f40..7e3d9e926b9 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/test/SimpleMessageTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/test/SimpleMessageTestCase.java @@ -1,11 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.messagebus.test; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Simon Thoresen Hult @@ -13,7 +11,7 @@ import static org.junit.Assert.assertTrue; public class SimpleMessageTestCase { @Test - public void requireThatAccessorsWork() { + void requireThatAccessorsWork() { SimpleMessage msg = new SimpleMessage("foo"); assertEquals(SimpleProtocol.MESSAGE, msg.getType()); assertEquals(SimpleProtocol.NAME, msg.getProtocol()); diff --git a/messagebus/src/test/java/com/yahoo/messagebus/test/SimpleProtocolTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/test/SimpleProtocolTestCase.java index 76d6a1ee778..a8406cd5d1f 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/test/SimpleProtocolTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/test/SimpleProtocolTestCase.java @@ -4,11 +4,9 @@ package com.yahoo.messagebus.test; import com.yahoo.component.Version; import com.yahoo.messagebus.EmptyReply; import com.yahoo.messagebus.Routable; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.*; /** * @author Simon Thoresen Hult @@ -19,45 +17,45 @@ public class SimpleProtocolTestCase { private static final SimpleProtocol PROTOCOL = new SimpleProtocol(); @Test - public void requireThatNameIsSet() { + void requireThatNameIsSet() { assertEquals(SimpleProtocol.NAME, PROTOCOL.getName()); } @Test - public void requireThatMessageCanBeEncodedAndDecoded() { + void requireThatMessageCanBeEncodedAndDecoded() { SimpleMessage msg = new SimpleMessage("foo"); byte[] buf = PROTOCOL.encode(Version.emptyVersion, msg); Routable routable = PROTOCOL.decode(Version.emptyVersion, buf); assertNotNull(routable); assertEquals(SimpleMessage.class, routable.getClass()); - msg = (SimpleMessage)routable; + msg = (SimpleMessage) routable; assertEquals("foo", msg.getValue()); } @Test - public void requireThatReplyCanBeDecoded() { + void requireThatReplyCanBeDecoded() { SimpleReply reply = new SimpleReply("foo"); byte[] buf = PROTOCOL.encode(Version.emptyVersion, reply); Routable routable = PROTOCOL.decode(Version.emptyVersion, buf); assertNotNull(routable); assertEquals(SimpleReply.class, routable.getClass()); - reply = (SimpleReply)routable; + reply = (SimpleReply) routable; assertEquals("foo", reply.getValue()); } @Test - public void requireThatUnknownRoutablesAreNotEncoded() { + void requireThatUnknownRoutablesAreNotEncoded() { assertNull(PROTOCOL.encode(VERSION, new EmptyReply())); } @Test - public void requireThatEmptyBufferIsNotDecoded() { + void requireThatEmptyBufferIsNotDecoded() { assertNull(PROTOCOL.decode(VERSION, new byte[0])); } @Test - public void requireThatUnknownBufferIsNotDecoded() { - assertNull(PROTOCOL.decode(VERSION, new byte[] { 'U' })); + void requireThatUnknownBufferIsNotDecoded() { + assertNull(PROTOCOL.decode(VERSION, new byte[]{'U'})); } } diff --git a/messagebus/src/test/java/com/yahoo/messagebus/test/SimpleReplyTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/test/SimpleReplyTestCase.java index 0d3f67bcb3c..bbb72a6b637 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/test/SimpleReplyTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/test/SimpleReplyTestCase.java @@ -1,9 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.messagebus.test; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Simon Thoresen Hult @@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals; public class SimpleReplyTestCase { @Test - public void requireThatAccessorsWork() { + void requireThatAccessorsWork() { SimpleReply reply = new SimpleReply("foo"); assertEquals(SimpleProtocol.REPLY, reply.getType()); assertEquals(SimpleProtocol.NAME, reply.getProtocol()); |