X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fcds-access-client%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Faccess%2Fclient%2FActorBehaviorTest.java;h=2b6be7d5f1d42994f5b05311b4609301ecb77b31;hb=466078ab1dc8a8cc2981b161051f6edecd6af85a;hp=b0a6011222d147d7a4c380e6058112800079862d;hpb=5f8b40a13b88b2a183450c2b67401415da47511a;p=controller.git

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 b0a6011222..2b6be7d5f1 100644
--- 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
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.controller.cluster.access.client;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.verify;
@@ -19,8 +19,9 @@ 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 com.typesafe.config.ConfigFactory;
 import java.lang.reflect.Field;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
@@ -51,7 +52,8 @@ public class ActorBehaviorTest {
     public void setUp() throws Exception {
         initialBehavior = createInitialBehaviorMock();
         system = ActorSystem.apply("system1");
-        final ActorRef storeRef = system.registerExtension(Persistence.lookup()).snapshotStoreFor(null);
+        final ActorRef storeRef = system.registerExtension(Persistence.lookup()).snapshotStoreFor(null,
+            ConfigFactory.empty());
         probe = new TestProbe(system);
         storeRef.tell(probe.ref(), ActorRef.noSender());
         final MemberName name = MemberName.forName("member-1");
@@ -62,12 +64,12 @@ public class ActorBehaviorTest {
     }
 
     @After
-    public void tearDown() throws Exception {
-        JavaTestKit.shutdownActorSystem(system);
+    public void tearDown() {
+        TestKit.shutdownActorSystem(system);
     }
 
     @Test
-    public void testInitialBehavior() throws Exception {
+    public void testInitialBehavior() {
         final InternalCommand<BackendInfo> cmd = mock(InternalCommand.class);
         when(cmd.execute(any())).thenReturn(initialBehavior);
         mockedActor.tell(cmd, ActorRef.noSender());
@@ -75,7 +77,7 @@ public class ActorBehaviorTest {
     }
 
     @Test
-    public void testCommandStashing() throws Exception {
+    public void testCommandStashing() {
         system.stop(mockedActor);
         mockedActor = system.actorOf(MockedActor.props(id, initialBehavior));
         final InternalCommand<BackendInfo> cmd = mock(InternalCommand.class);
@@ -90,7 +92,7 @@ public class ActorBehaviorTest {
     }
 
     @Test
-    public void testRecoveryAfterRestart() throws Exception {
+    public void testRecoveryAfterRestart() {
         system.stop(mockedActor);
         mockedActor = system.actorOf(MockedActor.props(id, initialBehavior));
         final MockedSnapshotStore.SaveRequest newSaveRequest =
@@ -99,7 +101,7 @@ public class ActorBehaviorTest {
     }
 
     @Test
-    public void testRecoveryAfterRestartFrontendIdMismatch() throws Exception {
+    public void testRecoveryAfterRestartFrontendIdMismatch() {
         system.stop(mockedActor);
         //start actor again
         mockedActor = system.actorOf(MockedActor.props(id, initialBehavior));
@@ -116,7 +118,7 @@ public class ActorBehaviorTest {
     }
 
     @Test
-    public void testRecoveryAfterRestartSaveSnapshotFail() throws Exception {
+    public void testRecoveryAfterRestartSaveSnapshotFail() {
         system.stop(mockedActor);
         mockedActor = system.actorOf(MockedActor.props(id, initialBehavior));
         probe.watch(mockedActor);
@@ -129,7 +131,7 @@ public class ActorBehaviorTest {
     }
 
     @Test
-    public void testRecoveryAfterRestartDeleteSnapshotsFail() throws Exception {
+    public void testRecoveryAfterRestartDeleteSnapshotsFail() {
         system.stop(mockedActor);
         mockedActor = system.actorOf(MockedActor.props(id, initialBehavior));
         probe.watch(mockedActor);
@@ -140,11 +142,11 @@ public class ActorBehaviorTest {
         probe.expectMsgClass(MockedSnapshotStore.DeleteByCriteriaRequest.class);
         probe.reply(new RuntimeException("delete failed"));
         //actor shouldn't terminate
-        probe.expectNoMsg();
+        probe.expectNoMessage();
     }
 
     @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 +175,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 +192,10 @@ public class ActorBehaviorTest {
             return initialBehavior;
         }
 
+        @Override
+        protected ClientActorConfig getClientActorConfig() {
+            return mockConfig;
+        }
     }
 
-}
\ No newline at end of file
+}