Remove use of globals when non-intrusively setting up test environment and add use of test events.

core/Access.php

@@ -46,9 +46,7 @@ class Piwik_Access
         if (self::$instance == null) {
             self::$instance = new self;
             
-            if (!empty($GLOBALS['PIWIK_ACCESS_IS_SUPERUSER'])) {
-                self::$instance->setSuperUser(true);
-            }
+            Piwik_PostTestEvent('Access.createAccessSingleton', array(self::$instance));
         }
         return self::$instance;
     }
@@ -213,12 +211,9 @@ class Piwik_Access
             $allSitesId = array();
         }
         $this->idsitesByAccess['superuser'] = $allSitesId;
-        
-        if (isset($GLOBALS['PIWIK_ACCESS_SUPERUSER_LOGIN'])) {
-            $this->login = $GLOBALS['PIWIK_ACCESS_SUPERUSER_LOGIN'];
-        } else {
-            $this->login = Piwik_Config::getInstance()->superuser['login'];
-        }
+        $this->login = Piwik_Config::getInstance()->superuser['login'];
+
+        Piwik_PostTestEvent('Access.loadingSuperUserAccess', array(&$this->idsitesByAccess, &$this->login));
         
         return true;
     }

core/Config.php

@@ -9,6 +9,8 @@
  * @package Piwik
  */
 
+require_once PIWIK_INCLUDE_PATH . '/core/EventDispatcher.php';
+
 /**
  * For general performance (and specifically, the Tracker), we use deferred (lazy) initialization
  * and cache sections.  We also avoid any dependency on Zend Framework's Zend_Config.
@@ -51,12 +53,9 @@ class Piwik_Config
     {
         if (self::$instance == null) {
             self::$instance = new self;
-            
-            if (empty($GLOBALS['PIWIK_CONFIG_TEST_ENVIRONMENT'])) {
-                self::$instance->init();
-            } else {
-                self::$instance->setTestEnvironment();
-            }
+            self::$instance->init();
+
+            Piwik_PostTestEvent('Config.createConfigSingleton', array(self::$instance));
         }
         return self::$instance;
     }

core/EventDispatcher.php

@@ -206,3 +206,14 @@ function Piwik_AddAction($eventName, $function)
 {
     Piwik_EventDispatcher::getInstance()->addObserver($eventName, $function);
 }
+
+/**
+ * Posts an event if we are currently running tests. Whether we are running tests is
+ * determined by looking for the PIWIK_TEST_MODE constant.
+ */
+function Piwik_PostTestEvent($eventName, $params = array(), $pending = false, $plugins = null)
+{
+    if (defined('PIWIK_TEST_MODE')) {
+        Piwik_PostEvent($eventName, $params, $pending, $plugins);
+    }
+}
\ No newline at end of file

tests/PHPUnit/TestingEnvironment.php

+<?php
+
+require_once realpath(dirname(__FILE__)) . "/../../core/EventDispatcher.php";
+
+/**
+ * Sets the test environment.
+ */
+class Piwik_TestingEnvironment
+{
+    public static function addHooks()
+    {
+        if (!defined('PIWIK_TEST_MODE')) {
+            define('PIWIK_TEST_MODE', true);
+        }
+
+        Piwik_AddAction('Access.createAccessSingleton', function($access) {
+            $access->setSuperUser(true);
+        });
+        Piwik_AddAction('Access.loadingSuperUserAccess', function(&$idSitesByAccess, &$login) {
+            $login = 'superUserLogin';
+        });
+        Piwik_AddAction('Config.createConfigSingleton', function($config) {
+            $config->setTestEnvironment();
+        });
+    }
+}
\ No newline at end of file

tests/PHPUnit/proxy/archive.php

 <?php
 
-// include archive.php, and let 'er rip
-$GLOBALS['PIWIK_CONFIG_TEST_ENVIRONMENT'] = true;
-$GLOBALS['PIWIK_ACCESS_IS_SUPERUSER'] = true;
-$GLOBALS['PIWIK_ACCESS_SUPERUSER_LOGIN'] = 'superUserLogin';
-require realpath(dirname(__FILE__)) . "/../../../misc/cron/archive.php";
+// make sure the test environment is loaded
+require realpath(dirname(__FILE__)) . "/../../../tests/PHPUnit/TestingEnvironment.php";
+Piwik_TestingEnvironment::addHooks();
 
+// include archive.php, and let 'er rip
+require realpath(dirname(__FILE__)) . "/../../../misc/cron/archive.php";
\ No newline at end of file

tests/PHPUnit/proxy/index.php

@@ -4,9 +4,9 @@
  * Used by tests/PHPUnit/Integration/ImportLogsTest.php and tests/PHPUnit/Integration/UITest.php
  */
 
-$GLOBALS['PIWIK_CONFIG_TEST_ENVIRONMENT'] = true;
-$GLOBALS['PIWIK_ACCESS_IS_SUPERUSER'] = true;
-$GLOBALS['PIWIK_ACCESS_SUPERUSER_LOGIN'] = 'superUserLogin';
+// make sure the test environment is loaded
+require realpath(dirname(__FILE__)) . "/../../../tests/PHPUnit/TestingEnvironment.php";
+Piwik_TestingEnvironment::addHooks();
 
 // Wrapping the request inside ob_start() calls to ensure that the Test
 // calling us waits for the full request to process before unblocking