X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fmessages%2FBatchedModificationsTest.java;h=c4027ad2a5f3ac1292c6213dedc7a8d0dedd6172;hb=edcc020c8fda4b13f22a31d79c13feef0b53b0ee;hp=15d2eea598d74e353dc446672d4f7e85a949bdf9;hpb=3927509ec3ecfa32a51b725d2b7155d425f5b877;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/BatchedModificationsTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/BatchedModificationsTest.java index 15d2eea598..c4027ad2a5 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/BatchedModificationsTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/BatchedModificationsTest.java @@ -41,15 +41,19 @@ public class BatchedModificationsTest { YangInstanceIdentifier deletePath = TestModel.TEST_PATH; - BatchedModifications batched = new BatchedModifications(DataStoreVersions.CURRENT_VERSION); + BatchedModifications batched = new BatchedModifications("tx1", DataStoreVersions.CURRENT_VERSION, "txChain"); batched.addModification(new WriteModification(writePath, writeData)); batched.addModification(new MergeModification(mergePath, mergeData)); batched.addModification(new DeleteModification(deletePath)); + batched.setReady(true); BatchedModifications clone = (BatchedModifications) SerializationUtils.clone( (Serializable) batched.toSerializable()); assertEquals("getVersion", DataStoreVersions.CURRENT_VERSION, clone.getVersion()); + assertEquals("getTransactionID", "tx1", clone.getTransactionID()); + assertEquals("getTransactionChainID", "txChain", clone.getTransactionChainID()); + assertEquals("isReady", true, clone.isReady()); assertEquals("getModifications size", 3, clone.getModifications().size()); @@ -66,6 +70,20 @@ public class BatchedModificationsTest { DeleteModification delete = (DeleteModification)clone.getModifications().get(2); assertEquals("getVersion", DataStoreVersions.CURRENT_VERSION, delete.getVersion()); assertEquals("getPath", deletePath, delete.getPath()); + + // Test with different params. + + batched = new BatchedModifications("tx2", (short)10, null); + + clone = (BatchedModifications) SerializationUtils.clone((Serializable) batched.toSerializable()); + + assertEquals("getVersion", 10, clone.getVersion()); + assertEquals("getTransactionID", "tx2", clone.getTransactionID()); + assertEquals("getTransactionChainID", "", clone.getTransactionChainID()); + assertEquals("isReady", false, clone.isReady()); + + assertEquals("getModifications size", 0, clone.getModifications().size()); + } @Test @@ -73,5 +91,11 @@ public class BatchedModificationsTest { BatchedModificationsReply clone = (BatchedModificationsReply) SerializationUtils.clone( (Serializable) new BatchedModificationsReply(100).toSerializable()); assertEquals("getNumBatched", 100, clone.getNumBatched()); + assertEquals("getCohortPath", null, clone.getCohortPath()); + + clone = (BatchedModificationsReply) SerializationUtils.clone( + (Serializable) new BatchedModificationsReply(50, "cohort path").toSerializable()); + assertEquals("getNumBatched", 50, clone.getNumBatched()); + assertEquals("getCohortPath", "cohort path", clone.getCohortPath()); } }