Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
BUG-5626: use lambdas, Runnable and Consumer instead of Procedure
[controller.git]
/
opendaylight
/
md-sal
/
sal-akka-raft
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
raft
/
SnapshotManagerTest.java
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 27596dff74f6a0b83ebab2775cf507d7515900fb..e35c9bd44a2bb7992136e45e43ded29c720c02d5 100644
(file)
--- 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 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;
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 RaftActorBehavior mockRaftActorBehavior;
@Mock
- private
Procedure<Void>
mockProcedure;
+ private
Runnable
mockProcedure;
@Mock
private ElectionTerm mockElectionTerm;
@Mock
private ElectionTerm mockElectionTerm;
@@
-81,6
+80,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
doReturn(mockReplicatedLog).when(mockRaftActorContext).getReplicatedLog();
doReturn("123").when(mockRaftActorContext).getId();
doReturn(mockDataPersistenceProvider).when(mockRaftActorContext).getPersistenceProvider();
doReturn(mockReplicatedLog).when(mockRaftActorContext).getReplicatedLog();
doReturn("123").when(mockRaftActorContext).getId();
doReturn(mockDataPersistenceProvider).when(mockRaftActorContext).getPersistenceProvider();
+ doReturn(mockRaftActorBehavior).when(mockRaftActorContext).getCurrentBehavior();
doReturn("123").when(mockRaftActorBehavior).getLeaderId();
doReturn(mockElectionTerm).when(mockRaftActorContext).getTermInformation();
doReturn("123").when(mockRaftActorBehavior).getLeaderId();
doReturn(mockElectionTerm).when(mockRaftActorContext).getTermInformation();
@@
-93,7
+93,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
actorRef = factory.createTestActor(MessageCollectorActor.props(), factory.generateActorId("test-"));
doReturn(actorRef).when(mockRaftActorContext).getActor();
actorRef = factory.createTestActor(MessageCollectorActor.props(), factory.generateActorId("test-"));
doReturn(actorRef).when(mockRaftActorContext).getActor();
- snapshotManager.setCreateSnapshot
Call
able(mockProcedure);
+ snapshotManager.setCreateSnapshot
Runn
able(mockProcedure);
}
@After
}
@After
@@
-115,7
+115,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
assertEquals(true, snapshotManager.isCapturing());
assertEquals(true, snapshotManager.isCapturing());
- verify(mockProcedure).
apply(null
);
+ verify(mockProcedure).
run(
);
CaptureSnapshot captureSnapshot = snapshotManager.getCaptureSnapshot();
CaptureSnapshot captureSnapshot = snapshotManager.getCaptureSnapshot();
@@
-142,7
+142,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
assertEquals(true, snapshotManager.isCapturing());
assertEquals(true, snapshotManager.isCapturing());
- verify(mockProcedure).
apply(null
);
+ verify(mockProcedure).
run(
);
CaptureSnapshot captureSnapshot = snapshotManager.getCaptureSnapshot();
CaptureSnapshot captureSnapshot = snapshotManager.getCaptureSnapshot();
@@
-170,7
+170,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
assertEquals(true, snapshotManager.isCapturing());
assertEquals(true, snapshotManager.isCapturing());
- verify(mockProcedure).
apply(null
);
+ verify(mockProcedure).
run(
);
CaptureSnapshot captureSnapshot = snapshotManager.getCaptureSnapshot();
CaptureSnapshot captureSnapshot = snapshotManager.getCaptureSnapshot();
@@
-193,7
+193,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
@Test
public void testCaptureWithCreateProcedureError () throws Exception {
@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);
boolean capture = snapshotManager.capture(new MockRaftActorContext.MockReplicatedLogEntry(1,9,
new MockRaftActorContext.MockPayload()), 9);
@@
-202,7
+202,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
assertEquals(false, snapshotManager.isCapturing());
assertEquals(false, snapshotManager.isCapturing());
- verify(mockProcedure).
apply(null
);
+ verify(mockProcedure).
run(
);
}
@Test
}
@Test
@@
-212,7
+212,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
assertTrue(capture);
assertTrue(capture);
- verify(mockProcedure).
apply(null
);
+ verify(mockProcedure).
run(
);
reset(mockProcedure);
reset(mockProcedure);
@@
-222,7
+222,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
assertFalse(capture);
assertFalse(capture);
- verify(mockProcedure, never()).
apply(null
);
+ verify(mockProcedure, never()).
run(
);
}
@Test
}
@Test
@@
-247,7
+247,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
snapshotManager.capture(lastLogEntry, -1);
byte[] bytes = new byte[] {1,2,3,4,5,6,7,8,9,10};
snapshotManager.capture(lastLogEntry, -1);
byte[] bytes = new byte[] {1,2,3,4,5,6,7,8,9,10};
- snapshotManager.persist(bytes,
mockRaftActorBehavior,
Runtime.getRuntime().totalMemory());
+ snapshotManager.persist(bytes, Runtime.getRuntime().totalMemory());
ArgumentCaptor<Snapshot> snapshotArgumentCaptor = ArgumentCaptor.forClass(Snapshot.class);
verify(mockDataPersistenceProvider).saveSnapshot(snapshotArgumentCaptor.capture());
ArgumentCaptor<Snapshot> snapshotArgumentCaptor = ArgumentCaptor.forClass(Snapshot.class);
verify(mockDataPersistenceProvider).saveSnapshot(snapshotArgumentCaptor.capture());
@@
-280,7
+280,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
new MockRaftActorContext.MockPayload()), 9);
byte[] bytes = new byte[] {1,2,3,4,5,6,7,8,9,10};
new MockRaftActorContext.MockPayload()), 9);
byte[] bytes = new byte[] {1,2,3,4,5,6,7,8,9,10};
- snapshotManager.persist(bytes,
mockRaftActorBehavior,
Runtime.getRuntime().totalMemory());
+ snapshotManager.persist(bytes, Runtime.getRuntime().totalMemory());
ArgumentCaptor<Snapshot> snapshotArgumentCaptor = ArgumentCaptor.forClass(Snapshot.class);
verify(mockDataPersistenceProvider).saveSnapshot(snapshotArgumentCaptor.capture());
ArgumentCaptor<Snapshot> snapshotArgumentCaptor = ArgumentCaptor.forClass(Snapshot.class);
verify(mockDataPersistenceProvider).saveSnapshot(snapshotArgumentCaptor.capture());
@@
-307,7
+307,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
snapshotManager.capture(new MockRaftActorContext.MockReplicatedLogEntry(6,9,
new MockRaftActorContext.MockPayload()), -1);
snapshotManager.capture(new MockRaftActorContext.MockReplicatedLogEntry(6,9,
new MockRaftActorContext.MockPayload()), -1);
- snapshotManager.persist(new byte[]{},
mockRaftActorBehavior,
Runtime.getRuntime().totalMemory());
+ snapshotManager.persist(new byte[]{}, Runtime.getRuntime().totalMemory());
verify(mockDataPersistenceProvider).saveSnapshot(any(Snapshot.class));
verify(mockDataPersistenceProvider).saveSnapshot(any(Snapshot.class));
@@
-333,7
+333,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
snapshotManager.capture(new MockRaftActorContext.MockReplicatedLogEntry(6, 9,
new MockRaftActorContext.MockPayload()), replicatedToAllIndex);
snapshotManager.capture(new MockRaftActorContext.MockReplicatedLogEntry(6, 9,
new MockRaftActorContext.MockPayload()), replicatedToAllIndex);
- snapshotManager.persist(new byte[]{},
mockRaftActorBehavior,
2000000L);
+ snapshotManager.persist(new byte[]{}, 2000000L);
verify(mockDataPersistenceProvider).saveSnapshot(any(Snapshot.class));
verify(mockDataPersistenceProvider).saveSnapshot(any(Snapshot.class));
@@
-354,7
+354,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
byte[] bytes = new byte[] {1,2,3,4,5,6,7,8,9,10};
byte[] bytes = new byte[] {1,2,3,4,5,6,7,8,9,10};
- snapshotManager.persist(bytes,
mockRaftActorBehavior,
Runtime.getRuntime().totalMemory());
+ snapshotManager.persist(bytes, Runtime.getRuntime().totalMemory());
assertEquals(true, snapshotManager.isCapturing());
assertEquals(true, snapshotManager.isCapturing());
@@
-374,7
+374,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
@Test
public void testCallingPersistWithoutCaptureWillDoNothing(){
@Test
public void testCallingPersistWithoutCaptureWillDoNothing(){
- snapshotManager.persist(new byte[]{},
mockRaftActorBehavior,
Runtime.getRuntime().totalMemory());
+ snapshotManager.persist(new byte[]{}, Runtime.getRuntime().totalMemory());
verify(mockDataPersistenceProvider, never()).saveSnapshot(any(Snapshot.class));
verify(mockDataPersistenceProvider, never()).saveSnapshot(any(Snapshot.class));
@@
-390,9
+390,9
@@
public class SnapshotManagerTest extends AbstractActorTest {
snapshotManager.captureToInstall(new MockRaftActorContext.MockReplicatedLogEntry(6, 9,
new MockRaftActorContext.MockPayload()), -1, "follower-1");
snapshotManager.captureToInstall(new MockRaftActorContext.MockReplicatedLogEntry(6, 9,
new MockRaftActorContext.MockPayload()), -1, "follower-1");
- snapshotManager.persist(new byte[]{},
mockRaftActorBehavior,
Runtime.getRuntime().totalMemory());
+ snapshotManager.persist(new byte[]{}, Runtime.getRuntime().totalMemory());
- snapshotManager.persist(new byte[]{},
mockRaftActorBehavior,
Runtime.getRuntime().totalMemory());
+ snapshotManager.persist(new byte[]{}, Runtime.getRuntime().totalMemory());
verify(mockDataPersistenceProvider).saveSnapshot(any(Snapshot.class));
verify(mockDataPersistenceProvider).saveSnapshot(any(Snapshot.class));
@@
-409,11
+409,11
@@
public class SnapshotManagerTest extends AbstractActorTest {
snapshotManager.captureToInstall(new MockRaftActorContext.MockReplicatedLogEntry(6, 9,
new MockRaftActorContext.MockPayload()), -1, "follower-1");
snapshotManager.captureToInstall(new MockRaftActorContext.MockReplicatedLogEntry(6, 9,
new MockRaftActorContext.MockPayload()), -1, "follower-1");
- snapshotManager.persist(new byte[]{},
mockRaftActorBehavior,
Runtime.getRuntime().totalMemory());
+ snapshotManager.persist(new byte[]{}, Runtime.getRuntime().totalMemory());
assertEquals(true, snapshotManager.isCapturing());
assertEquals(true, snapshotManager.isCapturing());
- snapshotManager.commit(100L
, mockRaftActorBehavior
);
+ snapshotManager.commit(100L);
assertEquals(false, snapshotManager.isCapturing());
assertEquals(false, snapshotManager.isCapturing());
@@
-438,7
+438,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
snapshotManager.captureToInstall(new MockRaftActorContext.MockReplicatedLogEntry(6, 9,
new MockRaftActorContext.MockPayload()), -1, "follower-1");
snapshotManager.captureToInstall(new MockRaftActorContext.MockReplicatedLogEntry(6, 9,
new MockRaftActorContext.MockPayload()), -1, "follower-1");
- snapshotManager.commit(100L
, mockRaftActorBehavior
);
+ snapshotManager.commit(100L);
verify(mockReplicatedLog, never()).snapshotCommit();
verify(mockReplicatedLog, never()).snapshotCommit();
@@
-450,7
+450,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
@Test
public void testCommitBeforeCapture(){
@Test
public void testCommitBeforeCapture(){
- snapshotManager.commit(100L
, mockRaftActorBehavior
);
+ snapshotManager.commit(100L);
verify(mockReplicatedLog, never()).snapshotCommit();
verify(mockReplicatedLog, never()).snapshotCommit();
@@
-468,11
+468,11
@@
public class SnapshotManagerTest extends AbstractActorTest {
snapshotManager.captureToInstall(new MockRaftActorContext.MockReplicatedLogEntry(6, 9,
new MockRaftActorContext.MockPayload()), -1, "follower-1");
snapshotManager.captureToInstall(new MockRaftActorContext.MockReplicatedLogEntry(6, 9,
new MockRaftActorContext.MockPayload()), -1, "follower-1");
- snapshotManager.persist(new byte[]{},
mockRaftActorBehavior,
Runtime.getRuntime().totalMemory());
+ snapshotManager.persist(new byte[]{}, Runtime.getRuntime().totalMemory());
- snapshotManager.commit(100L
, mockRaftActorBehavior
);
+ snapshotManager.commit(100L);
- snapshotManager.commit(100L
, mockRaftActorBehavior
);
+ snapshotManager.commit(100L);
verify(mockReplicatedLog, times(1)).snapshotCommit();
verify(mockReplicatedLog, times(1)).snapshotCommit();
@@
-487,7
+487,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
snapshotManager.captureToInstall(new MockRaftActorContext.MockReplicatedLogEntry(6, 9,
new MockRaftActorContext.MockPayload()), -1, "follower-1");
snapshotManager.captureToInstall(new MockRaftActorContext.MockReplicatedLogEntry(6, 9,
new MockRaftActorContext.MockPayload()), -1, "follower-1");
- snapshotManager.persist(new byte[]{},
mockRaftActorBehavior,
Runtime.getRuntime().totalMemory());
+ snapshotManager.persist(new byte[]{}, Runtime.getRuntime().totalMemory());
snapshotManager.rollback();
snapshotManager.rollback();
@@
-521,7
+521,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
snapshotManager.captureToInstall(new MockRaftActorContext.MockReplicatedLogEntry(6, 9,
new MockRaftActorContext.MockPayload()), -1, "follower-1");
snapshotManager.captureToInstall(new MockRaftActorContext.MockReplicatedLogEntry(6, 9,
new MockRaftActorContext.MockPayload()), -1, "follower-1");
- snapshotManager.persist(new byte[]{},
mockRaftActorBehavior,
Runtime.getRuntime().totalMemory());
+ snapshotManager.persist(new byte[]{}, Runtime.getRuntime().totalMemory());
snapshotManager.rollback();
snapshotManager.rollback();
@@
-539,7
+539,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
doReturn(replicatedLogEntry).when((mockReplicatedLog)).get(10);
doReturn(5L).when(replicatedLogEntry).getTerm();
doReturn(replicatedLogEntry).when((mockReplicatedLog)).get(10);
doReturn(5L).when(replicatedLogEntry).getTerm();
- long retIndex = snapshotManager.trimLog(10
, mockRaftActorBehavior
);
+ long retIndex = snapshotManager.trimLog(10);
assertEquals("return index", 10L, retIndex);
verify(mockReplicatedLog).snapshotPreCommit(10, 5);
assertEquals("return index", 10L, retIndex);
verify(mockReplicatedLog).snapshotPreCommit(10, 5);
@@
-557,7
+557,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
doReturn(replicatedLogEntry).when((mockReplicatedLog)).get(10);
doReturn(5L).when(replicatedLogEntry).getTerm();
doReturn(replicatedLogEntry).when((mockReplicatedLog)).get(10);
doReturn(5L).when(replicatedLogEntry).getTerm();
- long retIndex = snapshotManager.trimLog(10
, mockRaftActorBehavior
);
+ long retIndex = snapshotManager.trimLog(10);
assertEquals("return index", -1L, retIndex);
verify(mockReplicatedLog, never()).snapshotPreCommit(anyLong(), anyLong());
assertEquals("return index", -1L, retIndex);
verify(mockReplicatedLog, never()).snapshotPreCommit(anyLong(), anyLong());
@@
-575,7
+575,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
doReturn(replicatedLogEntry).when((mockReplicatedLog)).get(10);
doReturn(5L).when(replicatedLogEntry).getTerm();
doReturn(replicatedLogEntry).when((mockReplicatedLog)).get(10);
doReturn(5L).when(replicatedLogEntry).getTerm();
- long retIndex = snapshotManager.trimLog(10
, mockRaftActorBehavior
);
+ long retIndex = snapshotManager.trimLog(10);
assertEquals("return index", -1L, retIndex);
verify(mockReplicatedLog, never()).snapshotPreCommit(anyLong(), anyLong());
assertEquals("return index", -1L, retIndex);
verify(mockReplicatedLog, never()).snapshotPreCommit(anyLong(), anyLong());
@@
-590,7
+590,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
doReturn(false).when(mockReplicatedLog).isPresent(10);
doReturn(false).when(mockReplicatedLog).isPresent(10);
- long retIndex = snapshotManager.trimLog(10
, mockRaftActorBehavior
);
+ long retIndex = snapshotManager.trimLog(10);
assertEquals("return index", -1L, retIndex);
verify(mockReplicatedLog, never()).snapshotPreCommit(anyLong(), anyLong());
assertEquals("return index", -1L, retIndex);
verify(mockReplicatedLog, never()).snapshotPreCommit(anyLong(), anyLong());
@@
-615,7
+615,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
doReturn(replicatedLogEntry).when((mockReplicatedLog)).get(10);
doReturn(5L).when(replicatedLogEntry).getTerm();
doReturn(replicatedLogEntry).when((mockReplicatedLog)).get(10);
doReturn(5L).when(replicatedLogEntry).getTerm();
- snapshotManager.trimLog(10
, mockRaftActorBehavior
);
+ snapshotManager.trimLog(10);
verify(mockReplicatedLog, never()).snapshotPreCommit(anyLong(), anyLong());
verify(mockReplicatedLog, never()).snapshotCommit();
verify(mockReplicatedLog, never()).snapshotPreCommit(anyLong(), anyLong());
verify(mockReplicatedLog, never()).snapshotCommit();
@@
-637,7
+637,7
@@
public class SnapshotManagerTest extends AbstractActorTest {
doReturn(replicatedLogEntry).when((mockReplicatedLog)).get(10);
doReturn(5L).when(replicatedLogEntry).getTerm();
doReturn(replicatedLogEntry).when((mockReplicatedLog)).get(10);
doReturn(5L).when(replicatedLogEntry).getTerm();
- snapshotManager.trimLog(10
, mockRaftActorBehavior
);
+ snapshotManager.trimLog(10);
verify(mockReplicatedLog, never()).snapshotPreCommit(10, 5);
verify(mockReplicatedLog, never()).snapshotCommit();
verify(mockReplicatedLog, never()).snapshotPreCommit(10, 5);
verify(mockReplicatedLog, never()).snapshotCommit();