Move tests touching the global environment into integration tests

tests/PHPUnit/Integration/Menu/MenuReportingTest.php

@@ -27,6 +27,8 @@ class ReportingTest extends IntegrationTestCase
 
     public function setUp()
     {
+        parent::setUp();
+
         PluginManager::getInstance()->unloadPlugins();
         $this->menu = MenuReporting::getInstance();
     }

tests/PHPUnit/Integration/Tracker/RequestTest.php

@@ -19,15 +19,6 @@ use Piwik\Tracker\Request;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 use Piwik\Tracker\TrackerConfig;
 
-class TestRequest extends Request {
-
-    public function setIsAuthenticated()
-    {
-        $this->isAuthenticated = true;
-    }
-
-}
-
 /**
  * @group RequestTest
  * @group Request
@@ -335,6 +326,19 @@ class RequestTest extends IntegrationTestCase
                             $this->buildCustomVars(array('key' => 'val', 'key2' => 'val2')));
     }
 
+    public function test_getIdSite_shouldTriggerEventAndReturnThatIdSite()
+    {
+        $self = $this;
+        Piwik::addAction('Tracker.Request.getIdSite', function (&$idSite, $params) use ($self) {
+            $self->assertSame(14, $idSite);
+            $self->assertEquals(array('idsite' => '14'), $params);
+            $idSite = 12;
+        });
+
+        $request = $this->buildRequest(array('idsite' => '14'));
+        $this->assertSame(12, $request->getIdSite());
+    }
+
     private function assertCustomVariablesInVisitScope($expectedCvars, $cvarsJsonEncoded)
     {
         $request = $this->buildRequest(array('_cvar' => $cvarsJsonEncoded));
@@ -384,3 +388,11 @@ class RequestTest extends IntegrationTestCase
         return new TestRequest($params, $token);
     }
 }
+
+class TestRequest extends Request
+{
+    public function setIsAuthenticated()
+    {
+        $this->isAuthenticated = true;
+    }
+}

tests/PHPUnit/Integration/CronArchive/FixedSiteIdsTest.php → tests/PHPUnit/Unit/CronArchive/FixedSiteIdsTest.php

@@ -6,7 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Tests\Integration\CronArchive;
+namespace Piwik\Tests\Unit\CronArchive;
 
 use Piwik\CronArchive\FixedSiteIds;
 

tests/PHPUnit/Unit/Tracker/RequestTest.php

@@ -476,19 +476,6 @@ class RequestTest extends UnitTestCase
         $this->assertSame(14, $request->getIdSite());
     }
 
-    public function test_getIdSite_shouldTriggerEventAndReturnThatIdSite()
-    {
-        $self = $this;
-        Piwik::addAction('Tracker.Request.getIdSite', function (&$idSite, $params) use ($self) {
-            $self->assertSame(14, $idSite);
-            $self->assertEquals(array('idsite' => '14'), $params);
-            $idSite = 12;
-        });
-
-        $request = $this->buildRequest(array('idsite' => '14'));
-        $this->assertSame(12, $request->getIdSite());
-    }
-
     /**
      * @expectedException \Piwik\Exception\UnexpectedWebsiteFoundException
      * @expectedExceptionMessage Invalid idSite: '0'