Revert "Add mockito-configuration to tests"

[controller.git] / opendaylight / md-sal / sal-akka-raft / src / test / java / org / opendaylight / controller / cluster / raft / RaftActorRecoverySupportTest.java

diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupportTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupportTest.java
index 2c130314718d9ab092f5dde8546164c61ddd71b4..71ca4cae5df490d6d6d5faa00954b167dc614fb9 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupportTest.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupportTest.java
@@ -12,7 +12,6 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -78,20 +77,13 @@ public class RaftActorRecoverySupportTest {
     public void setup() {
         MockitoAnnotations.initMocks(this);
 
-        doNothing().when(mockCohort).startLogRecoveryBatch(any(int.class));
-        doNothing().when(mockCohort).applyCurrentLogRecoveryBatch();
-        doNothing().when(mockCohort).applyRecoverySnapshot(any(byte[].class));
-        doNothing().when(mockCohort).appendRecoveredLogEntry(any(Payload.class));
-        doReturn(null).when(mockCohort).getRestoreFromSnapshot();
-        doReturn(true).when(mockPersistence).isRecoveryApplicable();
-        doNothing().when(mockPersistence).deleteMessages(any(long.class));
-        doNothing().when(mockPersistentProvider).deleteMessages(any(long.class));
-        doNothing().when(mockPersistentProvider).deleteSnapshots(any(SnapshotSelectionCriteria.class));
-        doNothing().when(mockPersistentProvider).persist(any(Object.class), any(Procedure.class));
-
         context = new RaftActorContextImpl(null, null, localId, new ElectionTermImpl(mockPersistentProvider, "test", LOG),
                 -1, -1, Collections.<String,String>emptyMap(), configParams, mockPersistence, LOG);
+
         support = new RaftActorRecoverySupport(context, mockBehavior , mockCohort);
+
+        doReturn(true).when(mockPersistence).isRecoveryApplicable();
+
         context.setReplicatedLog(ReplicatedLogImpl.newInstance(context, mockBehavior));
     }