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%2FShardTest.java;h=4466e50f96f53651be61a696deda5249692196e9;hp=7740b8e667a974c10b53d0e436edb41455e40cf5;hb=be324821e7ef3dba64375e74b920b7ab513c42e3;hpb=63b36aa3537d77bd9be323e1113716ef2cd54098 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 7740b8e667..4466e50f96 100644 --- 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 @@ -4,7 +4,8 @@ import akka.actor.ActorRef; import akka.actor.Props; import akka.event.Logging; import akka.testkit.JavaTestKit; -import junit.framework.Assert; + +import org.junit.Assert; import org.junit.Test; import org.opendaylight.controller.cluster.datastore.identifiers.ShardIdentifier; import org.opendaylight.controller.cluster.datastore.messages.CreateTransaction; @@ -28,11 +29,14 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import static junit.framework.Assert.assertFalse; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; public class ShardTest extends AbstractActorTest { + + private static final DatastoreContext DATA_STORE_CONTEXT = new DatastoreContext(); + @Test public void testOnReceiveCreateTransactionChain() throws Exception { new JavaTestKit(getSystem()) {{ @@ -40,7 +44,7 @@ public class ShardTest extends AbstractActorTest { ShardIdentifier.builder().memberName("member-1") .shardName("inventory").type("config").build(); - final Props props = Shard.props(identifier, Collections.EMPTY_MAP, null); + final Props props = Shard.props(identifier, Collections.EMPTY_MAP, DATA_STORE_CONTEXT); final ActorRef subject = getSystem().actorOf(props, "testCreateTransactionChain"); @@ -49,6 +53,7 @@ public class ShardTest extends AbstractActorTest { final boolean result = new JavaTestKit.EventFilter(Logging.Info.class ) { + @Override protected Boolean run() { return true; } @@ -58,13 +63,15 @@ public class ShardTest extends AbstractActorTest { Assert.assertEquals(true, result); - new Within(duration("1 seconds")) { + new Within(duration("3 seconds")) { + @Override protected void run() { subject.tell(new CreateTransactionChain().toSerializable(), getRef()); - final String out = new ExpectMsg(duration("1 seconds"), "match hint") { + final String out = new ExpectMsg(duration("3 seconds"), "match hint") { // do not put code outside this method, will run afterwards + @Override protected String match(Object in) { if (in.getClass().equals(CreateTransactionChainReply.SERIALIZABLE_CLASS)){ CreateTransactionChainReply reply = @@ -96,11 +103,12 @@ public class ShardTest extends AbstractActorTest { ShardIdentifier.builder().memberName("member-1") .shardName("inventory").type("config").build(); - final Props props = Shard.props(identifier, Collections.EMPTY_MAP, null); + final Props props = Shard.props(identifier, Collections.EMPTY_MAP, DATA_STORE_CONTEXT); final ActorRef subject = getSystem().actorOf(props, "testRegisterChangeListener"); - new Within(duration("1 seconds")) { + new Within(duration("3 seconds")) { + @Override protected void run() { subject.tell( @@ -111,8 +119,10 @@ public class ShardTest extends AbstractActorTest { getRef().path(), AsyncDataBroker.DataChangeScope.BASE), getRef()); - final Boolean notificationEnabled = new ExpectMsg("enable notification") { + final Boolean notificationEnabled = new ExpectMsg( + duration("3 seconds"), "enable notification") { // do not put code outside this method, will run afterwards + @Override protected Boolean match(Object in) { if(in instanceof EnableNotification){ return ((EnableNotification) in).isEnabled(); @@ -124,8 +134,9 @@ public class ShardTest extends AbstractActorTest { assertFalse(notificationEnabled); - final String out = new ExpectMsg(duration("1 seconds"), "match hint") { + final String out = new ExpectMsg(duration("3 seconds"), "match hint") { // do not put code outside this method, will run afterwards + @Override protected String match(Object in) { if (in.getClass().equals(RegisterChangeListenerReply.class)) { RegisterChangeListenerReply reply = @@ -154,15 +165,15 @@ public class ShardTest extends AbstractActorTest { ShardIdentifier.builder().memberName("member-1") .shardName("inventory").type("config").build(); - final Props props = Shard.props(identifier, Collections.EMPTY_MAP, null); + final Props props = Shard.props(identifier, Collections.EMPTY_MAP, DATA_STORE_CONTEXT); final ActorRef subject = getSystem().actorOf(props, "testCreateTransaction"); - // Wait for a specific log message to show up final boolean result = new JavaTestKit.EventFilter(Logging.Info.class ) { + @Override protected Boolean run() { return true; } @@ -172,7 +183,8 @@ public class ShardTest extends AbstractActorTest { Assert.assertEquals(true, result); - new Within(duration("1 seconds")) { + new Within(duration("3 seconds")) { + @Override protected void run() { subject.tell( @@ -182,8 +194,9 @@ public class ShardTest extends AbstractActorTest { subject.tell(new CreateTransaction("txn-1", TransactionProxy.TransactionType.READ_ONLY.ordinal() ).toSerializable(), getRef()); - final String out = new ExpectMsg(duration("1 seconds"), "match hint") { + final String out = new ExpectMsg(duration("3 seconds"), "match hint") { // do not put code outside this method, will run afterwards + @Override protected String match(Object in) { if (in instanceof CreateTransactionReply) { CreateTransactionReply reply = @@ -200,8 +213,6 @@ public class ShardTest extends AbstractActorTest { out.contains("akka://test/user/testCreateTransaction/shard-txn-1")); expectNoMsg(); } - - }; }}; } @@ -216,11 +227,12 @@ public class ShardTest extends AbstractActorTest { .shardName("inventory").type("config").build(); peerAddresses.put(identifier, null); - final Props props = Shard.props(identifier, peerAddresses, null); + final Props props = Shard.props(identifier, peerAddresses, DATA_STORE_CONTEXT); final ActorRef subject = getSystem().actorOf(props, "testPeerAddressResolved"); - new Within(duration("1 seconds")) { + new Within(duration("3 seconds")) { + @Override protected void run() { subject.tell( @@ -229,8 +241,6 @@ public class ShardTest extends AbstractActorTest { expectNoMsg(); } - - }; }}; }