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

[openflowplugin.git] / openflowplugin-impl / src / test / java / org / opendaylight / openflowplugin / impl / statistics / StatisticsContextImplTest.java

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsContextImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsContextImplTest.java
index 509f5ad7b19720586330631b7ad39e0d7e4e55d9..aa3bbad44ca743997d46f5c8de0e5e5ca8b98354 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsContextImplTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsContextImplTest.java
@@ -10,6 +10,7 @@ package org.opendaylight.openflowplugin.impl.statistics;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -21,7 +22,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
@@ -137,11 +137,11 @@ public class StatisticsContextImplTest extends StatisticsContextImpMockInitiatio
         initStatisticsContext();
 
         when(mockedStatisticsGatheringService
-                     .getStatisticsOfType(Matchers.any(EventIdentifier.class), Matchers.any(MultipartType.class)))
+                     .getStatisticsOfType(any(EventIdentifier.class), any(MultipartType.class)))
                 .thenReturn(Futures.immediateFuture(
                         RpcResultBuilder.success(Collections.<MultipartReply>emptyList()).build()));
         when(mockedStatisticsOnFlyGatheringService
-                     .getStatisticsOfType(Matchers.any(EventIdentifier.class), Matchers.any(MultipartType.class)))
+                     .getStatisticsOfType(any(EventIdentifier.class), any(MultipartType.class)))
                 .thenReturn(Futures.immediateFuture(
                         RpcResultBuilder.success(Collections.<MultipartReply>emptyList()).build()));
 
@@ -151,9 +151,9 @@ public class StatisticsContextImplTest extends StatisticsContextImpMockInitiatio
         statisticsContext.instantiateServiceInstance();
 
         verify(mockedStatisticsGatheringService, times(7))
-                .getStatisticsOfType(Matchers.any(EventIdentifier.class), Matchers.any(MultipartType.class));
+                .getStatisticsOfType(any(EventIdentifier.class), any(MultipartType.class));
         verify(mockedStatisticsOnFlyGatheringService)
-                .getStatisticsOfType(Matchers.any(EventIdentifier.class), Matchers.any(MultipartType.class));
+                .getStatisticsOfType(any(EventIdentifier.class), any(MultipartType.class));
         Mockito.verifyNoMoreInteractions(mockedStatisticsGatheringService, mockedStatisticsOnFlyGatheringService);
     }
 }