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=e23a76b0b223ee2b8ee0d5398da878cd520caf65;hb=33877f41ffc3f8eb36ad8490315419b90817d26e;hpb=4a8d4efda0828bc0c147dee3644c51baa6ff5a15

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 e23a76b0b2..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,43 +9,26 @@
 package org.opendaylight.controller.cluster.datastore;
 
 import akka.actor.ActorSystem;
-import akka.testkit.JavaTestKit;
-import org.apache.commons.io.FileUtils;
+import akka.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 
-import java.io.File;
-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 {
-        File journal = new File("journal");
-
-        if(journal.exists()) {
-            FileUtils.deleteDirectory(journal);
-        }
-
+    public static void setUpClass() {
         System.setProperty("shard.persistent", "false");
         system = ActorSystem.create("test");
     }
 
     @AfterClass
-    public static void tearDownClass() throws IOException {
-        JavaTestKit.shutdownActorSystem(system);
+    public static void tearDownClass() {
+        TestKit.shutdownActorSystem(system);
         system = null;
-
-        File journal = new File("journal");
-
-        if(journal.exists()) {
-            FileUtils.deleteDirectory(journal);
-        }
     }
 
-    protected ActorSystem getSystem() {
+    protected static ActorSystem getSystem() {
         return system;
     }
-
 }