Bug 7521: Convert DatastoreSnapshot.ShardSnapshot to store Snapshot

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / test / java / org / opendaylight / controller / cluster / datastore / shardmanager / ShardManagerGetSnapshotReplyActorTest.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerGetSnapshotReplyActorTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerGetSnapshotReplyActorTest.java
index f2b11b01c311aaaf0b798ed809fed267dd9f3d75..5085cdd305bdb5a5e5636cab31485b9cdd692ca5 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerGetSnapshotReplyActorTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerGetSnapshotReplyActorTest.java
@@ -15,6 +15,7 @@ import akka.actor.Status.Failure;
 import akka.actor.Terminated;
 import akka.testkit.JavaTestKit;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -24,7 +25,10 @@ import org.opendaylight.controller.cluster.datastore.AbstractActorTest;
 import org.opendaylight.controller.cluster.datastore.identifiers.ShardIdentifier;
 import org.opendaylight.controller.cluster.datastore.persisted.DatastoreSnapshot;
 import org.opendaylight.controller.cluster.datastore.persisted.DatastoreSnapshot.ShardSnapshot;
+import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry;
 import org.opendaylight.controller.cluster.raft.client.messages.GetSnapshotReply;
+import org.opendaylight.controller.cluster.raft.persisted.ByteState;
+import org.opendaylight.controller.cluster.raft.persisted.Snapshot;
 import scala.concurrent.duration.Duration;
 import scala.concurrent.duration.FiniteDuration;
 
@@ -47,19 +51,22 @@ public class ShardManagerGetSnapshotReplyActorTest extends AbstractActorTest {
 
         kit.watch(replyActor);
 
-        byte[] shard1Snapshot = new byte[]{1,2,3};
+        ByteState shard1SnapshotState = ByteState.of(new byte[]{1,2,3});
         replyActor.tell(new GetSnapshotReply(ShardIdentifier.create("shard1", MEMBER_1, "config").toString(),
-            shard1Snapshot), ActorRef.noSender());
+                Snapshot.create(shard1SnapshotState, Collections.<ReplicatedLogEntry>emptyList(),
+                        2, 1, 2, 1, 1, "member-1", null)), ActorRef.noSender());
 
-        byte[] shard2Snapshot = new byte[]{4,5,6};
+        ByteState shard2SnapshotState = ByteState.of(new byte[]{4,5,6});
         replyActor.tell(new GetSnapshotReply(ShardIdentifier.create("shard2", MEMBER_1, "config").toString(),
-            shard2Snapshot), ActorRef.noSender());
+                Snapshot.create(shard2SnapshotState, Collections.<ReplicatedLogEntry>emptyList(),
+                        2, 1, 2, 1, 1, "member-1", null)), ActorRef.noSender());
 
         kit.expectNoMsg(FiniteDuration.create(500, TimeUnit.MILLISECONDS));
 
-        byte[] shard3Snapshot = new byte[]{7,8,9};
+        ByteState shard3SnapshotState = ByteState.of(new byte[]{7,8,9});
         replyActor.tell(new GetSnapshotReply(ShardIdentifier.create("shard3", MEMBER_1, "config").toString(),
-            shard3Snapshot), ActorRef.noSender());
+                Snapshot.create(shard3SnapshotState, Collections.<ReplicatedLogEntry>emptyList(),
+                        2, 1, 2, 1, 1, "member-1", null)), ActorRef.noSender());
 
         DatastoreSnapshot datastoreSnapshot = kit.expectMsgClass(DatastoreSnapshot.class);
 
@@ -68,11 +75,14 @@ public class ShardManagerGetSnapshotReplyActorTest extends AbstractActorTest {
         List<ShardSnapshot> shardSnapshots = datastoreSnapshot.getShardSnapshots();
         assertEquals("ShardSnapshot size", 3, shardSnapshots.size());
         assertEquals("ShardSnapshot 1 getName", "shard1", shardSnapshots.get(0).getName());
-        assertArrayEquals("ShardSnapshot 1 getSnapshot", shard1Snapshot, shardSnapshots.get(0).getSnapshot());
+        assertEquals("ShardSnapshot 1 getSnapshot", shard1SnapshotState,
+                shardSnapshots.get(0).getSnapshot().getState());
         assertEquals("ShardSnapshot 2 getName", "shard2", shardSnapshots.get(1).getName());
-        assertArrayEquals("ShardSnapshot 2 getSnapshot", shard2Snapshot, shardSnapshots.get(1).getSnapshot());
+        assertEquals("ShardSnapshot 2 getSnapshot", shard2SnapshotState,
+                shardSnapshots.get(1).getSnapshot().getState());
         assertEquals("ShardSnapshot 3 getName", "shard3", shardSnapshots.get(2).getName());
-        assertArrayEquals("ShardSnapshot 3 getSnapshot", shard3Snapshot, shardSnapshots.get(2).getSnapshot());
+        assertEquals("ShardSnapshot 3 getSnapshot", shard3SnapshotState,
+                shardSnapshots.get(2).getSnapshot().getState());
 
         kit.expectMsgClass(Terminated.class);
     }
@@ -89,7 +99,8 @@ public class ShardManagerGetSnapshotReplyActorTest extends AbstractActorTest {
         kit.watch(replyActor);
 
         replyActor.tell(new GetSnapshotReply(ShardIdentifier.create("shard1", MEMBER_1, "config").toString(),
-            new byte[]{1,2,3}), ActorRef.noSender());
+                Snapshot.create(ByteState.of(new byte[]{1,2,3}), Collections.<ReplicatedLogEntry>emptyList(),
+                        2, 1, 2, 1, 1, "member-1", null)), ActorRef.noSender());
 
         replyActor.tell(new Failure(new RuntimeException()), ActorRef.noSender());