Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Switch current {ABI,DataStore,Payload}Version to Sodium SR1
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
AbstractShardManagerTest.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardManagerTest.java
b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardManagerTest.java
index 8152c9e6e2cebfe7e221be31fb0b85585d927489..283e6867bff94997861cd385db9b10d3a9eb78ba 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardManagerTest.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardManagerTest.java
@@
-14,7
+14,6
@@
import static org.mockito.MockitoAnnotations.initMocks;
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.testkit.TestActorRef;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.junit.After;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.junit.After;
@@
-34,7
+33,7
@@
public class AbstractShardManagerTest extends AbstractClusterRefActorTest {
protected static final MemberName MEMBER_1 = MemberName.forName("member-1");
protected static int ID_COUNTER = 1;
protected static final MemberName MEMBER_1 = MemberName.forName("member-1");
protected static int ID_COUNTER = 1;
- protected static
TestActorRef<MessageCollectorActor>
mockShardActor;
+ protected static
ActorRef
mockShardActor;
protected static ShardIdentifier mockShardName;
protected final String shardMrgIDSuffix = "config" + ID_COUNTER++;
protected static ShardIdentifier mockShardName;
protected final String shardMrgIDSuffix = "config" + ID_COUNTER++;
@@
-60,7
+59,7
@@
public class AbstractShardManagerTest extends AbstractClusterRefActorTest {
}
@Before
}
@Before
- public void setUp()
throws Exception
{
+ public void setUp() {
initMocks(this);
InMemoryJournal.clear();
initMocks(this);
InMemoryJournal.clear();
@@
-68,11
+67,10
@@
public class AbstractShardManagerTest extends AbstractClusterRefActorTest {
if (mockShardActor == null) {
mockShardName = ShardIdentifier.create(Shard.DEFAULT_NAME, MEMBER_1, "config");
if (mockShardActor == null) {
mockShardName = ShardIdentifier.create(Shard.DEFAULT_NAME, MEMBER_1, "config");
- mockShardActor = TestActorRef.create(getSystem(), Props.create(MessageCollectorActor.class),
- mockShardName.toString());
+ mockShardActor = getSystem().actorOf(MessageCollectorActor.props(), mockShardName.toString());
}
}
-
mockShardActor.underlyingActor().clear(
);
+
MessageCollectorActor.clearMessages(mockShardActor
);
}
@After
}
@After