package org.opendaylight.controller.cluster.datastore;
import akka.actor.ActorSystem;
-import akka.testkit.JavaTestKit;
+import akka.testkit.javadsl.TestKit;
import com.typesafe.config.ConfigFactory;
import java.util.ArrayList;
import java.util.Collection;
import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
import scala.compat.java8.FutureConverters;
import scala.concurrent.Await;
-import scala.concurrent.duration.Duration;
+import scala.concurrent.duration.FiniteDuration;
public abstract class AbstractTest {
protected static final MemberName MEMBER_NAME = MemberName.forName("member-1");
return new LocalHistoryIdentifier(CLIENT_ID, HISTORY_COUNTER.incrementAndGet());
}
- protected static <T> T waitOnAsyncTask(final CompletionStage<T> completionStage, final Duration timeout)
+ protected static <T> T waitOnAsyncTask(final CompletionStage<T> completionStage, final FiniteDuration timeout)
throws Exception {
return Await.result(FutureConverters.toScala(completionStage), timeout);
}
@After
public void actorSystemCleanup() {
for (final ActorSystem system : actorSystems) {
- JavaTestKit.shutdownActorSystem(system, null, Boolean.TRUE);
+ TestKit.shutdownActorSystem(system, true);
}
}
- protected ActorSystem newActorSystem(String name, String config) {
+ protected ActorSystem newActorSystem(final String name, final String config) {
ActorSystem system = ActorSystem.create(name, ConfigFactory.load().getConfig(config));
actorSystems.add(system);
return system;