Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Correct Frontend{Client,History}Metadata deserialization
[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..61abb2cba68926b8d51ae424b89c4462433c22fb 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
@@
-9,43
+9,26
@@
package org.opendaylight.controller.cluster.datastore;
import akka.actor.ActorSystem;
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 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
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
System.setProperty("shard.persistent", "false");
system = ActorSystem.create("test");
}
@AfterClass
- public static void tearDownClass()
throws IOException
{
-
Java
TestKit.shutdownActorSystem(system);
+ public static void tearDownClass() {
+ TestKit.shutdownActorSystem(system);
system = null;
system = null;
-
- File journal = new File("journal");
-
- if(journal.exists()) {
- FileUtils.deleteDirectory(journal);
- }
}
}
- protected ActorSystem getSystem() {
+ protected
static
ActorSystem getSystem() {
return system;
}
return system;
}
-
}
}