Fix unstable test for NetconfDeviceCommunicator

[netconf.git] / netconf / sal-netconf-connector / src / test / java / org / opendaylight / netconf / sal / connect / netconf / listener / NetconfSessionPreferencesTest.java

diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfSessionPreferencesTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfSessionPreferencesTest.java
index bd98fd191ebb44df7dcccae24703f952f3fdec4b..50055813fee8570c18689827fc28ef16c0df3115 100644 (file)
--- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfSessionPreferencesTest.java
+++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfSessionPreferencesTest.java
@@ -5,13 +5,12 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.netconf.sal.connect.netconf.listener;
 
 import static org.hamcrest.CoreMatchers.hasItem;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import com.google.common.collect.Lists;
@@ -27,7 +26,8 @@ public class NetconfSessionPreferencesTest {
         final List<String> caps1 = Lists.newArrayList(
                 "namespace:1?module=module1&revision=2012-12-12",
                 "namespace:2?module=module2&amp;revision=2012-12-12",
-                "urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring?module=ietf-netconf-monitoring&amp;revision=2010-10-04",
+                "urn:ietf:params:xml:ns:yang:"
+                        + "ietf-netconf-monitoring?module=ietf-netconf-monitoring&amp;revision=2010-10-04",
                 "urn:ietf:params:netconf:base:1.0",
                 "urn:ietf:params:netconf:capability:rollback-on-error:1.0"
         );
@@ -44,8 +44,8 @@ public class NetconfSessionPreferencesTest {
 
         final NetconfSessionPreferences merged = sessionCaps1.addModuleCaps(sessionCaps2);
         assertCaps(merged, 2, 2 + 1 /*Preserved monitoring*/ + 2 /*already present*/);
-        for (final QName qName : sessionCaps2.getModuleBasedCaps()) {
-            assertThat(merged.getModuleBasedCaps(), hasItem(qName));
+        for (final QName qualifiedName : sessionCaps2.getModuleBasedCaps()) {
+            assertThat(merged.getModuleBasedCaps(), hasItem(qualifiedName));
         }
         assertThat(merged.getModuleBasedCaps(), hasItem(NetconfMessageTransformUtil.IETF_NETCONF_MONITORING));
 
@@ -58,7 +58,8 @@ public class NetconfSessionPreferencesTest {
         final List<String> caps1 = Lists.newArrayList(
                 "namespace:1?module=module1&revision=2012-12-12",
                 "namespace:2?module=module2&amp;revision=2012-12-12",
-                "urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring?module=ietf-netconf-monitoring&amp;revision=2010-10-04",
+                "urn:ietf:params:xml:ns:yang:"
+                        + "ietf-netconf-monitoring?module=ietf-netconf-monitoring&amp;revision=2010-10-04",
                 "urn:ietf:params:netconf:base:1.0",
                 "urn:ietf:params:netconf:capability:rollback-on-error:1.0"
         );
@@ -82,7 +83,8 @@ public class NetconfSessionPreferencesTest {
         final List<String> caps1 = Lists.newArrayList(
                 "namespace:1?module=module1&revision=2012-12-12",
                 "namespace:2?module=module2&amp;revision=2012-12-12",
-                "urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring?module=ietf-netconf-monitoring&amp;revision=2010-10-04",
+                "urn:ietf:params:xml:ns:yang:"
+                        + "ietf-netconf-monitoring?module=ietf-netconf-monitoring&amp;revision=2010-10-04",
                 "urn:ietf:params:netconf:base:1.0",
                 "urn:ietf:params:netconf:capability:rollback-on-error:1.0",
                 "urn:ietf:params:netconf:capability:candidate:1.0"
@@ -103,7 +105,7 @@ public class NetconfSessionPreferencesTest {
 
         final NetconfSessionPreferences merged = sessionCaps1.addNonModuleCaps(sessionCaps2);
 
-        assertCaps(merged, 3+2, 3);
+        assertCaps(merged, 3 + 2, 3);
         for (final String capability : sessionCaps2.getNonModuleCaps()) {
             assertThat(merged.getNonModuleCaps(), hasItem(capability));
         }
@@ -122,7 +124,8 @@ public class NetconfSessionPreferencesTest {
         final List<String> caps1 = Lists.newArrayList(
                 "namespace:1?module=module1&revision=2012-12-12",
                 "namespace:2?module=module2&amp;revision=2012-12-12",
-                "urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring?module=ietf-netconf-monitoring&amp;revision=2010-10-04",
+                "urn:ietf:params:xml:ns:yang:"
+                        + "ietf-netconf-monitoring?module=ietf-netconf-monitoring&amp;revision=2010-10-04",
                 "urn:ietf:params:netconf:base:1.0",
                 "urn:ietf:params:netconf:capability:rollback-on-error:1.0",
                 "urn:ietf:params:netconf:capability:candidate:1.0"
@@ -163,7 +166,8 @@ public class NetconfSessionPreferencesTest {
         assertCaps(sessionCaps1, 0, 4);
     }
 
-    private void assertCaps(final NetconfSessionPreferences sessionCaps1, final int nonModuleCaps, final int moduleCaps) {
+    private static void assertCaps(final NetconfSessionPreferences sessionCaps1, final int nonModuleCaps,
+            final int moduleCaps) {
         assertEquals(nonModuleCaps, sessionCaps1.getNonModuleCaps().size());
         assertEquals(moduleCaps, sessionCaps1.getModuleBasedCaps().size());
     }