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

[openflowplugin.git] / applications / forwardingrules-sync / src / test / java / org / opendaylight / openflowplugin / applications / frsync / impl / strategy / MeterForwarderTest.java

diff --git a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/MeterForwarderTest.java b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/MeterForwarderTest.java
index 779ebfccb107e889eef95fb9a50ed4e65d0ea897..31f6dd51f5044622fd46f0b02ab1b9cf0c8182ee 100644 (file)
--- a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/MeterForwarderTest.java
+++ b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/MeterForwarderTest.java
@@ -16,8 +16,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
+import org.mockito.ArgumentMatchers;
 import org.mockito.Captor;
-import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
@@ -95,8 +95,9 @@ public class MeterForwarderTest {
 
         Meter removeMeter = new MeterBuilder(meter).build();
 
-        final Future<RpcResult<RemoveMeterOutput>> removeResult = meterForwarder.remove(meterPath, removeMeter, flowCapableNodePath);
-        Mockito.verify(salMeterService).removeMeter(Matchers.<RemoveMeterInput>any());
+        final Future<RpcResult<RemoveMeterOutput>> removeResult =
+                meterForwarder.remove(meterPath, removeMeter, flowCapableNodePath);
+        Mockito.verify(salMeterService).removeMeter(ArgumentMatchers.<RemoveMeterInput>any());
 
         Assert.assertTrue(removeResult.isDone());
         final RpcResult<RemoveMeterOutput> meterResult = removeResult.get(2, TimeUnit.SECONDS);
@@ -123,9 +124,10 @@ public class MeterForwarderTest {
                 .setMeterName("another-test")
                 .build();
 
-        final Future<RpcResult<UpdateMeterOutput>> updateResult = meterForwarder.update(meterPath, meterOriginal, meterUpdate,
+        final Future<RpcResult<UpdateMeterOutput>> updateResult =
+                meterForwarder.update(meterPath, meterOriginal, meterUpdate,
                 flowCapableNodePath);
-        Mockito.verify(salMeterService).updateMeter(Matchers.<UpdateMeterInput>any());
+        Mockito.verify(salMeterService).updateMeter(ArgumentMatchers.<UpdateMeterInput>any());
 
         Assert.assertTrue(updateResult.isDone());
         final RpcResult<UpdateMeterOutput> meterResult = updateResult.get(2, TimeUnit.SECONDS);
@@ -150,7 +152,7 @@ public class MeterForwarderTest {
         );
 
         final Future<RpcResult<AddMeterOutput>> addResult = meterForwarder.add(meterPath, meter, flowCapableNodePath);
-        Mockito.verify(salMeterService).addMeter(Matchers.<AddMeterInput>any());
+        Mockito.verify(salMeterService).addMeter(ArgumentMatchers.<AddMeterInput>any());
 
         Assert.assertTrue(addResult.isDone());
         final RpcResult<AddMeterOutput> meterResult = addResult.get(2, TimeUnit.SECONDS);
@@ -163,4 +165,4 @@ public class MeterForwarderTest {
         Assert.assertEquals(nodePath, addMeterInput.getNode().getValue());
         Assert.assertEquals("test-meter", addMeterInput.getMeterName());
     }
-}
\ No newline at end of file
+}