BUG: Refs #212. Further testing cleanup and reorganization.

Removed the configs file for testing, removed the README as it
is now obsolete, and reorganized the CMakeLists files to include some files
that weren't tested.

Also some style fixes in Executor.php

modules/batchmake/library/Executor.php

@@ -10,13 +10,26 @@
 PURPOSE.  See the above copyright notices for more information.
 =========================================================================*/
 include_once BASE_PATH . '/library/KWUtils.php';
+
+/**
+ * an executor class for the batchmake module, used to forward calls
+ * to exec on to KWUtils.
+ */
 class Batchmake_Executor
 {
+  /**
+   * forwards a call to this method on to KWUtils.exec, with the same
+   * method signature.
+   * @param type $command
+   * @param type $output
+   * @param type $chdir
+   * @param type $return_val
+   */
   public function exec($command, &$output = null, $chdir = "", &$return_val = null)
     {
-    KWUtils::exec($command, $output, $chdir, $return_val);  
+    KWUtils::exec($command, $output, $chdir, $return_val);
     }
 } // end class
 
-    
-    
+
+

modules/batchmake/tests/CMakeLists.txt

@@ -1,7 +1,21 @@
 option( MIDAS_RUN_BATCHMAKE_TESTS "Should MIDAS run BatchMake tests?  Specific configuration is required, see modules/batchmake/tests/README." )
 if(MIDAS_RUN_BATCHMAKE_TESTS)
+  # functionality tests will be added by the subdirectories 
   add_subdirectory( controllers )
+
+  # Style tests for code
+  add_midas_style_test( StyleBatchmakeControllers ${CMAKE_SOURCE_DIR}/modules/batchmake/controllers )
+  add_midas_style_test( StyleBatchmakeComponents ${CMAKE_SOURCE_DIR}/modules/batchmake/controllers/components )
+  add_midas_style_test( StyleBatchmakeLibrary ${CMAKE_SOURCE_DIR}/modules/batchmake/library )
+  add_midas_style_test( StyleBatchmakeModels ${CMAKE_SOURCE_DIR}/modules/batchmake/models )
+  add_midas_style_test( StyleBatchmakeModelsBase ${CMAKE_SOURCE_DIR}/modules/batchmake/models/base )
+  add_midas_style_test( StyleBatchmakeModelsDAO ${CMAKE_SOURCE_DIR}/modules/batchmake/models/dao )
+  add_midas_style_test( StyleBatchmakeModelPDO ${CMAKE_SOURCE_DIR}/modules/batchmake/models/pdo )
+
+
+  # Style tests for test code
   add_midas_style_test( StyleTestsBatchmakeControllers ${CMAKE_SOURCE_DIR}/modules/batchmake/tests/controllers )
+  add_midas_style_test( StyleTestsBatchmakeComponents ${CMAKE_SOURCE_DIR}/modules/batchmake/tests/controllers/components )
   add_midas_style_test( StyleTestsBatchmakeLibrary ${CMAKE_SOURCE_DIR}/modules/batchmake/tests/library )
 endif()
 

modules/batchmake/tests/controllers/CMakeLists.txt

@@ -1,7 +1,3 @@
 add_subdirectory( components )
 
-add_midas_test( BatchmakeConfigController ConfigControllerTest.php )
-
-# Style
-add_midas_style_test( StyleBatchmakeControllers ${CMAKE_SOURCE_DIR}/modules/batchmake/controllers )
-add_midas_style_test( StyleTestsBatchmakeComponents ${CMAKE_SOURCE_DIR}/modules/batchmake/tests/controllers/components )
+add_midas_test( BatchmakeConfigController ConfigControllerTest.php )

modules/batchmake/tests/controllers/components/CMakeLists.txt

@@ -1,6 +1 @@
-
-
-add_midas_test( KWBatchmakeComponent KWBatchmakeComponentTest.php )
-
-# Style
-add_midas_style_test( StyleBatchmakeComponents ${CMAKE_SOURCE_DIR}/modules/batchmake/controllers/components )
+add_midas_test( KWBatchmakeComponent KWBatchmakeComponentTest.php )