From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 12 Oct 2020 13:34:07 +0000 (+0200)
Subject: Migrate to new expectTerminated()
X-Git-Tag: v3.0.7~4
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=d0755da7907c23b46ff706e96f8da64d588612f7

Migrate to new expectTerminated()

There is a new overload which takex java.time.Duration.

Change-Id: I21568e7dc893ea695b99313b1f1869978fc9a654
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/TestActorFactory.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/TestActorFactory.java
index c71c8b7de4..50a3c98131 100644
--- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/TestActorFactory.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/TestActorFactory.java
@@ -22,6 +22,7 @@ import akka.testkit.javadsl.TestKit;
 import akka.util.Timeout;
 import com.google.common.base.Stopwatch;
 import com.google.common.util.concurrent.Uninterruptibles;
+import java.time.Duration;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -51,7 +52,7 @@ public class TestActorFactory implements AutoCloseable {
     List<ActorRef> createdActors = new LinkedList<>();
     private static int actorCount = 1;
 
-    public TestActorFactory(ActorSystem system) {
+    public TestActorFactory(final ActorSystem system) {
         this.system = system;
     }
 
@@ -61,7 +62,7 @@ public class TestActorFactory implements AutoCloseable {
      * @param props the actor Props
      * @return the ActorRef
      */
-    public ActorRef createActor(Props props) {
+    public ActorRef createActor(final Props props) {
         ActorRef actorRef = system.actorOf(props);
         return addActor(actorRef, true);
     }
@@ -73,7 +74,7 @@ public class TestActorFactory implements AutoCloseable {
      * @param actorId name of actor
      * @return the ActorRef
      */
-    public ActorRef createActor(Props props, String actorId) {
+    public ActorRef createActor(final Props props, final String actorId) {
         ActorRef actorRef = system.actorOf(props, actorId);
         return addActor(actorRef, true);
     }
@@ -85,7 +86,7 @@ public class TestActorFactory implements AutoCloseable {
      * @param actorId name of actor
      * @return the ActorRef
      */
-    public ActorRef createActorNoVerify(Props props, String actorId) {
+    public ActorRef createActorNoVerify(final Props props, final String actorId) {
         ActorRef actorRef = system.actorOf(props, actorId);
         return addActor(actorRef, false);
     }
@@ -99,7 +100,7 @@ public class TestActorFactory implements AutoCloseable {
      * @return the ActorRef
      */
     @SuppressWarnings("unchecked")
-    public <T extends Actor> TestActorRef<T> createTestActor(Props props, String actorId) {
+    public <T extends Actor> TestActorRef<T> createTestActor(final Props props, final String actorId) {
         InvalidActorNameException lastError = null;
         for (int i = 0; i < 10; i++) {
             try {
@@ -122,12 +123,12 @@ public class TestActorFactory implements AutoCloseable {
      * @return the TestActorRef
      */
     @SuppressWarnings("unchecked")
-    public <T extends Actor> TestActorRef<T> createTestActor(Props props) {
+    public <T extends Actor> TestActorRef<T> createTestActor(final Props props) {
         TestActorRef<T> actorRef = TestActorRef.create(system, props);
         return (TestActorRef<T>) addActor(actorRef, true);
     }
 
-    private <T extends ActorRef> ActorRef addActor(T actorRef, boolean verify) {
+    private <T extends ActorRef> ActorRef addActor(final T actorRef, final boolean verify) {
         createdActors.add(actorRef);
         if (verify) {
             verifyActorReady(actorRef);
@@ -137,7 +138,7 @@ public class TestActorFactory implements AutoCloseable {
     }
 
     @SuppressWarnings("checkstyle:IllegalCatch")
-    private void verifyActorReady(ActorRef actorRef) {
+    private void verifyActorReady(final ActorRef actorRef) {
         // Sometimes we see messages go to dead letters soon after creation - it seems the actor isn't quite
         // in a state yet to receive messages or isn't actually created yet. This seems to happen with
         // actorSelection so, to alleviate it, we use an actorSelection and send an Identify message with
@@ -168,26 +169,26 @@ public class TestActorFactory implements AutoCloseable {
      * @param prefix the name prefix
      * @return the actor name
      */
-    public String generateActorId(String prefix) {
+    public String generateActorId(final String prefix) {
         return prefix + actorCount++;
     }
 
-    public void killActor(ActorRef actor, TestKit kit) {
+    public void killActor(final ActorRef actor, final TestKit kit) {
         killActor(actor, kit, true);
     }
 
-    private void killActor(ActorRef actor, TestKit kit, boolean remove) {
+    private void killActor(final ActorRef actor, final TestKit kit, final boolean remove) {
         LOG.info("Killing actor {}", actor);
         kit.watch(actor);
         actor.tell(PoisonPill.getInstance(), ActorRef.noSender());
-        kit.expectTerminated(kit.duration("5 seconds"), actor);
+        kit.expectTerminated(Duration.ofSeconds(5), actor);
 
         if (remove) {
             createdActors.remove(actor);
         }
     }
 
-    public String createTestActorPath(String actorId) {
+    public String createTestActorPath(final String actorId) {
         return "akka://test/user/" + actorId;
     }