From d12f069567a99536c84598700ad4f00048936cde Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Fri, 27 Apr 2018 13:35:40 +0200 Subject: Remove usage of junit.framework --- .../java/com/yahoo/messagebus/ChokeTestCase.java | 5 +- .../yahoo/messagebus/RateThrottlingTestCase.java | 10 +++- .../com/yahoo/messagebus/RoutableTestCase.java | 23 +++++++-- .../com/yahoo/messagebus/SendProxyTestCase.java | 21 ++++++--- .../com/yahoo/messagebus/SequencerTestCase.java | 12 ++++- .../com/yahoo/messagebus/SimpleTripTestCase.java | 13 +++-- .../com/yahoo/messagebus/ThrottlerTestCase.java | 50 ++++++++++---------- .../java/com/yahoo/messagebus/TraceTestCase.java | 19 +++++++- .../com/yahoo/messagebus/TraceTripTestCase.java | 19 +++++--- .../network/rpc/BasicNetworkTestCase.java | 18 +++++-- .../network/rpc/LoadBalanceTestCase.java | 12 +++-- .../network/rpc/ServiceAddressTestCase.java | 21 ++++++--- .../network/rpc/ServicePoolTestCase.java | 11 +++-- .../messagebus/network/rpc/SlobrokTestCase.java | 20 ++++---- .../messagebus/network/rpc/TargetPoolTestCase.java | 18 +++++-- .../routing/AdvancedRoutingTestCase.java | 42 ++++++++++------- .../yahoo/messagebus/routing/ResenderTestCase.java | 55 ++++++++++++---------- 17 files changed, 242 insertions(+), 127 deletions(-) (limited to 'messagebus') diff --git a/messagebus/src/test/java/com/yahoo/messagebus/ChokeTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/ChokeTestCase.java index a4bb5694a31..585ce2913c0 100755 --- a/messagebus/src/test/java/com/yahoo/messagebus/ChokeTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/ChokeTestCase.java @@ -10,11 +10,8 @@ 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 com.yahoo.net.HostName; -import junit.framework.TestCase; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import java.net.UnknownHostException; @@ -36,7 +33,7 @@ public class ChokeTestCase { DestinationSession dstSession; @Before - public void setUp() throws ListenFailedException, UnknownHostException { + public void setUp() throws ListenFailedException { slobrok = new Slobrok(); dstServer = new TestServer(new MessageBusParams().addProtocol(new SimpleProtocol()), new RPCNetworkParams().setIdentity(new Identity("dst")).setSlobrokConfigId(TestServer.getSlobrokConfig(slobrok))); diff --git a/messagebus/src/test/java/com/yahoo/messagebus/RateThrottlingTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/RateThrottlingTestCase.java index 7901778e86b..e67b33f2303 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/RateThrottlingTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/RateThrottlingTestCase.java @@ -2,10 +2,14 @@ package com.yahoo.messagebus; import com.yahoo.messagebus.test.SimpleMessage; -import junit.framework.TestCase; +import org.junit.Test; -public class RateThrottlingTestCase extends TestCase { +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +public class RateThrottlingTestCase { + + @Test public void testPending() { CustomTimer timer = new CustomTimer(); RateThrottlingPolicy policy = new RateThrottlingPolicy(5.0, timer); @@ -30,10 +34,12 @@ public class RateThrottlingTestCase extends TestCase { return ok; } + @Test public void testRates() { assertEquals(10, getActualRate(0.1), 1); assertEquals(1000, getActualRate(10), 100); assertEquals(500, getActualRate(5), 50); assertEquals(100, getActualRate(1), 10); } + } diff --git a/messagebus/src/test/java/com/yahoo/messagebus/RoutableTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/RoutableTestCase.java index b760ee6d13f..7738b46e912 100755 --- a/messagebus/src/test/java/com/yahoo/messagebus/RoutableTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/RoutableTestCase.java @@ -8,12 +8,22 @@ 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 java.net.UnknownHostException; -public class RoutableTestCase extends junit.framework.TestCase { +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; - public void testMessageContext() throws ListenFailedException, UnknownHostException { +public class RoutableTestCase { + + private final double delta = 0.00000001; + + @Test + public void testMessageContext() throws ListenFailedException { Slobrok slobrok = new Slobrok(); TestServer srcServer = new TestServer("src", null, slobrok, null); TestServer dstServer = new TestServer("dst", null, slobrok, null); @@ -43,6 +53,7 @@ public class RoutableTestCase extends junit.framework.TestCase { slobrok.stop(); } + @Test public void testMessageSwapState() { Message foo = new SimpleMessage("foo"); Route fooRoute = Route.parse("foo"); @@ -68,6 +79,7 @@ public class RoutableTestCase extends junit.framework.TestCase { assertEquals(2, bar.getTimeRemaining()); } + @Test public void testReplySwapState() { Reply foo = new SimpleReply("foo"); Message fooMsg = new SimpleMessage("foo"); @@ -85,12 +97,13 @@ public class RoutableTestCase extends junit.framework.TestCase { foo.swapState(bar); assertEquals(barMsg, foo.getMessage()); assertEquals(fooMsg, bar.getMessage()); - assertEquals(2.0, foo.getRetryDelay()); - assertEquals(1.0, bar.getRetryDelay()); + assertEquals(2.0, foo.getRetryDelay(), delta); + assertEquals(1.0, bar.getRetryDelay(), delta); assertEquals(1, foo.getNumErrors()); assertEquals(2, bar.getNumErrors()); } + @Test public void testMessageDiscard() { Receptor handler = new Receptor(); Message msg = new SimpleMessage("foo"); @@ -100,6 +113,7 @@ public class RoutableTestCase extends junit.framework.TestCase { assertNull(handler.getReply(0)); } + @Test public void testReplyDiscard() { Receptor handler = new Receptor(); Message msg = new SimpleMessage("foo"); @@ -111,4 +125,5 @@ public class RoutableTestCase extends junit.framework.TestCase { assertNull(handler.getReply(0)); } + } diff --git a/messagebus/src/test/java/com/yahoo/messagebus/SendProxyTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/SendProxyTestCase.java index cfac45d0df2..fe9611b0a37 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/SendProxyTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/SendProxyTestCase.java @@ -14,24 +14,31 @@ import com.yahoo.messagebus.test.SimpleMessage; import com.yahoo.messagebus.test.SimpleProtocol; import com.yahoo.messagebus.test.SimpleReply; import junit.framework.TestCase; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; -import java.net.UnknownHostException; 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; + /** - * @author Simon Thoresen + * @author Simon Thoresen */ -public class SendProxyTestCase extends TestCase { +public class SendProxyTestCase { Slobrok slobrok; TestServer srcServer, dstServer; SourceSession srcSession; DestinationSession dstSession; - @Override - public void setUp() throws UnknownHostException, ListenFailedException { + @Before + public void setUp() throws ListenFailedException { slobrok = new Slobrok(); dstServer = new TestServer(new MessageBusParams().addProtocol(new SimpleProtocol()), new RPCNetworkParams().setIdentity(new Identity("dst")).setSlobrokConfigId(TestServer.getSlobrokConfig(slobrok))); @@ -43,7 +50,7 @@ public class SendProxyTestCase extends TestCase { assertTrue(srcServer.waitSlobrok("dst/session", 1)); } - @Override + @After public void tearDown() { slobrok.stop(); dstSession.destroy(); @@ -52,6 +59,7 @@ public class SendProxyTestCase extends TestCase { srcServer.destroy(); } + @Test public void testTraceByLogLevel() { Logger log = Logger.getLogger(SendProxy.class.getName()); LogHandler logHandler = new LogHandler(); @@ -166,4 +174,5 @@ public class SendProxyTestCase extends TestCase { // empty } } + } diff --git a/messagebus/src/test/java/com/yahoo/messagebus/SequencerTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/SequencerTestCase.java index e8c74f77e48..562243b8b79 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/SequencerTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/SequencerTestCase.java @@ -2,15 +2,21 @@ package com.yahoo.messagebus; import com.yahoo.messagebus.test.SimpleMessage; +import org.junit.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; + /** - * @author Simon Thoresen + * @author Simon Thoresen */ -public class SequencerTestCase extends junit.framework.TestCase { +public class SequencerTestCase { + @Test public void testSyncNone() { TestQueue src = new TestQueue(); TestQueue dst = new TestQueue(); @@ -42,6 +48,7 @@ public class SequencerTestCase extends junit.framework.TestCase { assertEquals(0, dst.size()); } + @Test public void testSyncId() { TestQueue src = new TestQueue(); TestQueue dst = new TestQueue(); @@ -175,5 +182,6 @@ public class SequencerTestCase extends junit.framework.TestCase { return seqId; } } + } diff --git a/messagebus/src/test/java/com/yahoo/messagebus/SimpleTripTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/SimpleTripTestCase.java index 433183f227a..b0d61268e76 100755 --- a/messagebus/src/test/java/com/yahoo/messagebus/SimpleTripTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/SimpleTripTestCase.java @@ -11,15 +11,19 @@ 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 java.net.UnknownHostException; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** - * @author Simon Thoresen + * @author Simon Thoresen */ -public class SimpleTripTestCase extends junit.framework.TestCase { +public class SimpleTripTestCase { - public void testSimpleTrip() throws ListenFailedException, UnknownHostException { + @Test + public void testSimpleTrip() throws ListenFailedException { Slobrok slobrok = new Slobrok(); TestServer server = new TestServer(new MessageBusParams().addProtocol(new SimpleProtocol()), new RPCNetworkParams() @@ -50,4 +54,5 @@ public class SimpleTripTestCase extends junit.framework.TestCase { dst.destroy(); server.destroy(); } + } diff --git a/messagebus/src/test/java/com/yahoo/messagebus/ThrottlerTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/ThrottlerTestCase.java index 6c298f5f3b5..4e3520f2419 100644 --- a/messagebus/src/test/java/com/yahoo/messagebus/ThrottlerTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/ThrottlerTestCase.java @@ -5,26 +5,32 @@ import com.yahoo.jrt.ListenFailedException; import com.yahoo.jrt.slobrok.server.Slobrok; import com.yahoo.messagebus.network.rpc.test.TestServer; import com.yahoo.messagebus.routing.RoutingTableSpec; -import com.yahoo.messagebus.test.*; +import com.yahoo.messagebus.test.QueueAdapter; +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 java.net.UnknownHostException; 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; + /** - * @author Simon Thoresen + * @author Simon Thoresen */ -public class ThrottlerTestCase extends junit.framework.TestCase { - - //////////////////////////////////////////////////////////////////////////////// - // - // Setup - // - //////////////////////////////////////////////////////////////////////////////// +public class ThrottlerTestCase { Slobrok slobrok; TestServer src, dst; - public void setUp() throws ListenFailedException, UnknownHostException { + @Before + public void setUp() throws ListenFailedException { RoutingTableSpec table = new RoutingTableSpec(SimpleProtocol.NAME); table.addHop("dst", "test/dst/session", Arrays.asList("test/dst/session")); table.addRoute("test", Arrays.asList("dst")); @@ -33,18 +39,14 @@ public class ThrottlerTestCase extends junit.framework.TestCase { dst = new TestServer("test/dst", table, slobrok, null); } + @After public void tearDown() { dst.destroy(); src.destroy(); slobrok.stop(); } - //////////////////////////////////////////////////////////////////////////////// - // - // Tests - // - //////////////////////////////////////////////////////////////////////////////// - + @Test public void testMaxCount() { // Prepare a source session with throttle enabled. SourceSessionParams params = new SourceSessionParams().setTimeout(600.0); @@ -85,6 +87,7 @@ public class ThrottlerTestCase extends junit.framework.TestCase { dst_s.destroy(); } + @Test public void testMaxSize() { // Prepare a source session with throttle enabled. SourceSessionParams params = new SourceSessionParams().setTimeout(600.0); @@ -125,6 +128,7 @@ public class ThrottlerTestCase extends junit.framework.TestCase { dst_s.destroy(); } + @Test public void testDynamicWindowSize() { CustomTimer timer = new CustomTimer(); DynamicThrottlePolicy policy = new DynamicThrottlePolicy(timer); @@ -146,8 +150,9 @@ public class ThrottlerTestCase extends junit.framework.TestCase { windowSize = getWindowSize(policy, timer, 100); assertTrue(windowSize >= 90 && windowSize <= 115); - } + } + @Test public void testIdleTimePeriod() { CustomTimer timer = new CustomTimer(); DynamicThrottlePolicy policy = new DynamicThrottlePolicy(timer); @@ -173,6 +178,7 @@ public class ThrottlerTestCase extends junit.framework.TestCase { } + @Test public void testMinWindowSize() { CustomTimer timer = new CustomTimer(); DynamicThrottlePolicy policy = new DynamicThrottlePolicy(timer); @@ -185,6 +191,7 @@ public class ThrottlerTestCase extends junit.framework.TestCase { assertTrue(windowSize >= 150 && windowSize <= 210); } + @Test public void testMaxWindowSize() { CustomTimer timer = new CustomTimer(); DynamicThrottlePolicy policy = new DynamicThrottlePolicy(timer); @@ -197,13 +204,6 @@ public class ThrottlerTestCase extends junit.framework.TestCase { assertTrue(windowSize >= 40 && windowSize <= 50); } - - //////////////////////////////////////////////////////////////////////////////// - // - // Utilities - // - //////////////////////////////////////////////////////////////////////////////// - private int getWindowSize(DynamicThrottlePolicy policy, CustomTimer timer, int maxPending) { Message msg = new SimpleMessage("foo"); Reply reply = new SimpleReply("bar"); diff --git a/messagebus/src/test/java/com/yahoo/messagebus/TraceTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/TraceTestCase.java index 65175fe4e98..f0a8a127492 100755 --- a/messagebus/src/test/java/com/yahoo/messagebus/TraceTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/TraceTestCase.java @@ -1,11 +1,17 @@ // Copyright 2017 Yahoo Holdings. 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 static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + /** - * @author Simon Thoresen + * @author Simon Thoresen */ -public class TraceTestCase extends junit.framework.TestCase { +public class TraceTestCase { + @Test public void testEncodeDecode() { assertEquals("()", TraceNode.decode("").encode()); assertEquals("()", TraceNode.decode("[xyz").encode()); @@ -91,6 +97,7 @@ public class TraceTestCase extends junit.framework.TestCase { } } + @Test public void testReservedChars() { TraceNode t = new TraceNode(); t.addChild("abc(){}[]\\xyz"); @@ -109,6 +116,7 @@ public class TraceTestCase extends junit.framework.TestCase { } } + @Test public void testAdd() { TraceNode t1 = TraceNode.decode("([x])"); TraceNode t2 = TraceNode.decode("([y])"); @@ -128,12 +136,14 @@ public class TraceTestCase extends junit.framework.TestCase { assertEquals("([y]([y])([y]([y])))", t2.encode()); } + @Test public 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() { Trace t = new Trace(); t.setLevel(4); @@ -160,6 +170,7 @@ public class TraceTestCase extends junit.framework.TestCase { assertEquals(5, t.getRoot().getNumChildren()); } + @Test public void testCompact() { assertEquals("()", TraceNode.decode("()").compact().encode()); assertEquals("()", TraceNode.decode("(())").compact().encode()); @@ -189,6 +200,7 @@ public class TraceTestCase extends junit.framework.TestCase { assertEquals("({[a][b][c][d][e][f]})", TraceNode.decode("({({[a][b]})({[c][d]})({[e][f]})})").compact().encode()); } + @Test public void testSort() { assertEquals("([b][a][c])", TraceNode.decode("([b][a][c])").sort().encode()); assertEquals("({[a][b][c]})", TraceNode.decode("({[b][a][c]})").sort().encode()); @@ -198,6 +210,7 @@ public class TraceTestCase extends junit.framework.TestCase { assertEquals("({([b]){[a][c]}})", TraceNode.decode("({{[c][a]}([b])})").sort().encode()); } + @Test public 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])})"); @@ -238,6 +251,7 @@ public class TraceTestCase extends junit.framework.TestCase { assertEquals("({([c][d])([e][f])([a][b]{[x][y]([p][q])})})", t1.normalize().encode()); } + @Test public void testTraceDump() { { Trace big = new Trace(); @@ -283,4 +297,5 @@ public class TraceTestCase extends junit.framework.TestCase { 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 007f7a70d14..1f16e9bb5af 100755 --- a/messagebus/src/test/java/com/yahoo/messagebus/TraceTripTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/TraceTripTestCase.java @@ -8,25 +8,27 @@ 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 java.net.UnknownHostException; import java.util.Arrays; +import static org.junit.Assert.assertTrue; + /** - * @author Simon Thoresen + * @author Simon Thoresen */ -public class TraceTripTestCase extends junit.framework.TestCase { +public class TraceTripTestCase { Slobrok slobrok; TestServer src; TestServer pxy; TestServer dst; - public TraceTripTestCase(String message) { - super(message); - } - - public void setUp() throws ListenFailedException, UnknownHostException { + @Before + public void setUp() throws ListenFailedException { RoutingTableSpec table = new RoutingTableSpec(SimpleProtocol.NAME) .addHop("pxy", "test/pxy/session", Arrays.asList("test/pxy/session")) .addHop("dst", "test/dst/session", Arrays.asList("test/dst/session")) @@ -38,6 +40,7 @@ public class TraceTripTestCase extends junit.framework.TestCase { dst = new TestServer("test/dst", table, slobrok, null); } + @After public void tearDown() { dst.destroy(); pxy.destroy(); @@ -45,6 +48,7 @@ public class TraceTripTestCase extends junit.framework.TestCase { slobrok.stop(); } + @Test public void testTrip() { Receptor src_rr = new Receptor(); SourceSession src_s = src.mb.createSourceSession(src_rr); @@ -113,4 +117,5 @@ public class TraceTripTestCase extends junit.framework.TestCase { session.reply(reply); } } + } 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 603d8433524..0aef3f3e994 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,22 +13,30 @@ 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 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; + /** - * @author Haavard Pettersen + * @author havardpe */ -public class BasicNetworkTestCase extends junit.framework.TestCase { +public class BasicNetworkTestCase { Slobrok slobrok; TestServer src; TestServer pxy; TestServer dst; - public void setUp() throws ListenFailedException, UnknownHostException { + @Before + public void setUp() throws ListenFailedException { RoutingTableSpec table = new RoutingTableSpec(SimpleProtocol.NAME); table.addHop("pxy", "test/pxy/session", Arrays.asList("test/pxy/session")); table.addHop("dst", "test/dst/session", Arrays.asList("test/dst/session")); @@ -39,6 +47,7 @@ public class BasicNetworkTestCase extends junit.framework.TestCase { dst = new TestServer("test/dst", table, slobrok, null); } + @After public void tearDown() { dst.destroy(); pxy.destroy(); @@ -46,6 +55,7 @@ public class BasicNetworkTestCase extends junit.framework.TestCase { slobrok.stop(); } + @Test public void testNetwork() { // set up receptors Receptor src_rr = new Receptor(); @@ -115,6 +125,7 @@ public class BasicNetworkTestCase extends junit.framework.TestCase { ds.destroy(); } + @Test public void testTimeoutsFollowMessage() { SourceSessionParams params = new SourceSessionParams().setTimeout(600.0); SourceSession ss = src.mb.createSourceSession(new Receptor(), params); @@ -149,4 +160,5 @@ public class BasicNetworkTestCase extends junit.framework.TestCase { 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 c9a4c38a682..6cb0736f6fa 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,15 +9,20 @@ 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 java.net.UnknownHostException; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + /** - * @author Haavard Pettersen + * @author havardpe */ -public class LoadBalanceTestCase extends junit.framework.TestCase { +public class LoadBalanceTestCase { - public void testLoadBalance() throws ListenFailedException, UnknownHostException { + @Test + public 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); @@ -93,4 +98,5 @@ public class LoadBalanceTestCase extends junit.framework.TestCase { return cnt; } } + } 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 073ad531bdd..82a03d06c6c 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,21 +6,26 @@ 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 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; + /** - * @author Simon Thoresen + * @author Simon Thoresen */ -public class ServiceAddressTestCase extends junit.framework.TestCase { +public class ServiceAddressTestCase { private Slobrok slobrok; private RPCNetwork network; - public ServiceAddressTestCase(String msg) { - super(msg); - } - + @Before public void setUp() throws ListenFailedException, UnknownHostException { slobrok = new Slobrok(); network = new RPCNetwork(new RPCNetworkParams() @@ -29,11 +34,13 @@ public class ServiceAddressTestCase extends junit.framework.TestCase { new Spec("localhost", slobrok.port()).toString() + "\"\n")); } + @After public void tearDown() { network.shutdown(); slobrok.stop(); } + @Test public void testAddrServiceAddress() { assertNullAddress("tcp"); assertNullAddress("tcp/"); @@ -47,6 +54,7 @@ public class ServiceAddressTestCase extends junit.framework.TestCase { assertNullAddress("tcp/:/session"); } + @Test public void testNameServiceAddress() { network.unregisterSession("session"); assertTrue(waitSlobrok("foo/session", 0)); @@ -87,4 +95,5 @@ public class ServiceAddressTestCase extends junit.framework.TestCase { assertEquals(expectedSession, obj.getSessionName()); } } + } 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 b5c64c5ea6b..9bc9ef41af9 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,13 +4,17 @@ 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 junit.framework.TestCase; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** - * @author Simon Thoresen + * @author Simon Thoresen */ -public class ServicePoolTestCase extends TestCase { +public class ServicePoolTestCase { + @Test public void testMaxSize() throws ListenFailedException { Slobrok slobrok = new Slobrok(); RPCNetwork net = new RPCNetwork(new RPCNetworkParams().setSlobrokConfigId(TestServer.getSlobrokConfig(slobrok))); @@ -54,4 +58,5 @@ public class ServicePoolTestCase extends TestCase { 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 0c4e55b5001..c6737385f4c 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,6 +7,9 @@ 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 java.net.UnknownHostException; import java.util.ArrayList; @@ -14,11 +17,13 @@ import java.util.Arrays; import java.util.Comparator; import java.util.List; +import static org.junit.Assert.assertTrue; + /** - * @author Haavard Pettersen + * @author havardpe */ -public class SlobrokTestCase extends junit.framework.TestCase { +public class SlobrokTestCase { private static class Res { private List lst = new ArrayList<>(); @@ -31,11 +36,6 @@ public class SlobrokTestCase extends junit.framework.TestCase { } } - - public SlobrokTestCase(String message) { - super(message); - } - Slobrok slobrok; RPCNetwork net1; RPCNetwork net2; @@ -83,7 +83,8 @@ public class SlobrokTestCase extends junit.framework.TestCase { assertTrue(false); } - public void setUp() throws ListenFailedException, UnknownHostException { + @Before + public void setUp() throws ListenFailedException { slobrok = new Slobrok(); String slobrokCfgId = "raw:slobrok[1]\nslobrok[0].connectionspec \"" + new Spec("localhost", slobrok.port()).toString() + "\"\n"; net1 = new RPCNetwork(new RPCNetworkParams().setIdentity(new Identity("net/a")).setSlobrokConfigId(slobrokCfgId)); @@ -94,6 +95,7 @@ public class SlobrokTestCase extends junit.framework.TestCase { port3 = net3.getPort(); } + @After public void tearDown() { net3.shutdown(); net2.shutdown(); @@ -101,6 +103,7 @@ public class SlobrokTestCase extends junit.framework.TestCase { slobrok.stop(); } + @Test public void testSlobrok() { net1.registerSession("foo"); net2.registerSession("foo"); @@ -148,4 +151,5 @@ public class SlobrokTestCase extends junit.framework.TestCase { .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 26b32eeb418..626cb7031d8 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,28 +7,34 @@ 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 java.net.UnknownHostException; import java.util.ArrayList; import java.util.List; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + /** - * @author Simon Thoresen + * @author Simon Thoresen */ -public class TargetPoolTestCase extends junit.framework.TestCase { +public class TargetPoolTestCase { private Slobrok slobrok; private List servers; private Supervisor orb; - @Override + @Before public void setUp() throws ListenFailedException { slobrok = new Slobrok(); servers = new ArrayList<>(); orb = new Supervisor(new Transport()); } - @Override + @After public void tearDown() { slobrok.stop(); for (TestServer server : servers) { @@ -37,6 +43,7 @@ public class TargetPoolTestCase extends junit.framework.TestCase { orb.transport().shutdown().join(); } + @Test public void testConnectionExpire() throws ListenFailedException, UnknownHostException { // Necessary setup to be able to resolve targets. RPCServiceAddress adr1 = registerServer(); @@ -96,7 +103,7 @@ public class TargetPoolTestCase extends junit.framework.TestCase { assertEquals(0, pool.size()); } - private RPCServiceAddress registerServer() throws ListenFailedException, UnknownHostException { + private RPCServiceAddress registerServer() { servers.add(new TestServer("srv" + servers.size(), null, slobrok, null)); return new RPCServiceAddress("foo/bar", servers.get(servers.size() - 1).mb.getConnectionSpec()); } @@ -109,4 +116,5 @@ public class TargetPoolTestCase extends junit.framework.TestCase { return millis; } } + } 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 d255c3cff6d..bd90107f52e 100755 --- a/messagebus/src/test/java/com/yahoo/messagebus/routing/AdvancedRoutingTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/routing/AdvancedRoutingTestCase.java @@ -3,8 +3,16 @@ package com.yahoo.messagebus.routing; import com.yahoo.jrt.ListenFailedException; import com.yahoo.jrt.slobrok.server.Slobrok; -import com.yahoo.messagebus.*; +import com.yahoo.messagebus.DestinationSession; +import com.yahoo.messagebus.DestinationSessionParams; +import com.yahoo.messagebus.EmptyReply; import com.yahoo.messagebus.Error; +import com.yahoo.messagebus.ErrorCode; +import com.yahoo.messagebus.Message; +import com.yahoo.messagebus.MessageBusParams; +import com.yahoo.messagebus.Reply; +import com.yahoo.messagebus.SourceSession; +import com.yahoo.messagebus.SourceSessionParams; import com.yahoo.messagebus.network.Identity; import com.yahoo.messagebus.network.rpc.RPCNetworkParams; import com.yahoo.messagebus.network.rpc.test.TestServer; @@ -12,27 +20,29 @@ 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 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; + /** - * @author Simon Thoresen + * @author Simon Thoresen */ -public class AdvancedRoutingTestCase extends junit.framework.TestCase { - - //////////////////////////////////////////////////////////////////////////////// - // - // Setup - // - //////////////////////////////////////////////////////////////////////////////// +public class AdvancedRoutingTestCase { Slobrok slobrok; TestServer srcServer, dstServer; SourceSession srcSession; DestinationSession dstFoo, dstBar, dstBaz; - @Override - public void setUp() throws ListenFailedException, UnknownHostException { + @Before + public void setUp() throws ListenFailedException { slobrok = new Slobrok(); dstServer = new TestServer(new MessageBusParams().addProtocol(new SimpleProtocol()), new RPCNetworkParams().setIdentity(new Identity("dst")).setSlobrokConfigId(TestServer.getSlobrokConfig(slobrok))); @@ -46,7 +56,7 @@ public class AdvancedRoutingTestCase extends junit.framework.TestCase { assertTrue(srcServer.waitSlobrok("dst/*", 3)); } - @Override + @After public void tearDown() { slobrok.stop(); dstFoo.destroy(); @@ -57,12 +67,7 @@ public class AdvancedRoutingTestCase extends junit.framework.TestCase { srcServer.destroy(); } - //////////////////////////////////////////////////////////////////////////////// - // - // Tests - // - //////////////////////////////////////////////////////////////////////////////// - + @Test public void testAdvanced() { SimpleProtocol protocol = new SimpleProtocol(); protocol.addPolicyFactory("Custom", new CustomPolicyFactory(false, ErrorCode.NO_ADDRESS_FOR_SERVICE)); @@ -116,4 +121,5 @@ public class AdvancedRoutingTestCase extends junit.framework.TestCase { assertEquals(ErrorCode.FATAL_ERROR, reply.getError(0).getCode()); assertEquals(ErrorCode.NO_ADDRESS_FOR_SERVICE, reply.getError(1).getCode()); } + } 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 9d63e9719ab..fcf3923c940 100755 --- a/messagebus/src/test/java/com/yahoo/messagebus/routing/ResenderTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/routing/ResenderTestCase.java @@ -3,27 +3,36 @@ package com.yahoo.messagebus.routing; import com.yahoo.jrt.ListenFailedException; import com.yahoo.jrt.slobrok.server.Slobrok; -import com.yahoo.messagebus.*; +import com.yahoo.messagebus.DestinationSession; +import com.yahoo.messagebus.DestinationSessionParams; +import com.yahoo.messagebus.EmptyReply; import com.yahoo.messagebus.Error; +import com.yahoo.messagebus.ErrorCode; +import com.yahoo.messagebus.Message; +import com.yahoo.messagebus.MessageBusParams; +import com.yahoo.messagebus.Reply; +import com.yahoo.messagebus.SourceSession; +import com.yahoo.messagebus.SourceSessionParams; import com.yahoo.messagebus.network.Identity; import com.yahoo.messagebus.network.rpc.RPCNetworkParams; 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 java.net.UnknownHostException; +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; /** - * @author Simon Thoresen + * @author Simon Thoresen */ -public class ResenderTestCase extends junit.framework.TestCase { - - //////////////////////////////////////////////////////////////////////////////// - // - // Setup - // - //////////////////////////////////////////////////////////////////////////////// +public class ResenderTestCase { Slobrok slobrok; TestServer srcServer, dstServer; @@ -31,8 +40,8 @@ public class ResenderTestCase extends junit.framework.TestCase { DestinationSession dstSession; RetryTransientErrorsPolicy retryPolicy; - @Override - public void setUp() throws ListenFailedException, UnknownHostException { + @Before + public void setUp() throws ListenFailedException { slobrok = new Slobrok(); dstServer = new TestServer(new MessageBusParams().addProtocol(new SimpleProtocol()), new RPCNetworkParams().setIdentity(new Identity("dst")).setSlobrokConfigId(TestServer.getSlobrokConfig(slobrok))); @@ -46,7 +55,7 @@ public class ResenderTestCase extends junit.framework.TestCase { assertTrue(srcServer.waitSlobrok("dst/session", 1)); } - @Override + @After public void tearDown() { slobrok.stop(); dstSession.destroy(); @@ -55,12 +64,7 @@ public class ResenderTestCase extends junit.framework.TestCase { srcServer.destroy(); } - //////////////////////////////////////////////////////////////////////////////// - // - // Tests - // - //////////////////////////////////////////////////////////////////////////////// - + @Test public void testRetryTag() { assertTrue(srcSession.send(createMessage("msg"), Route.parse("dst/session")).isAccepted()); Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); @@ -79,6 +83,7 @@ public class ResenderTestCase extends junit.framework.TestCase { System.out.println(reply.getTrace()); } + @Test public void testRetryEnabledTag() { Message msg = createMessage("msg"); msg.setRetryEnabled(false); @@ -93,6 +98,7 @@ public class ResenderTestCase extends junit.framework.TestCase { System.out.println(reply.getTrace()); } + @Test public void testTransientError() { assertTrue(srcSession.send(createMessage("msg"), Route.parse("dst/session")).isAccepted()); Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); @@ -106,6 +112,7 @@ public class ResenderTestCase extends junit.framework.TestCase { assertNull(((Receptor)dstSession.getMessageHandler()).getMessage(0)); } + @Test public void testFatalError() { assertTrue(srcSession.send(createMessage("msg"), Route.parse("dst/session")).isAccepted()); Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); @@ -117,6 +124,7 @@ public class ResenderTestCase extends junit.framework.TestCase { assertNull(((Receptor)dstSession.getMessageHandler()).getMessage(0)); } + @Test public void testDisableRetry() { retryPolicy.setEnabled(false); assertTrue(srcSession.send(createMessage("msg"), Route.parse("dst/session")).isAccepted()); @@ -130,6 +138,7 @@ public class ResenderTestCase extends junit.framework.TestCase { assertNull(((Receptor)dstSession.getMessageHandler()).getMessage(0)); } + @Test public void testRetryDelay() { retryPolicy.setBaseDelay(0.01); assertTrue(srcSession.send(createMessage("msg"), Route.parse("dst/session")).isAccepted()); @@ -153,6 +162,7 @@ public class ResenderTestCase extends junit.framework.TestCase { assertTrue(trace.contains("retry 5 in 0.05")); } + @Test public void testRequestRetryDelay() { assertTrue(srcSession.send(createMessage("msg"), Route.parse("dst/session")).isAccepted()); Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60); @@ -176,12 +186,6 @@ public class ResenderTestCase extends junit.framework.TestCase { assertTrue(trace.contains("retry 5 in 0.08")); } - //////////////////////////////////////////////////////////////////////////////// - // - // Utilities - // - //////////////////////////////////////////////////////////////////////////////// - private static Message createMessage(String msg) { SimpleMessage ret = new SimpleMessage(msg); ret.getTrace().setLevel(9); @@ -197,4 +201,5 @@ public class ResenderTestCase extends junit.framework.TestCase { reply.setRetryDelay(retryDelay); dstSession.reply(reply); } + } -- cgit v1.2.3