Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Verify BatchedModifications messages sent vs received
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
AbstractShardTest.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java
b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java
index 8cafb46528e4ceddfe39e96234ead00988552597..34f0164504fe666e7cfb76090c57ed5b2362a268 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java
@@
-16,6
+16,7
@@
import static org.mockito.Mockito.mock;
import akka.actor.ActorRef;
import akka.actor.PoisonPill;
import akka.actor.Props;
import akka.actor.ActorRef;
import akka.actor.PoisonPill;
import akka.actor.Props;
+import akka.dispatch.Dispatchers;
import akka.japi.Creator;
import akka.testkit.TestActorRef;
import com.google.common.base.Function;
import akka.japi.Creator;
import akka.testkit.TestActorRef;
import com.google.common.base.Function;
@@
-87,7
+88,7
@@
public abstract class AbstractShardTest extends AbstractActorTest{
}
protected Props newShardProps() {
}
protected Props newShardProps() {
- return Shard.props(shardID, Collections.<S
hardIdentifier
,String>emptyMap(),
+ return Shard.props(shardID, Collections.<S
tring
,String>emptyMap(),
newDatastoreContext(), SCHEMA_CONTEXT);
}
newDatastoreContext(), SCHEMA_CONTEXT);
}
@@
-102,7
+103,7
@@
public abstract class AbstractShardTest extends AbstractActorTest{
Creator<Shard> creator = new Creator<Shard>() {
@Override
public Shard create() throws Exception {
Creator<Shard> creator = new Creator<Shard>() {
@Override
public Shard create() throws Exception {
- return new Shard(shardID, Collections.<S
hardIdentifier
,String>emptyMap(),
+ return new Shard(shardID, Collections.<S
tring
,String>emptyMap(),
newDatastoreContext(), SCHEMA_CONTEXT) {
@Override
protected void onRecoveryComplete() {
newDatastoreContext(), SCHEMA_CONTEXT) {
@Override
protected void onRecoveryComplete() {
@@
-117,7
+118,7
@@
public abstract class AbstractShardTest extends AbstractActorTest{
};
TestActorRef<Shard> shard = TestActorRef.create(getSystem(),
};
TestActorRef<Shard> shard = TestActorRef.create(getSystem(),
- Props.create(new DelegatingShardCreator(creator)), "testRecovery");
+ Props.create(new DelegatingShardCreator(creator))
.withDispatcher(Dispatchers.DefaultDispatcherId())
, "testRecovery");
assertEquals("Recovery complete", true, recoveryComplete.await(5, TimeUnit.SECONDS));
assertEquals("Recovery complete", true, recoveryComplete.await(5, TimeUnit.SECONDS));