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

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

diff --git a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/GroupForwarderTest.java b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/GroupForwarderTest.java
index 4dd05c3c77c843af649cc79c82060a5deef40785..3a5bc5dae13e30221241918952104433bce2fe4b 100644 (file)
--- a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/GroupForwarderTest.java
+++ b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/strategy/GroupForwarderTest.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;
@@ -97,9 +97,10 @@ public class GroupForwarderTest {
                         .buildFuture()
         );
 
-        final Future<RpcResult<RemoveGroupOutput>> addResult = groupForwarder.remove(groupPath, group, flowCapableNodePath);
+        final Future<RpcResult<RemoveGroupOutput>> addResult =
+                groupForwarder.remove(groupPath, group, flowCapableNodePath);
 
-        Mockito.verify(salGroupService).removeGroup(Matchers.<RemoveGroupInput>any());
+        Mockito.verify(salGroupService).removeGroup(ArgumentMatchers.<RemoveGroupInput>any());
 
         Assert.assertTrue(addResult.isDone());
         final RpcResult<RemoveGroupOutput> result = addResult.get(2, TimeUnit.SECONDS);
@@ -129,10 +130,10 @@ public class GroupForwarderTest {
                 .setGroupName("another-test")
                 .build();
 
-        final Future<RpcResult<UpdateGroupOutput>> addResult = groupForwarder.update(groupPath, groupOriginal, groupUpdate,
-                flowCapableNodePath);
+        final Future<RpcResult<UpdateGroupOutput>> addResult =
+                groupForwarder.update(groupPath, groupOriginal, groupUpdate, flowCapableNodePath);
 
-        Mockito.verify(salGroupService).updateGroup(Matchers.<UpdateGroupInput>any());
+        Mockito.verify(salGroupService).updateGroup(ArgumentMatchers.<UpdateGroupInput>any());
 
         Assert.assertTrue(addResult.isDone());
         final RpcResult<UpdateGroupOutput> result = addResult.get(2, TimeUnit.SECONDS);
@@ -162,7 +163,7 @@ public class GroupForwarderTest {
 
         final Future<RpcResult<AddGroupOutput>> addResult = groupForwarder.add(groupPath, group, flowCapableNodePath);
 
-        Mockito.verify(salGroupService).addGroup(Matchers.<AddGroupInput>any());
+        Mockito.verify(salGroupService).addGroup(ArgumentMatchers.<AddGroupInput>any());
 
         Assert.assertTrue(addResult.isDone());
         final RpcResult<AddGroupOutput> result = addResult.get(2, TimeUnit.SECONDS);
@@ -176,4 +177,4 @@ public class GroupForwarderTest {
         Assert.assertNotNull(addGroupInput.getBuckets());
         Assert.assertEquals("test-group", addGroupInput.getGroupName());
     }
-}
\ No newline at end of file
+}