From 2cef256250c8e4411df092fe4bf501c154c2e18a Mon Sep 17 00:00:00 2001
From: Alex Reimers <alex@bigswitch.com>
Date: Fri, 3 Feb 2012 17:12:00 -0800
Subject: [PATCH] Updates to unit tests.
---
.../core/module/FloodlightModuleContext.java | 2 +-
.../perfmon/PktinProcessingTime.java | 4 +-
.../storage/AbstractStorageSource.java | 7 ----
.../core/test/MockFloodlightProvider.java | 42 ++++++++++++++++++-
.../devicemanager/test/MockDeviceManager.java | 42 ++++++++++++++++++-
.../memory/tests/MemoryStorageTest.java | 2 +
.../storage/tests/StorageTest.java | 4 +-
.../test/FloodlightTestCase.java | 2 -
8 files changed, 89 insertions(+), 16 deletions(-)
diff --git a/src/main/java/net/floodlightcontroller/core/module/FloodlightModuleContext.java b/src/main/java/net/floodlightcontroller/core/module/FloodlightModuleContext.java
index 00cf5af9f..2f90c3a33 100644
--- a/src/main/java/net/floodlightcontroller/core/module/FloodlightModuleContext.java
+++ b/src/main/java/net/floodlightcontroller/core/module/FloodlightModuleContext.java
@@ -36,7 +36,7 @@ public class FloodlightModuleContext implements IFloodlightModuleContext {
public <T extends IFloodlightService> T getServiceImpl(Class<T> service) {
IFloodlightService s = serviceMap.get(service);
return (T)s;
- }
+ }
@Override
public Collection<Class<? extends IFloodlightService>> getAllServices() {
diff --git a/src/main/java/net/floodlightcontroller/perfmon/PktinProcessingTime.java b/src/main/java/net/floodlightcontroller/perfmon/PktinProcessingTime.java
index 773ba2e46..cfaa174ce 100644
--- a/src/main/java/net/floodlightcontroller/perfmon/PktinProcessingTime.java
+++ b/src/main/java/net/floodlightcontroller/perfmon/PktinProcessingTime.java
@@ -49,7 +49,7 @@ public class PktInProcessingTime
*
*/
- protected static Logger logger =
+ protected static Logger logger =
LoggerFactory.getLogger(PktInProcessingTime.class);
/***
@@ -95,7 +95,7 @@ public class PktInProcessingTime
}
}
- protected PerfMonConfigs perfMonCfgs;
+ protected PerfMonConfigs perfMonCfgs;
// Maintains the time when the last packet was processed
protected long lastPktTime_ns;
protected long curBucketStartTime;
diff --git a/src/main/java/net/floodlightcontroller/storage/AbstractStorageSource.java b/src/main/java/net/floodlightcontroller/storage/AbstractStorageSource.java
index b07f105d4..5fdafa3b8 100644
--- a/src/main/java/net/floodlightcontroller/storage/AbstractStorageSource.java
+++ b/src/main/java/net/floodlightcontroller/storage/AbstractStorageSource.java
@@ -28,7 +28,6 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import net.floodlightcontroller.core.module.FloodlightModuleContext;
import net.floodlightcontroller.core.module.IFloodlightModule;
import org.slf4j.Logger;
@@ -328,10 +327,4 @@ public abstract class AbstractStorageSource
for (StorageSourceNotification notification : notifications)
notifyListeners(notification);
}
-
- @Override
- public void startUp(FloodlightModuleContext context) {
- // TODO Auto-generated method stub
-
- }
}
diff --git a/src/test/java/net/floodlightcontroller/core/test/MockFloodlightProvider.java b/src/test/java/net/floodlightcontroller/core/test/MockFloodlightProvider.java
index df1d29e1a..86d3427d6 100644
--- a/src/test/java/net/floodlightcontroller/core/test/MockFloodlightProvider.java
+++ b/src/test/java/net/floodlightcontroller/core/test/MockFloodlightProvider.java
@@ -18,6 +18,7 @@
package net.floodlightcontroller.core.test;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -33,6 +34,10 @@ import net.floodlightcontroller.core.IOFSwitchFilter;
import net.floodlightcontroller.core.IOFSwitchListener;
import net.floodlightcontroller.core.IOFMessageListener.Command;
import net.floodlightcontroller.core.internal.CmdLineSettings;
+import net.floodlightcontroller.core.module.FloodlightModuleContext;
+import net.floodlightcontroller.core.module.FloodlightModuleException;
+import net.floodlightcontroller.core.module.IFloodlightModule;
+import net.floodlightcontroller.core.module.IFloodlightService;
import net.floodlightcontroller.packet.Ethernet;
import org.openflow.protocol.OFMessage;
@@ -44,7 +49,7 @@ import org.openflow.protocol.factory.BasicFactory;
*
* @author David Erickson (daviderickson@cs.stanford.edu)
*/
-public class MockFloodlightProvider implements IFloodlightProviderService {
+public class MockFloodlightProvider implements IFloodlightModule, IFloodlightProviderService {
protected Map<OFType, List<IOFMessageListener>> listeners;
protected List<IOFSwitchListener> switchListeners;
protected Map<Long, IOFSwitch> switches;
@@ -205,4 +210,39 @@ public class MockFloodlightProvider implements IFloodlightProviderService {
public void setCmdLineOptions(CmdLineSettings settings) {
// no-op
}
+
+ @Override
+ public Collection<Class<? extends IFloodlightService>> getModuleServices() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Map<Class<? extends IFloodlightService>, IFloodlightService>
+ getServiceImpls() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Collection<Class<? extends IFloodlightService>>
+ getModuleDependencies() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public
+ void
+ init(FloodlightModuleContext context)
+ throws FloodlightModuleException {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void startUp(FloodlightModuleContext context) {
+ // TODO Auto-generated method stub
+
+ }
}
diff --git a/src/test/java/net/floodlightcontroller/devicemanager/test/MockDeviceManager.java b/src/test/java/net/floodlightcontroller/devicemanager/test/MockDeviceManager.java
index 31ba67ad9..5c582623a 100644
--- a/src/test/java/net/floodlightcontroller/devicemanager/test/MockDeviceManager.java
+++ b/src/test/java/net/floodlightcontroller/devicemanager/test/MockDeviceManager.java
@@ -18,6 +18,7 @@
package net.floodlightcontroller.devicemanager.test;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -25,12 +26,16 @@ import java.util.ListIterator;
import java.util.Map;
import java.util.Map.Entry;
+import net.floodlightcontroller.core.module.FloodlightModuleContext;
+import net.floodlightcontroller.core.module.FloodlightModuleException;
+import net.floodlightcontroller.core.module.IFloodlightModule;
+import net.floodlightcontroller.core.module.IFloodlightService;
import net.floodlightcontroller.devicemanager.Device;
import net.floodlightcontroller.devicemanager.IDeviceManagerAware;
import net.floodlightcontroller.devicemanager.IDeviceManagerService;
import net.floodlightcontroller.packet.Ethernet;
-public class MockDeviceManager implements IDeviceManagerService {
+public class MockDeviceManager implements IFloodlightModule, IDeviceManagerService {
protected Map<Long, Device> devices;
public MockDeviceManager() {
@@ -99,4 +104,39 @@ public class MockDeviceManager implements IDeviceManagerService {
// TODO Auto-generated method stub
}
+
+ @Override
+ public Collection<Class<? extends IFloodlightService>> getModuleServices() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Map<Class<? extends IFloodlightService>, IFloodlightService>
+ getServiceImpls() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Collection<Class<? extends IFloodlightService>>
+ getModuleDependencies() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public
+ void
+ init(FloodlightModuleContext context)
+ throws FloodlightModuleException {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void startUp(FloodlightModuleContext context) {
+ // TODO Auto-generated method stub
+
+ }
}
diff --git a/src/test/java/net/floodlightcontroller/storage/memory/tests/MemoryStorageTest.java b/src/test/java/net/floodlightcontroller/storage/memory/tests/MemoryStorageTest.java
index a0f79f1aa..8933634b8 100644
--- a/src/test/java/net/floodlightcontroller/storage/memory/tests/MemoryStorageTest.java
+++ b/src/test/java/net/floodlightcontroller/storage/memory/tests/MemoryStorageTest.java
@@ -17,6 +17,7 @@
package net.floodlightcontroller.storage.memory.tests;
+import net.floodlightcontroller.core.module.IFloodlightModule;
import net.floodlightcontroller.storage.memory.MemoryStorageSource;
import net.floodlightcontroller.storage.tests.StorageTest;
import org.junit.Before;
@@ -26,6 +27,7 @@ public class MemoryStorageTest extends StorageTest {
@Before
public void setUp() throws Exception {
storageSource = new MemoryStorageSource();
+ ((IFloodlightModule)storageSource).startUp(null);
super.setUp();
}
}
diff --git a/src/test/java/net/floodlightcontroller/storage/tests/StorageTest.java b/src/test/java/net/floodlightcontroller/storage/tests/StorageTest.java
index 2aa44bd12..779d6bd29 100644
--- a/src/test/java/net/floodlightcontroller/storage/tests/StorageTest.java
+++ b/src/test/java/net/floodlightcontroller/storage/tests/StorageTest.java
@@ -30,7 +30,6 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import net.floodlightcontroller.perfmon.IPktInProcessingTimeService;
import net.floodlightcontroller.perfmon.PktInProcessingTime;
import net.floodlightcontroller.storage.CompoundPredicate;
import net.floodlightcontroller.storage.IStorageExceptionHandler;
@@ -141,7 +140,8 @@ public abstract class StorageTest extends FloodlightTestCase {
public void setUp() throws Exception {
super.setUp();
- IPktInProcessingTimeService pktinProcessingTime = new PktInProcessingTime();
+ PktInProcessingTime pktinProcessingTime = new PktInProcessingTime();
+ pktinProcessingTime.startUp(null);
storageSource.setPktinProcessingTime(pktinProcessingTime);
Set<String> indexedColumnNames = new HashSet<String>();
indexedColumnNames.add(PERSON_LAST_NAME);
diff --git a/src/test/java/net/floodlightcontroller/test/FloodlightTestCase.java b/src/test/java/net/floodlightcontroller/test/FloodlightTestCase.java
index d0fc5c48a..ac711dbd3 100644
--- a/src/test/java/net/floodlightcontroller/test/FloodlightTestCase.java
+++ b/src/test/java/net/floodlightcontroller/test/FloodlightTestCase.java
@@ -34,8 +34,6 @@ import org.openflow.protocol.OFType;
* @author David Erickson (daviderickson@cs.stanford.edu)
*/
public class FloodlightTestCase extends TestCase {
-
-
protected MockFloodlightProvider mockFloodlightProvider;
public MockFloodlightProvider getMockFloodlightProvider() {
--
GitLab