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=7c2255e962e522d94382bfd4b35fe8383061b4fd;hb=f41c5e6e6f6e10b36b1e4b1992877e38e718c8fb;hp=fae21f27091a2382f3e1feabf7a3c26ce7004ba5;hpb=879a57936375ca3dec48c5bf52b0b5988c807bae;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 fae21f2709..7c2255e962 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,30 +9,27 @@ package org.opendaylight.controller.cluster.datastore; import akka.actor.ActorSystem; -import akka.testkit.JavaTestKit; - +import akka.testkit.javadsl.TestKit; +import java.io.IOException; import org.junit.AfterClass; import org.junit.BeforeClass; -import java.io.IOException; - -public abstract class AbstractActorTest { +public abstract class AbstractActorTest extends AbstractTest { private static ActorSystem system; @BeforeClass public static void setUpClass() throws IOException { - System.setProperty("shard.persistent", "false"); system = ActorSystem.create("test"); } @AfterClass public static void tearDownClass() throws IOException { - JavaTestKit.shutdownActorSystem(system); + TestKit.shutdownActorSystem(system); system = null; } - protected ActorSystem getSystem() { + protected static ActorSystem getSystem() { return system; } }