Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorFabian Becker <fabian.becker@uni-tuebingen.de>2013-07-18 13:28:48 +0400
committerFabian Becker <fabian.becker@uni-tuebingen.de>2013-07-18 13:28:48 +0400
commit181a36bbe3f3b9081d7bfe7e89a86b63fd6b5eb5 (patch)
treed2c63f66f644e30d2f49223b7b2c4dae8fb3eaa6 /tests
parent879d0e094824bd6d46ca1ecbba1cda945394bb05 (diff)
Refactor class Piwik to \Piwik\Core\Piwik
Diffstat (limited to 'tests')
-rwxr-xr-xtests/PHPUnit/Benchmarks/Fixtures/SqlDump.php1
-rw-r--r--tests/PHPUnit/Core/ArchiveProcessingTest.php1
-rw-r--r--tests/PHPUnit/Core/DateTest.php2
-rw-r--r--tests/PHPUnit/Core/PiwikTest.php2
-rw-r--r--tests/PHPUnit/Core/ReleaseCheckListTest.php2
-rw-r--r--tests/PHPUnit/Core/ServeStaticFileTest.php2
-rw-r--r--tests/PHPUnit/DatabaseTestCase.php1
-rw-r--r--tests/PHPUnit/Integration/ArchiveCronTest.php1
-rwxr-xr-xtests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php1
-rwxr-xr-xtests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRange_ArchivingTestsTest.php1
-rwxr-xr-xtests/PHPUnit/IntegrationTestCase.php1
-rw-r--r--tests/PHPUnit/Plugins/LoginTest.php1
-rwxr-xr-xtests/PHPUnit/Plugins/PrivacyManagerTest.php1
-rw-r--r--tests/PHPUnit/Plugins/SegmentEditorTest.php2
-rw-r--r--tests/PHPUnit/Plugins/UserCountryTest.php2
-rw-r--r--tests/PHPUnit/UI/UIIntegrationTest.php1
-rw-r--r--tests/resources/staticFileServer.php2
17 files changed, 24 insertions, 0 deletions
diff --git a/tests/PHPUnit/Benchmarks/Fixtures/SqlDump.php b/tests/PHPUnit/Benchmarks/Fixtures/SqlDump.php
index f4c303430c..fb73285612 100755
--- a/tests/PHPUnit/Benchmarks/Fixtures/SqlDump.php
+++ b/tests/PHPUnit/Benchmarks/Fixtures/SqlDump.php
@@ -6,6 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
use Piwik\Core\Config;
+use Piwik\Core\Piwik;
/**
* Reusable fixture. Loads a ~1GB SQL dump into the DB.
diff --git a/tests/PHPUnit/Core/ArchiveProcessingTest.php b/tests/PHPUnit/Core/ArchiveProcessingTest.php
index fbe5fccecc..596c7973c4 100644
--- a/tests/PHPUnit/Core/ArchiveProcessingTest.php
+++ b/tests/PHPUnit/Core/ArchiveProcessingTest.php
@@ -1,5 +1,6 @@
<?php
use Piwik\Core\Config;
+use Piwik\Core\Piwik;
/**
* Piwik - Open source web analytics
diff --git a/tests/PHPUnit/Core/DateTest.php b/tests/PHPUnit/Core/DateTest.php
index 45d2e1af12..1b03141865 100644
--- a/tests/PHPUnit/Core/DateTest.php
+++ b/tests/PHPUnit/Core/DateTest.php
@@ -1,4 +1,6 @@
<?php
+use Piwik\Core\Piwik;
+
/**
* Piwik - Open source web analytics
*
diff --git a/tests/PHPUnit/Core/PiwikTest.php b/tests/PHPUnit/Core/PiwikTest.php
index 8294763058..5ed4a51f24 100644
--- a/tests/PHPUnit/Core/PiwikTest.php
+++ b/tests/PHPUnit/Core/PiwikTest.php
@@ -1,4 +1,6 @@
<?php
+use Piwik\Core\Piwik;
+
/**
* Piwik - Open source web analytics
*
diff --git a/tests/PHPUnit/Core/ReleaseCheckListTest.php b/tests/PHPUnit/Core/ReleaseCheckListTest.php
index 9542c663c7..04cb72a5a3 100644
--- a/tests/PHPUnit/Core/ReleaseCheckListTest.php
+++ b/tests/PHPUnit/Core/ReleaseCheckListTest.php
@@ -1,4 +1,6 @@
<?php
+use Piwik\Core\Piwik;
+
/**
* Piwik - Open source web analytics
*
diff --git a/tests/PHPUnit/Core/ServeStaticFileTest.php b/tests/PHPUnit/Core/ServeStaticFileTest.php
index 253526f3ca..764fd85e17 100644
--- a/tests/PHPUnit/Core/ServeStaticFileTest.php
+++ b/tests/PHPUnit/Core/ServeStaticFileTest.php
@@ -12,6 +12,8 @@
*/
// This is Piwik logo, the static file used in this test suit
+use Piwik\Core\Piwik;
+
define("TEST_FILE_LOCATION", realpath(dirname(__FILE__) . "/../../resources/lipsum.txt"));
define("TEST_FILE_CONTENT_TYPE", "text/plain");
diff --git a/tests/PHPUnit/DatabaseTestCase.php b/tests/PHPUnit/DatabaseTestCase.php
index f30c5b0fe3..e432767b5b 100644
--- a/tests/PHPUnit/DatabaseTestCase.php
+++ b/tests/PHPUnit/DatabaseTestCase.php
@@ -6,6 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
use Piwik\Core\Config;
+use Piwik\Core\Piwik;
/**
* Tests extending DatabaseTestCase are much slower to run: the setUp will
diff --git a/tests/PHPUnit/Integration/ArchiveCronTest.php b/tests/PHPUnit/Integration/ArchiveCronTest.php
index 47c3beaac4..ad0bbe3aae 100644
--- a/tests/PHPUnit/Integration/ArchiveCronTest.php
+++ b/tests/PHPUnit/Integration/ArchiveCronTest.php
@@ -5,6 +5,7 @@
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
+use Piwik\Core\Piwik;
/**
* Tests the archive.php cron script.
diff --git a/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php b/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php
index d34d88e8aa..9ff5d73aba 100755
--- a/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php
+++ b/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php
@@ -5,6 +5,7 @@
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
+use Piwik\Core\Piwik;
/**
* Tests API methods after ecommerce orders are tracked.
diff --git a/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRange_ArchivingTestsTest.php b/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRange_ArchivingTestsTest.php
index 1f924f2ac6..e416615da9 100755
--- a/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRange_ArchivingTestsTest.php
+++ b/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRange_ArchivingTestsTest.php
@@ -5,6 +5,7 @@
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
+use Piwik\Core\Piwik;
/**
* Tests some API using range periods & makes sure the correct amount of blob/numeric
diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php
index 9967f8252e..2c662f39f5 100755
--- a/tests/PHPUnit/IntegrationTestCase.php
+++ b/tests/PHPUnit/IntegrationTestCase.php
@@ -6,6 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
use Piwik\Core\Config;
+use Piwik\Core\Piwik;
require_once PIWIK_INCLUDE_PATH . '/libs/PiwikTracker/PiwikTracker.php';
diff --git a/tests/PHPUnit/Plugins/LoginTest.php b/tests/PHPUnit/Plugins/LoginTest.php
index efd1e101a3..e6b00deada 100644
--- a/tests/PHPUnit/Plugins/LoginTest.php
+++ b/tests/PHPUnit/Plugins/LoginTest.php
@@ -6,6 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
use Piwik\Core\Config;
+use Piwik\Core\Piwik;
require_once 'Login/Auth.php';
diff --git a/tests/PHPUnit/Plugins/PrivacyManagerTest.php b/tests/PHPUnit/Plugins/PrivacyManagerTest.php
index f731f91bef..ffcfe6a38f 100755
--- a/tests/PHPUnit/Plugins/PrivacyManagerTest.php
+++ b/tests/PHPUnit/Plugins/PrivacyManagerTest.php
@@ -6,6 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
use Piwik\Core\Config;
+use Piwik\Core\Piwik;
require_once 'PrivacyManager/PrivacyManager.php';
diff --git a/tests/PHPUnit/Plugins/SegmentEditorTest.php b/tests/PHPUnit/Plugins/SegmentEditorTest.php
index 3ef4238c8a..18b0fabd68 100644
--- a/tests/PHPUnit/Plugins/SegmentEditorTest.php
+++ b/tests/PHPUnit/Plugins/SegmentEditorTest.php
@@ -1,4 +1,6 @@
<?php
+use Piwik\Core\Piwik;
+
/**
* Piwik - Open source web analytics
*
diff --git a/tests/PHPUnit/Plugins/UserCountryTest.php b/tests/PHPUnit/Plugins/UserCountryTest.php
index 6206ab5054..6c6e88536e 100644
--- a/tests/PHPUnit/Plugins/UserCountryTest.php
+++ b/tests/PHPUnit/Plugins/UserCountryTest.php
@@ -5,6 +5,8 @@
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
+use Piwik\Core\Piwik;
+
require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/UserCountry.php';
require_once 'UserCountry/functions.php';
require_once PIWIK_INCLUDE_PATH . '/core/DataFiles/Countries.php';
diff --git a/tests/PHPUnit/UI/UIIntegrationTest.php b/tests/PHPUnit/UI/UIIntegrationTest.php
index 14a047c832..905ca23d1f 100644
--- a/tests/PHPUnit/UI/UIIntegrationTest.php
+++ b/tests/PHPUnit/UI/UIIntegrationTest.php
@@ -5,6 +5,7 @@
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
+use Piwik\Core\Piwik;
/**
* Tests UI code by grabbing screenshots of webpages and comparing with expected files.
diff --git a/tests/resources/staticFileServer.php b/tests/resources/staticFileServer.php
index fc647f26af..da49ceb7ad 100644
--- a/tests/resources/staticFileServer.php
+++ b/tests/resources/staticFileServer.php
@@ -9,6 +9,8 @@
* This decision has a structural impact on the usual unit test file structure
* serveStaticFile.test.php has been created to avoid making too many modifications to /tests/core/Piwik.test.php
*/
+use Piwik\Core\Piwik;
+
define('PIWIK_DOCUMENT_ROOT', dirname(__FILE__).'/../../');
if(file_exists(PIWIK_DOCUMENT_ROOT . '/bootstrap.php'))
{