Namespaced all unit tests correctly

matomo-org · Nov 3, 2014 · 5651dd9 · 5651dd9 · mattab · Nov 10, 2014
1 parent 63eb568
commit 5651dd9
Show file tree

Hide file tree

Showing 66 changed files with 372 additions and 194 deletions.
diff --git a/tests/PHPUnit/Unit/API/ApiRendererTest.php b/tests/PHPUnit/Unit/API/ApiRendererTest.php
@@ -6,35 +6,38 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
+namespace Piwik\Tests\Unit\API;
+
 use Piwik\API\ApiRenderer;
+use Piwik\Plugin\Manager;
 
 /**
  * @group Core
  * @group Only2
  */
-class ApiRendererTest extends PHPUnit_Framework_TestCase
+class ApiRendererTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
-        \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('API'));
+        Manager::getInstance()->loadPlugins(array('API'));
     }
 
     public function test_factory_shouldCreateAnInstance_IfValidFormatGiven()
     {
         $renderer = ApiRenderer::factory('php', array());
-        $this->assertInstanceOf('\\Piwik\\Plugins\\API\\Renderer\\Php', $renderer);
+        $this->assertInstanceOf('Piwik\Plugins\API\Renderer\Php', $renderer);
 
         $renderer = ApiRenderer::factory('PHP', array());
-        $this->assertInstanceOf('\\Piwik\\Plugins\\API\\Renderer\\Php', $renderer);
+        $this->assertInstanceOf('Piwik\Plugins\API\Renderer\Php', $renderer);
 
         $renderer = ApiRenderer::factory('pHp', array());
-        $this->assertInstanceOf('\\Piwik\\Plugins\\API\\Renderer\\Php', $renderer);
+        $this->assertInstanceOf('Piwik\Plugins\API\Renderer\Php', $renderer);
 
         $renderer = ApiRenderer::factory('xmL', array());
-        $this->assertInstanceOf('\\Piwik\\Plugins\\API\\Renderer\\Xml', $renderer);
+        $this->assertInstanceOf('Piwik\Plugins\API\Renderer\Xml', $renderer);
 
         $renderer = ApiRenderer::factory('OriginAl', array());
-        $this->assertInstanceOf('\\Piwik\\Plugins\\API\\Renderer\\Original', $renderer);
+        $this->assertInstanceOf('Piwik\Plugins\API\Renderer\Original', $renderer);
     }
 
     /**

diff --git a/tests/PHPUnit/Unit/API/ResponseBuilderTest.php b/tests/PHPUnit/Unit/API/ResponseBuilderTest.php
@@ -6,17 +6,21 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
+namespace Piwik\Tests\Unit\API;
+
+use Exception;
 use Piwik\API\ResponseBuilder;
 use Piwik\DataTable;
+use Piwik\Plugin\Manager;
 
 /**
  * @group Core
  */
-class ResponseBuilderTest extends PHPUnit_Framework_TestCase
+class ResponseBuilderTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
-        \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('API'));
+        Manager::getInstance()->loadPlugins(array('API'));
     }
 
     public function test_getResponseException_shouldFormatExceptionDependingOnFormatAndAddDebugHelp()

diff --git a/tests/PHPUnit/Unit/AssetManager/PluginManagerMock.php b/tests/PHPUnit/Unit/AssetManager/PluginManagerMock.php
@@ -6,6 +6,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
+namespace Piwik\Tests\Unit\AssetManager;
+
 use Piwik\Plugin\Manager;
 use Piwik\Plugin;
 use Piwik\Theme;

diff --git a/tests/PHPUnit/Unit/AssetManager/PluginMock.php b/tests/PHPUnit/Unit/AssetManager/PluginMock.php
@@ -6,6 +6,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
+namespace Piwik\Tests\Unit\AssetManager;
+
 use Piwik\Plugin;
 
 class PluginMock extends Plugin

diff --git a/tests/PHPUnit/Unit/AssetManager/ThemeMock.php b/tests/PHPUnit/Unit/AssetManager/ThemeMock.php
@@ -6,6 +6,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
+namespace Piwik\Tests\Unit\AssetManager;
+
 use Piwik\Plugin;
 use Piwik\Theme;
 

diff --git a/tests/PHPUnit/Unit/AssetManager/UIAssetCacheBusterMock.php b/tests/PHPUnit/Unit/AssetManager/UIAssetCacheBusterMock.php
@@ -6,6 +6,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
+namespace Piwik\Tests\Unit\AssetManager;
+
 use Piwik\AssetManager\UIAssetCacheBuster;
 
 class UIAssetCacheBusterMock extends UIAssetCacheBuster

