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 "Bug 1446: Add JMX stats for clustered data store"
[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 fc527b6bffe13726d89d5923cee71a6c471af055..8a7b50d20c9003682b0ec6a2626b1c342ea73a03 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,9
+3,12
@@
package org.opendaylight.controller.cluster.datastore;
import akka.actor.ActorSystem;
import akka.event.Logging;
import akka.testkit.JavaTestKit;
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 com.google.common.base.Optional;
import com.google.common.util.concurrent.ListenableFuture;
+
import junit.framework.Assert;
import junit.framework.Assert;
+
import org.apache.commons.io.FileUtils;
import org.junit.After;
import org.junit.Before;
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")) {
{
new Within(duration("10 seconds")) {
+ @Override
protected void run() {
try {
final DistributedDataStore distributedDataStore =
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());
distributedDataStore.onGlobalContextUpdated(TestModel.createTestContext());
@@
-80,6
+86,7
@@
public class DistributedDataStoreIntegrationTest {
final boolean result =
new JavaTestKit.EventFilter<Boolean>(Logging.Info.class
) {
final boolean result =
new JavaTestKit.EventFilter<Boolean>(Logging.Info.class
) {
+ @Override
protected Boolean run() {
return true;
}
protected Boolean run() {
return true;
}
@@
-150,11
+157,12
@@
public class DistributedDataStoreIntegrationTest {
{
new Within(duration("10 seconds")) {
{
new Within(duration("10 seconds")) {
+ @Override
protected void run() {
try {
final DistributedDataStore distributedDataStore =
new DistributedDataStore(getSystem(), "config",
protected void run() {
try {
final DistributedDataStore distributedDataStore =
new DistributedDataStore(getSystem(), "config",
- new MockClusterWrapper(), configuration);
+ new MockClusterWrapper(), configuration
, null
);
distributedDataStore.onGlobalContextUpdated(
SchemaContextHelper.full());
distributedDataStore.onGlobalContextUpdated(
SchemaContextHelper.full());
@@
-164,6
+172,7
@@
public class DistributedDataStoreIntegrationTest {
new JavaTestKit.EventFilter<Boolean>(
Logging.Info.class
) {
new JavaTestKit.EventFilter<Boolean>(
Logging.Info.class
) {
+ @Override
protected Boolean run() {
return true;
}
protected Boolean run() {
return true;
}