X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FAbstractActorTest.java;h=61abb2cba68926b8d51ae424b89c4462433c22fb;hp=2fe7b69cc9b349548f9b44ea36f5d9a9adf1bc2c;hb=12fcdfe39aa26dcba7fd3bb4d4c68e3d02e65c51;hpb=80aa861b74f7b0b3574f0962cdb45740ff71946c

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 2fe7b69cc9..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,26 +9,26 @@
 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 {
-  private static ActorSystem system;
+public abstract class AbstractActorTest extends AbstractTest {
+    private static ActorSystem system;
 
-  @BeforeClass
-  public static void setUp(){
-    system = ActorSystem.create("test");
-  }
+    @BeforeClass
+    public static void setUpClass() {
+        System.setProperty("shard.persistent", "false");
+        system = ActorSystem.create("test");
+    }
 
-  @AfterClass
-  public static void tearDown(){
-    JavaTestKit.shutdownActorSystem(system);
-    system = null;
-  }
-
-  protected ActorSystem getSystem(){
-    return system;
-  }
+    @AfterClass
+    public static void tearDownClass() {
+        TestKit.shutdownActorSystem(system);
+        system = null;
+    }
 
+    protected static ActorSystem getSystem() {
+        return system;
+    }
 }