diff --git a/tests/PHPUnit/Unit/AssetManager/UIAssetCacheBusterTest.php b/tests/PHPUnit/Unit/AssetManager/UIAssetCacheBusterTest.php
@@ -6,11 +6,13 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
+namespace Piwik\Tests\Unit\AssetManager;
+
+use PHPUnit_Framework_TestCase;
 use Piwik\AssetManager\UIAssetCacheBuster;
 
 class UIAssetCacheBusterTest extends PHPUnit_Framework_TestCase
 {
-
     /**
      * @var UIAssetCacheBuster
      */

diff --git a/tests/PHPUnit/Unit/AssetManager/UIAssetCatalogSorterTest.php b/tests/PHPUnit/Unit/AssetManager/UIAssetCatalogSorterTest.php
@@ -5,6 +5,10 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
+namespace Piwik\Tests\Unit\AssetManager;
+
+use PHPUnit_Framework_TestCase;
 use Piwik\AssetManager\UIAsset\OnDiskUIAsset;
 use Piwik\AssetManager\UIAssetCatalog;
 use Piwik\AssetManager\UIAssetCatalogSorter;

diff --git a/tests/PHPUnit/Unit/AssetManagerTest.php b/tests/PHPUnit/Unit/AssetManagerTest.php
@@ -5,6 +5,10 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
+namespace Piwik\Tests\Unit;
+
+use PHPUnit_Framework_TestCase;
 use Piwik\AssetManager\UIAsset\OnDiskUIAsset;
 use Piwik\AssetManager\UIAsset;
 use Piwik\AssetManager;
@@ -13,11 +17,10 @@
 use Piwik\Plugin;
 use Piwik\Plugin\Manager;
 use Piwik\EventDispatcher;
-
-require_once PIWIK_INCLUDE_PATH . "/tests/PHPUnit/Unit/AssetManager/UIAssetCacheBusterMock.php";
-require_once PIWIK_INCLUDE_PATH . "/tests/PHPUnit/Unit/AssetManager/PluginManagerMock.php";
-require_once PIWIK_INCLUDE_PATH . "/tests/PHPUnit/Unit/AssetManager/PluginMock.php";
-require_once PIWIK_INCLUDE_PATH . "/tests/PHPUnit/Unit/AssetManager/ThemeMock.php";
+use Piwik\Tests\Unit\AssetManager\PluginManagerMock;
+use Piwik\Tests\Unit\AssetManager\PluginMock;
+use Piwik\Tests\Unit\AssetManager\ThemeMock;
+use Piwik\Tests\Unit\AssetManager\UIAssetCacheBusterMock;
 
 /**
  * @group AssetManagerTest
@@ -50,12 +53,12 @@ class AssetManagerTest extends PHPUnit_Framework_TestCase
     private $mergedAsset;
 
     /**
-     * @var UIAssetCacheBusterMock
+     * @var \Piwik\Tests\Unit\AssetManager\UIAssetCacheBusterMock
      */
     private $cacheBuster;
 
     /**
-     * @var PluginManagerMock
+     * @var \Piwik\Tests\Unit\AssetManager\PluginManagerMock
      */
     private $pluginManager;
 

diff --git a/tests/PHPUnit/Unit/CliMulti/OutputTest.php b/tests/PHPUnit/Unit/CliMulti/OutputTest.php
@@ -5,23 +5,25 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
+namespace Piwik\Tests\Unit\CliMulti;
+
 use Piwik\CliMulti\Output;
+use Piwik\Url;
 
 /**
- * Class OutputTest
  * @group Core
  */
-class OutputTest extends PHPUnit_Framework_TestCase
+class OutputTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * @var Output
      */
     private $output;
 
     public function setUp()
     {
-        \Piwik\Url::setHost(false);
+        Url::setHost(false);
         $this->output = new Output('myid');
     }
 

diff --git a/tests/PHPUnit/Unit/CliMulti/ProcessTest.php b/tests/PHPUnit/Unit/CliMulti/ProcessTest.php
@@ -6,13 +6,15 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
+namespace Piwik\Tests\Unit\CliMulti;
+
 use Piwik\CliMulti\Process;
+use ReflectionProperty;
 
 /**
- * Class ProcessTest
  * @group Core
  */
-class ProcessTest extends PHPUnit_Framework_TestCase
+class ProcessTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var Process

diff --git a/tests/PHPUnit/Unit/Columns/DimensionTest.php b/tests/PHPUnit/Unit/Columns/DimensionTest.php
@@ -43,7 +43,7 @@ protected function configureSegments()
     }
 }
 
