diff options
Diffstat (limited to 'messagebus/src/test/java/com/yahoo/messagebus/ThrottlerTestCase.java')
-rw-r--r-- | messagebus/src/test/java/com/yahoo/messagebus/ThrottlerTestCase.java | 47 |
1 files changed, 22 insertions, 25 deletions
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); |