Update yang-data-api tests

Use List.of()/Map.of() instead of Collections and Guava where
appropriate.

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

diff --git a/data/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/PathArgumentListTest.java b/data/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/PathArgumentListTest.java
index 4c08bd084f425e54a38f5abe185155762883d0a7..5f5f79508f68d1c0783e06e863ee300afa486886 100644 (file)
--- a/data/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/PathArgumentListTest.java
+++ b/data/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/PathArgumentListTest.java
@@ -14,8 +14,8 @@ import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 
 import com.google.common.collect.UnmodifiableIterator;
-import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
 import org.junit.Test;
@@ -64,9 +64,9 @@ public class PathArgumentListTest {
         final PathArgumentList l = new TestClass();
 
         assertThrows(UnsupportedOperationException.class, () -> l.remove(null));
-        assertThrows(UnsupportedOperationException.class, () -> l.addAll(Collections.emptyList()));
-        assertThrows(UnsupportedOperationException.class, () -> l.removeAll(Collections.emptyList()));
-        assertThrows(UnsupportedOperationException.class, () -> l.retainAll(Collections.emptyList()));
+        assertThrows(UnsupportedOperationException.class, () -> l.addAll(List.of()));
+        assertThrows(UnsupportedOperationException.class, () -> l.removeAll(List.of()));
+        assertThrows(UnsupportedOperationException.class, () -> l.retainAll(List.of()));
         assertThrows(UnsupportedOperationException.class, () -> l.clear());
         assertThrows(UnsupportedOperationException.class, () -> l.addAll(0, null));
     }

diff --git a/data/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifierTest.java b/data/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifierTest.java
index bc4c4630602a4824969a0f94ed4516a0a204895d..0b19109e7c4821288c201a7a3fe711e54f1f9bb5 100644 (file)
--- a/data/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifierTest.java
+++ b/data/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifierTest.java
@@ -17,17 +17,15 @@ import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
 import org.junit.Test;
@@ -130,7 +128,7 @@ public class YangInstanceIdentifierTest {
                 new NodeIdentifier(NODENAME2), new NodeIdentifier(NODENAME3), new NodeIdentifier(NODENAME4));
         final YangInstanceIdentifier id2 = YangInstanceIdentifier.create(new NodeIdentifier(NODENAME1),
                 new NodeIdentifier(NODENAME2));
-        final YangInstanceIdentifier id3 = YangInstanceIdentifier.create(Arrays.asList(
+        final YangInstanceIdentifier id3 = YangInstanceIdentifier.create(List.of(
                     new NodeIdentifier(NODENAME1), new NodeIdentifier(NODENAME2)));
 
         Optional<YangInstanceIdentifier> relative = id1.relativeTo(id2);
@@ -189,7 +187,7 @@ public class YangInstanceIdentifierTest {
     public void testBuilder() {
         YangInstanceIdentifier newID = YangInstanceIdentifier.builder()
                 .node(NODENAME1)
-                .nodeWithKey(NODENAME2, Collections.singletonMap(KEY1, "foo"))
+                .nodeWithKey(NODENAME2, Map.of(KEY1, "foo"))
                 .nodeWithKey(NODENAME3, KEY2, "bar").build();
 
         assertNotNull("InstanceIdentifier is null", newID);
@@ -251,18 +249,15 @@ public class YangInstanceIdentifierTest {
         assertNotNull(node1.toString());
         assertNotNull(node1.toRelativeString(node2));
 
-        NodeIdentifierWithPredicates node3 = NodeIdentifierWithPredicates.of(NODENAME1,
-                ImmutableMap.of(KEY1, 10, KEY2, 20));
+        NodeIdentifierWithPredicates node3 = NodeIdentifierWithPredicates.of(NODENAME1, Map.of(KEY1, 10, KEY2, 20));
 
-        NodeIdentifierWithPredicates node4 = NodeIdentifierWithPredicates.of(NODENAME1,
-                ImmutableMap.of(KEY1, 10, KEY2, 20));
+        NodeIdentifierWithPredicates node4 = NodeIdentifierWithPredicates.of(NODENAME1, Map.of(KEY1, 10, KEY2, 20));
 
         assertEquals("hashCode", node3.hashCode(), node4.hashCode());
         assertTrue("equals", node3.equals(node4));
 
         assertFalse("equals", node3.equals(node1));
-        assertFalse("equals", node1.equals(NodeIdentifierWithPredicates.of(NODENAME1,
-            ImmutableMap.of(KEY1, 10, KEY3, 20))));
+        assertFalse("equals", node1.equals(NodeIdentifierWithPredicates.of(NODENAME1, Map.of(KEY1, 10, KEY3, 20))));
 
         node1 = NodeIdentifierWithPredicates.of(NODENAME1, KEY1, new byte[]{ 1, 2 });
         node2 = NodeIdentifierWithPredicates.of(NODENAME1, KEY1, new byte[]{ 1, 2 });