From 3d020640a2373b15779f2578cb9aa65d596b1da7 Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@gmail.com>
Date: Wed, 13 Nov 2013 01:59:11 +0000
Subject: [PATCH] refs# 4233 fix class names
---
tests/PHPUnit/Integration/Core/AccessTest.php | 2 +-
.../Integration/Core/ArchiveProcessingTest.php | 6 +++---
tests/PHPUnit/Integration/Core/LogTest.php | 2 +-
tests/PHPUnit/Integration/Core/OptionTest.php | 2 +-
tests/PHPUnit/Integration/Core/PiwikTest.php | 2 +-
.../Integration/Core/Plugin/SettingsTest.php | 14 +++++++-------
tests/PHPUnit/Integration/Core/SqlTest.php | 2 +-
.../Integration/Core/Tracker/ActionTest.php | 2 +-
.../PHPUnit/Integration/Core/Tracker/VisitTest.php | 2 +-
tests/PHPUnit/Integration/Core/UpdaterTest.php | 2 +-
tests/PHPUnit/Integration/Core/WidgetsListTest.php | 2 +-
tests/PHPUnit/Integration/Plugins/LoginTest.php | 2 +-
.../Integration/Plugins/MobileMessagingTest.php | 2 +-
.../PHPUnit/Integration/Plugins/MultiSitesTest.php | 2 +-
.../Integration/Plugins/ScheduledReportsTest.php | 2 +-
.../Integration/Plugins/SegmentEditorTest.php | 2 +-
.../Integration/Plugins/SitesManagerTest.php | 2 +-
.../Integration/Plugins/UsersManagerTest.php | 2 +-
18 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/tests/PHPUnit/Integration/Core/AccessTest.php b/tests/PHPUnit/Integration/Core/AccessTest.php
index e02bda9d57..4b02d495bd 100644
--- a/tests/PHPUnit/Integration/Core/AccessTest.php
+++ b/tests/PHPUnit/Integration/Core/AccessTest.php
@@ -8,7 +8,7 @@
use Piwik\Access;
use Piwik\AuthResult;
-class AccessTest extends DatabaseTestCase
+class Core_AccessTest extends DatabaseTestCase
{
public function setUp()
{
diff --git a/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php b/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php
index 12c6c59b7e..39bc7321d9 100644
--- a/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php
+++ b/tests/PHPUnit/Integration/Core/ArchiveProcessingTest.php
@@ -22,7 +22,7 @@ use Piwik\Segment;
use Piwik\SettingsServer;
use Piwik\Site;
-class ArchiveProcessorTest extends ArchiveProcessor\Loader {
+class Core_ArchiveProcessorTest extends ArchiveProcessor\Loader {
public function getParams()
{
@@ -77,7 +77,7 @@ class ArchiveProcessingTest extends DatabaseTestCase
* @param string $periodLabel
* @param string $dateLabel
* @param string $siteTimezone
- * @return \ArchiveProcessorTest
+ * @return \Core_ArchiveProcessorTest
*/
private function _createArchiveProcessor($periodLabel, $dateLabel, $siteTimezone)
{
@@ -87,7 +87,7 @@ class ArchiveProcessingTest extends DatabaseTestCase
$segment = new Segment('', $site->getId());
$params = new ArchiveProcessor\Parameters($site, $period, $segment);
- return new \ArchiveProcessorTest($params);
+ return new \Core_ArchiveProcessorTest($params);
}
/**
diff --git a/tests/PHPUnit/Integration/Core/LogTest.php b/tests/PHPUnit/Integration/Core/LogTest.php
index 484a2269ba..ffd227ccfe 100644
--- a/tests/PHPUnit/Integration/Core/LogTest.php
+++ b/tests/PHPUnit/Integration/Core/LogTest.php
@@ -15,7 +15,7 @@ require_once PIWIK_INCLUDE_PATH . '/tests/resources/TestPluginLogClass.php';
use Piwik\Log;
use Piwik\Plugins\TestPlugin\TestLoggingUtility;
-class LogTest extends DatabaseTestCase
+class Core_LogTest extends DatabaseTestCase
{
const TESTMESSAGE = 'test%smessage';
const STRING_MESSAGE_FORMAT = '[%tag%] %message%';
diff --git a/tests/PHPUnit/Integration/Core/OptionTest.php b/tests/PHPUnit/Integration/Core/OptionTest.php
index 15db913bc0..8ace6f2487 100644
--- a/tests/PHPUnit/Integration/Core/OptionTest.php
+++ b/tests/PHPUnit/Integration/Core/OptionTest.php
@@ -11,7 +11,7 @@ use Piwik\Option;
require_once "Option.php";
-class OptionTest extends DatabaseTestCase
+class Core_OptionTest extends DatabaseTestCase
{
/**
* @group Core
diff --git a/tests/PHPUnit/Integration/Core/PiwikTest.php b/tests/PHPUnit/Integration/Core/PiwikTest.php
index 98690d1c72..b0df34b09d 100644
--- a/tests/PHPUnit/Integration/Core/PiwikTest.php
+++ b/tests/PHPUnit/Integration/Core/PiwikTest.php
@@ -12,7 +12,7 @@ use Piwik\Piwik;
use Piwik\Plugins\SitesManager\API;
use Piwik\Translate;
-class PiwikTest extends DatabaseTestCase
+class Core_PiwikTest extends DatabaseTestCase
{
/**
* Tests the generated JS code
diff --git a/tests/PHPUnit/Integration/Core/Plugin/SettingsTest.php b/tests/PHPUnit/Integration/Core/Plugin/SettingsTest.php
index e56801ef27..009ba40fca 100644
--- a/tests/PHPUnit/Integration/Core/Plugin/SettingsTest.php
+++ b/tests/PHPUnit/Integration/Core/Plugin/SettingsTest.php
@@ -10,7 +10,7 @@ use Piwik\Access;
use Piwik\Plugin\Settings as PluginSettings;
use Piwik\Settings\Setting;
-class TestablePluginSettings extends \Piwik\Plugins\ExampleSettingsPlugin\Settings {
+class Core_Plugin_SettingsTest extends \Piwik\Plugins\ExampleSettingsPlugin\Settings {
public function init()
{
@@ -31,7 +31,7 @@ class TestablePluginSettings extends \Piwik\Plugins\ExampleSettingsPlugin\Settin
class SettingsTest extends DatabaseTestCase
{
/**
- * @var TestablePluginSettings
+ * @var Core_Plugin_SettingsTest
*/
private $settings;
@@ -76,21 +76,21 @@ class SettingsTest extends DatabaseTestCase
public function test_addSetting_shouldAssignDefaultType_IfFieldIsGivenButNoType()
{
$setting = $this->buildUserSetting('myname', 'mytitle');
- $setting->uiControlType = TestablePluginSettings::CONTROL_MULTI_SELECT;
+ $setting->uiControlType = Core_Plugin_SettingsTest::CONTROL_MULTI_SELECT;
$this->settings->addSetting($setting);
- $this->assertEquals(TestablePluginSettings::TYPE_ARRAY, $setting->type);
+ $this->assertEquals(Core_Plugin_SettingsTest::TYPE_ARRAY, $setting->type);
}
public function test_addSetting_shouldAssignDefaultField_IfTypeIsGivenButNoField()
{
$setting = $this->buildUserSetting('myname', 'mytitle');
- $setting->type = TestablePluginSettings::TYPE_ARRAY;
+ $setting->type = Core_Plugin_SettingsTest::TYPE_ARRAY;
$this->settings->addSetting($setting);
- $this->assertEquals(TestablePluginSettings::CONTROL_MULTI_SELECT, $setting->uiControlType);
+ $this->assertEquals(Core_Plugin_SettingsTest::CONTROL_MULTI_SELECT, $setting->uiControlType);
}
public function test_addSetting_shouldAddAValidator_IfFieldOptionsAreGiven()
@@ -650,6 +650,6 @@ class SettingsTest extends DatabaseTestCase
private function createSettingsInstance()
{
- return new TestablePluginSettings('ExampleSettingsPlugin');
+ return new Core_Plugin_SettingsTest('ExampleSettingsPlugin');
}
}
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/Core/SqlTest.php b/tests/PHPUnit/Integration/Core/SqlTest.php
index e1eb17229c..8aab87022b 100755
--- a/tests/PHPUnit/Integration/Core/SqlTest.php
+++ b/tests/PHPUnit/Integration/Core/SqlTest.php
@@ -7,7 +7,7 @@ use Piwik\Db;
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-class SqlTest extends DatabaseTestCase
+class Core_SqlTest extends DatabaseTestCase
{
public function setUp()
{
diff --git a/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php b/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php
index 9c03119c66..5e86530986 100644
--- a/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php
+++ b/tests/PHPUnit/Integration/Core/Tracker/ActionTest.php
@@ -13,7 +13,7 @@ use Piwik\Translate;
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-class Tracker_ActionTest extends DatabaseTestCase
+class Core_Tracker_ActionTest extends DatabaseTestCase
{
public function setUp()
{
diff --git a/tests/PHPUnit/Integration/Core/Tracker/VisitTest.php b/tests/PHPUnit/Integration/Core/Tracker/VisitTest.php
index f95fabc133..ff084a4494 100644
--- a/tests/PHPUnit/Integration/Core/Tracker/VisitTest.php
+++ b/tests/PHPUnit/Integration/Core/Tracker/VisitTest.php
@@ -11,7 +11,7 @@ use Piwik\Plugins\SitesManager\API;
use Piwik\Tracker\Request;
use Piwik\Tracker\VisitExcluded;
-class Tracker_VisitTest extends DatabaseTestCase
+class Core_Tracker_VisitTest extends DatabaseTestCase
{
public function setUp()
{
diff --git a/tests/PHPUnit/Integration/Core/UpdaterTest.php b/tests/PHPUnit/Integration/Core/UpdaterTest.php
index e16af91b4d..a00d6c4086 100644
--- a/tests/PHPUnit/Integration/Core/UpdaterTest.php
+++ b/tests/PHPUnit/Integration/Core/UpdaterTest.php
@@ -7,7 +7,7 @@
*/
use Piwik\Updater;
-class UpdaterTest extends DatabaseTestCase
+class Core_UpdaterTest extends DatabaseTestCase
{
/**
* @group Core
diff --git a/tests/PHPUnit/Integration/Core/WidgetsListTest.php b/tests/PHPUnit/Integration/Core/WidgetsListTest.php
index 4c10917744..72fa57830a 100644
--- a/tests/PHPUnit/Integration/Core/WidgetsListTest.php
+++ b/tests/PHPUnit/Integration/Core/WidgetsListTest.php
@@ -10,7 +10,7 @@ use Piwik\Access;
use Piwik\Plugins\Goals\API;
use Piwik\WidgetsList;
-class WidgetsListTest extends DatabaseTestCase
+class Core_WidgetsListTest extends DatabaseTestCase
{
/**
* @group Core
diff --git a/tests/PHPUnit/Integration/Plugins/LoginTest.php b/tests/PHPUnit/Integration/Plugins/LoginTest.php
index d45419e5de..25f9072097 100644
--- a/tests/PHPUnit/Integration/Plugins/LoginTest.php
+++ b/tests/PHPUnit/Integration/Plugins/LoginTest.php
@@ -14,7 +14,7 @@ use Piwik\Plugins\UsersManager\API;
require_once 'Login/Auth.php';
-class LoginTest extends DatabaseTestCase
+class Plugins_LoginTest extends DatabaseTestCase
{
public function setUp()
{
diff --git a/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php b/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php
index 01a1257368..d08081781c 100644
--- a/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php
+++ b/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php
@@ -13,7 +13,7 @@ use Piwik\Plugins\MobileMessaging\SMSProvider;
use Piwik\Plugins\ScheduledReports\API as APIScheduledReports;
use Piwik\Plugins\SitesManager\API as APISitesManager;
-class MobileMessagingTest extends DatabaseTestCase
+class Plugins_MobileMessagingTest extends DatabaseTestCase
{
protected $idSiteAccess;
diff --git a/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php b/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php
index 7df1b05104..72f9f970b5 100644
--- a/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php
+++ b/tests/PHPUnit/Integration/Plugins/MultiSitesTest.php
@@ -10,7 +10,7 @@ use Piwik\Access;
use Piwik\Plugins\MultiSites\API as APIMultiSites;
use Piwik\Plugins\SitesManager\API as APISitesManager;
-class MultiSitesTest extends DatabaseTestCase
+class Plugins_MultiSitesTest extends DatabaseTestCase
{
protected $idSiteAccess;
diff --git a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php b/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
index 8c5ffc79ea..9787f73d00 100644
--- a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
+++ b/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
@@ -19,7 +19,7 @@ use Piwik\Site;
require_once 'ScheduledReports/ScheduledReports.php';
-class ScheduledReportsTest extends DatabaseTestCase
+class Plugins_ScheduledReportsTest extends DatabaseTestCase
{
private $idSite = 1;
diff --git a/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php b/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php
index ec2038f2f7..52a0a3a411 100644
--- a/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php
+++ b/tests/PHPUnit/Integration/Plugins/SegmentEditorTest.php
@@ -11,7 +11,7 @@ use Piwik\Piwik;
use Piwik\Plugins\SegmentEditor\API;
use Piwik\Plugins\SitesManager\API as APISitesManager;
-class SegmentEditorTest extends DatabaseTestCase
+class Plugins_SegmentEditorTest extends DatabaseTestCase
{
public function setUp()
{
diff --git a/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php b/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php
index 8aa8e85992..aa2eb89ef2 100644
--- a/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php
+++ b/tests/PHPUnit/Integration/Plugins/SitesManagerTest.php
@@ -10,7 +10,7 @@ use Piwik\Plugins\SitesManager\API;
use Piwik\Plugins\UsersManager\API as APIUsersManager;
use Piwik\Site;
-class SitesManagerTest extends DatabaseTestCase
+class Plugins_SitesManagerTest extends DatabaseTestCase
{
public function setUp()
{
diff --git a/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php b/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php
index d1ed631328..08da4b001b 100644
--- a/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php
+++ b/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php
@@ -10,7 +10,7 @@ use Piwik\Plugins\UsersManager\API;
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-class UsersManagerTest extends DatabaseTestCase
+class Plugins_UsersManagerTest extends DatabaseTestCase
{
public function setUp()
{
--
GitLab