Skip to content
Snippets Groups Projects
Commit fe5e8242 authored by Srinivasan Ramasubramanian's avatar Srinivasan Ramasubramanian
Browse files

Fix a failing unit test.

parent 3a94f489
No related branches found
No related tags found
No related merge requests found
package net.floodlightcontroller.virtualnetwork; package net.floodlightcontroller.virtualnetwork;
import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.*;
import static org.easymock.EasyMock.replay;
import java.util.List; import java.util.List;
...@@ -36,6 +35,7 @@ import net.floodlightcontroller.restserver.IRestApiService; ...@@ -36,6 +35,7 @@ import net.floodlightcontroller.restserver.IRestApiService;
import net.floodlightcontroller.restserver.RestApiServer; import net.floodlightcontroller.restserver.RestApiServer;
import net.floodlightcontroller.test.FloodlightTestCase; import net.floodlightcontroller.test.FloodlightTestCase;
import net.floodlightcontroller.threadpool.IThreadPoolService; import net.floodlightcontroller.threadpool.IThreadPoolService;
import net.floodlightcontroller.topology.ITopologyService;
import net.floodlightcontroller.util.MACAddress; import net.floodlightcontroller.util.MACAddress;
import net.floodlightcontroller.virtualnetwork.VirtualNetworkFilter; import net.floodlightcontroller.virtualnetwork.VirtualNetworkFilter;
...@@ -89,6 +89,7 @@ public class VirtualNetworkFilterTest extends FloodlightTestCase { ...@@ -89,6 +89,7 @@ public class VirtualNetworkFilterTest extends FloodlightTestCase {
deviceService = new MockDeviceManager(); deviceService = new MockDeviceManager();
FlowReconcileManager frm = new FlowReconcileManager(); FlowReconcileManager frm = new FlowReconcileManager();
MockThreadPoolService tps = new MockThreadPoolService(); MockThreadPoolService tps = new MockThreadPoolService();
ITopologyService topology = createMock(ITopologyService.class);
vns = new VirtualNetworkFilter(); vns = new VirtualNetworkFilter();
DefaultEntityClassifier entityClassifier = new DefaultEntityClassifier(); DefaultEntityClassifier entityClassifier = new DefaultEntityClassifier();
fmc.addService(IRestApiService.class, restApi); fmc.addService(IRestApiService.class, restApi);
...@@ -97,6 +98,7 @@ public class VirtualNetworkFilterTest extends FloodlightTestCase { ...@@ -97,6 +98,7 @@ public class VirtualNetworkFilterTest extends FloodlightTestCase {
fmc.addService(IFlowReconcileService.class, frm); fmc.addService(IFlowReconcileService.class, frm);
fmc.addService(IThreadPoolService.class, tps); fmc.addService(IThreadPoolService.class, tps);
fmc.addService(IEntityClassifierService.class, entityClassifier); fmc.addService(IEntityClassifierService.class, entityClassifier);
fmc.addService(ITopologyService.class, topology);
tps.init(fmc); tps.init(fmc);
frm.init(fmc); frm.init(fmc);
deviceService.init(fmc); deviceService.init(fmc);
...@@ -111,7 +113,10 @@ public class VirtualNetworkFilterTest extends FloodlightTestCase { ...@@ -111,7 +113,10 @@ public class VirtualNetworkFilterTest extends FloodlightTestCase {
getMockFloodlightProvider().startUp(fmc); getMockFloodlightProvider().startUp(fmc);
vns.startUp(fmc); vns.startUp(fmc);
entityClassifier.startUp(fmc); entityClassifier.startUp(fmc);
topology.addListener(deviceService);
expectLastCall().times(1);
replay(topology);
// Mock switches // Mock switches
//fastWilcards mocked as this constant //fastWilcards mocked as this constant
int fastWildcards = int fastWildcards =
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment