Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Convert to use EffectiveModelContext
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
AbstractClusterRefActorTest.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractClusterRefActorTest.java
b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractClusterRefActorTest.java
index f47ff18027468caa790d8fa4a17b9e3303f762fc..95b4499a7b9536f9e2d00068f516dd06fe24d2d9 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractClusterRefActorTest.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractClusterRefActorTest.java
@@
-9,9
+9,8
@@
package org.opendaylight.controller.cluster.datastore;
import akka.actor.ActorSystem;
package org.opendaylight.controller.cluster.datastore;
import akka.actor.ActorSystem;
-import akka.testkit.
Java
TestKit;
+import akka.testkit.
javadsl.
TestKit;
import com.typesafe.config.ConfigFactory;
import com.typesafe.config.ConfigFactory;
-import java.io.IOException;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@
-19,14
+18,14
@@
public abstract class AbstractClusterRefActorTest extends AbstractTest {
private static ActorSystem system;
@BeforeClass
private static ActorSystem system;
@BeforeClass
- public static void setUpClass()
throws IOException
{
+ public static void setUpClass() {
System.setProperty("shard.persistent", "false");
System.setProperty("shard.persistent", "false");
- system = ActorSystem.create("test", ConfigFactory.load().getConfig("test"));
+ system = ActorSystem.create("test", ConfigFactory.load().getConfig("test
-config
"));
}
@AfterClass
}
@AfterClass
- public static void tearDownClass()
throws IOException
{
-
JavaTestKit.shutdownActorSystem(system
);
+ public static void tearDownClass() {
+
TestKit.shutdownActorSystem(system, true
);
system = null;
}
system = null;
}