Streamline path constant usage & consolidate app URL construction

* Removed THINKUP_BASE_URL & replaced with either $THINKUP_CFG['site_root_path'] or when the config doesn't exist (like in installer) Utils::getSiteRootPathFromFileSystem * Corrected incorrect uses of THINKUP_ROOT_PATH (where THINKUP_WEBAPP_PATH should have been used instead) * Moved Utils::defineConstants to Loader::definePathConstants * Added Utils::getApplicationURL() to consolidate all the places where the app built the URL and checked for https, server name, etc
ThinkUpLLC · Feb 1, 2012 · ac05f94 · ac05f94
1 parent 8e8414b
commit ac05f94
Show file tree

Hide file tree

Showing 184 changed files with 601 additions and 609 deletions.
diff --git a/tests/TestOfAccountConfigurationController.php b/tests/TestOfAccountConfigurationController.php
@@ -30,15 +30,15 @@
  *
  */
 require_once dirname(__FILE__).'/init.tests.php';
-require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php';
-require_once THINKUP_ROOT_PATH.'webapp/config.inc.php';
+require_once THINKUP_WEBAPP_PATH.'_lib/extlib/simpletest/autorun.php';
+require_once THINKUP_WEBAPP_PATH.'config.inc.php';
 
 if (isset($RUNNING_ALL_TESTS) && !$RUNNING_ALL_TESTS) {
-    require_once THINKUP_ROOT_PATH.'webapp/plugins/twitter/extlib/twitteroauth/twitteroauth.php';
+    require_once THINKUP_WEBAPP_PATH.'plugins/twitter/extlib/twitteroauth/twitteroauth.php';
 }
