Merge "ONF Bundles sample application"

[openflowplugin.git] / openflowplugin-impl / src / test / java / org / opendaylight / openflowplugin / impl / lifecycle / ContextChainImplTest.java

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/lifecycle/ContextChainImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/lifecycle/ContextChainImplTest.java
index 13019a48dc56b242b930748a5a1e3432daaa61e2..7741209d739e32ac85b2a9ed9e767a1e26155b38 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/lifecycle/ContextChainImplTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/lifecycle/ContextChainImplTest.java
@@ -49,7 +49,7 @@ public class ContextChainImplTest {
                 .thenReturn(Futures.immediateFuture(null));
         Mockito.when(rpcContext.stopClusterServices()).thenReturn(Futures.immediateFuture(null));
         Mockito.when(statisticsContext.stopClusterServices()).thenReturn(Futures.immediateFuture(null));
-        Mockito.when(statisticsContext.initialGatherDynamicData()).thenReturn(Futures.immediateFuture(null));
+        Mockito.when(statisticsContext.gatherDynamicData()).thenReturn(Futures.immediateFuture(null));
         Mockito.when(connectionContext.getDeviceInfo()).thenReturn(deviceInfo);
 
         contextChain = new ContextChainImpl(connectionContext);
@@ -83,6 +83,7 @@ public class ContextChainImplTest {
         contextChain.isMastered(ContextChainMastershipState.INITIAL_SUBMIT);
         contextChain.isMastered(ContextChainMastershipState.MASTER_ON_DEVICE);
         contextChain.isMastered(ContextChainMastershipState.INITIAL_FLOW_REGISTRY_FILL);
+        contextChain.isMastered(ContextChainMastershipState.RPC_REGISTRATION);
         contextChain.connectionDropped();
         Mockito.verify(deviceContext).stopClusterServices();
         Mockito.verify(rpcContext).stopClusterServices();