1 files changed, 20 insertions, 23 deletions

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());