OPNFLWPLUG-1032: Neon-MRI: Bump odlparent, yangtools, mdsal

[openflowplugin.git] / openflowplugin-impl / src / test / java / org / opendaylight / openflowplugin / impl / util / MdSalRegistrationUtilsTest.java

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/MdSalRegistrationUtilsTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/MdSalRegistrationUtilsTest.java
index acfee6858c1b5af2d8a6d758be3e8a52fd6cd7f8..94643b753b05a8ea6374d3f8d00750ccac130380 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/MdSalRegistrationUtilsTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/MdSalRegistrationUtilsTest.java
@@ -8,7 +8,7 @@
 
 package org.opendaylight.openflowplugin.impl.util;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -17,7 +17,6 @@ import java.math.BigInteger;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
@@ -68,10 +67,8 @@ public class MdSalRegistrationUtilsTest {
     @Before
     public void setUp() throws Exception {
         convertorManager = ConvertorManagerFactory.createDefaultManager();
-        when(mockedDeviceContext.getDeviceState()).thenReturn(mockedDeviceState);
         when(mockedDeviceContext.getDeviceInfo()).thenReturn(mockedDeviceInfo);
         when(mockedConnectionContext.getFeatures()).thenReturn(mockedFeatures);
-        when(mockedFeatures.getDatapathId()).thenReturn(mockedDataPathId);
         when(mockedDeviceInfo.getDatapathId()).thenReturn(mockedDataPathId);
         when(mockedDeviceContext.getPrimaryConnectionContext()).thenReturn(mockedConnectionContext);
     }
@@ -83,7 +80,7 @@ public class MdSalRegistrationUtilsTest {
                                                 extensionConverterProvider,
                                                 convertorManager);
         verify(mockedRpcContext, times(NUMBER_OF_RPC_SERVICE_REGISTRATION)).registerRpcServiceImplementation(
-                Matchers.any(), any(RpcService.class));
+                any(), any(RpcService.class));
     }
 
     @Test
@@ -98,7 +95,7 @@ public class MdSalRegistrationUtilsTest {
                                                                  notificationPublishService,
                                                                  convertorManager);
         verify(mockedRpcContext, times(NUMBER_OF_STAT_COMPAT_RPC_SERVICE_REGISTRATION))
-                .registerRpcServiceImplementation(Matchers.any(), any(RpcService.class));
+                .registerRpcServiceImplementation(any(), any(RpcService.class));
     }
 
 }
\ No newline at end of file