Remove deprecated persisted raft payloads

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

diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MigratedMessagesTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MigratedMessagesTest.java
index 460dd4a445a8306731499e205b1207c563e1e110..70f45045b71bf859ed50eff880b0ee07acc365d0 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MigratedMessagesTest.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MigratedMessagesTest.java
@@ -11,7 +11,6 @@ import static org.junit.Assert.assertEquals;
 
 import akka.actor.ActorRef;
 import akka.dispatch.Dispatchers;
-import akka.testkit.JavaTestKit;
 import akka.testkit.TestActorRef;
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableMap;
@@ -21,7 +20,6 @@ import com.google.common.util.concurrent.Uninterruptibles;
 import java.io.OutputStream;
 import java.io.Serializable;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
@@ -68,98 +66,6 @@ public class MigratedMessagesTest extends AbstractActorTest {
         InMemorySnapshotStore.clear();
     }
 
-    @Test
-    public void testSnapshotAfterStartupWithMigratedServerConfigPayloadAndPersistenceEnabled() {
-        TEST_LOG.info("testSnapshotAfterStartupWithMigratedServerConfigPayloadAndPersistenceEnabled starting");
-        doTestSnapshotAfterStartupWithMigratedServerConfigPayload(true);
-        TEST_LOG.info("testSnapshotAfterStartupWithMigratedServerConfigPayloadAndPersistenceEnabled ending");
-    }
-
-    @Test
-    public void testSnapshotAfterStartupWithMigratedServerConfigPayloadAndPersistenceDisabled() {
-        TEST_LOG.info("testSnapshotAfterStartupWithMigratedServerConfigPayloadAndPersistenceDisabled starting");
-
-        TestActorRef<MockRaftActor> actor = doTestSnapshotAfterStartupWithMigratedServerConfigPayload(false);
-        MockRaftActor mockRaftActor = actor.underlyingActor();
-        String id = mockRaftActor.persistenceId();
-        ConfigParams config = mockRaftActor.getRaftActorContext().getConfigParams();
-
-        factory.killActor(actor, new JavaTestKit(getSystem()));
-
-        actor = factory.createTestActor(MockRaftActor.builder().id(id).config(config)
-                .persistent(Optional.of(false)).props().withDispatcher(Dispatchers.DefaultDispatcherId()), id);
-        mockRaftActor = actor.underlyingActor();
-        mockRaftActor.waitForRecoveryComplete();
-
-        assertEquals("electionTerm", 1,
-                mockRaftActor.getRaftActorContext().getTermInformation().getCurrentTerm());
-        assertEquals("votedFor", id,
-                mockRaftActor.getRaftActorContext().getTermInformation().getVotedFor());
-
-        TEST_LOG.info("testSnapshotAfterStartupWithMigratedServerConfigPayloadAndPersistenceDisabled ending");
-    }
-
-    @Test
-    public void testSnapshotAfterStartupWithMigratedUpdateElectionTermAndPersistenceEnabled() {
-        TEST_LOG.info("testSnapshotAfterStartupWithMigratedUpdateElectionTermAndPersistenceEnabled starting");
-
-        String persistenceId = factory.generateActorId("test-actor-");
-
-        org.opendaylight.controller.cluster.raft.base.messages.UpdateElectionTerm updateElectionTerm =
-                new org.opendaylight.controller.cluster.raft.base.messages.UpdateElectionTerm(5, persistenceId);
-
-        InMemoryJournal.addEntry(persistenceId, 1, updateElectionTerm);
-
-        doTestSnapshotAfterStartupWithMigratedMessage(persistenceId, true, snapshot -> {
-            assertEquals("getElectionVotedFor", persistenceId, snapshot.getElectionVotedFor());
-            assertEquals("getElectionTerm", 5, snapshot.getElectionTerm());
-        }, ByteState.empty());
-
-        TEST_LOG.info("testSnapshotAfterStartupWithMigratedUpdateElectionTermAndPersistenceEnabled ending");
-    }
-
-    @Test
-    public void testSnapshotAfterStartupWithMigratedUpdateElectionTermAndPersistenceDisabled() {
-        TEST_LOG.info("testSnapshotAfterStartupWithMigratedUpdateElectionTermAndPersistenceDisabled starting");
-
-        String persistenceId = factory.generateActorId("test-actor-");
-
-        org.opendaylight.controller.cluster.raft.base.messages.UpdateElectionTerm updateElectionTerm =
-                new org.opendaylight.controller.cluster.raft.base.messages.UpdateElectionTerm(5, persistenceId);
-
-        InMemoryJournal.addEntry(persistenceId, 1, updateElectionTerm);
-
-        doTestSnapshotAfterStartupWithMigratedMessage(persistenceId, false, snapshot -> {
-            assertEquals("getElectionVotedFor", persistenceId, snapshot.getElectionVotedFor());
-            assertEquals("getElectionTerm", 5, snapshot.getElectionTerm());
-        }, ByteState.empty());
-
-        TEST_LOG.info("testSnapshotAfterStartupWithMigratedUpdateElectionTermAndPersistenceDisabled ending");
-    }
-
-    @Test
-    public void testSnapshotAfterStartupWithMigratedApplyJournalEntries() {
-        TEST_LOG.info("testSnapshotAfterStartupWithMigratedApplyJournalEntries starting");
-
-        String persistenceId = factory.generateActorId("test-actor-");
-
-        InMemoryJournal.addEntry(persistenceId, 1, new UpdateElectionTerm(1, persistenceId));
-        InMemoryJournal.addEntry(persistenceId, 2, new SimpleReplicatedLogEntry(0, 1,
-                new MockRaftActorContext.MockPayload("A")));
-        InMemoryJournal.addEntry(persistenceId, 3,
-                new org.opendaylight.controller.cluster.raft.base.messages.ApplyJournalEntries(0));
-
-
-        doTestSnapshotAfterStartupWithMigratedMessage(persistenceId, true, snapshot -> {
-            assertEquals("getLastAppliedIndex", 0, snapshot.getLastAppliedIndex());
-            assertEquals("getLastAppliedTerm", 1, snapshot.getLastAppliedTerm());
-            assertEquals("getLastIndex", 0, snapshot.getLastIndex());
-            assertEquals("getLastTerm", 1, snapshot.getLastTerm());
-        }, ByteState.empty());
-
-        TEST_LOG.info("testSnapshotAfterStartupWithMigratedApplyJournalEntries ending");
-    }
-
     @Test
     public void testNoSnapshotAfterStartupWithNoMigratedMessages() {
         TEST_LOG.info("testNoSnapshotAfterStartupWithNoMigratedMessages starting");
@@ -203,54 +109,6 @@ public class MigratedMessagesTest extends AbstractActorTest {
         TEST_LOG.info("testNoSnapshotAfterStartupWithNoMigratedMessages ending");
     }
 
-    @Test
-    public void testSnapshotAfterStartupWithMigratedReplicatedLogEntry() {
-        TEST_LOG.info("testSnapshotAfterStartupWithMigratedReplicatedLogEntry starting");
-
-        String persistenceId = factory.generateActorId("test-actor-");
-
-        InMemoryJournal.addEntry(persistenceId, 1, new UpdateElectionTerm(1, persistenceId));
-        MockRaftActorContext.MockPayload expPayload = new MockRaftActorContext.MockPayload("A");
-        InMemoryJournal.addEntry(persistenceId, 2, new org.opendaylight.controller.cluster.raft.ReplicatedLogImplEntry(
-                0, 1, expPayload));
-
-        doTestSnapshotAfterStartupWithMigratedMessage(persistenceId, true, snapshot -> {
-            assertEquals("Unapplied entries size", 1, snapshot.getUnAppliedEntries().size());
-            assertEquals("Unapplied entry term", 1, snapshot.getUnAppliedEntries().get(0).getTerm());
-            assertEquals("Unapplied entry index", 0, snapshot.getUnAppliedEntries().get(0).getIndex());
-            assertEquals("Unapplied entry data", expPayload, snapshot.getUnAppliedEntries().get(0).getData());
-        }, ByteState.empty());
-
-        TEST_LOG.info("testSnapshotAfterStartupWithMigratedReplicatedLogEntry ending");
-    }
-
-    private TestActorRef<MockRaftActor> doTestSnapshotAfterStartupWithMigratedServerConfigPayload(boolean persistent) {
-        String persistenceId = factory.generateActorId("test-actor-");
-
-        org.opendaylight.controller.cluster.raft.ServerConfigurationPayload persistedServerConfig =
-                new org.opendaylight.controller.cluster.raft.ServerConfigurationPayload(Arrays.asList(
-                    new org.opendaylight.controller.cluster.raft.ServerConfigurationPayload.ServerInfo(
-                            persistenceId, true),
-                    new org.opendaylight.controller.cluster.raft.ServerConfigurationPayload.ServerInfo(
-                            "downNode", true)));
-
-        ServerConfigurationPayload expectedServerConfig = new ServerConfigurationPayload(Arrays.asList(
-                new ServerInfo(persistenceId, true), new ServerInfo("downNode", true)));
-
-        InMemoryJournal.addEntry(persistenceId, 1, new UpdateElectionTerm(1, persistenceId));
-        InMemoryJournal.addEntry(persistenceId, 3, new SimpleReplicatedLogEntry(0, 1, persistedServerConfig));
-
-        TestActorRef<MockRaftActor> actor = doTestSnapshotAfterStartupWithMigratedMessage(persistenceId,
-            persistent, snapshot -> {
-                assertEquals("getElectionVotedFor", persistenceId, snapshot.getElectionVotedFor());
-                assertEquals("getElectionTerm", 1, snapshot.getElectionTerm());
-                assertEquals("getServerConfiguration", new HashSet<>(expectedServerConfig.getServerConfig()),
-                        new HashSet<>(snapshot.getServerConfiguration().getServerConfig()));
-            }, ByteState.empty());
-
-        return actor;
-    }
-
     @Test
     public void testSnapshotAfterStartupWithMigratedSnapshot() throws Exception {
         TEST_LOG.info("testSnapshotAfterStartupWithMigratedSnapshot starting");