Make Netty-3 dependency optional

[controller.git] / opendaylight / md-sal / sal-akka-raft / src / test / java / org / opendaylight / controller / cluster / raft / behaviors / IsolatedLeaderTest.java

diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/IsolatedLeaderTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/IsolatedLeaderTest.java
index 618bd4bb0d15d07ee41d27913151afaf6c9cedd1..794a18d2d253d5f84dfc3258c026900ae2d03204 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/IsolatedLeaderTest.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/IsolatedLeaderTest.java
@@ -10,8 +10,6 @@ package org.opendaylight.controller.cluster.raft.behaviors;
 import static org.junit.Assert.assertEquals;
 
 import akka.actor.ActorRef;
-import akka.actor.Props;
-import akka.testkit.TestActorRef;
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.After;
@@ -25,17 +23,17 @@ import org.opendaylight.controller.cluster.raft.utils.MessageCollectorActor;
 
 public class IsolatedLeaderTest extends AbstractLeaderTest<IsolatedLeader> {
 
-    private final TestActorRef<MessageCollectorActor> leaderActor = actorFactory.createTestActor(
-            Props.create(MessageCollectorActor.class), actorFactory.generateActorId("leader"));
+    private final ActorRef leaderActor = actorFactory.createActor(
+            MessageCollectorActor.props(), actorFactory.generateActorId("leader"));
 
-    private final TestActorRef<MessageCollectorActor> senderActor = actorFactory.createTestActor(
-            Props.create(MessageCollectorActor.class), actorFactory.generateActorId("sender"));
+    private final ActorRef senderActor = actorFactory.createActor(
+            MessageCollectorActor.props(), actorFactory.generateActorId("sender"));
 
     private AbstractLeader isolatedLeader;
 
     @Override
     @After
-    public void tearDown() throws Exception {
+    public void tearDown() {
         if (isolatedLeader != null) {
             isolatedLeader.close();
         }
@@ -44,7 +42,7 @@ public class IsolatedLeaderTest extends AbstractLeaderTest<IsolatedLeader> {
     }
 
     @Override
-    protected IsolatedLeader createBehavior(RaftActorContext actorContext) {
+    protected IsolatedLeader createBehavior(final RaftActorContext actorContext) {
         return new IsolatedLeader(actorContext);
     }
 
@@ -54,7 +52,7 @@ public class IsolatedLeaderTest extends AbstractLeaderTest<IsolatedLeader> {
     }
 
     @Override
-    protected MockRaftActorContext createActorContext(ActorRef actor) {
+    protected MockRaftActorContext createActorContext(final ActorRef actor) {
         DefaultConfigParamsImpl configParams = new DefaultConfigParamsImpl();
         configParams.setElectionTimeoutFactor(100000);
         MockRaftActorContext context = new MockRaftActorContext("isolated-leader", getSystem(), actor);
@@ -63,7 +61,7 @@ public class IsolatedLeaderTest extends AbstractLeaderTest<IsolatedLeader> {
     }
 
     @Test
-    public void testHandleMessageWithThreeMembers() throws Exception {
+    public void testHandleMessageWithThreeMembers() {
         String followerAddress1 = "akka://test/user/$a";
         String followerAddress2 = "akka://test/user/$b";
 
@@ -89,13 +87,13 @@ public class IsolatedLeaderTest extends AbstractLeaderTest<IsolatedLeader> {
 
         newBehavior = isolatedLeader.handleMessage(senderActor,
                 new AppendEntriesReply("follower-2", isolatedLeader.lastTerm() - 1, true,
-                        isolatedLeader.lastIndex() - 1, isolatedLeader.lastTerm() - 1, (short)0 ));
+                        isolatedLeader.lastIndex() - 1, isolatedLeader.lastTerm() - 1, (short) 0));
 
         assertEquals("Raft state", RaftState.Leader, newBehavior.state());
     }
 
     @Test
-    public void testHandleMessageWithFiveMembers() throws Exception {
+    public void testHandleMessageWithFiveMembers() {
         String followerAddress1 = "akka://test/user/$a";
         String followerAddress2 = "akka://test/user/$b";
         String followerAddress3 = "akka://test/user/$c";
@@ -116,13 +114,13 @@ public class IsolatedLeaderTest extends AbstractLeaderTest<IsolatedLeader> {
         // in a 5 member cluster, atleast 2 followers need to be active and return a reply
         RaftActorBehavior newBehavior = isolatedLeader.handleMessage(senderActor,
                 new AppendEntriesReply("follower-1", isolatedLeader.lastTerm() - 1, true,
-                        isolatedLeader.lastIndex() - 1, isolatedLeader.lastTerm() - 1, (short)0 ));
+                        isolatedLeader.lastIndex() - 1, isolatedLeader.lastTerm() - 1, (short) 0));
 
         assertEquals("Raft state", RaftState.IsolatedLeader, newBehavior.state());
 
         newBehavior = isolatedLeader.handleMessage(senderActor,
                 new AppendEntriesReply("follower-2", isolatedLeader.lastTerm() - 1, true,
-                        isolatedLeader.lastIndex() - 1, isolatedLeader.lastTerm() - 1, (short)0 ));
+                        isolatedLeader.lastIndex() - 1, isolatedLeader.lastTerm() - 1, (short) 0));
 
         assertEquals("Raft state", RaftState.Leader, newBehavior.state());
 
@@ -131,13 +129,13 @@ public class IsolatedLeaderTest extends AbstractLeaderTest<IsolatedLeader> {
 
         newBehavior = isolatedLeader.handleMessage(senderActor,
                 new AppendEntriesReply("follower-3", isolatedLeader.lastTerm() - 1, true,
-                        isolatedLeader.lastIndex() - 1, isolatedLeader.lastTerm() - 1, (short)0 ));
+                        isolatedLeader.lastIndex() - 1, isolatedLeader.lastTerm() - 1, (short) 0));
 
         assertEquals("Raft state", RaftState.Leader, newBehavior.state());
     }
 
     @Test
-    public void testHandleMessageFromAnotherLeader() throws Exception {
+    public void testHandleMessageFromAnotherLeader() {
         String followerAddress1 = "akka://test/user/$a";
         String followerAddress2 = "akka://test/user/$b";