Bump upstreams to SNAPSHOTs

[netconf.git] / netconf / mdsal-netconf-notification / src / test / java / org / opendaylight / netconf / mdsal / notification / impl / CapabilityChangeNotificationProducerTest.java

diff --git a/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/CapabilityChangeNotificationProducerTest.java b/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/CapabilityChangeNotificationProducerTest.java
index 6c721dc05fc13ab559646121b0cba37bd9af1dd9..a2d07018fa1025f52ec6522cef3628bdd5edeae7 100644 (file)
--- a/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/CapabilityChangeNotificationProducerTest.java
+++ b/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/CapabilityChangeNotificationProducerTest.java
@@ -13,11 +13,10 @@ import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
-import com.google.common.collect.Lists;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -76,37 +75,34 @@ public class CapabilityChangeNotificationProducerTest {
     public void testOnDataChangedCreate() {
         final InstanceIdentifier<Capabilities> capabilitiesIdentifier =
                 InstanceIdentifier.create(NetconfState.class).child(Capabilities.class);
-        final List<Uri> newCapabilitiesList =
-                Lists.newArrayList(new Uri("newCapability"), new Uri("createdCapability"));
+        final Set<Uri> newCapabilitiesList = Set.of(new Uri("newCapability"), new Uri("createdCapability"));
         Capabilities newCapabilities = new CapabilitiesBuilder().setCapability(newCapabilitiesList).build();
         Map<InstanceIdentifier<?>, DataObject> createdData = new HashMap<>();
         createdData.put(capabilitiesIdentifier, newCapabilities);
         verifyDataTreeChange(DataObjectModification.ModificationType.WRITE, null, newCapabilities,
-                changedCapabilitesFrom(newCapabilitiesList, Collections.emptyList()));
+                changedCapabilitesFrom(newCapabilitiesList, Set.of()));
     }
 
     @Test
     public void testOnDataChangedUpdate() {
-        final List<Uri> originalCapabilitiesList =
-                Lists.newArrayList(new Uri("originalCapability"), new Uri("anotherOriginalCapability"));
-        final List<Uri> updatedCapabilitiesList =
-                Lists.newArrayList(new Uri("originalCapability"), new Uri("newCapability"));
-        Capabilities originalCapabilities = new CapabilitiesBuilder().setCapability(originalCapabilitiesList).build();
-        Capabilities updatedCapabilities = new CapabilitiesBuilder().setCapability(updatedCapabilitiesList).build();
-        verifyDataTreeChange(DataObjectModification.ModificationType.WRITE, originalCapabilities,
-                updatedCapabilities, changedCapabilitesFrom(
-                Lists.newArrayList(new Uri("newCapability")), Lists.newArrayList(new Uri("anotherOriginalCapability")
-                        )));
+        Capabilities originalCapabilities = new CapabilitiesBuilder()
+            .setCapability(Set.of(new Uri("originalCapability"), new Uri("anotherOriginalCapability")))
+            .build();
+        Capabilities updatedCapabilities = new CapabilitiesBuilder()
+            .setCapability(Set.of(new Uri("originalCapability"), new Uri("newCapability")))
+            .build();
+        verifyDataTreeChange(DataObjectModification.ModificationType.WRITE, originalCapabilities, updatedCapabilities,
+            changedCapabilitesFrom(Set.of(new Uri("newCapability")), Set.of(new Uri("anotherOriginalCapability"))));
     }
 
     @Test
     public void testOnDataChangedDelete() {
-        final List<Uri> originalCapabilitiesList = Lists.newArrayList(new Uri("originalCapability"),
-                new Uri("anotherOriginalCapability"));
+        final Set<Uri> originalCapabilitiesList =
+            Set.of(new Uri("originalCapability"), new Uri("anotherOriginalCapability"));
         final Capabilities originalCapabilities =
-                new CapabilitiesBuilder().setCapability(originalCapabilitiesList).build();
+            new CapabilitiesBuilder().setCapability(originalCapabilitiesList).build();
         verifyDataTreeChange(DataObjectModification.ModificationType.DELETE, originalCapabilities, null,
-                changedCapabilitesFrom(Collections.emptyList(), originalCapabilitiesList));
+            changedCapabilitesFrom(Set.of(), originalCapabilitiesList));
     }
 
     @SuppressWarnings("unchecked")
@@ -119,16 +115,16 @@ public class CapabilityChangeNotificationProducerTest {
         doReturn(objectChange2).when(treeChange2).getRootNode();
         doReturn(originalCapabilities).when(objectChange2).getDataBefore();
         doReturn(updatedCapabilities).when(objectChange2).getDataAfter();
-        capabilityChangeNotificationProducer.onDataTreeChanged(Collections.singleton(treeChange2));
+        capabilityChangeNotificationProducer.onDataTreeChanged(List.of(treeChange2));
         verify(baseNotificationPublisherRegistration).onCapabilityChanged(expectedChange);
     }
 
-    private static NetconfCapabilityChange changedCapabilitesFrom(final List<Uri> added, final List<Uri> deleted) {
+    private static NetconfCapabilityChange changedCapabilitesFrom(final Set<Uri> added, final Set<Uri> deleted) {
         NetconfCapabilityChangeBuilder netconfCapabilityChangeBuilder = new NetconfCapabilityChangeBuilder();
         netconfCapabilityChangeBuilder.setChangedBy(new ChangedByBuilder().setServerOrUser(
                 new ServerBuilder().setServer(Empty.value()).build()).build());
 
-        netconfCapabilityChangeBuilder.setModifiedCapability(Collections.emptyList());
+        netconfCapabilityChangeBuilder.setModifiedCapability(Set.of());
         netconfCapabilityChangeBuilder.setAddedCapability(added);
         netconfCapabilityChangeBuilder.setDeletedCapability(deleted);