Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bug 5280: Enable tests for ClientBackedDatastore
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
AbstractActorTest.java
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 e23a76b0b223ee2b8ee0d5398da878cd520caf65..851bec63461bdca9dac96df2727be0b95326ccaa 100644
(file)
--- 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
@@
-10,24
+10,15
@@
package org.opendaylight.controller.cluster.datastore;
import akka.actor.ActorSystem;
import akka.testkit.JavaTestKit;
import akka.actor.ActorSystem;
import akka.testkit.JavaTestKit;
-import
org.apache.commons.io.FileUtils
;
+import
java.io.IOException
;
import org.junit.AfterClass;
import org.junit.BeforeClass;
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 {
private static ActorSystem system;
@BeforeClass
public static void setUpClass() throws IOException {
- File journal = new File("journal");
-
- if(journal.exists()) {
- FileUtils.deleteDirectory(journal);
- }
-
System.setProperty("shard.persistent", "false");
system = ActorSystem.create("test");
}
System.setProperty("shard.persistent", "false");
system = ActorSystem.create("test");
}
@@
-36,16
+27,9
@@
public abstract class AbstractActorTest {
public static void tearDownClass() throws IOException {
JavaTestKit.shutdownActorSystem(system);
system = null;
public static void tearDownClass() throws IOException {
JavaTestKit.shutdownActorSystem(system);
system = null;
-
- File journal = new File("journal");
-
- if(journal.exists()) {
- FileUtils.deleteDirectory(journal);
- }
}
}
- protected ActorSystem getSystem() {
+ protected
static
ActorSystem getSystem() {
return system;
}
return system;
}
-
}
}