Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Implementation of ModuleShardStrategy"
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
DistributedDataStoreIntegrationTest.java
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 f400e74231f83b7f72881656fe891404a0b7b24d..6a25328a4d2559c2ea654284bc48e17191e367e7 100644
(file)
--- 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,6
+3,9
@@
package org.opendaylight.controller.cluster.datastore;
import com.google.common.base.Optional;
import com.google.common.util.concurrent.ListenableFuture;
import org.junit.Test;
import com.google.common.base.Optional;
import com.google.common.util.concurrent.ListenableFuture;
import org.junit.Test;
+import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategyFactory;
+import org.opendaylight.controller.cluster.datastore.utils.MockClusterWrapper;
+import org.opendaylight.controller.cluster.datastore.utils.MockConfiguration;
import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadWriteTransaction;
import org.opendaylight.controller.sal.core.spi.data.DOMStoreThreePhaseCommitCohort;
import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadWriteTransaction;
import org.opendaylight.controller.sal.core.spi.data.DOMStoreThreePhaseCommitCohort;
@@
-16,8
+19,9
@@
public class DistributedDataStoreIntegrationTest extends AbstractActorTest {
@Test
public void integrationTest() throws Exception {
@Test
public void integrationTest() throws Exception {
+ ShardStrategyFactory.setConfiguration(new MockConfiguration());
DistributedDataStore distributedDataStore =
DistributedDataStore distributedDataStore =
- new DistributedDataStore(getSystem(), "config");
+ new DistributedDataStore(getSystem(), "config"
, new MockClusterWrapper(), new MockConfiguration()
);
distributedDataStore.onGlobalContextUpdated(TestModel.createTestContext());
distributedDataStore.onGlobalContextUpdated(TestModel.createTestContext());