X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-akka-raft%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fraft%2FSnapshotManagerTest.java;h=e35c9bd44a2bb7992136e45e43ded29c720c02d5;hp=e6f7bd7b9ed9cc1975037309c2caab99633e633d;hb=dc538304e4d5f91185c140cc227575f4305344df;hpb=a95ae5d38e1797c76945842aa68096e45f901f46 diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/SnapshotManagerTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/SnapshotManagerTest.java index e6f7bd7b9e..e35c9bd44a 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/SnapshotManagerTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/SnapshotManagerTest.java @@ -22,7 +22,6 @@ import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import akka.actor.ActorRef; -import akka.japi.Procedure; import akka.persistence.SnapshotSelectionCriteria; import akka.testkit.TestActorRef; import java.util.Arrays; @@ -59,7 +58,7 @@ public class SnapshotManagerTest extends AbstractActorTest { private RaftActorBehavior mockRaftActorBehavior; @Mock - private Procedure mockProcedure; + private Runnable mockProcedure; @Mock private ElectionTerm mockElectionTerm; @@ -94,7 +93,7 @@ public class SnapshotManagerTest extends AbstractActorTest { actorRef = factory.createTestActor(MessageCollectorActor.props(), factory.generateActorId("test-")); doReturn(actorRef).when(mockRaftActorContext).getActor(); - snapshotManager.setCreateSnapshotCallable(mockProcedure); + snapshotManager.setCreateSnapshotRunnable(mockProcedure); } @After @@ -116,7 +115,7 @@ public class SnapshotManagerTest extends AbstractActorTest { assertEquals(true, snapshotManager.isCapturing()); - verify(mockProcedure).apply(null); + verify(mockProcedure).run(); CaptureSnapshot captureSnapshot = snapshotManager.getCaptureSnapshot(); @@ -143,7 +142,7 @@ public class SnapshotManagerTest extends AbstractActorTest { assertEquals(true, snapshotManager.isCapturing()); - verify(mockProcedure).apply(null); + verify(mockProcedure).run(); CaptureSnapshot captureSnapshot = snapshotManager.getCaptureSnapshot(); @@ -171,7 +170,7 @@ public class SnapshotManagerTest extends AbstractActorTest { assertEquals(true, snapshotManager.isCapturing()); - verify(mockProcedure).apply(null); + verify(mockProcedure).run(); CaptureSnapshot captureSnapshot = snapshotManager.getCaptureSnapshot(); @@ -194,7 +193,7 @@ public class SnapshotManagerTest extends AbstractActorTest { @Test public void testCaptureWithCreateProcedureError () throws Exception { - doThrow(new Exception("mock")).when(mockProcedure).apply(null); + doThrow(new RuntimeException("mock")).when(mockProcedure).run(); boolean capture = snapshotManager.capture(new MockRaftActorContext.MockReplicatedLogEntry(1,9, new MockRaftActorContext.MockPayload()), 9); @@ -203,7 +202,7 @@ public class SnapshotManagerTest extends AbstractActorTest { assertEquals(false, snapshotManager.isCapturing()); - verify(mockProcedure).apply(null); + verify(mockProcedure).run(); } @Test @@ -213,7 +212,7 @@ public class SnapshotManagerTest extends AbstractActorTest { assertTrue(capture); - verify(mockProcedure).apply(null); + verify(mockProcedure).run(); reset(mockProcedure); @@ -223,7 +222,7 @@ public class SnapshotManagerTest extends AbstractActorTest { assertFalse(capture); - verify(mockProcedure, never()).apply(null); + verify(mockProcedure, never()).run(); } @Test