Cleanup RequestContextStack

[openflowplugin.git] / openflowplugin-impl / src / test / java / org / opendaylight / openflowplugin / api / openflow / device / RpcManagerImplTest.java

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/api/openflow/device/RpcManagerImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/api/openflow/device/RpcManagerImplTest.java
index 9a41997a5a0667eb2c85387151ff9b143f84c453..3fea20faaf7bb15825b23829c8928cd0e7722bdc 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/api/openflow/device/RpcManagerImplTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/api/openflow/device/RpcManagerImplTest.java
@@ -11,17 +11,18 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-
 import java.math.BigInteger;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.Matchers;
+import org.mockito.Mock;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
 import org.opendaylight.openflowjava.protocol.api.connection.ConnectionAdapter;
 import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext;
 import org.opendaylight.openflowplugin.api.openflow.rpc.RpcContext;
+import org.opendaylight.openflowplugin.api.openflow.statistics.ofpspecific.MessageSpy;
 import org.opendaylight.openflowplugin.impl.rpc.RpcContextImpl;
 import org.opendaylight.openflowplugin.impl.rpc.RpcManagerImpl;
 import org.opendaylight.openflowplugin.impl.services.SalFlowServiceImpl;
@@ -50,6 +51,8 @@ public class RpcManagerImplTest {
     final RpcContext mockedRpcContext = mock(RpcContext.class);
     final AddFlowInput mockedFlowInput = prepareTestingAddFlow();
     final DeviceContext mockedDeviceContext = mock(DeviceContext.class);
+    @Mock
+    private MessageSpy messageSpy;
 
     @Ignore
     @Test
@@ -82,7 +85,7 @@ public class RpcManagerImplTest {
         final Xid mockedXid = mock(Xid.class);
         final Long dummyXid = 1l;
         when(mockedXid.getValue()).thenReturn(dummyXid);
-        when(mockedDeviceContext.getNextXid()).thenReturn(mockedXid);
+        when(mockedDeviceContext.getReservedXid()).thenReturn(dummyXid);
 
         invokeRpcTestExistsCapacity(10, true);
         invokeRpcTestExistsCapacity(0, false);
@@ -93,9 +96,8 @@ public class RpcManagerImplTest {
         // TODO: how to invoke service remotely?
         NodeId nodeId = new NodeId("openflow:1");
         KeyedInstanceIdentifier<Node, NodeKey> nodeInstanceIdentifier = InstanceIdentifier.create(Nodes.class).child(Node.class, new NodeKey(nodeId));
-        final RpcContextImpl rpcContext = new RpcContextImpl(mockedProviderContext, nodeInstanceIdentifier);
+        final RpcContextImpl rpcContext = new RpcContextImpl(messageSpy, mockedProviderContext, nodeInstanceIdentifier, capacity);
         when(mockedProviderContext.getRpcService(SalFlowService.class)).thenReturn(new SalFlowServiceImpl(rpcContext, mockedDeviceContext));
-        rpcContext.setRequestContextQuota(capacity);
 
         final SalFlowService salFlowService = mockedProviderContext.getRpcService(SalFlowService.class);
         final Future<RpcResult<AddFlowOutput>> addedFlow = salFlowService.addFlow(prepareTestingAddFlow());
@@ -104,7 +106,7 @@ public class RpcManagerImplTest {
     /**
      * @return
      */
-    private AddFlowInput prepareTestingAddFlow() {
+    private static AddFlowInput prepareTestingAddFlow() {
         final AddFlowInputBuilder builder = new AddFlowInputBuilder();
         builder.setFlowName("dummy flow");
         builder.setHardTimeout(10000);