Merge "Migrate netconf to mockito ArgumentMatchers"

[netconf.git] / netconf / mdsal-netconf-notification / src / test / java / org / opendaylight / controller / config / yang / netconf / mdsal / notification / CapabilityChangeNotificationProducerTest.java

diff --git a/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/notification/CapabilityChangeNotificationProducerTest.java b/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/notification/CapabilityChangeNotificationProducerTest.java
index 549c0ce2e1504aa7f4a97ac477bdc789f862c9d3..6ddcd8df4df90b544cc138c3d39d619877a7a472 100644 (file)
--- a/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/notification/CapabilityChangeNotificationProducerTest.java
+++ b/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/notification/CapabilityChangeNotificationProducerTest.java
@@ -8,7 +8,7 @@
 
 package org.opendaylight.controller.config.yang.netconf.mdsal.notification;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -74,15 +74,15 @@ public class CapabilityChangeNotificationProducerTest {
 
     @Test
     public void testOnDataChangedCreate() {
-        final InstanceIdentifier capabilitiesIdentifier =
-                InstanceIdentifier.create(NetconfState.class).child(Capabilities.class).builder().build();
+        final InstanceIdentifier<Capabilities> capabilitiesIdentifier =
+                InstanceIdentifier.create(NetconfState.class).child(Capabilities.class);
         final List<Uri> newCapabilitiesList =
                 Lists.newArrayList(new Uri("newCapability"), new Uri("createdCapability"));
         Capabilities newCapabilities = new CapabilitiesBuilder().setCapability(newCapabilitiesList).build();
         Map<InstanceIdentifier<?>, DataObject> createdData = Maps.newHashMap();
         createdData.put(capabilitiesIdentifier, newCapabilities);
         verifyDataTreeChange(DataObjectModification.ModificationType.WRITE, null, newCapabilities,
-                changedCapabilitesFrom(newCapabilitiesList, Collections.<Uri>emptyList()));
+                changedCapabilitesFrom(newCapabilitiesList, Collections.emptyList()));
     }
 
     @Test
@@ -111,8 +111,8 @@ public class CapabilityChangeNotificationProducerTest {
 
     @SuppressWarnings("unchecked")
     private void verifyDataTreeChange(final DataObjectModification.ModificationType modificationType,
-                                      Capabilities originalCapabilities, Capabilities updatedCapabilities,
-                                      NetconfCapabilityChange expectedChange) {
+                                      final Capabilities originalCapabilities, final Capabilities updatedCapabilities,
+                                      final NetconfCapabilityChange expectedChange) {
         final DataTreeModification<Capabilities> treeChange2 = mock(DataTreeModification.class);
         final DataObjectModification<Capabilities> objectChange2 = mock(DataObjectModification.class);
         doReturn(modificationType).when(objectChange2).getModificationType();
@@ -123,12 +123,12 @@ public class CapabilityChangeNotificationProducerTest {
         verify(baseNotificationPublisherRegistration).onCapabilityChanged(expectedChange);
     }
 
-    private NetconfCapabilityChange changedCapabilitesFrom(List<Uri> added, List<Uri> deleted) {
+    private NetconfCapabilityChange changedCapabilitesFrom(final List<Uri> added, final List<Uri> deleted) {
         NetconfCapabilityChangeBuilder netconfCapabilityChangeBuilder = new NetconfCapabilityChangeBuilder();
         netconfCapabilityChangeBuilder.setChangedBy(new ChangedByBuilder().setServerOrUser(
                 new ServerBuilder().setServer(true).build()).build());
 
-        netconfCapabilityChangeBuilder.setModifiedCapability(Collections.<Uri>emptyList());
+        netconfCapabilityChangeBuilder.setModifiedCapability(Collections.emptyList());
         netconfCapabilityChangeBuilder.setAddedCapability(added);
         netconfCapabilityChangeBuilder.setDeletedCapability(deleted);