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 / utils / MockDataChangeListener.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MockDataChangeListener.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MockDataChangeListener.java
index 24664be0449114d579c943d7ace289c733160dc4..79dc27c7cbb8ad31a81fdb1180940b18bcea24ab 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MockDataChangeListener.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MockDataChangeListener.java
@@ -10,6 +10,7 @@ package org.opendaylight.controller.cluster.datastore.utils;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.Uninterruptibles;
 import java.util.Collections;
@@ -41,9 +42,9 @@ public class MockDataChangeListener implements
         reset(expChangeEventCount);
     }
 
-    public void reset(int expChangeEventCount) {
-        changeLatch = new CountDownLatch(expChangeEventCount);
-        this.expChangeEventCount = expChangeEventCount;
+    public void reset(int newExpChangeEventCount) {
+        changeLatch = new CountDownLatch(newExpChangeEventCount);
+        this.expChangeEventCount = newExpChangeEventCount;
         changeList.clear();
     }
 
@@ -55,24 +56,24 @@ public class MockDataChangeListener implements
 
     public void waitForChangeEvents(YangInstanceIdentifier... expPaths) {
         boolean done = Uninterruptibles.awaitUninterruptibly(changeLatch, 5, TimeUnit.SECONDS);
-        if(!done) {
+        if (!done) {
             fail(String.format("Missing change notifications. Expected: %d. Actual: %d",
-                    expChangeEventCount, (expChangeEventCount - changeLatch.getCount())));
+                    expChangeEventCount, expChangeEventCount - changeLatch.getCount()));
         }
 
-        for(int i = 0; i < expPaths.length; i++) {
+        for (int i = 0; i < expPaths.length; i++) {
             Map<YangInstanceIdentifier, NormalizedNode<?, ?>> createdData = changeList.get(i).getCreatedData();
-            assertTrue(String.format("Change %d does not contain %s. Actual: %s", (i+1), expPaths[i], createdData),
+            assertTrue(String.format("Change %d does not contain %s. Actual: %s", i + 1, expPaths[i], createdData),
                     createdData.containsKey(expPaths[i]));
         }
     }
 
-    public NormalizedNode<?, ?> getCreatedData(int i, YangInstanceIdentifier path) {
-        return changeList.get(i).getCreatedData().get(path);
+    public NormalizedNode<?, ?> getCreatedData(int num, YangInstanceIdentifier path) {
+        return changeList.get(num).getCreatedData().get(path);
     }
 
-    public void verifyCreatedData(int i, YangInstanceIdentifier path) {
-        Map<YangInstanceIdentifier, NormalizedNode<?, ?>> createdData = changeList.get(i).getCreatedData();
+    public void verifyCreatedData(int num, YangInstanceIdentifier path) {
+        Map<YangInstanceIdentifier, NormalizedNode<?, ?>> createdData = changeList.get(num).getCreatedData();
         assertTrue(path + " not present in " + createdData.keySet(), createdData.get(path) != null);
     }
 
@@ -81,8 +82,8 @@ public class MockDataChangeListener implements
         assertEquals(assertMsg, expChangeEventCount, changeList.size());
     }
 
-    public void verifyNoCreatedData(int i, YangInstanceIdentifier path) {
-        Map<YangInstanceIdentifier, NormalizedNode<?, ?>> createdData = changeList.get(i).getCreatedData();
+    public void verifyNoCreatedData(int num, YangInstanceIdentifier path) {
+        Map<YangInstanceIdentifier, NormalizedNode<?, ?>> createdData = changeList.get(num).getCreatedData();
         assertTrue("Unexpected " + path + " present in createdData", createdData.get(path) == null);
     }
 }