BUG: refs #0380. Added getTempDirectory call to DatabaseSetup.php

Author: Michael Grauer

core/include.php

@@ -13,9 +13,10 @@
 // midas core files
 require_once BASE_PATH . '/notification/MIDASNotifier.php';
 require_once BASE_PATH . '/notification/GlobalNotification.php';
+require_once BASE_PATH . '/core/GlobalComponent.php';
+require_once BASE_PATH . '/core/AppComponent.php';
 require_once BASE_PATH . '/core/GlobalController.php';
 require_once BASE_PATH . '/modules/GlobalModule.php';
-require_once BASE_PATH . '/core/GlobalComponent.php';
 require_once BASE_PATH . '/core/models/MIDASModel.php';
 
 require_once BASE_PATH . '/core/models/MIDASDatabaseInterface.php';
@@ -29,7 +30,6 @@
 require_once BASE_PATH . '/core/ComponentLoader.php';
 
 require_once BASE_PATH.'/core/AppController.php';
-require_once BASE_PATH.'/core/AppComponent.php';
 require_once BASE_PATH.'/core/AppForm.php';
 require_once BASE_PATH.'/core/models/AppModel.php';
 require_once BASE_PATH.'/core/models/AppDao.php';

tests/DatabaseSetup.php

@@ -128,7 +128,8 @@ function createDefaultAssetstore()
   $modelLoader->loadModel('Assetstore');
 
   // path munging
-  $testAssetstoreBase = BASE_PATH.'/tmp/misc/test';
+  require_once BASE_PATH.'/core/controllers/components/UtilityComponent.php';
+  $testAssetstoreBase = UtilityComponent::getTempDirectory().'/test/';
   $testAssetstoreBase = str_replace('tests/../', '', $testAssetstoreBase);
   $testAssetstoreBase = str_replace('//', '/', $testAssetstoreBase);