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 "Datastore: Reuse successful future"
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
ShardTest.java
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 fc45efcdea854bea791c44b12a4437c2c74bc2f1..4466e50f96f53651be61a696deda5249692196e9 100644
(file)
--- 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
@@
-35,7
+35,7
@@
import static org.junit.Assert.assertTrue;
public class ShardTest extends AbstractActorTest {
public class ShardTest extends AbstractActorTest {
- private static final
ShardContext shardContext = new Shard
Context();
+ private static final
DatastoreContext DATA_STORE_CONTEXT = new Datastore
Context();
@Test
public void testOnReceiveCreateTransactionChain() throws Exception {
@Test
public void testOnReceiveCreateTransactionChain() throws Exception {
@@
-44,7
+44,7
@@
public class ShardTest extends AbstractActorTest {
ShardIdentifier.builder().memberName("member-1")
.shardName("inventory").type("config").build();
ShardIdentifier.builder().memberName("member-1")
.shardName("inventory").type("config").build();
- final Props props = Shard.props(identifier, Collections.EMPTY_MAP,
shardContext
);
+ final Props props = Shard.props(identifier, Collections.EMPTY_MAP,
DATA_STORE_CONTEXT
);
final ActorRef subject =
getSystem().actorOf(props, "testCreateTransactionChain");
final ActorRef subject =
getSystem().actorOf(props, "testCreateTransactionChain");
@@
-103,7
+103,7
@@
public class ShardTest extends AbstractActorTest {
ShardIdentifier.builder().memberName("member-1")
.shardName("inventory").type("config").build();
ShardIdentifier.builder().memberName("member-1")
.shardName("inventory").type("config").build();
- final Props props = Shard.props(identifier, Collections.EMPTY_MAP,
shardContext
);
+ final Props props = Shard.props(identifier, Collections.EMPTY_MAP,
DATA_STORE_CONTEXT
);
final ActorRef subject =
getSystem().actorOf(props, "testRegisterChangeListener");
final ActorRef subject =
getSystem().actorOf(props, "testRegisterChangeListener");
@@
-165,7
+165,7
@@
public class ShardTest extends AbstractActorTest {
ShardIdentifier.builder().memberName("member-1")
.shardName("inventory").type("config").build();
ShardIdentifier.builder().memberName("member-1")
.shardName("inventory").type("config").build();
- final Props props = Shard.props(identifier, Collections.EMPTY_MAP,
shardContext
);
+ final Props props = Shard.props(identifier, Collections.EMPTY_MAP,
DATA_STORE_CONTEXT
);
final ActorRef subject =
getSystem().actorOf(props, "testCreateTransaction");
final ActorRef subject =
getSystem().actorOf(props, "testCreateTransaction");
@@
-227,7
+227,7
@@
public class ShardTest extends AbstractActorTest {
.shardName("inventory").type("config").build();
peerAddresses.put(identifier, null);
.shardName("inventory").type("config").build();
peerAddresses.put(identifier, null);
- final Props props = Shard.props(identifier, peerAddresses,
shardContext
);
+ final Props props = Shard.props(identifier, peerAddresses,
DATA_STORE_CONTEXT
);
final ActorRef subject =
getSystem().actorOf(props, "testPeerAddressResolved");
final ActorRef subject =
getSystem().actorOf(props, "testPeerAddressResolved");