Migrate from JavaTestKit to javadsl.TestKit

[controller.git] / opendaylight / md-sal / cds-access-client / src / test / java / org / opendaylight / controller / cluster / access / client / ActorBehaviorTest.java

diff --git a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ActorBehaviorTest.java b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ActorBehaviorTest.java
index b0a6011222d147d7a4c380e6058112800079862d..82544657fd03ac75011cc4b2623938a856e9ba36 100644 (file)
--- a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ActorBehaviorTest.java
+++ b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ActorBehaviorTest.java
@@ -19,8 +19,8 @@ import akka.actor.Props;
 import akka.persistence.Persistence;
 import akka.persistence.SelectedSnapshot;
 import akka.persistence.SnapshotMetadata;
-import akka.testkit.JavaTestKit;
 import akka.testkit.TestProbe;
+import akka.testkit.javadsl.TestKit;
 import java.lang.reflect.Field;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
@@ -63,7 +63,7 @@ public class ActorBehaviorTest {
 
     @After
     public void tearDown() throws Exception {
-        JavaTestKit.shutdownActorSystem(system);
+        TestKit.shutdownActorSystem(system);
     }
 
     @Test
@@ -144,7 +144,7 @@ public class ActorBehaviorTest {
     }
 
     @SuppressWarnings("unchecked")
-    private ClientActorBehavior<BackendInfo> createInitialBehaviorMock() throws Exception {
+    private static ClientActorBehavior<BackendInfo> createInitialBehaviorMock() throws Exception {
         final ClientActorBehavior<BackendInfo> initialBehavior = mock(ClientActorBehavior.class);
         //persistenceId() in AbstractClientActorBehavior is final and can't be mocked
         //use reflection to work around this
@@ -173,13 +173,14 @@ public class ActorBehaviorTest {
 
     private static class MockedActor extends AbstractClientActor {
 
-        private final ClientActorBehavior initialBehavior;
+        private final ClientActorBehavior<?> initialBehavior;
+        private final ClientActorConfig mockConfig = AccessClientUtil.newMockClientActorConfig();
 
-        private static Props props(final FrontendIdentifier frontendId, final ClientActorBehavior initialBehavior) {
+        private static Props props(final FrontendIdentifier frontendId, final ClientActorBehavior<?> initialBehavior) {
             return Props.create(MockedActor.class, () -> new MockedActor(frontendId, initialBehavior));
         }
 
-        private MockedActor(final FrontendIdentifier frontendId, final ClientActorBehavior initialBehavior) {
+        MockedActor(final FrontendIdentifier frontendId, final ClientActorBehavior<?> initialBehavior) {
             super(frontendId);
             this.initialBehavior = initialBehavior;
         }
@@ -189,6 +190,10 @@ public class ActorBehaviorTest {
             return initialBehavior;
         }
 
+        @Override
+        protected ClientActorConfig getClientActorConfig() {
+            return mockConfig;
+        }
     }
 
-}
\ No newline at end of file
+}