-require_once THINKUP_ROOT_PATH.'webapp/plugins/twitter/model/class.TwitterOAuthThinkUp.php';
-require_once THINKUP_ROOT_PATH.'webapp/plugins/twitter/model/class.TwitterPlugin.php';
-require_once THINKUP_ROOT_PATH.'webapp/plugins/twitter/controller/class.TwitterPluginConfigurationController.php';
+require_once THINKUP_WEBAPP_PATH.'plugins/twitter/model/class.TwitterOAuthThinkUp.php';
+require_once THINKUP_WEBAPP_PATH.'plugins/twitter/model/class.TwitterPlugin.php';
+require_once THINKUP_WEBAPP_PATH.'plugins/twitter/controller/class.TwitterPluginConfigurationController.php';
 
 class TestOfAccountConfigurationController extends ThinkUpUnitTestCase {
 
@@ -47,6 +47,7 @@ public function setUp(){
         $webapp = Webapp::getInstance();
         $webapp->registerPlugin('twitter', 'TwitterPlugin');
         $this->builders = self::buildData();
+        $_SERVER['HTTP_HOST'] = "mytesthost";
     }
 
     public function tearDown() {
@@ -61,7 +62,7 @@ protected function buildData() {
         $hashed_pass = ThinkUpTestLoginHelper::hashPasswordUsingDeprecatedMethod("oldpassword");
 
         $builders[] = FixtureBuilder::build('owners', array('id'=>1, 'full_name'=>'ThinkUp J. User',
-        'email'=>'me@example.com', 'is_activated'=>1, 'pwd'=>$hashed_pass, 
+        'email'=>'me@example.com', 'is_activated'=>1, 'pwd'=>$hashed_pass,
         'pwd_salt'=> OwnerMySQLDAO::$default_salt, 'api_key' => 'c9089f3c9adaf0186f6ffb1ee8d6501c'));
 
         $builders[] = FixtureBuilder::build('owners', array('id'=>2, 'full_name'=>'ThinkUp J. Admin',
@@ -635,7 +636,7 @@ public function testAuthControlLoggedInChangePasswordNewPwdNotAlphanumeric() {
 
     public function testAuthControlInviteUserNoCSRFToken() {
         $this->simulateLogin('me@example.com', false, true);
-        $_SERVER['HTTP_HOST'] = "mytestthinkup/";
+        $_SERVER['HTTP_HOST'] = "mytestthinkup";
         $_SERVER['HTTPS'] = null;
         $_POST['invite'] = 'Create Invitation' ;
 
@@ -649,6 +650,8 @@ public function testAuthControlInviteUserNoCSRFToken() {
     }
 
     public function testAuthControlInviteUser() {
+        $cfg = Config::getInstance();
+        $cfg->setValue('site_root_path', '/');
         $this->simulateLogin('me@example.com', false, true);
 
         $_SERVER['HTTP_HOST'] = "mytestthinkup";
@@ -750,16 +753,16 @@ public function testLoadProperRSSUrlWithPlusSignInEmailAddress() {
 
     private function buildRSSData() {
         $builders[] = FixtureBuilder::build('owners', array(
-            'id' => 152, 
-            'email' => 'me152@example.com', 
-            'pwd' => 'XXX', 
+            'id' => 152,
+            'email' => 'me152@example.com',
+            'pwd' => 'XXX',
             'is_activated' => 1,
             'api_key' => 'c9089f3c9adaf0186f6ffb1ee8d6501c'
             ));
             $builders[] = FixtureBuilder::build('owners', array(
-            'id' => 153, 
-            'email' => 'me153+checkurlencoding@example.com', 
-            'pwd' => 'XXX', 
+            'id' => 153,
+            'email' => 'me153+checkurlencoding@example.com',
+            'pwd' => 'XXX',
             'is_activated' => 1,
             'api_key' => 'c9089f3c9adaf0186f6ffb1ee8d6501c'
             ));

diff --git a/tests/TestOfActivateAccountController.php b/tests/TestOfActivateAccountController.php
@@ -29,8 +29,8 @@
  */
 
 require dirname(__FILE__).'/init.tests.php';
-require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php';
-require_once THINKUP_ROOT_PATH.'webapp/config.inc.php';
+require_once THINKUP_WEBAPP_PATH.'_lib/extlib/simpletest/autorun.php';
+require_once THINKUP_WEBAPP_PATH.'config.inc.php';
 
 class TestOfActivateAccountController extends ThinkUpUnitTestCase {
 

diff --git a/tests/TestOfAppConfigController.php b/tests/TestOfAppConfigController.php
@@ -27,8 +27,8 @@
  * @author Mark Wilkie <mwilkie[at]gmail[dot]com>
  */
 require_once dirname(__FILE__).'/init.tests.php';
-require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php';
-require_once THINKUP_ROOT_PATH.'webapp/config.inc.php';
+require_once THINKUP_WEBAPP_PATH.'_lib/extlib/simpletest/autorun.php';
+require_once THINKUP_WEBAPP_PATH.'config.inc.php';
 
 class TestOfAppConfigController extends ThinkUpUnitTestCase {
 

diff --git a/tests/TestOfBackupController.php b/tests/TestOfBackupController.php
@@ -26,10 +26,10 @@
  * @copyright 2009-2012 Mark Wilkie
  */
 require_once dirname(__FILE__).'/init.tests.php';
-require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php';
-require_once THINKUP_ROOT_PATH.'webapp/config.inc.php';
+require_once THINKUP_WEBAPP_PATH.'_lib/extlib/simpletest/autorun.php';
+require_once THINKUP_WEBAPP_PATH.'config.inc.php';
 if (!class_exists('BackupDAO')) {
-    require_once THINKUP_ROOT_PATH.'webapp/_lib/model/interface.BackupDAO.php';
+    require_once THINKUP_WEBAPP_PATH.'_lib/model/interface.BackupDAO.php';
 }
 
 class TestOfBackupController extends ThinkUpUnitTestCase {

diff --git a/tests/TestOfBackupMySQLDAO.php b/tests/TestOfBackupMySQLDAO.php
@@ -26,8 +26,8 @@
  * @copyright 2009-2012 Mark Wilkie
  */
 require_once dirname(__FILE__).'/init.tests.php';
-require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php';
-require_once THINKUP_ROOT_PATH.'webapp/config.inc.php';
+require_once THINKUP_WEBAPP_PATH.'_lib/extlib/simpletest/autorun.php';
+require_once THINKUP_WEBAPP_PATH.'config.inc.php';
 
 class TestOfBackupMySQLDAO extends ThinkUpUnitTestCase {
 

diff --git a/tests/TestOfCheckCrawlerController.php b/tests/TestOfCheckCrawlerController.php
@@ -27,8 +27,8 @@
  * @author Gina Trapani <ginatrapani[at]gmail[dot]com>
  */
 require_once dirname(__FILE__).'/init.tests.php';
-require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php';
-require_once THINKUP_ROOT_PATH.'webapp/config.inc.php';
+require_once THINKUP_WEBAPP_PATH.'_lib/extlib/simpletest/autorun.php';
+require_once THINKUP_WEBAPP_PATH.'config.inc.php';
 
 class TestOfCheckCrawlerController extends ThinkUpUnitTestCase {
 

diff --git a/tests/TestOfCheckVersionController.php b/tests/TestOfCheckVersionController.php
@@ -27,8 +27,8 @@
  * @author Gina Trapani <ginatrapani[at]gmail[dot]com>
  */
 require_once dirname(__FILE__).'/init.tests.php';
-require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php';
-require_once THINKUP_ROOT_PATH.'webapp/config.inc.php';
+require_once THINKUP_WEBAPP_PATH.'_lib/extlib/simpletest/autorun.php';
+require_once THINKUP_WEBAPP_PATH.'config.inc.php';
 
 class TestOfCheckVersionController extends ThinkUpUnitTestCase {
 
@@ -65,7 +65,7 @@ public function testLoggedin() {
     }
 
     public function testOptedOut() {
-        include THINKUP_ROOT_PATH.'webapp/install/version.php';
+        include THINKUP_WEBAPP_PATH.'install/version.php';
         $bvalues = array('namespace' => OptionDAO::APP_OPTIONS, 'option_name' => 'is_opted_out_usage_stats',
         'option_value' => 'true');
         $bdata = FixtureBuilder::build('options', $bvalues);
@@ -81,7 +81,7 @@ public function testOptedOut() {
     }
 
     public function testNotOptedOut() {
-        include THINKUP_ROOT_PATH.'webapp/install/version.php';
+        include THINKUP_WEBAPP_PATH.'install/version.php';
         $this->simulateLogin('me@example.com');
         $controller = new CheckVersionController(true);
 

diff --git a/tests/TestOfConfig.php b/tests/TestOfConfig.php
@@ -28,8 +28,8 @@
  */
 
 require_once dirname(__FILE__).'/init.tests.php';
-require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php';
-require_once THINKUP_ROOT_PATH.'webapp/config.inc.php';
+require_once THINKUP_WEBAPP_PATH.'_lib/extlib/simpletest/autorun.php';
+require_once THINKUP_WEBAPP_PATH.'config.inc.php';
 
 class TestOfConfig extends ThinkUpUnitTestCase {
 
@@ -56,8 +56,8 @@ public function testConfigSingleton() {
     }
 
     public function testGetValuesArray() {
-        require THINKUP_ROOT_PATH.'webapp/config.inc.php';
-        require THINKUP_ROOT_PATH.'webapp/install/version.php';
+        require THINKUP_WEBAPP_PATH.'config.inc.php';
+        require THINKUP_WEBAPP_PATH.'install/version.php';
         $config = Config::getInstance();
         //tests assume profiler and caching is off
         $THINKUP_CFG['cache_pages']=false;

diff --git a/tests/TestOfCrawler.php b/tests/TestOfCrawler.php
@@ -27,9 +27,9 @@
  *
  */
 require_once dirname(__FILE__).'/init.tests.php';
-require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php';
-require_once THINKUP_ROOT_PATH.'webapp/config.inc.php';
-require_once THINKUP_ROOT_PATH.'webapp/plugins/hellothinkup/model/class.HelloThinkUpPlugin.php';
+require_once THINKUP_WEBAPP_PATH.'_lib/extlib/simpletest/autorun.php';
+require_once THINKUP_WEBAPP_PATH.'config.inc.php';
+require_once THINKUP_WEBAPP_PATH.'plugins/hellothinkup/model/class.HelloThinkUpPlugin.php';
 
 class TestOfCrawler extends ThinkUpUnitTestCase {
 

diff --git a/tests/TestOfCrawlerAuthController.php b/tests/TestOfCrawlerAuthController.php
@@ -26,8 +26,8 @@
  * @copyright 2009-2012 Gina Trapani
  */
 require_once dirname(__FILE__).'/init.tests.php';
-require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php';
-require_once THINKUP_ROOT_PATH.'webapp/config.inc.php';
+require_once THINKUP_WEBAPP_PATH.'_lib/extlib/simpletest/autorun.php';
+require_once THINKUP_WEBAPP_PATH.'config.inc.php';
 
 class TestOfCrawlerAuthController extends ThinkUpUnitTestCase {
 

diff --git a/tests/TestOfDAOFactory.php b/tests/TestOfDAOFactory.php
@@ -30,9 +30,9 @@
  *
  */
 require_once dirname(__FILE__).'/init.tests.php';
-require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php';
-require_once THINKUP_ROOT_PATH.'webapp/config.inc.php';
-require_once THINKUP_ROOT_PATH.'webapp/plugins/twitter/model/class.TwitterInstanceMySQLDAO.php';
+require_once THINKUP_WEBAPP_PATH.'_lib/extlib/simpletest/autorun.php';
+require_once THINKUP_WEBAPP_PATH.'config.inc.php';
+require_once THINKUP_WEBAPP_PATH.'plugins/twitter/model/class.TwitterInstanceMySQLDAO.php';
 
 class TestOfDAOFactory extends ThinkUpUnitTestCase {
 

diff --git a/tests/TestOfDashboardController.php b/tests/TestOfDashboardController.php
@@ -27,11 +27,11 @@
  * @author Gina Trapani <ginatrapani[at]gmail[dot]com>
  */
 require_once dirname(__FILE__).'/init.tests.php';
-require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php';
-require_once THINKUP_ROOT_PATH.'webapp/config.inc.php';
+require_once THINKUP_WEBAPP_PATH.'_lib/extlib/simpletest/autorun.php';
+require_once THINKUP_WEBAPP_PATH.'config.inc.php';
 
-require_once THINKUP_ROOT_PATH.'webapp/plugins/twitter/model/class.TwitterOAuthThinkUp.php';
-require_once THINKUP_ROOT_PATH.'webapp/plugins/twitter/model/class.TwitterPlugin.php';
+require_once THINKUP_WEBAPP_PATH.'plugins/twitter/model/class.TwitterOAuthThinkUp.php';
+require_once THINKUP_WEBAPP_PATH.'plugins/twitter/model/class.TwitterPlugin.php';
 
 class TestOfDashboardController extends ThinkUpUnitTestCase {
 

diff --git a/tests/TestOfDataset.php b/tests/TestOfDataset.php
@@ -28,8 +28,8 @@
  */
 
 require_once dirname(__FILE__).'/init.tests.php';
-require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php';
-require_once THINKUP_ROOT_PATH.'webapp/config.inc.php';
+require_once THINKUP_WEBAPP_PATH.'_lib/extlib/simpletest/autorun.php';
+require_once THINKUP_WEBAPP_PATH.'config.inc.php';
 
 class TestOfDataset extends ThinkUpUnitTestCase {
 

diff --git a/tests/TestOfExportController.php b/tests/TestOfExportController.php
@@ -28,8 +28,8 @@
  * @copyright 2009-2012 Gina Trapani, Mark Wilkie, Michael Louis Thaler
  */
 require_once dirname(__FILE__).'/init.tests.php';
-require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php';
-require_once THINKUP_ROOT_PATH.'webapp/config.inc.php';
+require_once THINKUP_WEBAPP_PATH.'_lib/extlib/simpletest/autorun.php';
+require_once THINKUP_WEBAPP_PATH.'config.inc.php';
 
 class TestOfExportController extends ThinkUpUnitTestCase {
 

diff --git a/tests/TestOfExportMySQLDAO.php b/tests/TestOfExportMySQLDAO.php
@@ -29,8 +29,8 @@
  *
  */
 require_once dirname(__FILE__).'/init.tests.php';
-require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php';
-require_once THINKUP_ROOT_PATH.'webapp/config.inc.php';
+require_once THINKUP_WEBAPP_PATH.'_lib/extlib/simpletest/autorun.php';
+require_once THINKUP_WEBAPP_PATH.'config.inc.php';
 
 class TestOfExportMySQLDAO extends ThinkUpUnitTestCase {
 

diff --git a/tests/TestOfExportServiceUserDataController.php b/tests/TestOfExportServiceUserDataController.php
@@ -25,12 +25,12 @@
  * @author Gina Trapani <ginatrapani[at]gmail[dot]com>
  */
 require_once dirname(__FILE__).'/init.tests.php';
-require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php';
-require_once THINKUP_ROOT_PATH.'webapp/config.inc.php';
+require_once THINKUP_WEBAPP_PATH.'_lib/extlib/simpletest/autorun.php';
+require_once THINKUP_WEBAPP_PATH.'config.inc.php';
 if (!class_exists('ExportDAO')) {
-    require_once THINKUP_ROOT_PATH.'webapp/_lib/model/interface.ExportDAO.php';
+    require_once THINKUP_WEBAPP_PATH.'_lib/model/interface.ExportDAO.php';
 }
-require_once THINKUP_ROOT_PATH.'webapp/_lib/model/class.ExportMySQLDAO.php';
+require_once THINKUP_WEBAPP_PATH.'_lib/model/class.ExportMySQLDAO.php';
 
 class TestOfExportServiceUserDataController extends ThinkUpUnitTestCase {
 

diff --git a/tests/TestOfFavoritePostMySQLDAO.php b/tests/TestOfFavoritePostMySQLDAO.php
@@ -25,10 +25,10 @@
  */
 
 require_once dirname(__FILE__).'/init.tests.php';
-require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php';
-require_once THINKUP_ROOT_PATH.'webapp/config.inc.php';
-require_once THINKUP_ROOT_PATH.'webapp/plugins/twitter/model/class.TwitterPlugin.php';
-require_once THINKUP_ROOT_PATH.'webapp/plugins/facebook/model/class.FacebookPlugin.php';
+require_once THINKUP_WEBAPP_PATH.'_lib/extlib/simpletest/autorun.php';
+require_once THINKUP_WEBAPP_PATH.'config.inc.php';
+require_once THINKUP_WEBAPP_PATH.'plugins/twitter/model/class.TwitterPlugin.php';
+require_once THINKUP_WEBAPP_PATH.'plugins/facebook/model/class.FacebookPlugin.php';
 
 class TestOfFavoritePostMySQLDAO extends ThinkUpUnitTestCase {
     /**

diff --git a/tests/TestOfFileDataManager.php b/tests/TestOfFileDataManager.php
@@ -26,8 +26,8 @@
  * @copyright 2012 Gina Trapani, Guillaume Boudreau
  */
 require_once dirname(__FILE__).'/init.tests.php';
-require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php';
-require_once THINKUP_ROOT_PATH.'webapp/config.inc.php';
+require_once THINKUP_WEBAPP_PATH.'_lib/extlib/simpletest/autorun.php';
+require_once THINKUP_WEBAPP_PATH.'config.inc.php';
 
 class TestOfFileDataManager extends ThinkUpBasicUnitTestCase {
 
@@ -62,7 +62,7 @@ public function testGetDataPathConfigExistsWithoutDataDirValue() {
     }
 
     public function testGetDataPathConfigExistsWithDataDirValue() {
-        require THINKUP_ROOT_PATH.'webapp/config.inc.php';
+        require THINKUP_WEBAPP_PATH.'config.inc.php';
 
         //if test fails here, the config file doesn't have datadir_path set
         $this->assertNotNull($THINKUP_CFG['datadir_path']);
@@ -77,7 +77,7 @@ public function testGetDataPathConfigExistsWithDataDirValue() {
     }
 
     public function testGetBackupPath() {
-        require THINKUP_ROOT_PATH.'webapp/config.inc.php';
+        require THINKUP_WEBAPP_PATH.'config.inc.php';
 
         //if test fails here, the config file doesn't have datadir_path set
         $this->assertNotNull($THINKUP_CFG['datadir_path']);

diff --git a/tests/TestOfFollowMySQLDAO.php b/tests/TestOfFollowMySQLDAO.php
@@ -27,8 +27,8 @@
  * @copyright 2009-2012 Gina Trapani, Christoffer Viken
  */
 require_once dirname(__FILE__).'/init.tests.php';
-require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php';
-require_once THINKUP_ROOT_PATH.'webapp/config.inc.php';
+require_once THINKUP_WEBAPP_PATH.'_lib/extlib/simpletest/autorun.php';
+require_once THINKUP_WEBAPP_PATH.'config.inc.php';
 
 class TestOfFollowMySQLDAO extends ThinkUpUnitTestCase {
     protected $DAO;

diff --git a/tests/TestOfFollowerCountMySQLDAO.php b/tests/TestOfFollowerCountMySQLDAO.php
@@ -26,8 +26,8 @@
  * @copyright 2009-2012 Gina Trapani
  */
 require_once dirname(__FILE__).'/init.tests.php';
-require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php';
-require_once THINKUP_ROOT_PATH.'webapp/config.inc.php';
+require_once THINKUP_WEBAPP_PATH.'_lib/extlib/simpletest/autorun.php';
+require_once THINKUP_WEBAPP_PATH.'config.inc.php';
 
 class TestOfFollowerCountMySQLDAO extends ThinkUpUnitTestCase {
 

diff --git a/tests/TestOfForgotPasswordController.php b/tests/TestOfForgotPasswordController.php
@@ -28,8 +28,8 @@
  */
 
 require_once dirname(__FILE__).'/init.tests.php';
-require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php';
-require_once THINKUP_ROOT_PATH.'webapp/config.inc.php';
+require_once THINKUP_WEBAPP_PATH.'_lib/extlib/simpletest/autorun.php';
+require_once THINKUP_WEBAPP_PATH.'config.inc.php';
 
 class TestOfForgotPasswordController extends ThinkUpUnitTestCase {
 

diff --git a/tests/TestOfGridController.php b/tests/TestOfGridController.php
@@ -28,8 +28,8 @@
  * @copyright 2009-2012 Mark Wilkie, Gina Trapani, Guillaume Boudreau
  */
 require_once dirname(__FILE__).'/init.tests.php';
-require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php';
-require_once THINKUP_ROOT_PATH.'webapp/config.inc.php';
+require_once THINKUP_WEBAPP_PATH.'_lib/extlib/simpletest/autorun.php';
+require_once THINKUP_WEBAPP_PATH.'config.inc.php';
 
 class TestOfGridController extends ThinkUpUnitTestCase {
 

diff --git a/tests/TestOfGridExportController.php b/tests/TestOfGridExportController.php
@@ -27,8 +27,8 @@
  * @copyright 2009-2012 Gina Trapani, Mark Wilkie
  */
 require_once dirname(__FILE__).'/init.tests.php';
-require_once THINKUP_ROOT_PATH.'webapp/_lib/extlib/simpletest/autorun.php';
-require_once THINKUP_ROOT_PATH.'webapp/config.inc.php';
+require_once THINKUP_WEBAPP_PATH.'_lib/extlib/simpletest/autorun.php';
+require_once THINKUP_WEBAPP_PATH.'config.inc.php';
 
 class TestOfGridExportController extends ThinkUpUnitTestCase {