ENH: refs #258. changed loadData function to allow filename and model modules.

Before this fix, it was not possible to have a test xml dataset in modules that
had core models.  This fix allows calling loadData with both a fileModule, which
can specify the module that the data file came from, and a modelModule param,
which can specify the module that the model came from.  E.g.
  loadData('User','default','','batchmake');
would load a file default.xml defined in the batchmake module that has
User models from the core defined in it, with this command loading those users.
  loadData('Itemmetric','default','batchmake','batchmake');
would load a file default.xml defined in the batchmake module that has
Itemmetric models defined in the batchmake module, with this command loading
those itemmetrics.

Author: Michael Grauer

tests/DatabaseTestCase.php

@@ -134,16 +134,20 @@ protected function getDataSet($name = 'default', $module = null)
     return $this->createFlatXmlDataSet($path);
     }
 
-  /** loadData */
-  protected function loadData($modelName, $file = null, $module = '')
+  /** loadData
+   * @param modelName of model to load
+   * @param file that the test data is defined in
+   * @param modelModule the module of the model, or '' if in core
+   * @param fileModule the module the test data file is in, or '' if in core
+   */
+  protected function loadData($modelName, $file = null, $modelModule = '', $fileModule = '')
     {
-    $model = $this->ModelLoader->loadModel($modelName, $module);
+    $model = $this->ModelLoader->loadModel($modelName, $modelModule);
     if($file == null)
       {
       $file = strtolower($modelName);
       }
-
-    $data = $this->getDataSet($file, $module);
+    $data = $this->getDataSet($file, $fileModule);
     $dataUsers = $data->getTable($model->getName());
     $rows = $dataUsers->getRowCount();
     $key = array();