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

[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 4344cc01e6bd3aabcbb3c76c15c55e7620f315cc..9ca563094f6910460071d3b0c2524152ef12bc48 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
@@ -21,11 +21,11 @@ import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
+import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceState;
 import org.opendaylight.openflowplugin.api.openflow.device.RequestContext;
-import org.opendaylight.openflowplugin.api.openflow.device.XidSequencer;
 import org.opendaylight.openflowplugin.api.openflow.rpc.RpcContext;
 import org.opendaylight.openflowplugin.api.openflow.statistics.ofpspecific.MessageSpy;
 import org.opendaylight.openflowplugin.extension.api.core.extension.ExtensionConverterProvider;
@@ -47,17 +47,16 @@ public class RpcContextImplTest {
 
 
     @Mock
-    private BindingAwareBroker.ProviderContext rpcProviderRegistry;
+    private RpcProviderRegistry rpcProviderRegistry;
     @Mock
     private DeviceState deviceState;
     @Mock
-    private XidSequencer xidSequencer;
-    @Mock
     private MessageSpy messageSpy;
     @Mock
     private DeviceContext deviceContext;
     @Mock
     private BindingAwareBroker.RoutedRpcRegistration<TestRpcService> routedRpcReg;
+
     @Mock
     private NotificationPublishService notificationPublishService;
     @Mock
@@ -76,37 +75,32 @@ public class RpcContextImplTest {
         final NodeId nodeId = new NodeId("openflow:1");
         nodeInstanceIdentifier = InstanceIdentifier.create(Nodes.class).child(Node.class, new NodeKey(nodeId));
 
-        when(deviceContext.getDeviceState()).thenReturn(deviceState);
         when(deviceInfo.getNodeInstanceIdentifier()).thenReturn(nodeInstanceIdentifier);
         when(deviceContext.getMessageSpy()).thenReturn(messageSpy);
+        when(deviceContext.getDeviceInfo()).thenReturn(deviceInfo);
+        when(deviceInfo.getNodeInstanceIdentifier()).thenReturn(nodeInstanceIdentifier);
 
         rpcContext = new RpcContextImpl(
-                deviceInfo,
                 rpcProviderRegistry,
-                messageSpy,
                 MAX_REQUESTS,
-                nodeInstanceIdentifier,
                 deviceContext,
                 extensionConverterProvider,
                 convertorExecutor,
-                notificationPublishService);
-
-        when(rpcProviderRegistry.addRoutedRpcImplementation(TestRpcService.class, serviceInstance)).thenReturn(routedRpcReg);
+                notificationPublishService, true);
 
+        when(rpcProviderRegistry.addRoutedRpcImplementation(TestRpcService.class, serviceInstance))
+                .thenReturn(routedRpcReg);
     }
 
     @Test
     public void testStoreOrFail() throws Exception {
-        try (final RpcContext rpcContext = new RpcContextImpl(
-                deviceInfo,
+        try (RpcContext rpcContext = new RpcContextImpl(
                 rpcProviderRegistry,
-                messageSpy,
                 100,
-                nodeInstanceIdentifier,
                 deviceContext,
                 extensionConverterProvider,
                 convertorExecutor,
-                notificationPublishService)){
+                notificationPublishService, true)) {
             final RequestContext<?> requestContext = rpcContext.createRequestContext();
             assertNotNull(requestContext);
         }
@@ -114,16 +108,13 @@ public class RpcContextImplTest {
 
     @Test
     public void testStoreOrFailThatFails() throws Exception {
-        try (final RpcContext rpcContext = new RpcContextImpl(
-                deviceInfo,
+        try (RpcContext rpcContext = new RpcContextImpl(
                 rpcProviderRegistry,
-                messageSpy,
                 0,
-                nodeInstanceIdentifier,
                 deviceContext,
                 extensionConverterProvider,
                 convertorExecutor,
-                notificationPublishService)){
+                notificationPublishService, true)) {
             final RequestContext<?> requestContext = rpcContext.createRequestContext();
             assertNull(requestContext);
         }
@@ -131,20 +122,17 @@ public class RpcContextImplTest {
 
     @Test
     public void testStoreAndCloseOrFail() throws Exception {
-        try (final RpcContext rpcContext = new RpcContextImpl(
-                deviceInfo,
+        try (RpcContext rpcContext = new RpcContextImpl(
                 rpcProviderRegistry,
-                messageSpy,
                 100,
-                nodeInstanceIdentifier,
                 deviceContext,
                 extensionConverterProvider,
                 convertorExecutor,
-                notificationPublishService)){
+                notificationPublishService, true)) {
             final RequestContext<?> requestContext = rpcContext.createRequestContext();
             assertNotNull(requestContext);
             requestContext.close();
-            verify(messageSpy).spyMessage(RpcContextImpl.class, MessageSpy.STATISTIC_GROUP.REQUEST_STACK_FREED);
+            verify(messageSpy).spyMessage(RpcContextImpl.class, MessageSpy.StatisticsGroup.REQUEST_STACK_FREED);
         }
     }
 
@@ -155,7 +143,6 @@ public class RpcContextImplTest {
         assertEquals(rpcContext.isEmptyRpcRegistrations(), false);
     }
 
-
     @Test
     public void testLookupRpcService() {
         when(routedRpcReg.getInstance()).thenReturn(serviceInstance);
@@ -166,14 +153,15 @@ public class RpcContextImplTest {
 
     @Test
     public void testClose() {
+        Class<TestRpcService> serviceClass = TestRpcService.class;
+        when(routedRpcReg.getServiceType()).thenReturn(serviceClass);
         rpcContext.registerRpcServiceImplementation(TestRpcService.class, serviceInstance);
         rpcContext.close();
         assertEquals(rpcContext.isEmptyRpcRegistrations(), true);
     }
 
     /**
-     * When deviceContext.reserveXidForDeviceMessage returns null, null should be returned
-     * @throws InterruptedException
+     * When deviceContext.reserveXidForDeviceMessage returns null, null should be returned.
      */
     @Test
     public void testCreateRequestContext1() throws InterruptedException {
@@ -182,15 +170,14 @@ public class RpcContextImplTest {
     }
 
     /**
-     * When deviceContext.reserveXidForDeviceMessage returns value, AbstractRequestContext should be returned
-     * @throws InterruptedException
+     * When deviceContext.reserveXidForDeviceMessage returns value, AbstractRequestContext should be returned.
      */
 
     @Test
     public void testCreateRequestContext2() throws InterruptedException {
         RequestContext temp = rpcContext.createRequestContext();
         temp.close();
-        verify(messageSpy).spyMessage(RpcContextImpl.class,MessageSpy.STATISTIC_GROUP.REQUEST_STACK_FREED);
+        verify(messageSpy).spyMessage(RpcContextImpl.class, MessageSpy.StatisticsGroup.REQUEST_STACK_FREED);
     }
 
     @Test
@@ -201,6 +188,6 @@ public class RpcContextImplTest {
         assertEquals(rpcContext.isEmptyRpcRegistrations(), true);
     }
 
-    //Stub for RpcService class
+    //Stub for RpcService class.
     public class TestRpcService implements RpcService {}
 }