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 "Fix for possible NPE if Bundle is stopped."
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
ShardManagerTest.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardManagerTest.java
b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardManagerTest.java
index 268ed3c27383f3254eafec08e74c8f287456456a..499b4e1f3111d097cc0696aa7cd23367fc4c591d 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardManagerTest.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardManagerTest.java
@@
-42,7
+42,7
@@
public class ShardManagerTest {
new JavaTestKit(system) {{
final Props props = ShardManager
.props("config", new MockClusterWrapper(),
new JavaTestKit(system) {{
final Props props = ShardManager
.props("config", new MockClusterWrapper(),
- new MockConfiguration());
+ new MockConfiguration()
, null
);
final TestActorRef<ShardManager> subject =
TestActorRef.create(system, props);
final TestActorRef<ShardManager> subject =
TestActorRef.create(system, props);
@@
-66,7
+66,7
@@
public class ShardManagerTest {
new JavaTestKit(system) {{
final Props props = ShardManager
.props("config", new MockClusterWrapper(),
new JavaTestKit(system) {{
final Props props = ShardManager
.props("config", new MockClusterWrapper(),
- new MockConfiguration());
+ new MockConfiguration()
, null
);
final TestActorRef<ShardManager> subject =
TestActorRef.create(system, props);
final TestActorRef<ShardManager> subject =
TestActorRef.create(system, props);
@@
-75,7
+75,7
@@
public class ShardManagerTest {
subject.tell(new FindPrimary(Shard.DEFAULT_NAME).toSerializable(), getRef());
subject.tell(new FindPrimary(Shard.DEFAULT_NAME).toSerializable(), getRef());
- expectMsgClass(PrimaryFound.SERIALIZABLE_CLASS);
+ expectMsgClass(
duration("1 seconds"),
PrimaryFound.SERIALIZABLE_CLASS);
expectNoMsg();
}
expectNoMsg();
}
@@
-89,7
+89,7
@@
public class ShardManagerTest {
new JavaTestKit(system) {{
final Props props = ShardManager
.props("config", new MockClusterWrapper(),
new JavaTestKit(system) {{
final Props props = ShardManager
.props("config", new MockClusterWrapper(),
- new MockConfiguration());
+ new MockConfiguration()
, null
);
final TestActorRef<ShardManager> subject =
TestActorRef.create(system, props);
final TestActorRef<ShardManager> subject =
TestActorRef.create(system, props);
@@
-124,7
+124,7
@@
public class ShardManagerTest {
new JavaTestKit(system) {{
final Props props = ShardManager
.props("config", mockClusterWrapper,
new JavaTestKit(system) {{
final Props props = ShardManager
.props("config", mockClusterWrapper,
- new MockConfiguration());
+ new MockConfiguration()
, null
);
final TestActorRef<ShardManager> subject =
TestActorRef.create(system, props);
final TestActorRef<ShardManager> subject =
TestActorRef.create(system, props);
@@
-158,7
+158,7
@@
public class ShardManagerTest {
new JavaTestKit(system) {{
final Props props = ShardManager
.props("config", new MockClusterWrapper(),
new JavaTestKit(system) {{
final Props props = ShardManager
.props("config", new MockClusterWrapper(),
- new MockConfiguration());
+ new MockConfiguration()
, null
);
final TestActorRef<ShardManager> subject =
TestActorRef.create(system, props);
final TestActorRef<ShardManager> subject =
TestActorRef.create(system, props);
@@
-170,7
+170,7
@@
public class ShardManagerTest {
subject.tell(new FindPrimary("astronauts").toSerializable(), getRef());
subject.tell(new FindPrimary("astronauts").toSerializable(), getRef());
- final String out = new ExpectMsg<String>("primary found") {
+ final String out = new ExpectMsg<String>(
duration("1 seconds"),
"primary found") {
// do not put code outside this method, will run afterwards
protected String match(Object in) {
if (in.getClass().equals(PrimaryFound.SERIALIZABLE_CLASS)) {
// do not put code outside this method, will run afterwards
protected String match(Object in) {
if (in.getClass().equals(PrimaryFound.SERIALIZABLE_CLASS)) {
@@
-196,7
+196,7
@@
public class ShardManagerTest {
new JavaTestKit(system) {{
final Props props = ShardManager
.props("config", new MockClusterWrapper(),
new JavaTestKit(system) {{
final Props props = ShardManager
.props("config", new MockClusterWrapper(),
- new MockConfiguration());
+ new MockConfiguration()
, null
);
final TestActorRef<ShardManager> subject =
TestActorRef.create(system, props);
final TestActorRef<ShardManager> subject =
TestActorRef.create(system, props);
@@
-208,13
+208,13
@@
public class ShardManagerTest {
subject.tell(new FindPrimary("astronauts").toSerializable(), getRef());
subject.tell(new FindPrimary("astronauts").toSerializable(), getRef());
- expectMsgClass(PrimaryFound.SERIALIZABLE_CLASS);
+ expectMsgClass(
duration("1 seconds"),
PrimaryFound.SERIALIZABLE_CLASS);
MockClusterWrapper.sendMemberRemoved(subject, "member-2", getRef().path().toString());
subject.tell(new FindPrimary("astronauts").toSerializable(), getRef());
MockClusterWrapper.sendMemberRemoved(subject, "member-2", getRef().path().toString());
subject.tell(new FindPrimary("astronauts").toSerializable(), getRef());
- expectMsgClass(PrimaryNotFound.SERIALIZABLE_CLASS);
+ expectMsgClass(
duration("1 seconds"),
PrimaryNotFound.SERIALIZABLE_CLASS);
expectNoMsg();
}
expectNoMsg();
}