Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump versions 9.0.4-SNAPSHOT
[controller.git]
/
opendaylight
/
md-sal
/
sal-akka-raft
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
raft
/
behaviors
/
AbstractLeaderElectionScenarioTest.java
diff --git
a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeaderElectionScenarioTest.java
b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeaderElectionScenarioTest.java
index 1d4fde1a448d8dccfc998334c343fc2f00b86d42..8f0cc998030b66b2d19157da6df197812f240a3f 100644
(file)
--- a/
opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeaderElectionScenarioTest.java
+++ b/
opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeaderElectionScenarioTest.java
@@
-19,8
+19,8
@@
import akka.dispatch.ControlMessage;
import akka.dispatch.Dispatchers;
import akka.dispatch.Mailboxes;
import akka.pattern.Patterns;
import akka.dispatch.Dispatchers;
import akka.dispatch.Mailboxes;
import akka.pattern.Patterns;
-import akka.testkit.JavaTestKit;
import akka.testkit.TestActorRef;
import akka.testkit.TestActorRef;
+import akka.testkit.javadsl.TestKit;
import akka.util.Timeout;
import com.google.common.util.concurrent.Uninterruptibles;
import java.util.Map;
import akka.util.Timeout;
import com.google.common.util.concurrent.Uninterruptibles;
import java.util.Map;
@@
-40,7
+40,6
@@
import org.opendaylight.controller.cluster.raft.utils.MessageCollectorActor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import scala.concurrent.Await;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import scala.concurrent.Await;
-import scala.concurrent.duration.Duration;
import scala.concurrent.duration.FiniteDuration;
/**
import scala.concurrent.duration.FiniteDuration;
/**
@@
-151,12
+150,11
@@
public class AbstractLeaderElectionScenarioTest {
dropMessagesToBehavior.clear();
}
dropMessagesToBehavior.clear();
}
- @Override
public void clear() {
behaviorStateChangeLatch = null;
clearDropMessagesToBehavior();
messagesReceivedLatches.clear();
public void clear() {
behaviorStateChangeLatch = null;
clearDropMessagesToBehavior();
messagesReceivedLatches.clear();
-
super.clear(
);
+
clearMessages(getSelf()
);
}
void forwardCapturedMessageToBehavior(final Class<?> msgClass, final ActorRef sender) {
}
void forwardCapturedMessageToBehavior(final Class<?> msgClass, final ActorRef sender) {
@@
-178,15
+176,15
@@
public class AbstractLeaderElectionScenarioTest {
}
}
}
}
- static class SendImmediateHeartBeat implements ControlMessage {
-
public
static final SendImmediateHeartBeat INSTANCE = new SendImmediateHeartBeat();
+ static
final
class SendImmediateHeartBeat implements ControlMessage {
+ static final SendImmediateHeartBeat INSTANCE = new SendImmediateHeartBeat();
private SendImmediateHeartBeat() {
}
}
private SendImmediateHeartBeat() {
}
}
- static class GetBehaviorState implements ControlMessage {
-
public
static final GetBehaviorState INSTANCE = new GetBehaviorState();
+ static
final
class GetBehaviorState implements ControlMessage {
+ static final GetBehaviorState INSTANCE = new GetBehaviorState();
private GetBehaviorState() {
}
private GetBehaviorState() {
}
@@
-227,8
+225,8
@@
public class AbstractLeaderElectionScenarioTest {
}
@After
}
@After
- public void tearDown()
throws Exception
{
-
Java
TestKit.shutdownActorSystem(system);
+ public void tearDown() {
+ TestKit.shutdownActorSystem(system);
}
DefaultConfigParamsImpl newConfigParams() {
}
DefaultConfigParamsImpl newConfigParams() {
@@
-252,7
+250,7
@@
public class AbstractLeaderElectionScenarioTest {
RaftState actualState;
try {
actualState = (RaftState) Await.result(Patterns.ask(actor.self(), GetBehaviorState.INSTANCE,
RaftState actualState;
try {
actualState = (RaftState) Await.result(Patterns.ask(actor.self(), GetBehaviorState.INSTANCE,
- Timeout.apply(5, TimeUnit.SECONDS)),
Duration.apply
(5, TimeUnit.SECONDS));
+ Timeout.apply(5, TimeUnit.SECONDS)),
FiniteDuration.create
(5, TimeUnit.SECONDS));
} catch (RuntimeException e) {
throw e;
} catch (Exception e) {
} catch (RuntimeException e) {
throw e;
} catch (Exception e) {