Merge "SONAR TD - Group actions redundancy"

[openflowplugin.git] / openflowplugin-impl / src / test / java / org / opendaylight / openflowplugin / impl / rpc / RpcContextImplTest.java

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImplTest.java
index a1ba78f65795c47008c7e234944214b4b33f6fbe..d38ff06800cc8da44022af9744d30ba99e6eb508 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImplTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImplTest.java
@@ -10,6 +10,7 @@ package org.opendaylight.openflowplugin.impl.rpc;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -58,6 +59,8 @@ public class RpcContextImplTest {
     private DeviceContext deviceContext;
     @Mock
     private BindingAwareBroker.RoutedRpcRegistration<TestRpcService> routedRpcReg;
+
+    private Class<TestRpcService> serviceClass;
     @Mock
     private NotificationPublishService notificationPublishService;
     @Mock
@@ -83,7 +86,6 @@ public class RpcContextImplTest {
         rpcContext = new RpcContextImpl(
                 deviceInfo,
                 rpcProviderRegistry,
-                deviceContext,
                 messageSpy,
                 MAX_REQUESTS,
                 nodeInstanceIdentifier,
@@ -101,7 +103,6 @@ public class RpcContextImplTest {
         try (final RpcContext rpcContext = new RpcContextImpl(
                 deviceInfo,
                 rpcProviderRegistry,
-                xidSequencer,
                 messageSpy,
                 100,
                 nodeInstanceIdentifier,
@@ -119,7 +120,6 @@ public class RpcContextImplTest {
         try (final RpcContext rpcContext = new RpcContextImpl(
                 deviceInfo,
                 rpcProviderRegistry,
-                xidSequencer,
                 messageSpy,
                 0,
                 nodeInstanceIdentifier,
@@ -137,7 +137,6 @@ public class RpcContextImplTest {
         try (final RpcContext rpcContext = new RpcContextImpl(
                 deviceInfo,
                 rpcProviderRegistry,
-                deviceContext,
                 messageSpy,
                 100,
                 nodeInstanceIdentifier,
@@ -170,6 +169,8 @@ public class RpcContextImplTest {
 
     @Test
     public void testClose() {
+        serviceClass = TestRpcService.class;
+        when(routedRpcReg.getServiceType()).thenReturn(serviceClass);
         rpcContext.registerRpcServiceImplementation(TestRpcService.class, serviceInstance);
         rpcContext.close();
         assertEquals(rpcContext.isEmptyRpcRegistrations(), true);
@@ -181,7 +182,7 @@ public class RpcContextImplTest {
      */
     @Test
     public void testCreateRequestContext1() throws InterruptedException {
-        when(deviceContext.reserveXidForDeviceMessage()).thenReturn(null);
+        when(deviceInfo.reserveXidForDeviceMessage()).thenReturn(null);
         assertEquals(rpcContext.createRequestContext(),null);
     }