Refs #808 Fixing Config.test.php when ran in all_tests.php. Side effect due to...

Refs #808 Fixing Config.test.php when ran in all_tests.php. Side effect due to setTestEnvironment(). Renamed test config section from Global (which is a special case in test environment) to GlobalSection

git-svn-id: http://dev.piwik.org/svn/trunk@2433 59fd770c-687e-43c8-a1e3-f5a4ff64c105

core/Tracker/Config.php

@@ -56,6 +56,8 @@ class Piwik_Tracker_Config
 	 */
 	public $config = array();
 	protected $initialized = false;
+	protected $configGlobal = false;
+	protected $configUser = false;
 	
 	public function init($pathIniFileUser = null, $pathIniFileGlobal = null)
 	{
@@ -128,7 +130,10 @@ class Piwik_Tracker_Config
 	public function setTestEnvironment()
 	{
 		foreach(self::$toRestoreFromGlobalConfig as $section) {
-			$this->$section = $this->configGlobal[$section];
+			if(isset($this->configGlobal[$section]))
+			{
+				$this->configUser = $this->configGlobal[$section];
+			}
 		}
 		$this->database = $this->database_tests;
 		$this->PluginsInstalled = array();	

tests/all_tests.php

@@ -39,7 +39,7 @@ foreach(Piwik::globr(PIWIK_INCLUDE_PATH . '/plugins', '*/tests/*.php') as $file)
 array_unshift($toInclude, PIWIK_INCLUDE_PATH . '/tests/core/Database.test.php');
 $toInclude[] = PIWIK_INCLUDE_PATH . '/tests/core/ReleaseCheckList.test.php';
 
-foreach(Piwik::globr(PIWIK_INCLUDE_PATH . '/tests/integration', '*.php') as $file)
+foreach(Piwik::globr(PIWIK_INCLUDE_PATH . '/tests/integration', '*.test.php') as $file)
 {
 	$toInclude[] = $file;
 }

tests/core/ArchiveProcessing.test.php

@@ -33,6 +33,8 @@ class Test_Piwik_ArchiveProcessing extends Test_Database
 												$excludedIps = "",
 												$excludedQueryParameters = "",
 												$timezone);
+												
+		Piwik_Site::clearCache();
     	return new Piwik_Site($idsite);
 	}
 

tests/core/Config.test.php

@@ -18,7 +18,7 @@ class Test_Piwik_Config extends UnitTestCase
     	$config->init();
     	$this->assertEqual($config->Category->key1, "value_overwritten");
     	$this->assertEqual($config->Category->key2, "value2");
-    	$this->assertEqual($config->General->login, 'tes"t');
+    	$this->assertEqual($config->GeneralSection->login, 'tes"t');
     	$this->assertEqual($config->CategoryOnlyInGlobalFile->key3, "value3");
     	$this->assertEqual($config->CategoryOnlyInGlobalFile->key4, "value4");
     	

tests/core/Tracker/Config.test.php

@@ -8,6 +8,7 @@ if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
 }
 
 require_once 'Tracker/Config.php';
+
 class Test_Piwik_TrackerConfig extends UnitTestCase
 {
 	public function test_UserConfigOverwritesGlobalConfig()
@@ -15,12 +16,13 @@ class Test_Piwik_TrackerConfig extends UnitTestCase
     	$userFile = PIWIK_PATH_TEST_TO_ROOT . '/tests/resources/Config/config.ini.php';
     	$globalFile = PIWIK_PATH_TEST_TO_ROOT . '/tests/resources/Config/global.ini.php';
     	
+        Piwik_Tracker_Config::getInstance()->setTestEnvironment();
     	$config = Piwik_Tracker_Config::getInstance();
     	$config->init($userFile, $globalFile);
     	
     	$this->assertEqual($config->Category['key1'], "value_overwritten");
     	$this->assertEqual($config->Category['key2'], "value2");
-    	$this->assertEqual($config->General['login'], 'tes"t');
+    	$this->assertEqual($config->GeneralSection['login'], "tes\"t");
     	$this->assertEqual($config->CategoryOnlyInGlobalFile['key3'], "value3");
     	$this->assertEqual($config->CategoryOnlyInGlobalFile['key4'], "value4");
     	
@@ -31,7 +33,6 @@ class Test_Piwik_TrackerConfig extends UnitTestCase
     	$expectedArray = array('value1', 'value2');
     	$array = $config->TestArrayOnlyInGlobalFile;
     	$this->assertEqual($array['my_array'], $expectedArray);
-
     }
 }
 

tests/resources/Config/config.ini.php

-[General]
+[GeneralSection]
 login="tes"t"
 password=test