Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Migrate sal-akka-raft tests
[controller.git]
/
opendaylight
/
md-sal
/
sal-akka-raft
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
raft
/
behaviors
/
AbstractRaftActorBehaviorTest.java
diff --git
a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehaviorTest.java
b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehaviorTest.java
index 03950dbd4b62e605083c708d475f7379b42915bd..7695d05133e6cd18e4d97a35282d9931995a2f01 100644
(file)
--- a/
opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehaviorTest.java
+++ b/
opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehaviorTest.java
@@
-13,9
+13,7
@@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import akka.actor.ActorRef;
import static org.junit.Assert.assertNull;
import akka.actor.ActorRef;
-import akka.actor.Props;
-import akka.testkit.TestActorRef;
-import com.google.protobuf.ByteString;
+import akka.protobuf.ByteString;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
@@
-49,13
+47,13
@@
public abstract class AbstractRaftActorBehaviorTest<T extends RaftActorBehavior>
protected final TestActorFactory actorFactory = new TestActorFactory(getSystem());
protected final TestActorFactory actorFactory = new TestActorFactory(getSystem());
- private final
TestActorRef<MessageCollectorActor> behaviorActor = actorFactory.createTest
Actor(
-
Props.create(MessageCollectorActor.class
), actorFactory.generateActorId("behavior"));
+ private final
ActorRef behaviorActor = actorFactory.create
Actor(
+
MessageCollectorActor.props(
), actorFactory.generateActorId("behavior"));
RaftActorBehavior behavior;
@After
RaftActorBehavior behavior;
@After
- public void tearDown()
throws Exception
{
+ public void tearDown() {
if (behavior != null) {
behavior.close();
}
if (behavior != null) {
behavior.close();
}
@@
-71,7
+69,7
@@
public abstract class AbstractRaftActorBehaviorTest<T extends RaftActorBehavior>
* term the RaftActor gets into the Follower state.
*/
@Test
* term the RaftActor gets into the Follower state.
*/
@Test
- public void testHandleRaftRPCWithNewerTerm()
throws Exception
{
+ public void testHandleRaftRPCWithNewerTerm() {
MockRaftActorContext actorContext = createActorContext();
assertStateChangesToFollowerWhenRaftRPCHasNewerTerm(actorContext, behaviorActor,
MockRaftActorContext actorContext = createActorContext();
assertStateChangesToFollowerWhenRaftRPCHasNewerTerm(actorContext, behaviorActor,
@@
-94,7
+92,7
@@
public abstract class AbstractRaftActorBehaviorTest<T extends RaftActorBehavior>
* change it's state and it responds back with a failure.
*/
@Test
* change it's state and it responds back with a failure.
*/
@Test
- public void testHandleAppendEntriesSenderTermLessThanReceiverTerm()
throws Exception
{
+ public void testHandleAppendEntriesSenderTermLessThanReceiverTerm() {
MockRaftActorContext context = createActorContext();
short payloadVersion = 5;
context.setPayloadVersion(payloadVersion);
MockRaftActorContext context = createActorContext();
short payloadVersion = 5;
context.setPayloadVersion(payloadVersion);
@@
-124,7
+122,7
@@
public abstract class AbstractRaftActorBehaviorTest<T extends RaftActorBehavior>
@Test
@Test
- public void testHandleAppendEntriesAddSameEntryToLog()
throws Exception
{
+ public void testHandleAppendEntriesAddSameEntryToLog() {
MockRaftActorContext context = createActorContext();
context.getTermInformation().update(2, "test");
MockRaftActorContext context = createActorContext();
context.getTermInformation().update(2, "test");
@@
-156,8
+154,7
@@
public abstract class AbstractRaftActorBehaviorTest<T extends RaftActorBehavior>
handleAppendEntriesAddSameEntryToLogReply(behaviorActor);
}
handleAppendEntriesAddSameEntryToLogReply(behaviorActor);
}
- protected void handleAppendEntriesAddSameEntryToLogReply(TestActorRef<MessageCollectorActor> replyActor)
- throws Exception {
+ protected void handleAppendEntriesAddSameEntryToLogReply(final ActorRef replyActor) {
AppendEntriesReply reply = MessageCollectorActor.getFirstMatching(replyActor, AppendEntriesReply.class);
Assert.assertNull("Expected no AppendEntriesReply", reply);
}
AppendEntriesReply reply = MessageCollectorActor.getFirstMatching(replyActor, AppendEntriesReply.class);
Assert.assertNull("Expected no AppendEntriesReply", reply);
}
@@
-279,8
+276,8
@@
public abstract class AbstractRaftActorBehaviorTest<T extends RaftActorBehavior>
}
}
- protected void assertStateChangesToFollowerWhenRaftRPCHasNewerTerm(MockRaftActorContext actorContext,
-
ActorRef actorRef, RaftRPC rpc) throws Exception
{
+ protected void assertStateChangesToFollowerWhenRaftRPCHasNewerTerm(
final
MockRaftActorContext actorContext,
+
final ActorRef actorRef, final RaftRPC rpc)
{
Payload payload = new MockRaftActorContext.MockPayload("");
setLastLogEntry(actorContext, 1, 0, payload);
Payload payload = new MockRaftActorContext.MockPayload("");
setLastLogEntry(actorContext, 1, 0, payload);
@@
-297,12
+294,12
@@
public abstract class AbstractRaftActorBehaviorTest<T extends RaftActorBehavior>
}
protected MockRaftActorContext.SimpleReplicatedLog setLastLogEntry(
}
protected MockRaftActorContext.SimpleReplicatedLog setLastLogEntry(
-
MockRaftActorContext actorContext, long term, long index,
Payload data) {
+
final MockRaftActorContext actorContext, final long term, final long index, final
Payload data) {
return setLastLogEntry(actorContext, new SimpleReplicatedLogEntry(index, term, data));
}
return setLastLogEntry(actorContext, new SimpleReplicatedLogEntry(index, term, data));
}
- protected MockRaftActorContext.SimpleReplicatedLog setLastLogEntry(MockRaftActorContext actorContext,
- ReplicatedLogEntry logEntry) {
+ protected MockRaftActorContext.SimpleReplicatedLog setLastLogEntry(
final
MockRaftActorContext actorContext,
+
final
ReplicatedLogEntry logEntry) {
MockRaftActorContext.SimpleReplicatedLog log = new MockRaftActorContext.SimpleReplicatedLog();
log.append(logEntry);
actorContext.setReplicatedLog(log);
MockRaftActorContext.SimpleReplicatedLog log = new MockRaftActorContext.SimpleReplicatedLog();
log.append(logEntry);
actorContext.setReplicatedLog(log);
@@
-312,7
+309,7
@@
public abstract class AbstractRaftActorBehaviorTest<T extends RaftActorBehavior>
protected abstract T createBehavior(RaftActorContext actorContext);
protected abstract T createBehavior(RaftActorContext actorContext);
- protected final T createBehavior(MockRaftActorContext actorContext) {
+ protected final T createBehavior(
final
MockRaftActorContext actorContext) {
T ret = createBehavior((RaftActorContext)actorContext);
actorContext.setCurrentBehavior(ret);
return ret;
T ret = createBehavior((RaftActorContext)actorContext);
actorContext.setCurrentBehavior(ret);
return ret;
@@
-326,7
+323,7
@@
public abstract class AbstractRaftActorBehaviorTest<T extends RaftActorBehavior>
return new MockRaftActorContext();
}
return new MockRaftActorContext();
}
- protected MockRaftActorContext createActorContext(ActorRef actor) {
+ protected MockRaftActorContext createActorContext(
final
ActorRef actor) {
return new MockRaftActorContext("test", getSystem(), actor);
}
return new MockRaftActorContext("test", getSystem(), actor);
}
@@
-346,7
+343,7
@@
public abstract class AbstractRaftActorBehaviorTest<T extends RaftActorBehavior>
return new RequestVoteReply(100, false);
}
return new RequestVoteReply(100, false);
}
- protected ByteString toByteString(Map<String, String> state) {
+ protected ByteString toByteString(
final
Map<String, String> state) {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
try (ObjectOutputStream oos = new ObjectOutputStream(bos)) {
oos.writeObject(state);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
try (ObjectOutputStream oos = new ObjectOutputStream(bos)) {
oos.writeObject(state);
@@
-356,7
+353,7
@@
public abstract class AbstractRaftActorBehaviorTest<T extends RaftActorBehavior>
}
}
}
}
- protected void logStart(String name) {
+ protected void logStart(
final
String name) {
LoggerFactory.getLogger(getClass()).info("Starting " + name);
}
LoggerFactory.getLogger(getClass()).info("Starting " + name);
}