Fix warnings in MdsalUtilsAsyncTest

We have unused suppressions and unnecessary use of Lists, fix those
up.

Change-Id: I52a1e4d66b4197e9e5efffb4dcf0abc90116fdd4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/utils/mdsal-utils/src/test/java/org/opendaylight/ovsdb/utils/mdsal/utils/MdsalUtilsAsyncTest.java b/utils/mdsal-utils/src/test/java/org/opendaylight/ovsdb/utils/mdsal/utils/MdsalUtilsAsyncTest.java
index 30f91c0b60b4586affb020547bdc22cade782645..0cd742b6e9509cb577b39a9f33ec14382aa1b73a 100644 (file)
--- a/utils/mdsal-utils/src/test/java/org/opendaylight/ovsdb/utils/mdsal/utils/MdsalUtilsAsyncTest.java
+++ b/utils/mdsal-utils/src/test/java/org/opendaylight/ovsdb/utils/mdsal/utils/MdsalUtilsAsyncTest.java
@@ -102,9 +102,9 @@ public class MdsalUtilsAsyncTest extends AbstractDataBrokerTest {
                 new SupportingNodeKey(new NodeId("id2"), TOPOLOGY_TEST)).build();
 
         final Node data1 = new NodeBuilder(DATA).setSupportingNode(
-                Collections.singletonList(supportingNodeBuilder1)).build();
+                Collections.singletonMap(supportingNodeBuilder1.key(), supportingNodeBuilder1)).build();
         final Node data2 = new NodeBuilder(DATA).setSupportingNode(
-                Collections.singletonList(supportingNodeBuilder2)).build();
+                Collections.singletonMap(supportingNodeBuilder2.key(), supportingNodeBuilder2)).build();
 
         mdsalUtilsAsync.put(LogicalDatastoreType.CONFIGURATION, TEST_IID, data1, operationDesc);
         assertEquals(data1, readDS());
@@ -134,9 +134,9 @@ public class MdsalUtilsAsyncTest extends AbstractDataBrokerTest {
                 new SupportingNodeKey(new NodeId("id2"), TOPOLOGY_TEST)).build();
 
         final Node data1 = new NodeBuilder(DATA).setSupportingNode(
-                Collections.singletonList(supportingNodeBuilder1)).build();
+                Collections.singletonMap(supportingNodeBuilder1.key(), supportingNodeBuilder1)).build();
         final Node data2 = new NodeBuilder(DATA).setSupportingNode(
-                Collections.singletonList(supportingNodeBuilder2)).build();
+                Collections.singletonMap(supportingNodeBuilder2.key(), supportingNodeBuilder2)).build();
 
         mdsalUtilsAsync.merge(LogicalDatastoreType.CONFIGURATION, TEST_IID, data1, operationDesc, true);
         assertEquals(data1, readDS());

diff --git a/utils/mdsal-utils/src/test/java/org/opendaylight/ovsdb/utils/mdsal/utils/MdsalUtilsTest.java b/utils/mdsal-utils/src/test/java/org/opendaylight/ovsdb/utils/mdsal/utils/MdsalUtilsTest.java
index 644f92475248cb2ba9bf1c0ef95702233fa2776e..238f8d167ab32411d4c30c1cf96583d817a8c5b4 100644 (file)
--- a/utils/mdsal-utils/src/test/java/org/opendaylight/ovsdb/utils/mdsal/utils/MdsalUtilsTest.java
+++ b/utils/mdsal-utils/src/test/java/org/opendaylight/ovsdb/utils/mdsal/utils/MdsalUtilsTest.java
@@ -35,7 +35,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
  * Unit test for class {@link MdsalUtils}.
  */
 @RunWith(MockitoJUnitRunner.class)
-@SuppressWarnings({ "unchecked", "rawtypes" })
+@SuppressWarnings("unchecked")
 public class MdsalUtilsTest {
 
     @InjectMocks private MdsalUtils mdsalUtils;