From 4f931a6a1657500699c06d0c2f0f890106cc0b03 Mon Sep 17 00:00:00 2001
From: diosmosis <benaka@piwik.pro>
Date: Fri, 11 Sep 2015 14:00:54 -0700
Subject: [PATCH] Fixing test namespaces and files of some system tests.
---
.../tests/System/CustomVariablesSystemTest.php | 7 ++++---
.../System/AttributeHistoricalDataWithLocationsTest.php | 2 +-
tests/PHPUnit/System/CliMultiTest.php | 1 +
...VisitorOneWebsiteSeveralDaysDateRangeArchivingTest.php} | 0
4 files changed, 6 insertions(+), 4 deletions(-)
rename tests/PHPUnit/System/{OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php => OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest.php} (100%)
diff --git a/plugins/CustomVariables/tests/System/CustomVariablesSystemTest.php b/plugins/CustomVariables/tests/System/CustomVariablesSystemTest.php
index 79c6f5ec43..176221fcff 100644
--- a/plugins/CustomVariables/tests/System/CustomVariablesSystemTest.php
+++ b/plugins/CustomVariables/tests/System/CustomVariablesSystemTest.php
@@ -6,8 +6,9 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-namespace Piwik\Plugins\CustomVariables\tests;
+namespace Piwik\Plugins\CustomVariables\tests\System;
+use Piwik\Plugins\CustomVariables\tests\Fixtures\VisitWithManyCustomVariables;
use Piwik\Tests\Framework\TestCase\SystemTestCase;
/**
@@ -18,7 +19,7 @@ use Piwik\Tests\Framework\TestCase\SystemTestCase;
class CustomVariablesSystemTest extends SystemTestCase
{
/**
- * @var Fixtures\VisitWithManyCustomVariables
+ * @var VisitWithManyCustomVariables
*/
public static $fixture = null; // initialized below class definition
@@ -57,4 +58,4 @@ class CustomVariablesSystemTest extends SystemTestCase
}
}
-CustomVariablesSystemTest::$fixture = new Fixtures\VisitWithManyCustomVariables();
\ No newline at end of file
+CustomVariablesSystemTest::$fixture = new VisitWithManyCustomVariables();
\ No newline at end of file
diff --git a/plugins/UserCountry/tests/System/AttributeHistoricalDataWithLocationsTest.php b/plugins/UserCountry/tests/System/AttributeHistoricalDataWithLocationsTest.php
index b41632ba6d..755ce0be82 100644
--- a/plugins/UserCountry/tests/System/AttributeHistoricalDataWithLocationsTest.php
+++ b/plugins/UserCountry/tests/System/AttributeHistoricalDataWithLocationsTest.php
@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
*/
-namespace Piwik\Plugins\UserCountry\Test\Integration;
+namespace Piwik\Plugins\UserCountry\Test\System;
use Piwik\Common;
use Piwik\Db;
diff --git a/tests/PHPUnit/System/CliMultiTest.php b/tests/PHPUnit/System/CliMultiTest.php
index c98714d3cc..55e95e0066 100644
--- a/tests/PHPUnit/System/CliMultiTest.php
+++ b/tests/PHPUnit/System/CliMultiTest.php
@@ -5,6 +5,7 @@
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
+namespace Piwik\Tests\System;
use Piwik\Archiver\Request;
use Piwik\CliMulti;
diff --git a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest.php
similarity index 100%
rename from tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php
rename to tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest.php
--
GitLab