X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-remoterpc-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fremote%2Frpc%2Futils%2FLatestEntryRoutingLogicTest.java;h=b8ddc3711e740882d7efff0d1393612a8fa3c890;hp=b21f0f0069e3db4d62a7e024c7c3d5ff513067d2;hb=12fcdfe39aa26dcba7fd3bb4d4c68e3d02e65c51;hpb=cb9d74fc36ddcbca1b7fb62941396db1eb3c42c1

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/utils/LatestEntryRoutingLogicTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/utils/LatestEntryRoutingLogicTest.java
index b21f0f0069..b8ddc3711e 100644
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/utils/LatestEntryRoutingLogicTest.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/utils/LatestEntryRoutingLogicTest.java
@@ -8,50 +8,47 @@
 
 package org.opendaylight.controller.remote.rpc.utils;
 
+import static org.junit.Assert.assertTrue;
 
 import akka.actor.ActorRef;
 import akka.actor.ActorSystem;
 import akka.japi.Pair;
-import akka.testkit.JavaTestKit;
 import akka.testkit.TestProbe;
+import akka.testkit.javadsl.TestKit;
 import com.typesafe.config.ConfigFactory;
-import junit.framework.Assert;
+import java.util.ArrayList;
+import java.util.List;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.util.ArrayList;
-import java.util.List;
-
-
 public class LatestEntryRoutingLogicTest {
-
-  static ActorSystem system;
-
-  @BeforeClass
-  public static void setup() throws InterruptedException {
-    system = ActorSystem.create("opendaylight-rpc", ConfigFactory.load().getConfig("odl-cluster"));
-  }
-
-  @AfterClass
-  public static void teardown() {
-    JavaTestKit.shutdownActorSystem(system);
-    system = null;
-  }
-
-  @Test
-  public void testRoutingLogic() {
-    List<Pair<ActorRef, Long>> pairList = new ArrayList<>();
-    TestProbe probe1 = new TestProbe(system);
-    TestProbe probe2 = new TestProbe(system);
-    TestProbe probe3 = new TestProbe(system);
-    ActorRef actor1 = probe1.ref();
-    ActorRef actor2 = probe2.ref();
-    ActorRef actor3 = probe3.ref();
-    pairList.add(new Pair<ActorRef, Long>(actor1, 1000L));
-    pairList.add(new Pair<ActorRef, Long>(actor2, 3000L));
-    pairList.add(new Pair<ActorRef, Long>(actor3, 2000L));
-    RoutingLogic logic = new LatestEntryRoutingLogic(pairList);
-    Assert.assertTrue(logic.select().equals(actor2));
-  }
+    static ActorSystem system;
+
+    @BeforeClass
+    public static void setup() {
+        system = ActorSystem.create("opendaylight-rpc", ConfigFactory.load().getConfig("odl-cluster-rpc"));
+    }
+
+    @AfterClass
+    public static void teardown() {
+        TestKit.shutdownActorSystem(system);
+        system = null;
+    }
+
+    @Test
+    public void testRoutingLogic() {
+        List<Pair<ActorRef, Long>> pairList = new ArrayList<>();
+        TestProbe probe1 = new TestProbe(system);
+        TestProbe probe2 = new TestProbe(system);
+        TestProbe probe3 = new TestProbe(system);
+        ActorRef actor1 = probe1.ref();
+        ActorRef actor2 = probe2.ref();
+        ActorRef actor3 = probe3.ref();
+        pairList.add(new Pair<>(actor1, 1000L));
+        pairList.add(new Pair<>(actor2, 3000L));
+        pairList.add(new Pair<>(actor3, 2000L));
+        RoutingLogic logic = new LatestEntryRoutingLogic(pairList);
+        assertTrue(logic.select().equals(actor2));
+    }
 }