Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix intermittent PreLeaderScenarioTest failure
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
utils
/
ActorContextTest.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/ActorContextTest.java
b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/ActorContextTest.java
index cb0864ffaf8d04d2fa59813dc4b6fe553e4ca8a2..960e0328d6cab5142d59540df7cbcdafffff49eb 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/ActorContextTest.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/ActorContextTest.java
@@
-110,11
+110,11
@@
public class ActorContextTest extends AbstractActorTest {
}
private static Props props(final boolean found, final ActorRef actorRef) {
}
private static Props props(final boolean found, final ActorRef actorRef) {
- return Props.create(new MockShardManagerCreator(found, actorRef)
);
+ return Props.create(new MockShardManagerCreator(found, actorRef));
}
private static Props props() {
}
private static Props props() {
- return Props.create(new MockShardManagerCreator()
);
+ return Props.create(new MockShardManagerCreator());
}
@SuppressWarnings("serial")
}
@SuppressWarnings("serial")
@@
-349,8
+349,7
@@
public class ActorContextTest extends AbstractActorTest {
@Test
public void testFindPrimaryShardAsyncRemotePrimaryFound() throws Exception {
@Test
public void testFindPrimaryShardAsyncRemotePrimaryFound() throws Exception {
- TestActorRef<MessageCollectorActor> shardManager = TestActorRef.create(getSystem(),
- Props.create(MessageCollectorActor.class));
+ ActorRef shardManager = getSystem().actorOf(MessageCollectorActor.props());
DatastoreContext dataStoreContext = DatastoreContext.newBuilder()
.logicalStoreType(LogicalDatastoreType.CONFIGURATION)
DatastoreContext dataStoreContext = DatastoreContext.newBuilder()
.logicalStoreType(LogicalDatastoreType.CONFIGURATION)
@@
-391,8
+390,7
@@
public class ActorContextTest extends AbstractActorTest {
@Test
public void testFindPrimaryShardAsyncLocalPrimaryFound() throws Exception {
@Test
public void testFindPrimaryShardAsyncLocalPrimaryFound() throws Exception {
- TestActorRef<MessageCollectorActor> shardManager = TestActorRef.create(getSystem(),
- Props.create(MessageCollectorActor.class));
+ ActorRef shardManager = getSystem().actorOf(MessageCollectorActor.props());
DatastoreContext dataStoreContext = DatastoreContext.newBuilder()
.logicalStoreType(LogicalDatastoreType.CONFIGURATION)
DatastoreContext dataStoreContext = DatastoreContext.newBuilder()
.logicalStoreType(LogicalDatastoreType.CONFIGURATION)
@@
-443,8
+441,7
@@
public class ActorContextTest extends AbstractActorTest {
@SuppressWarnings("checkstyle:IllegalCatch")
private static void testFindPrimaryExceptions(final Object expectedException) throws Exception {
@SuppressWarnings("checkstyle:IllegalCatch")
private static void testFindPrimaryExceptions(final Object expectedException) throws Exception {
- TestActorRef<MessageCollectorActor> shardManager =
- TestActorRef.create(getSystem(), Props.create(MessageCollectorActor.class));
+ ActorRef shardManager = getSystem().actorOf(MessageCollectorActor.props());
DatastoreContext dataStoreContext = DatastoreContext.newBuilder()
.logicalStoreType(LogicalDatastoreType.CONFIGURATION)
DatastoreContext dataStoreContext = DatastoreContext.newBuilder()
.logicalStoreType(LogicalDatastoreType.CONFIGURATION)
@@
-479,8
+476,8
@@
public class ActorContextTest extends AbstractActorTest {
public void testBroadcast() {
new JavaTestKit(getSystem()) {
{
public void testBroadcast() {
new JavaTestKit(getSystem()) {
{
- ActorRef shardActorRef1 = getSystem().actorOf(
Props.create(MessageCollectorActor.class
));
- ActorRef shardActorRef2 = getSystem().actorOf(
Props.create(MessageCollectorActor.class
));
+ ActorRef shardActorRef1 = getSystem().actorOf(
MessageCollectorActor.props(
));
+ ActorRef shardActorRef2 = getSystem().actorOf(
MessageCollectorActor.props(
));
TestActorRef<MockShardManager> shardManagerActorRef = TestActorRef.create(getSystem(),
MockShardManager.props());
TestActorRef<MockShardManager> shardManagerActorRef = TestActorRef.create(getSystem(),
MockShardManager.props());