X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FAbstractShardManagerTest.java;h=8152c9e6e2cebfe7e221be31fb0b85585d927489;hb=0b3bfca7f39ee1bb6dcf5379f44d0b402adeb7fe;hp=fc6445e8f29dee2639d77727636d72844138f837;hpb=149feb98f151186975fe42bab5853e05aafd4b51;p=controller.git 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 fc6445e8f2..8152c9e6e2 100644 --- 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 @@ -12,13 +12,9 @@ import static org.mockito.Mockito.mock; import static org.mockito.MockitoAnnotations.initMocks; import akka.actor.ActorRef; -import akka.actor.ActorSystem; import akka.actor.PoisonPill; import akka.actor.Props; -import akka.testkit.JavaTestKit; import akka.testkit.TestActorRef; -import java.util.ArrayList; -import java.util.Collection; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.junit.After; @@ -43,7 +39,6 @@ public class AbstractShardManagerTest extends AbstractClusterRefActorTest { protected final String shardMrgIDSuffix = "config" + ID_COUNTER++; protected final TestActorFactory actorFactory = new TestActorFactory(getSystem()); - protected final Collection actorSystems = new ArrayList<>(); protected final DatastoreContext.Builder datastoreContextBuilder = DatastoreContext.newBuilder() .dataStoreName(shardMrgIDSuffix).shardInitializationTimeout(600, TimeUnit.MILLISECONDS) .shardHeartbeatIntervalInMillis(100).shardElectionTimeoutFactor(6); @@ -85,10 +80,6 @@ public class AbstractShardManagerTest extends AbstractClusterRefActorTest { InMemoryJournal.clear(); InMemorySnapshotStore.clear(); - for (final ActorSystem system : actorSystems) { - JavaTestKit.shutdownActorSystem(system, null, Boolean.TRUE); - } - mockShardActor.tell(PoisonPill.getInstance(), ActorRef.noSender()); mockShardActor = null;