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%2FDistributedDataStoreIntegrationTest.java;h=8a7b50d20c9003682b0ec6a2626b1c342ea73a03;hp=fc527b6bffe13726d89d5923cee71a6c471af055;hb=4a2db09204b6cc8b3e25948b976921891849c9ce;hpb=ae9f221d8bb8db034f4297f632270ba202827c56 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreIntegrationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreIntegrationTest.java index fc527b6bff..8a7b50d20c 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreIntegrationTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreIntegrationTest.java @@ -3,9 +3,12 @@ package org.opendaylight.controller.cluster.datastore; import akka.actor.ActorSystem; import akka.event.Logging; import akka.testkit.JavaTestKit; + import com.google.common.base.Optional; import com.google.common.util.concurrent.ListenableFuture; + import junit.framework.Assert; + import org.apache.commons.io.FileUtils; import org.junit.After; import org.junit.Before; @@ -69,10 +72,13 @@ public class DistributedDataStoreIntegrationTest { { new Within(duration("10 seconds")) { + @Override protected void run() { try { final DistributedDataStore distributedDataStore = - new DistributedDataStore(getSystem(), "config", new MockClusterWrapper(), configuration); + new DistributedDataStore(getSystem(), "config", + new MockClusterWrapper(), configuration, + new DatastoreContext()); distributedDataStore.onGlobalContextUpdated(TestModel.createTestContext()); @@ -80,6 +86,7 @@ public class DistributedDataStoreIntegrationTest { final boolean result = new JavaTestKit.EventFilter(Logging.Info.class ) { + @Override protected Boolean run() { return true; } @@ -150,11 +157,12 @@ public class DistributedDataStoreIntegrationTest { { new Within(duration("10 seconds")) { + @Override protected void run() { try { final DistributedDataStore distributedDataStore = new DistributedDataStore(getSystem(), "config", - new MockClusterWrapper(), configuration); + new MockClusterWrapper(), configuration, null); distributedDataStore.onGlobalContextUpdated( SchemaContextHelper.full()); @@ -164,6 +172,7 @@ public class DistributedDataStoreIntegrationTest { new JavaTestKit.EventFilter( Logging.Info.class ) { + @Override protected Boolean run() { return true; }