X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fmessages%2FDatastoreSnapshotListTest.java;fp=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fmessages%2FDatastoreSnapshotListTest.java;h=8c8e329e14df9c4e8e27eb9f217260f331cb08b2;hb=95c296a7c1e8e186a88a0a0dc82e080b2185db33;hp=989ed46ca38a34b06f5ce1b5be86ff392a16d7bb;hpb=aafb8cb044e992dd784d1f4f66508599cc4cd588;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/DatastoreSnapshotListTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/DatastoreSnapshotListTest.java
index 989ed46ca3..8c8e329e14 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/DatastoreSnapshotListTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/messages/DatastoreSnapshotListTest.java
@@ -57,8 +57,9 @@ public class DatastoreSnapshotListTest {
 
         NormalizedNode<?, ?> legacyConfigRoot2 = toRootNode(PeopleModel.BASE_PATH, PeopleModel.emptyContainer());
 
+        ShardManagerSnapshot legacyShardManagerSnapshot = newLegacyShardManagerSnapshot("config-one", "config-two");
         DatastoreSnapshot legacyConfigSnapshot = new DatastoreSnapshot("config",
-                SerializationUtils.serialize(newLegacyShardManagerSnapshot("config-one", "config-two")),
+                SerializationUtils.serialize(legacyShardManagerSnapshot),
                 Arrays.asList(newLegacyShardSnapshot("config-one", newLegacySnapshot(legacyConfigRoot1)),
                     newLegacyShardSnapshot("config-two", newLegacySnapshot(legacyConfigRoot2))));
 
@@ -73,24 +74,29 @@ public class DatastoreSnapshotListTest {
                 SerializationUtils.clone(legacy);
 
         assertEquals("DatastoreSnapshotList size", 2, cloned.size());
-        assertDatastoreSnapshotEquals(legacyConfigSnapshot, cloned.get(0), Optional.of(legacyConfigRoot1),
-                Optional.of(legacyConfigRoot2));
-        assertDatastoreSnapshotEquals(legacyOperSnapshot, cloned.get(1), Optional.empty());
+        assertDatastoreSnapshotEquals(legacyConfigSnapshot, cloned.get(0),
+                new org.opendaylight.controller.cluster.datastore.persisted.ShardManagerSnapshot(
+                        legacyShardManagerSnapshot.getShardList()),
+                Optional.of(legacyConfigRoot1), Optional.of(legacyConfigRoot2));
+        assertDatastoreSnapshotEquals(legacyOperSnapshot, cloned.get(1),
+                (org.opendaylight.controller.cluster.datastore.persisted.ShardManagerSnapshot)null,
+                Optional.empty());
     }
 
+    @SuppressWarnings("unchecked")
     private void assertDatastoreSnapshotEquals(DatastoreSnapshot legacy,
             org.opendaylight.controller.cluster.datastore.persisted.DatastoreSnapshot actual,
+            org.opendaylight.controller.cluster.datastore.persisted.ShardManagerSnapshot expShardMgrSnapshot,
             Optional<NormalizedNode<?, ?>>... shardRoots) throws IOException {
         assertEquals("Type", legacy.getType(), actual.getType());
 
         if (legacy.getShardManagerSnapshot() == null) {
             assertNull("Expected null ShardManagerSnapshot", actual.getShardManagerSnapshot());
         } else {
-            ShardManagerSnapshot legacyShardManagerSnapshot =
-                    (ShardManagerSnapshot) SerializationUtils.deserialize(legacy.getShardManagerSnapshot());
-            ShardManagerSnapshot actualShardManagerSnapshot =
-                    (ShardManagerSnapshot) SerializationUtils.deserialize(actual.getShardManagerSnapshot());
-            assertEquals("ShardManagerSnapshot", legacyShardManagerSnapshot.getShardList(),
+            org.opendaylight.controller.cluster.datastore.persisted.ShardManagerSnapshot actualShardManagerSnapshot =
+                (org.opendaylight.controller.cluster.datastore.persisted.ShardManagerSnapshot)
+                    SerializationUtils.deserialize(legacy.getShardManagerSnapshot());
+            assertEquals("ShardManagerSnapshot", expShardMgrSnapshot.getShardList(),
                     actualShardManagerSnapshot.getShardList());
         }