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%2FAbstractActorTest.java;h=61abb2cba68926b8d51ae424b89c4462433c22fb;hb=9905bf0575ff196a531eb114e89b1bdb7226bc6c;hp=214b3e9d3d989d73d0cd618db937a0fa6bcfdcb6;hpb=d6d463bdd587ae6eb8884c914787af061c6f2973;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractActorTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractActorTest.java index 214b3e9d3d..61abb2cba6 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractActorTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractActorTest.java @@ -9,11 +9,11 @@ package org.opendaylight.controller.cluster.datastore; import akka.actor.ActorSystem; -import akka.testkit.JavaTestKit; +import akka.testkit.javadsl.TestKit; import org.junit.AfterClass; import org.junit.BeforeClass; -public abstract class AbstractActorTest { +public abstract class AbstractActorTest extends AbstractTest { private static ActorSystem system; @BeforeClass @@ -24,12 +24,11 @@ public abstract class AbstractActorTest { @AfterClass public static void tearDownClass() { - JavaTestKit.shutdownActorSystem(system); + TestKit.shutdownActorSystem(system); system = null; } - protected ActorSystem getSystem() { + protected static ActorSystem getSystem() { return system; } - }