Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Use Empty instead of Void in cohorts
[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 214b3e9d3d989d73d0cd618db937a0fa6bcfdcb6..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,11
+9,11
@@
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 org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-public abstract class AbstractActorTest {
+public abstract class AbstractActorTest
extends AbstractTest
{
private static ActorSystem system;
@BeforeClass
private static ActorSystem system;
@BeforeClass
@@
-24,12
+24,11
@@
public abstract class AbstractActorTest {
@AfterClass
public static void tearDownClass() {
@AfterClass
public static void tearDownClass() {
-
Java
TestKit.shutdownActorSystem(system);
+ TestKit.shutdownActorSystem(system);
system = null;
}
system = null;
}
- protected ActorSystem getSystem() {
+ protected
static
ActorSystem getSystem() {
return system;
}
return system;
}
-
}
}