Merge "Implement finding a primary based on the shard name and do basic wiring of...

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java
index 934c064c3e3b807abe957f5136886e9291245a4a..7f2a836b6f9cf7218037a6437044dbf6c15984df 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java
@@ -8,6 +8,8 @@ import org.opendaylight.controller.cluster.datastore.messages.CreateTransactionC
 import org.opendaylight.controller.cluster.datastore.messages.CreateTransactionChainReply;
 import org.opendaylight.controller.cluster.datastore.messages.RegisterChangeListener;
 import org.opendaylight.controller.cluster.datastore.messages.RegisterChangeListenerReply;
+import org.opendaylight.controller.cluster.datastore.messages.UpdateSchemaContext;
+import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeListener;
@@ -18,10 +20,10 @@ import static org.junit.Assert.assertTrue;
 
 public class ShardTest extends AbstractActorTest{
   @Test
-  public void testOnReceiveCreateTransaction() throws Exception {
+  public void testOnReceiveCreateTransactionChain() throws Exception {
     new JavaTestKit(getSystem()) {{
-      final Props props = Props.create(Shard.class);
-      final ActorRef subject = getSystem().actorOf(props, "testCreateTransaction");
+      final Props props = Shard.props("config");
+      final ActorRef subject = getSystem().actorOf(props, "testCreateTransactionChain");
 
       new Within(duration("1 seconds")) {
         protected void run() {
@@ -40,7 +42,7 @@ public class ShardTest extends AbstractActorTest{
             }
           }.get(); // this extracts the received message
 
-          assertTrue(out.matches("akka:\\/\\/test\\/user\\/testCreateTransaction\\/\\$.*"));
+          assertTrue(out.matches("akka:\\/\\/test\\/user\\/testCreateTransactionChain\\/\\$.*"));
           // Will wait for the rest of the 3 seconds
           expectNoMsg();
         }
@@ -53,12 +55,14 @@ public class ShardTest extends AbstractActorTest{
   @Test
   public void testOnReceiveRegisterListener() throws Exception {
     new JavaTestKit(getSystem()) {{
-      final Props props = Props.create(Shard.class);
+      final Props props = Shard.props("config");
       final ActorRef subject = getSystem().actorOf(props, "testRegisterChangeListener");
 
       new Within(duration("1 seconds")) {
         protected void run() {
 
+          subject.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
+
           subject.tell(new RegisterChangeListener(InstanceIdentifier.builder().build(), noOpDataChangeListener() , AsyncDataBroker.DataChangeScope.BASE), getRef());
 
           final String out = new ExpectMsg<String>("match hint") {