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%2Fmessages%2FAppendEntriesTest.java;fp=opendaylight%2Fmd-sal%2Fsal-akka-raft%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fraft%2Fmessages%2FAppendEntriesTest.java;h=93863147b36b4c8139542b56797ec2acb2a4e034;hp=aceed9ea5186df2088acb5b37d43fa1507345f51;hb=d066fa07902c7fe2c137616f18dac81fccefe6af;hpb=5db894b0b79b4d111768c3643efa1330f8fbee84 diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/messages/AppendEntriesTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/messages/AppendEntriesTest.java index aceed9ea51..93863147b3 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/messages/AppendEntriesTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/messages/AppendEntriesTest.java @@ -8,18 +8,13 @@ package org.opendaylight.controller.cluster.raft.messages; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; import java.util.Arrays; -import java.util.Collections; import java.util.Iterator; import org.apache.commons.lang.SerializationUtils; -import org.junit.Assert; import org.junit.Test; import org.opendaylight.controller.cluster.raft.MockRaftActorContext.MockPayload; -import org.opendaylight.controller.cluster.raft.RaftVersions; import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry; import org.opendaylight.controller.cluster.raft.ReplicatedLogImplEntry; -import org.opendaylight.controller.protobuff.messages.cluster.raft.AppendEntriesMessages; /** * Unit tests for AppendEntries. @@ -43,30 +38,6 @@ public class AppendEntriesTest { verifyAppendEntries(expected, cloned); } - @Test - public void testToAndFromSerializable() { - AppendEntries entries = new AppendEntries(5L, "node1", 7L, 8L, - Collections.emptyList(), 10L, -1, (short)0); - - assertSame("toSerializable", entries, entries.toSerializable()); - assertSame("fromSerializable", entries, - org.opendaylight.controller.cluster.raft.SerializationUtils.fromSerializable(entries)); - } - - @Test - public void testToAndFromLegacySerializable() { - ReplicatedLogEntry entry = new ReplicatedLogImplEntry(3, 4, new MockPayload("payload")); - AppendEntries entries = new AppendEntries(5L, "node1", 7L, 8L, Arrays.asList(entry), 10L, -1, (short)0); - - Object serializable = entries.toSerializable(RaftVersions.HELIUM_VERSION); - Assert.assertTrue(serializable instanceof AppendEntriesMessages.AppendEntries); - - AppendEntries entries2 = (AppendEntries) - org.opendaylight.controller.cluster.raft.SerializationUtils.fromSerializable(serializable); - - verifyAppendEntries(entries, entries2); - } - private static void verifyAppendEntries(AppendEntries expected, AppendEntries actual) { assertEquals("getLeaderId", expected.getLeaderId(), actual.getLeaderId()); assertEquals("getTerm", expected.getTerm(), actual.getTerm());