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

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

diff --git a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/ForwardingRulesSyncProviderTest.java b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/ForwardingRulesSyncProviderTest.java
index a9a649462ae0654486717e4451eee885fc9e18e2..ff9f903ec3e4191a8fcd54065f30d1029e226114 100644 (file)
--- a/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/ForwardingRulesSyncProviderTest.java
+++ b/applications/forwardingrules-sync/src/test/java/org/opendaylight/openflowplugin/applications/frsync/impl/ForwardingRulesSyncProviderTest.java
@@ -11,17 +11,13 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Matchers;
+import org.mockito.ArgumentMatchers;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
 import org.mockito.runners.MockitoJUnitRunner;
-import org.mockito.stubbing.Answer;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
 import org.opendaylight.controller.sal.binding.api.RpcConsumerRegistry;
 import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.SalFlatBatchService;
@@ -41,41 +37,34 @@ public class ForwardingRulesSyncProviderTest {
     @Mock
     private RpcConsumerRegistry rpcRegistry;
     @Mock
-    private BindingAwareBroker broker;
-    @Mock
-    private ProviderContext providerContext;
-    @Mock
     private ClusterSingletonServiceProvider clusterSingletonService;
 
     @Before
     public void setUp() throws Exception {
-        Mockito.when(rpcRegistry.getRpcService(Matchers.<Class<? extends RpcService>>any()))
-                .thenAnswer(new Answer<RpcService>() {
-                    @Override
-                    public RpcService answer(final InvocationOnMock invocation) throws Throwable {
-                        Class<? extends RpcService> serviceType = (Class<? extends RpcService>) invocation.getArguments()[0];
-                        return Mockito.mock(serviceType);
-                    }
+        Mockito.when(rpcRegistry.getRpcService(ArgumentMatchers.<Class<? extends RpcService>>any()))
+                .thenAnswer(invocation -> {
+                    Class<? extends RpcService> serviceType =
+                            (Class<? extends RpcService>) invocation.getArguments()[0];
+                    return Mockito.mock(serviceType);
                 });
 
-        provider = new ForwardingRulesSyncProvider(broker, dataBroker, rpcRegistry, clusterSingletonService);
+        provider = new ForwardingRulesSyncProvider(dataBroker, rpcRegistry, clusterSingletonService);
         Mockito.verify(rpcRegistry).getRpcService(SalTableService.class);
         Mockito.verify(rpcRegistry).getRpcService(SalFlatBatchService.class);
-        Mockito.verify(broker).registerProvider(provider);
     }
 
     @Test
-    public void testOnSessionInitiated() throws Exception {
-        provider.onSessionInitiated(providerContext);
+    public void testInit() throws Exception {
+        provider.init();
 
         Mockito.verify(dataBroker, Mockito.times(2)).registerDataTreeChangeListener(
-                Matchers.<DataTreeIdentifier<FlowCapableNode>>any(),
-                Matchers.<DataTreeChangeListener<FlowCapableNode>>any());
+                ArgumentMatchers.<DataTreeIdentifier<FlowCapableNode>>any(),
+                ArgumentMatchers.<DataTreeChangeListener<FlowCapableNode>>any());
     }
 
     @After
-    public void tearDown() throws InterruptedException {
+    public void tearDown() {
         provider.close();
     }
 
-}
\ No newline at end of file
+}