Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "BUG-1521 netconf-impl & netconf-monitoring line coverage."
[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 2fe7b69cc9b349548f9b44ea36f5d9a9adf1bc2c..fae21f27091a2382f3e1feabf7a3c26ce7004ba5 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,25
+10,29
@@
package org.opendaylight.controller.cluster.datastore;
import akka.actor.ActorSystem;
import akka.testkit.JavaTestKit;
import akka.actor.ActorSystem;
import akka.testkit.JavaTestKit;
+
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.AfterClass;
import org.junit.BeforeClass;
+import java.io.IOException;
+
public abstract class AbstractActorTest {
public abstract class AbstractActorTest {
- private static ActorSystem system;
+
private static ActorSystem system;
- @BeforeClass
- public static void setUp(){
- system = ActorSystem.create("test");
- }
+ @BeforeClass
+ public static void setUpClass() throws IOException {
- @AfterClass
- public static void tearDown(){
- JavaTestKit.shutdownActorSystem(system);
- system = null;
- }
+ System.setProperty("shard.persistent", "false");
+ system = ActorSystem.create("test");
+ }
- protected ActorSystem getSystem(){
- return system;
- }
+ @AfterClass
+ public static void tearDownClass() throws IOException {
+ JavaTestKit.shutdownActorSystem(system);
+ system = null;
+ }
+ protected ActorSystem getSystem() {
+ return system;
+ }
}
}