Merge "Migrate netconf to mockito ArgumentMatchers"

[netconf.git] / netconf / netconf-notifications-impl / src / test / java / org / opendaylight / netconf / notifications / impl / osgi / ActivatorTest.java

diff --git a/netconf/netconf-notifications-impl/src/test/java/org/opendaylight/netconf/notifications/impl/osgi/ActivatorTest.java b/netconf/netconf-notifications-impl/src/test/java/org/opendaylight/netconf/notifications/impl/osgi/ActivatorTest.java
index 24e865212786d591cef43c0cceca5af717754bf5..ddacdd957c81a013c484d14ead87b0870802719a 100644 (file)
--- a/netconf/netconf-notifications-impl/src/test/java/org/opendaylight/netconf/notifications/impl/osgi/ActivatorTest.java
+++ b/netconf/netconf-notifications-impl/src/test/java/org/opendaylight/netconf/notifications/impl/osgi/ActivatorTest.java
@@ -9,8 +9,8 @@
 package org.opendaylight.netconf.notifications.impl.osgi;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -23,8 +23,8 @@ import java.util.Hashtable;
 import java.util.Set;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
-import org.opendaylight.controller.config.util.capability.BasicCapability;
-import org.opendaylight.controller.config.util.capability.Capability;
+import org.opendaylight.netconf.api.capability.BasicCapability;
+import org.opendaylight.netconf.api.capability.Capability;
 import org.opendaylight.netconf.api.monitoring.CapabilityListener;
 import org.opendaylight.netconf.api.util.NetconfConstants;
 import org.opendaylight.netconf.mapping.api.NetconfOperation;
@@ -50,10 +50,10 @@ public class ActivatorTest {
         final ServiceRegistration operationaServiceRegistration = mock(ServiceRegistration.class);
 
         // test registering services
-        doReturn(netconfNotificationCollectorServiceRegistration).when(context).
-                registerService(eq(NetconfNotificationCollector.class), any(NetconfNotificationManager.class), any());
-        doReturn(operationaServiceRegistration).when(context).
-                registerService(eq(NetconfOperationServiceFactory.class), any(NetconfOperationServiceFactory.class), any());
+        doReturn(netconfNotificationCollectorServiceRegistration).when(context)
+                .registerService(eq(NetconfNotificationCollector.class), any(NetconfNotificationManager.class), any());
+        doReturn(operationaServiceRegistration).when(context).registerService(eq(NetconfOperationServiceFactory.class),
+                any(NetconfOperationServiceFactory.class), any());
 
         activator.start(context);
 
@@ -72,12 +72,17 @@ public class ActivatorTest {
         // test service factory argument requisites
         final NetconfOperationServiceFactory serviceFactory = serviceFactoryArgumentCaptor.getValue();
 
-        final Set<Capability> capabilities = Collections.singleton(new BasicCapability(NetconfNotification.NOTIFICATION_NAMESPACE));
+        final Set<Capability> capabilities =
+                Collections.singleton(new BasicCapability(NetconfNotification.NOTIFICATION_NAMESPACE));
 
-        assertEquals(capabilities.iterator().next().getCapabilityUri(), serviceFactory.getCapabilities().iterator().next().getCapabilityUri());
-        assertEquals(capabilities.iterator().next().getCapabilitySchema(), serviceFactory.getCapabilities().iterator().next().getCapabilitySchema());
-        assertEquals(capabilities.iterator().next().getModuleNamespace(), serviceFactory.getCapabilities().iterator().next().getModuleNamespace());
-        assertEquals(capabilities.iterator().next().getModuleName(), serviceFactory.getCapabilities().iterator().next().getModuleName());
+        assertEquals(capabilities.iterator().next()
+                .getCapabilityUri(), serviceFactory.getCapabilities().iterator().next().getCapabilityUri());
+        assertEquals(capabilities.iterator().next()
+                .getCapabilitySchema(), serviceFactory.getCapabilities().iterator().next().getCapabilitySchema());
+        assertEquals(capabilities.iterator().next()
+                .getModuleNamespace(), serviceFactory.getCapabilities().iterator().next().getModuleNamespace());
+        assertEquals(capabilities.iterator().next()
+                .getModuleName(), serviceFactory.getCapabilities().iterator().next().getModuleName());
 
         final CapabilityListener listener = mock(CapabilityListener.class);
 
@@ -90,17 +95,18 @@ public class ActivatorTest {
         final NetconfOperationService netconfOperationService = serviceFactory.createService("id");
         final Set<NetconfOperation> netconfOperations = netconfOperationService.getNetconfOperations();
 
-        final CreateSubscription createSubscription = new CreateSubscription("id", activator.getNetconfNotificationManager());
+        final CreateSubscription createSubscription =
+                new CreateSubscription("id", activator.getNetconfNotificationManager());
 
         netconfOperations.forEach(
-                operation -> {
-                    if (operation instanceof CreateSubscription) {
-                        assertEquals(createSubscription.toString(), operation.toString());
-                    }
-                    if (operation instanceof Get) {
-                        assertEquals("id", ((Get) operation).getNetconfSessionIdForReporting());
-                    }
+            operation -> {
+                if (operation instanceof CreateSubscription) {
+                    assertEquals(createSubscription.toString(), operation.toString());
                 }
+                if (operation instanceof Get) {
+                    assertEquals("id", ((Get) operation).getNetconfSessionIdForReporting());
+                }
+            }
         );
 
         // test unregister after stop