commit 786b7e4fa2d879872f09eb77785db600f27a5919
author kishore <kishore.onos@gmail.com> Thu May 19 16:25:57 2016 +0530
committer Gerrit Code Review <gerrit@onlab.us> Mon Jun 06 16:27:12 2016 +0000
tree 67d9afd133b68b62b5affe760668d611db96e704
parent 2e557be44d1e811ba3403adcc01dc8768a16ea0f

ControlPlaneRedirectManager.java, Cleaning flows on Deactivating the app

Change-Id: I06c9c2dd286f02ad84a1c01bfa5b7202988b0402

apps/routing/src/test/java/org/onosproject/routing/impl/ControlPlaneRedirectManagerTest.java

diff --git a/apps/routing/src/test/java/org/onosproject/routing/impl/ControlPlaneRedirectManagerTest.java b/apps/routing/src/test/java/org/onosproject/routing/impl/ControlPlaneRedirectManagerTest.java
index 8f61ddb..59f1fc2 100644
--- a/apps/routing/src/test/java/org/onosproject/routing/impl/ControlPlaneRedirectManagerTest.java
+++ b/apps/routing/src/test/java/org/onosproject/routing/impl/ControlPlaneRedirectManagerTest.java
@@ -24,6 +24,7 @@
 import org.onlab.packet.IpPrefix;
 import org.onlab.packet.MacAddress;
 import org.onlab.packet.VlanId;
+import org.onosproject.app.ApplicationService;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.CoreService;
 import org.onosproject.core.CoreServiceAdapter;
@@ -89,7 +90,7 @@
     private static final int OSPF_IP_PROTO = 0x59;
     private CoreService coreService = new TestCoreService();
     private InterfaceService interfaceService;
-    private static final ApplicationId APPID = TestApplicationId.create("org.onosproject.cpredirect");
+    private static final ApplicationId APPID = TestApplicationId.create("org.onosproject.vrouter");
 
     private static final DeviceId DEVICE_ID = DeviceId.deviceId("of:0000000000000001");
 
@@ -111,6 +112,7 @@
     private DeviceListener deviceListener;
     private MastershipService mastershipService = new InternalMastershipServiceTest();
     private InterfaceListener interfaceListener;
+    private ApplicationService applicationService;
 
     @Before
     public void setUp() {
@@ -126,6 +128,8 @@
         networkConfigService = new TestNetworkConfigService();
         networkConfigService.addListener(networkConfigListener);
         flowObjectiveService = createMock(FlowObjectiveService.class);
+        applicationService = createNiceMock(ApplicationService.class);
+        replay(applicationService);
         setUpFlowObjectiveService();
         controlPlaneRedirectManager.coreService = coreService;
         controlPlaneRedirectManager.flowObjectiveService = flowObjectiveService;
@@ -134,6 +138,7 @@
         controlPlaneRedirectManager.deviceService = deviceService;
         controlPlaneRedirectManager.hostService = createNiceMock(HostService.class);
         controlPlaneRedirectManager.mastershipService = mastershipService;
+        controlPlaneRedirectManager.applicationService = applicationService;
         controlPlaneRedirectManager.activate();
         verify(flowObjectiveService);
     }