Fix unit test CS warnings in sal-distributed-datastore

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / test / java / org / opendaylight / controller / cluster / datastore / RoleChangeNotifierTest.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/RoleChangeNotifierTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/RoleChangeNotifierTest.java
index bec679c16327789106d0f8938166f6c80bf0836c..13c42f919ef84b8b42fb6de5a0c28dead296a4fb 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/RoleChangeNotifierTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/RoleChangeNotifierTest.java
@@ -8,10 +8,10 @@
 
 package org.opendaylight.controller.cluster.datastore;
 
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+
 import akka.actor.ActorRef;
 import akka.actor.Props;
 import akka.testkit.JavaTestKit;
@@ -26,89 +26,96 @@ import org.opendaylight.controller.cluster.notifications.RoleChanged;
 import org.opendaylight.controller.cluster.raft.RaftState;
 import org.opendaylight.controller.cluster.raft.utils.MessageCollectorActor;
 
-public class RoleChangeNotifierTest extends AbstractActorTest  {
+public class RoleChangeNotifierTest extends AbstractActorTest {
 
     @Test
     public void testHandleRegisterRoleChangeListener() throws Exception {
-        new JavaTestKit(getSystem()) {{
-            String memberId = "testHandleRegisterRoleChangeListener";
-            ActorRef listenerActor =  getSystem().actorOf(Props.create(MessageCollectorActor.class));
-
-            TestActorRef<RoleChangeNotifier> notifierTestActorRef = TestActorRef.create(
-                getSystem(), RoleChangeNotifier.getProps(memberId), memberId);
+        new JavaTestKit(getSystem()) {
+            {
+                String memberId = "testHandleRegisterRoleChangeListener";
+                ActorRef listenerActor = getSystem().actorOf(Props.create(MessageCollectorActor.class));
 
-            notifierTestActorRef.tell(new RegisterRoleChangeListener(), listenerActor);
+                TestActorRef<RoleChangeNotifier> notifierTestActorRef = TestActorRef.create(getSystem(),
+                        RoleChangeNotifier.getProps(memberId), memberId);
 
-            RegisterRoleChangeListenerReply reply =
-                MessageCollectorActor.getFirstMatching(listenerActor, RegisterRoleChangeListenerReply.class);
-            assertNotNull(reply);
+                notifierTestActorRef.tell(new RegisterRoleChangeListener(), listenerActor);
 
-            RoleChangeNotification notification =
-                MessageCollectorActor.getFirstMatching(listenerActor, RoleChangeNotification.class);
-            assertNull(notification);
-        }};
+                RegisterRoleChangeListenerReply reply = MessageCollectorActor.getFirstMatching(listenerActor,
+                        RegisterRoleChangeListenerReply.class);
+                assertNotNull(reply);
 
+                RoleChangeNotification notification = MessageCollectorActor.getFirstMatching(listenerActor,
+                        RoleChangeNotification.class);
+                assertNull(notification);
+            }
+        };
     }
 
     @Test
     public void testHandleRaftRoleChanged() throws Exception {
-        new JavaTestKit(getSystem()) {{
-            String memberId = "testHandleRegisterRoleChangeListenerWithNotificationSet";
-            ActorRef listenerActor =  getSystem().actorOf(Props.create(MessageCollectorActor.class));
-            ActorRef shardActor =  getTestActor();
+        new JavaTestKit(getSystem()) {
+            {
+                String memberId = "testHandleRegisterRoleChangeListenerWithNotificationSet";
+                ActorRef listenerActor = getSystem().actorOf(Props.create(MessageCollectorActor.class));
+                ActorRef shardActor = getTestActor();
 
-            TestActorRef<RoleChangeNotifier> notifierTestActorRef = TestActorRef.create(
-                getSystem(), RoleChangeNotifier.getProps(memberId), memberId);
+                TestActorRef<RoleChangeNotifier> notifierTestActorRef = TestActorRef.create(getSystem(),
+                        RoleChangeNotifier.getProps(memberId), memberId);
 
-            notifierTestActorRef.tell(new RoleChanged(memberId, RaftState.Candidate.name(), RaftState.Leader.name()), shardActor);
+                notifierTestActorRef.tell(
+                        new RoleChanged(memberId, RaftState.Candidate.name(), RaftState.Leader.name()), shardActor);
 
-            // no notification should be sent as listener has not yet registered
-            assertNull(MessageCollectorActor.getFirstMatching(listenerActor, RoleChangeNotification.class));
+                // no notification should be sent as listener has not yet
+                // registered
+                assertNull(MessageCollectorActor.getFirstMatching(listenerActor, RoleChangeNotification.class));
 
-            // listener registers after role has been changed, ensure we sent the latest role change after a reply
-            notifierTestActorRef.tell(new RegisterRoleChangeListener(), listenerActor);
+                // listener registers after role has been changed, ensure we
+                // sent the latest role change after a reply
+                notifierTestActorRef.tell(new RegisterRoleChangeListener(), listenerActor);
 
-            RegisterRoleChangeListenerReply reply =
-                MessageCollectorActor.getFirstMatching(listenerActor, RegisterRoleChangeListenerReply.class);
-            assertNotNull(reply);
+                RegisterRoleChangeListenerReply reply = MessageCollectorActor.getFirstMatching(listenerActor,
+                        RegisterRoleChangeListenerReply.class);
+                assertNotNull(reply);
 
-            RoleChangeNotification notification =
-                MessageCollectorActor.getFirstMatching(listenerActor, RoleChangeNotification.class);
-            assertNotNull(notification);
-            assertEquals(RaftState.Candidate.name(), notification.getOldRole());
-            assertEquals(RaftState.Leader.name(), notification.getNewRole());
+                RoleChangeNotification notification = MessageCollectorActor.getFirstMatching(listenerActor,
+                        RoleChangeNotification.class);
+                assertNotNull(notification);
+                assertEquals(RaftState.Candidate.name(), notification.getOldRole());
+                assertEquals(RaftState.Leader.name(), notification.getNewRole());
 
-        }};
+            }
+        };
 
     }
 
     @Test
     public void testHandleLeaderStateChanged() throws Exception {
-        new JavaTestKit(getSystem()) {{
-            String actorId = "testHandleLeaderStateChanged";
-            TestActorRef<RoleChangeNotifier> notifierTestActorRef = TestActorRef.create(
-                getSystem(), RoleChangeNotifier.getProps(actorId), actorId);
+        new JavaTestKit(getSystem()) {
+            {
+                String actorId = "testHandleLeaderStateChanged";
+                TestActorRef<RoleChangeNotifier> notifierTestActorRef = TestActorRef.create(getSystem(),
+                        RoleChangeNotifier.getProps(actorId), actorId);
 
-            notifierTestActorRef.tell(new LeaderStateChanged("member1", "leader1", (short)5), ActorRef.noSender());
+                notifierTestActorRef.tell(new LeaderStateChanged("member1", "leader1", (short) 5), ActorRef.noSender());
 
-            // listener registers after the sate has been changed, ensure we sent the latest state change after a reply
-            notifierTestActorRef.tell(new RegisterRoleChangeListener(), getRef());
+                // listener registers after the sate has been changed, ensure we
+                // sent the latest state change after a reply
+                notifierTestActorRef.tell(new RegisterRoleChangeListener(), getRef());
 
-            expectMsgClass(RegisterRoleChangeListenerReply.class);
+                expectMsgClass(RegisterRoleChangeListenerReply.class);
 
-            LeaderStateChanged leaderStateChanged = expectMsgClass(LeaderStateChanged.class);
-            assertEquals("getMemberId", "member1", leaderStateChanged.getMemberId());
-            assertEquals("getLeaderId", "leader1", leaderStateChanged.getLeaderId());
-            assertEquals("getLeaderPayloadVersion", 5, leaderStateChanged.getLeaderPayloadVersion());
+                LeaderStateChanged leaderStateChanged = expectMsgClass(LeaderStateChanged.class);
+                assertEquals("getMemberId", "member1", leaderStateChanged.getMemberId());
+                assertEquals("getLeaderId", "leader1", leaderStateChanged.getLeaderId());
+                assertEquals("getLeaderPayloadVersion", 5, leaderStateChanged.getLeaderPayloadVersion());
 
-            notifierTestActorRef.tell(new LeaderStateChanged("member1", "leader2", (short)6), ActorRef.noSender());
+                notifierTestActorRef.tell(new LeaderStateChanged("member1", "leader2", (short) 6), ActorRef.noSender());
 
-            leaderStateChanged = expectMsgClass(LeaderStateChanged.class);
-            assertEquals("getMemberId", "member1", leaderStateChanged.getMemberId());
-            assertEquals("getLeaderId", "leader2", leaderStateChanged.getLeaderId());
-            assertEquals("getLeaderPayloadVersion", 6, leaderStateChanged.getLeaderPayloadVersion());
-        }};
+                leaderStateChanged = expectMsgClass(LeaderStateChanged.class);
+                assertEquals("getMemberId", "member1", leaderStateChanged.getMemberId());
+                assertEquals("getLeaderId", "leader2", leaderStateChanged.getLeaderId());
+                assertEquals("getLeaderPayloadVersion", 6, leaderStateChanged.getLeaderPayloadVersion());
+            }
+        };
     }
 }
-
-