-namespace Piwik\Tests\Core\Columns
+namespace Piwik\Tests\Unit\Columns
 {
     use Piwik\Columns\Dimension;
     use Piwik\Config;

diff --git a/tests/PHPUnit/Unit/CommonTest.php b/tests/PHPUnit/Unit/CommonTest.php
@@ -1,15 +1,21 @@
 <?php
-use Piwik\Common;
-use Piwik\Filesystem;
-
 /**
  * Piwik - free/libre analytics platform
  *
- * @backupGlobals enabled
- *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
+namespace Piwik\Tests\Unit;
+
+use Exception;
+use PHPUnit_Framework_TestCase;
+use Piwik\Common;
+use Piwik\Filesystem;
+
+/**
+ * @backupGlobals enabled
+ */
 class Core_CommonTest extends PHPUnit_Framework_TestCase
 {
     /**

diff --git a/tests/PHPUnit/Unit/ConfigTest.php b/tests/PHPUnit/Unit/ConfigTest.php
@@ -6,6 +6,9 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
+namespace Piwik\Tests\Unit;
+
+use PHPUnit_Framework_TestCase;
 use Piwik\Config;
 
 /**

diff --git a/tests/PHPUnit/Unit/CookieTest.php b/tests/PHPUnit/Unit/CookieTest.php
@@ -5,7 +5,10 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-class CookieTest extends PHPUnit_Framework_TestCase
+
+namespace Piwik\Tests\Unit;
+
+class CookieTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * Dataprovider for testJsonSerialize
@@ -41,11 +44,6 @@ public function getJsonSerializeData()
      */
     public function testJsonSerialize($testData, $id)
     {
-        // @see http://bugs.php.net/38680
-        if (PHP_VERSION >= '5.2.0' && PHP_VERSION < '5.2.1') {
-            $this->markTestSkipped('see http://bugs.php.net/38680');
-        }
-
         $this->assertEquals($testData, json_decode(json_encode($testData), $assoc = true), $id);
     }
 
@@ -95,7 +93,7 @@ public function testSafeSerialize($id, $testData)
     public function testSafeUnserialize()
     {
         /*
-         * serialize() uses its internal maachine representation when floats expressed in E-notation,
+         * serialize() uses its internal machine representation when floats expressed in E-notation,
          * which may vary between php versions, OS, and hardware platforms
          */
         $testData = -5.0E+142;

diff --git a/tests/PHPUnit/Unit/DataTable/Filter/AddSummaryRowTest.php b/tests/PHPUnit/Unit/DataTable/Filter/AddSummaryRowTest.php
@@ -5,10 +5,13 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
+namespace Piwik\Tests\Unit\DataTable\Filter;
+
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
-class DataTable_Filter_AddSummaryRowTest extends PHPUnit_Framework_TestCase
+class DataTable_Filter_AddSummaryRowTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @group AddSummaryRow

diff --git a/tests/PHPUnit/Unit/DataTable/Filter/ExcludeLowPopulationTest.php b/tests/PHPUnit/Unit/DataTable/Filter/ExcludeLowPopulationTest.php
@@ -5,11 +5,14 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
+namespace Piwik\Tests\Unit\DataTable\Filter;
+
 use Piwik\DataTable\Filter\ExcludeLowPopulation;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
-class DataTable_Filter_ExcludeLowPopulationTest extends PHPUnit_Framework_TestCase
+class DataTable_Filter_ExcludeLowPopulationTest extends \PHPUnit_Framework_TestCase
 {
     protected function getTestDataTable()
     {

diff --git a/tests/PHPUnit/Unit/DataTable/Filter/LimitTest.php b/tests/PHPUnit/Unit/DataTable/Filter/LimitTest.php
@@ -5,11 +5,14 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
+namespace Piwik\Tests\Unit\DataTable\Filter;
+
 use Piwik\DataTable\Filter\Limit;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
-class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase
+class DataTable_Filter_LimitTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * Returns table used for the tests

diff --git a/tests/PHPUnit/Unit/DataTable/Filter/PatternRecursiveTest.php b/tests/PHPUnit/Unit/DataTable/Filter/PatternRecursiveTest.php
@@ -5,10 +5,13 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
+namespace Piwik\Tests\Unit\DataTable\Filter;
+
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
-class DataTable_Filter_PatternRecursiveTest extends PHPUnit_Framework_TestCase
+class DataTable_Filter_PatternRecursiveTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * Returns a data table for testing

diff --git a/tests/PHPUnit/Unit/DataTable/Filter/PatternTest.php b/tests/PHPUnit/Unit/DataTable/Filter/PatternTest.php
@@ -5,10 +5,13 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
+namespace Piwik\Tests\Unit\DataTable\Filter;
+
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
-class DataTable_Filter_PatternTest extends PHPUnit_Framework_TestCase
+class DataTable_Filter_PatternTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * Dataprovider for testFilterPattern

diff --git a/tests/PHPUnit/Unit/DataTable/Filter/RangeCheckTest.php b/tests/PHPUnit/Unit/DataTable/Filter/RangeCheckTest.php
@@ -5,11 +5,14 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
+
+namespace Piwik\Tests\Unit\DataTable\Filter;
+
 use Piwik\DataTable\Filter\RangeCheck;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
-class DataTable_Filter_RangeCheckTest extends PHPUnit_Framework_TestCase
+class DataTable_Filter_RangeCheckTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @group Core