Move test modules which were erroneously included in main module resources file

build.xml

@@ -35,6 +35,7 @@
     <property name="coverage-output" location="${target}/coverage"/>
     <property name="source" location="src/main/java"/>
     <property name="resources" location="src/main/resources/"/>
+    <property name="testresources" location="src/test/resources/"/>
     <property name="source-test" location="src/test/java"/>
     <property name="python-src" location="src/main/python"/>
     <property name="docs" location="${target}/docs"/>
@@ -137,7 +138,7 @@
 
     <target name="compile-tests" depends="compile-test"/>
     <target name="compile-test" depends="compile">
-        <fileset dir="${resources}"/>
+        <fileset dir="${testresources}"/>
         <javac includeAntRuntime="false" debug="true" 
            srcdir="${source-test}"
            classpath="${build}"
@@ -190,8 +191,9 @@
             <classpath>
                 <pathelement location="${build-coverage}"/>
                 <pathelement location="${build}"/>
+                <pathelement location="${resources}"/>
+                <pathelement location="${test-resources}"/>
                 <pathelement location="${build-test}"/>
-                <pathelement location="${floodlight-jar}"/>
                 <path refid="classpath-test"/>
             </classpath>
             <formatter type="brief" usefile="true" />
@@ -253,7 +255,7 @@
                 <attribute name="Class-Path" value="."/>
             </manifest>
             <fileset dir="${build-test}"/>
-            <fileset dir="${resources}"/>
+            <fileset dir="${testresources}"/>
             <zipgroupfileset dir="${lib}">
                 <patternset refid="lib-test"/>
                 <patternset refid="lib-cobertura"/>

setup-eclipse.sh

@@ -78,6 +78,7 @@ cat >"$d/.classpath" <<EOF
 	<classpathentry kind="src" path="src/main/java" output="target/bin"/>
 	<classpathentry kind="src" path="src/main/resources"/>
         <classpathentry kind="src" path="src/test/java" output="target/bin-test"/>
+	<classpathentry kind="src" path="src/test/resources"/>
         <classpathentry kind="src" path="lib/gen-java" output="target/bin"/>
 EOF
 (

src/main/java/net/floodlightcontroller/core/module/FloodlightModuleLoader.java

@@ -106,8 +106,7 @@ public class FloodlightModuleLoader implements IModuleService {
                 try {
                     m = moduleIter.next();
                 } catch (ServiceConfigurationError sce) {
-                    logger.debug("Could not find module");
-                    //moduleIter.remove();
+                    logger.error("Could not find module: {}", sce.getMessage());
                     continue;
                 }
             //}

src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule

@@ -23,12 +23,8 @@ net.floodlightcontroller.debugevent.NullDebugEvent
 net.floodlightcontroller.threadpool.ThreadPool
 net.floodlightcontroller.ui.web.StaticWebRoutable
 net.floodlightcontroller.virtualnetwork.VirtualNetworkFilter
-net.floodlightcontroller.devicemanager.internal.DefaultEntityClassifier
-net.floodlightcontroller.devicemanager.test.MockDeviceManager
-net.floodlightcontroller.core.test.MockFloodlightProvider
-net.floodlightcontroller.core.test.MockThreadPoolService
 net.floodlightcontroller.firewall.Firewall
 net.floodlightcontroller.loadbalancer.LoadBalancer
 org.sdnplatform.sync.internal.SyncManager
 org.sdnplatform.sync.internal.SyncTorture
-org.sdnplatform.sync.test.MockSyncService
+net.floodlightcontroller.devicemanager.internal.DefaultEntityClassifier

src/test/java/net/floodlightcontroller/core/module/FloodlightTestModuleLoader.java

@@ -151,18 +151,14 @@ public class FloodlightTestModuleLoader extends FloodlightModuleLoader {
      * module that provides this service will not be loaded.
      */
     public void setupModules(Collection<Class<? extends IFloodlightModule>> modules,
-            Collection<IFloodlightService> mockedServices) {
+            Collection<IFloodlightService> mockedServices) throws FloodlightModuleException {
         addDefaultModules(modules);
         Collection<String> modulesAsString = new ArrayList<String>();
         for (Class<? extends IFloodlightModule> m : modules) {
             modulesAsString.add(m.getCanonicalName());
         }
 
-        try {
-            fmc = loadModulesFromList(modulesAsString, null, mockedServices);
-        } catch (FloodlightModuleException e) {
-            log.error(e.getMessage());
-        }
+        fmc = loadModulesFromList(modulesAsString, null, mockedServices);
     }
 
     /**

src/test/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule

+net.floodlightcontroller.devicemanager.test.MockDeviceManager
+net.floodlightcontroller.core.test.MockFloodlightProvider
+net.floodlightcontroller.core.test.MockThreadPoolService
+org.sdnplatform.sync.test.MockSyncService