X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FCompositeModificationByteStringPayloadTest.java;h=e1e968c02c2a233a6bafbc900b50a75507042026;hp=db9f3d1801c6698c863e3a5582059b493b0d05ee;hb=8ec73bf853a9b6708b455c0321a585992e02b125;hpb=24dd7056612c3b8fb42a574d572d3ea0dd23c90e diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/CompositeModificationByteStringPayloadTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/CompositeModificationByteStringPayloadTest.java index db9f3d1801..e1e968c02c 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/CompositeModificationByteStringPayloadTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/CompositeModificationByteStringPayloadTest.java @@ -8,36 +8,26 @@ package org.opendaylight.controller.cluster.datastore; -import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertTrue; -import java.util.ArrayList; -import java.util.List; import org.apache.commons.lang.SerializationUtils; import org.junit.Test; -import org.opendaylight.controller.cluster.datastore.modification.Modification; import org.opendaylight.controller.cluster.datastore.modification.MutableCompositeModification; import org.opendaylight.controller.cluster.datastore.modification.WriteModification; -import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry; -import org.opendaylight.controller.cluster.raft.ReplicatedLogImplEntry; -import org.opendaylight.controller.cluster.raft.messages.AppendEntries; import org.opendaylight.controller.cluster.raft.protobuff.client.messages.CompositeModificationByteStringPayload; import org.opendaylight.controller.md.cluster.datastore.model.TestModel; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +@Deprecated public class CompositeModificationByteStringPayloadTest { - private static final SchemaContext SCHEMA_CONTEXT = TestModel.createTestContext(); - @Test public void testSerialization(){ WriteModification writeModification = new WriteModification(TestModel.TEST_PATH, ImmutableNodes - .containerNode(TestModel.TEST_QNAME), - TestModel.createTestContext()); + .containerNode(TestModel.TEST_QNAME)); MutableCompositeModification compositeModification = - new MutableCompositeModification(); + new MutableCompositeModification(DataStoreVersions.HELIUM_2_VERSION); compositeModification.addModification(writeModification); @@ -51,33 +41,4 @@ public class CompositeModificationByteStringPayloadTest { assertTrue(deserialize instanceof CompositeModificationByteStringPayload); } - - @Test - public void testAppendEntries(){ - List entries = new ArrayList<>(); - - CompositeModificationByteStringPayload payload = newByteStringPayload( - new WriteModification(TestModel.OUTER_LIST_PATH, - ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build(), - SCHEMA_CONTEXT)); - - payload.clearModificationReference(); - - entries.add(new ReplicatedLogImplEntry(0, 1, payload)); - - - assertNotNull(new AppendEntries(10, "foobar", 10, 10, entries, 10).toSerializable()); - } - - - - private CompositeModificationByteStringPayload newByteStringPayload(final Modification... mods) { - MutableCompositeModification compMod = new MutableCompositeModification(); - for(Modification mod: mods) { - compMod.addModification(mod); - } - - return new CompositeModificationByteStringPayload(compMod.toSerializable()); - } - }