diff options
Diffstat (limited to 'tests')
51 files changed, 199 insertions, 163 deletions
diff --git a/tests/LocalTracker.php b/tests/LocalTracker.php index 7cdbab883e..e7c64ad96c 100755 --- a/tests/LocalTracker.php +++ b/tests/LocalTracker.php @@ -1,6 +1,6 @@ <?php -use Piwik\Core\Config; +use Piwik\Config; $GLOBALS['PIWIK_TRACKER_DEBUG'] = false; $GLOBALS['PIWIK_TRACKER_DEBUG_FORCE_SCHEDULED_TASKS'] = false; diff --git a/tests/PHPUnit/BaseFixture.php b/tests/PHPUnit/BaseFixture.php index 88f90a471b..82b1b956cc 100644 --- a/tests/PHPUnit/BaseFixture.php +++ b/tests/PHPUnit/BaseFixture.php @@ -5,8 +5,9 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -use Piwik\Core\Config; -use Piwik\Core\Common; +use Piwik\Config; +use Piwik\Common; +use Piwik\Access; /** * Base type for all integration test fixtures. Integration test fixtures @@ -200,7 +201,7 @@ abstract class Test_Piwik_BaseFixture extends PHPUnit_Framework_Assert // fake access is needed so API methods can call Piwik::getCurrentUserLogin(), e.g: 'PDFReports.addReport' $pseudoMockAccess = new FakeAccess; FakeAccess::$superUser = true; - Piwik_Access::setSingletonInstance($pseudoMockAccess); + Access::setSingletonInstance($pseudoMockAccess); // retrieve available reports $availableReportMetadata = Piwik_PDFReports_API::getReportMetadata($idSite, Piwik_PDFReports::EMAIL_TYPE); diff --git a/tests/PHPUnit/BenchmarkTestCase.php b/tests/PHPUnit/BenchmarkTestCase.php index 3f753e401b..d89fd58846 100755 --- a/tests/PHPUnit/BenchmarkTestCase.php +++ b/tests/PHPUnit/BenchmarkTestCase.php @@ -5,8 +5,8 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -use Piwik\Core\Config; -use Piwik\Core\Common; +use Piwik\Config; +use Piwik\Common; require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/IntegrationTestCase.php'; require_once PIWIK_INCLUDE_PATH . '/tests/LocalTracker.php'; diff --git a/tests/PHPUnit/Benchmarks/Fixtures/SqlDump.php b/tests/PHPUnit/Benchmarks/Fixtures/SqlDump.php index 2f6a75143b..701a6066f8 100755 --- a/tests/PHPUnit/Benchmarks/Fixtures/SqlDump.php +++ b/tests/PHPUnit/Benchmarks/Fixtures/SqlDump.php @@ -5,9 +5,9 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -use Piwik\Core\Config; -use Piwik\Core\Piwik; -use Piwik\Core\Common; +use Piwik\Config; +use Piwik\Piwik; +use Piwik\Common; /** * Reusable fixture. Loads a ~1GB SQL dump into the DB. diff --git a/tests/PHPUnit/Core/AccessTest.php b/tests/PHPUnit/Core/AccessTest.php index 09637df503..f6d8f6e103 100644 --- a/tests/PHPUnit/Core/AccessTest.php +++ b/tests/PHPUnit/Core/AccessTest.php @@ -5,6 +5,9 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\Access; +use Piwik\AuthResult; + class AccessTest extends DatabaseTestCase { /** @@ -13,7 +16,7 @@ class AccessTest extends DatabaseTestCase */ public function testGetListAccess() { - $accessList = Piwik_Access::getListAccess(); + $accessList = Access::getListAccess(); $shouldBe = array('noaccess', 'view', 'admin', 'superuser'); $this->assertEquals($shouldBe, $accessList); } @@ -24,7 +27,7 @@ class AccessTest extends DatabaseTestCase */ public function testGetTokenAuthWithEmptyAccess() { - $access = new Piwik_Access(); + $access = new Access(); $this->assertNull($access->getTokenAuth()); } @@ -34,7 +37,7 @@ class AccessTest extends DatabaseTestCase */ public function testGetLoginWithEmptyAccess() { - $access = new Piwik_Access(); + $access = new Access(); $this->assertNull($access->getLogin()); } @@ -44,7 +47,7 @@ class AccessTest extends DatabaseTestCase */ public function testIsSuperUserWithEmptyAccess() { - $access = new Piwik_Access(); + $access = new Access(); $this->assertFalse($access->isSuperUser()); } @@ -54,7 +57,7 @@ class AccessTest extends DatabaseTestCase */ public function testIsSuperUserWithSuperUserAccess() { - $access = Piwik_Access::getInstance(); + $access = Access::getInstance(); $access->setSuperUser(true); $this->assertTrue($access->isSuperUser()); } @@ -65,7 +68,7 @@ class AccessTest extends DatabaseTestCase */ public function testIsSuperUserWithNoSuperUserAccess() { - $access = Piwik_Access::getInstance(); + $access = Access::getInstance(); $access->setSuperUser(false); $this->assertFalse($access->isSuperUser()); } @@ -76,7 +79,7 @@ class AccessTest extends DatabaseTestCase */ public function testGetSitesIdWithAtLeastViewAccessWithEmptyAccess() { - $access = new Piwik_Access(); + $access = new Access(); $this->assertEmpty($access->getSitesIdWithAtLeastViewAccess()); } @@ -86,7 +89,7 @@ class AccessTest extends DatabaseTestCase */ public function testGetSitesIdWithAdminAccessWithEmptyAccess() { - $access = new Piwik_Access(); + $access = new Access(); $this->assertEmpty($access->getSitesIdWithAdminAccess()); } @@ -96,18 +99,18 @@ class AccessTest extends DatabaseTestCase */ public function testGetSitesIdWithViewAccessWithEmptyAccess() { - $access = new Piwik_Access(); + $access = new Access(); $this->assertEmpty($access->getSitesIdWithViewAccess()); } /** * @group Core * @group Access - * @expectedException Piwik_Access_NoAccessException + * @expectedException Piwik\NoAccessException */ public function testCheckUserIsSuperUserWithEmptyAccess() { - $access = new Piwik_Access(); + $access = new Access(); $access->checkUserIsSuperUser(); } @@ -117,7 +120,7 @@ class AccessTest extends DatabaseTestCase */ public function testCheckUserIsSuperUserWithSuperUserAccess() { - $access = Piwik_Access::getInstance(); + $access = Access::getInstance(); $access->setSuperUser(true); $access->checkUserIsSuperUser(); } @@ -125,11 +128,11 @@ class AccessTest extends DatabaseTestCase /** * @group Core * @group Access - * @expectedException Piwik_Access_NoAccessException + * @expectedException Piwik\NoAccessException */ public function testCheckUserHasSomeAdminAccessWithEmptyAccess() { - $access = new Piwik_Access(); + $access = new Access(); $access->checkUserHasSomeAdminAccess(); } @@ -139,7 +142,7 @@ class AccessTest extends DatabaseTestCase */ public function testCheckUserHasSomeAdminAccessWithSuperUserAccess() { - $access = Piwik_Access::getInstance(); + $access = Access::getInstance(); $access->setSuperUser(true); $access->checkUserHasSomeAdminAccess(); } @@ -151,13 +154,13 @@ class AccessTest extends DatabaseTestCase public function testCheckUserHasSomeAdminAccessWithSomeAccess() { $mock = $this->getMock( - 'Piwik_Access', + 'Piwik\Access', array('getSitesIdWithAdminAccess') ); $mock->expects($this->once()) - ->method('getSitesIdWithAdminAccess') - ->will($this->returnValue(array(2, 9))); + ->method('getSitesIdWithAdminAccess') + ->will($this->returnValue(array(2, 9))); $mock->checkUserHasSomeAdminAccess(); } @@ -165,11 +168,11 @@ class AccessTest extends DatabaseTestCase /** * @group Core * @group Access - * @expectedException Piwik_Access_NoAccessException + * @expectedException Piwik\NoAccessException */ public function testCheckUserHasSomeViewAccessWithEmptyAccess() { - $access = new Piwik_Access(); + $access = new Access(); $access->checkUserHasSomeViewAccess(); } @@ -179,7 +182,7 @@ class AccessTest extends DatabaseTestCase */ public function testCheckUserHasSomeViewAccessWithSuperUserAccess() { - $access = Piwik_Access::getInstance(); + $access = Access::getInstance(); $access->setSuperUser(true); $access->checkUserHasSomeViewAccess(); } @@ -191,7 +194,7 @@ class AccessTest extends DatabaseTestCase public function testCheckUserHasSomeViewAccessWithSomeAccess() { $mock = $this->getMock( - 'Piwik_Access', + 'Piwik\Access', array('getSitesIdWithAtLeastViewAccess') ); @@ -205,11 +208,11 @@ class AccessTest extends DatabaseTestCase /** * @group Core * @group Access - * @expectedException Piwik_Access_NoAccessException + * @expectedException Piwik\NoAccessException */ public function testCheckUserHasViewAccessWithEmptyAccessNoSiteIdsGiven() { - $access = new Piwik_Access(); + $access = new Access(); $access->checkUserHasViewAccess(array()); } @@ -219,7 +222,7 @@ class AccessTest extends DatabaseTestCase */ public function testCheckUserHasViewAccessWithSuperUserAccess() { - $access = Piwik_Access::getInstance(); + $access = Access::getInstance(); $access->setSuperUser(true); $access->checkUserHasViewAccess(array()); } @@ -231,7 +234,7 @@ class AccessTest extends DatabaseTestCase public function testCheckUserHasViewAccessWithSomeAccessSuccessIdSitesAsString() { $mock = $this->getMock( - 'Piwik_Access', + 'Piwik\Access', array('getSitesIdWithAtLeastViewAccess') ); @@ -249,7 +252,7 @@ class AccessTest extends DatabaseTestCase public function testCheckUserHasViewAccessWithSomeAccessSuccessAllSites() { $mock = $this->getMock( - 'Piwik_Access', + 'Piwik\Access', array('getSitesIdWithAtLeastViewAccess') ); @@ -263,12 +266,12 @@ class AccessTest extends DatabaseTestCase /** * @group Core * @group Access - * @expectedException Piwik_Access_NoAccessException + * @expectedException Piwik\NoAccessException */ public function testCheckUserHasViewAccessWithSomeAccessFailure() { $mock = $this->getMock( - 'Piwik_Access', + 'Piwik\Access', array('getSitesIdWithAtLeastViewAccess') ); @@ -285,7 +288,7 @@ class AccessTest extends DatabaseTestCase */ public function testCheckUserHasAdminAccessWithSuperUserAccess() { - $access = Piwik_Access::getInstance(); + $access = Access::getInstance(); $access->setSuperUser(true); $access->checkUserHasAdminAccess(array()); } @@ -293,11 +296,11 @@ class AccessTest extends DatabaseTestCase /** * @group Core * @group Access - * @expectedException Piwik_Access_NoAccessException + * @expectedException Piwik\NoAccessException */ public function testCheckUserHasAdminAccessWithEmptyAccessNoSiteIdsGiven() { - $access = new Piwik_Access(); + $access = new Access(); $access->checkUserHasViewAccess(array()); } @@ -308,7 +311,7 @@ class AccessTest extends DatabaseTestCase public function testCheckUserHasAdminAccessWithSomeAccessSuccessIdSitesAsString() { $mock = $this->getMock( - 'Piwik_Access', + 'Piwik\Access', array('getSitesIdWithAdminAccess') ); @@ -326,7 +329,7 @@ class AccessTest extends DatabaseTestCase public function testCheckUserHasAdminAccessWithSomeAccessSuccessAllSites() { $mock = $this->getMock( - 'Piwik_Access', + 'Piwik\Access', array('getSitesIdWithAdminAccess', 'getSitesIdWithAtLeastViewAccess') ); @@ -344,12 +347,12 @@ class AccessTest extends DatabaseTestCase /** * @group Core * @group Access - * @expectedException Piwik_Access_NoAccessException + * @expectedException Piwik\NoAccessException */ public function testCheckUserHasAdminAccessWithSomeAccessFailure() { $mock = $this->getMock( - 'Piwik_Access', + 'Piwik\Access', array('getSitesIdWithAdminAccess') ); @@ -366,7 +369,7 @@ class AccessTest extends DatabaseTestCase */ public function testReloadAccessWithEmptyAuth() { - $access = new Piwik_Access(); + $access = new Access(); $this->assertFalse($access->reloadAccess(null)); } @@ -376,7 +379,7 @@ class AccessTest extends DatabaseTestCase */ public function testReloadAccessWithEmptyAuthSuperUser() { - $access = Piwik_Access::getInstance(); + $access = Access::getInstance(); $access->setSuperUser(true); $this->assertTrue($access->reloadAccess(null)); } @@ -390,9 +393,9 @@ class AccessTest extends DatabaseTestCase $mock = $this->getMock('Piwik_Login_Auth', array('authenticate')); $mock->expects($this->once()) ->method('authenticate') - ->will($this->returnValue(new Piwik_Auth_Result(Piwik_Auth_Result::SUCCESS, 'login', 'token'))); + ->will($this->returnValue(new AuthResult(AuthResult::SUCCESS, 'login', 'token'))); - $access = Piwik_Access::getInstance(); + $access = Access::getInstance(); $this->assertTrue($access->reloadAccess($mock)); $this->assertFalse($access->isSuperUser()); } @@ -406,9 +409,9 @@ class AccessTest extends DatabaseTestCase $mock = $this->getMock('Piwik_Login_Auth', array('authenticate')); $mock->expects($this->once()) ->method('authenticate') - ->will($this->returnValue(new Piwik_Auth_Result(Piwik_Auth_Result::SUCCESS_SUPERUSER_AUTH_CODE, 'superuser', 'superusertoken'))); + ->will($this->returnValue(new AuthResult(AuthResult::SUCCESS_SUPERUSER_AUTH_CODE, 'superuser', 'superusertoken'))); - $access = Piwik_Access::getInstance(); + $access = Access::getInstance(); $this->assertTrue($access->reloadAccess($mock)); $this->assertTrue($access->isSuperUser()); } @@ -422,9 +425,9 @@ class AccessTest extends DatabaseTestCase $mock = $this->getMock('Piwik_Login_Auth', array('authenticate')); $mock->expects($this->once()) ->method('authenticate') - ->will($this->returnValue(new Piwik_Auth_Result(Piwik_Auth_Result::FAILURE_CREDENTIAL_INVALID, null, null))); + ->will($this->returnValue(new AuthResult(AuthResult::FAILURE_CREDENTIAL_INVALID, null, null))); - $access = Piwik_Access::getInstance(); + $access = Access::getInstance(); $this->assertFalse($access->reloadAccess($mock)); } diff --git a/tests/PHPUnit/Core/ArchiveProcessingTest.php b/tests/PHPUnit/Core/ArchiveProcessingTest.php index 8a73c11113..a190983ce9 100644 --- a/tests/PHPUnit/Core/ArchiveProcessingTest.php +++ b/tests/PHPUnit/Core/ArchiveProcessingTest.php @@ -1,7 +1,8 @@ <?php -use Piwik\Core\Config; -use Piwik\Core\Piwik; -use Piwik\Core\Common; +use Piwik\Config; +use Piwik\Piwik; +use Piwik\Common; +use Piwik\Access; /** * Piwik - Open source web analytics @@ -18,7 +19,7 @@ class ArchiveProcessingTest extends DatabaseTestCase // setup the access layer $pseudoMockAccess = new FakeAccess; FakeAccess::$superUser = true; - Piwik_Access::setSingletonInstance($pseudoMockAccess); + Access::setSingletonInstance($pseudoMockAccess); } /** diff --git a/tests/PHPUnit/Core/CommonTest.php b/tests/PHPUnit/Core/CommonTest.php index 0163ff548a..b0f69a69c4 100644 --- a/tests/PHPUnit/Core/CommonTest.php +++ b/tests/PHPUnit/Core/CommonTest.php @@ -1,5 +1,5 @@ <?php -use Piwik\Core\Common; +use Piwik\Common; /** * Piwik - Open source web analytics diff --git a/tests/PHPUnit/Core/ConfigTest.php b/tests/PHPUnit/Core/ConfigTest.php index df6ef685a6..0922c7a20e 100644 --- a/tests/PHPUnit/Core/ConfigTest.php +++ b/tests/PHPUnit/Core/ConfigTest.php @@ -1,5 +1,5 @@ <?php -use Piwik\Core\Config; +use Piwik\Config; /** * Piwik - Open source web analytics diff --git a/tests/PHPUnit/Core/DataTable/ArrayTest.php b/tests/PHPUnit/Core/DataTable/ArrayTest.php index 9ceaed5caa..2c1cc4e069 100755 --- a/tests/PHPUnit/Core/DataTable/ArrayTest.php +++ b/tests/PHPUnit/Core/DataTable/ArrayTest.php @@ -1,5 +1,5 @@ <?php -use Piwik\Core\Config; +use Piwik\Config; class Test_Piwik_DataTable_Array extends PHPUnit_Framework_TestCase { diff --git a/tests/PHPUnit/Core/DataTableTest.php b/tests/PHPUnit/Core/DataTableTest.php index 9249d7ea72..2a7fdc1548 100644 --- a/tests/PHPUnit/Core/DataTableTest.php +++ b/tests/PHPUnit/Core/DataTableTest.php @@ -1,4 +1,7 @@ <?php + +use Piwik\Common; + /** * Piwik - Open source web analytics * @@ -748,7 +751,7 @@ class DataTableTest extends PHPUnit_Framework_TestCase // when the expanded parameter is false. $rowBeingDestructed->c[Piwik_DataTable_Row::DATATABLE_ASSOCIATED] = $mockedDataTable->getId(); - destroy($rowBeingDestructed); + Common::destroy($rowBeingDestructed); } /** @@ -778,7 +781,7 @@ class DataTableTest extends PHPUnit_Framework_TestCase $rowBeingDestructed = new Piwik_DataTable_Row(); $rowBeingDestructed->setSubtable($mockedDataTable); - destroy($rowBeingDestructed); + Common::destroy($rowBeingDestructed); } protected function _getDataTable1ForTest() diff --git a/tests/PHPUnit/Core/DateTest.php b/tests/PHPUnit/Core/DateTest.php index 1b03141865..4b80aa3abd 100644 --- a/tests/PHPUnit/Core/DateTest.php +++ b/tests/PHPUnit/Core/DateTest.php @@ -1,5 +1,5 @@ <?php -use Piwik\Core\Piwik; +use Piwik\Piwik; /** * Piwik - Open source web analytics diff --git a/tests/PHPUnit/Core/IPTest.php b/tests/PHPUnit/Core/IPTest.php index 375f441fa3..49a4741ca4 100644 --- a/tests/PHPUnit/Core/IPTest.php +++ b/tests/PHPUnit/Core/IPTest.php @@ -1,6 +1,6 @@ <?php -use Piwik\Core\Config; -use Piwik\Core\Common; +use Piwik\Config; +use Piwik\Common; /** * Piwik - Open source web analytics diff --git a/tests/PHPUnit/Core/NonceTest.php b/tests/PHPUnit/Core/NonceTest.php index 25ecd3579c..a776cee77e 100644 --- a/tests/PHPUnit/Core/NonceTest.php +++ b/tests/PHPUnit/Core/NonceTest.php @@ -1,5 +1,5 @@ <?php -use Piwik\Core\Config; +use Piwik\Config; /** * Piwik - Open source web analytics diff --git a/tests/PHPUnit/Core/OptionTest.php b/tests/PHPUnit/Core/OptionTest.php index ea6bc19ef9..83625cfbae 100644 --- a/tests/PHPUnit/Core/OptionTest.php +++ b/tests/PHPUnit/Core/OptionTest.php @@ -5,7 +5,7 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -use Piwik\Core\Common; +use Piwik\Common; require_once "Option.php"; diff --git a/tests/PHPUnit/Core/PiwikTest.php b/tests/PHPUnit/Core/PiwikTest.php index 5ed4a51f24..e1697dde83 100644 --- a/tests/PHPUnit/Core/PiwikTest.php +++ b/tests/PHPUnit/Core/PiwikTest.php @@ -1,5 +1,6 @@ <?php -use Piwik\Core\Piwik; +use Piwik\Piwik; +use Piwik\Access; /** * Piwik - Open source web analytics @@ -212,7 +213,7 @@ class PiwikTest extends DatabaseTestCase { Piwik_Translate::getInstance()->loadEnglishTranslation(); - $access = Piwik_Access::getInstance(); + $access = Access::getInstance(); $access->setSuperUser(true); $idsite = Piwik_SitesManager_API::getInstance()->addSite("test", "http://test"); diff --git a/tests/PHPUnit/Core/PluginsFunctions/WidgetsListTest.php b/tests/PHPUnit/Core/PluginsFunctions/WidgetsListTest.php index b3f2add7c1..5bb375bd69 100644 --- a/tests/PHPUnit/Core/PluginsFunctions/WidgetsListTest.php +++ b/tests/PHPUnit/Core/PluginsFunctions/WidgetsListTest.php @@ -6,6 +6,8 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\Access; + class WidgetsListTest extends DatabaseTestCase { /** @@ -18,7 +20,7 @@ class WidgetsListTest extends DatabaseTestCase // setup the access layer $pseudoMockAccess = new FakeAccess; FakeAccess::$superUser = true; - Piwik_Access::setSingletonInstance($pseudoMockAccess); + Access::setSingletonInstance($pseudoMockAccess); Test_Piwik_BaseFixture::createWebsite('2009-01-04 00:11:42'); @@ -64,7 +66,7 @@ class WidgetsListTest extends DatabaseTestCase // setup the access layer $pseudoMockAccess = new FakeAccess; FakeAccess::$superUser = true; - Piwik_Access::setSingletonInstance($pseudoMockAccess); + Access::setSingletonInstance($pseudoMockAccess); Test_Piwik_BaseFixture::createWebsite('2009-01-04 00:11:42'); Piwik_Goals_API::getInstance()->addGoal(1, 'Goal 1 - Thank you', 'title', 'Thank you', 'contains', $caseSensitive = false, $revenue = 10, $allowMultipleConversions = 1); @@ -101,7 +103,7 @@ class WidgetsListTest extends DatabaseTestCase // setup the access layer $pseudoMockAccess = new FakeAccess; FakeAccess::$superUser = true; - Piwik_Access::setSingletonInstance($pseudoMockAccess); + Access::setSingletonInstance($pseudoMockAccess); Test_Piwik_BaseFixture::createWebsite('2009-01-04 00:11:42', true); Piwik_Goals_API::getInstance()->addGoal(1, 'Goal 1 - Thank you', 'title', 'Thank you', 'contains', $caseSensitive = false, $revenue = 10, $allowMultipleConversions = 1); diff --git a/tests/PHPUnit/Core/ReleaseCheckListTest.php b/tests/PHPUnit/Core/ReleaseCheckListTest.php index d58cbfaea5..116ddae02c 100644 --- a/tests/PHPUnit/Core/ReleaseCheckListTest.php +++ b/tests/PHPUnit/Core/ReleaseCheckListTest.php @@ -1,6 +1,6 @@ <?php -use Piwik\Core\Piwik; -use Piwik\Core\Common; +use Piwik\Piwik; +use Piwik\Common; /** * Piwik - Open source web analytics diff --git a/tests/PHPUnit/Core/SegmentTest.php b/tests/PHPUnit/Core/SegmentTest.php index e86a0affdc..563bb906af 100644 --- a/tests/PHPUnit/Core/SegmentTest.php +++ b/tests/PHPUnit/Core/SegmentTest.php @@ -1,5 +1,6 @@ <?php -use Piwik\Core\Common; +use Piwik\Common; +use Piwik\Access; /** * Piwik - Open source web analytics @@ -16,7 +17,7 @@ class SegmentTest extends PHPUnit_Framework_TestCase // setup the access layer (required in Segment contrustor testing if anonymous is allowed to use segments) $pseudoMockAccess = new FakeAccess; FakeAccess::$superUser = true; - Piwik_Access::setSingletonInstance($pseudoMockAccess); + Access::setSingletonInstance($pseudoMockAccess); // Load and install plugins IntegrationTestCase::loadAllPlugins(); diff --git a/tests/PHPUnit/Core/ServeStaticFileTest.php b/tests/PHPUnit/Core/ServeStaticFileTest.php index 47747527f7..116edab40a 100644 --- a/tests/PHPUnit/Core/ServeStaticFileTest.php +++ b/tests/PHPUnit/Core/ServeStaticFileTest.php @@ -12,8 +12,8 @@ */ // This is Piwik logo, the static file used in this test suit -use Piwik\Core\Piwik; -use Piwik\Core\Common; +use Piwik\Piwik; +use Piwik\Common; define("TEST_FILE_LOCATION", realpath(dirname(__FILE__) . "/../../resources/lipsum.txt")); define("TEST_FILE_CONTENT_TYPE", "text/plain"); diff --git a/tests/PHPUnit/Core/Tracker/ActionTest.php b/tests/PHPUnit/Core/Tracker/ActionTest.php index 83899537ea..22163644eb 100644 --- a/tests/PHPUnit/Core/Tracker/ActionTest.php +++ b/tests/PHPUnit/Core/Tracker/ActionTest.php @@ -1,5 +1,6 @@ <?php -use Piwik\Core\Config; +use Piwik\Config; +use Piwik\Access; /** * Piwik - Open source web analytics @@ -26,7 +27,7 @@ class Tracker_ActionTest extends DatabaseTestCase { $pseudoMockAccess = new FakeAccess; FakeAccess::$superUser = true; - Piwik_Access::setSingletonInstance($pseudoMockAccess); + Access::setSingletonInstance($pseudoMockAccess); } public function getTestUrls() diff --git a/tests/PHPUnit/Core/Tracker/VisitTest.php b/tests/PHPUnit/Core/Tracker/VisitTest.php index 7441bb6fe4..73514c7953 100644 --- a/tests/PHPUnit/Core/Tracker/VisitTest.php +++ b/tests/PHPUnit/Core/Tracker/VisitTest.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\Access; + class Tracker_VisitTest extends DatabaseTestCase { public function setUp() @@ -14,7 +16,7 @@ class Tracker_VisitTest extends DatabaseTestCase // setup the access layer $pseudoMockAccess = new FakeAccess; FakeAccess::$superUser = true; - Piwik_Access::setSingletonInstance($pseudoMockAccess); + Access::setSingletonInstance($pseudoMockAccess); Piwik_PluginsManager::getInstance()->loadPlugins(array('SitesManager')); } diff --git a/tests/PHPUnit/Core/TranslationWriterTest.php b/tests/PHPUnit/Core/TranslationWriterTest.php index 6b36c76dbf..c508bc2728 100644 --- a/tests/PHPUnit/Core/TranslationWriterTest.php +++ b/tests/PHPUnit/Core/TranslationWriterTest.php @@ -1,5 +1,5 @@ <?php -use Piwik\Core\Common; +use Piwik\Common; /** * Piwik - Open source web analytics diff --git a/tests/PHPUnit/Core/UrlTest.php b/tests/PHPUnit/Core/UrlTest.php index 8bb62b9b70..1866d74128 100644 --- a/tests/PHPUnit/Core/UrlTest.php +++ b/tests/PHPUnit/Core/UrlTest.php @@ -1,5 +1,5 @@ <?php -use Piwik\Core\Config; +use Piwik\Config; /** * Piwik - Open source web analytics diff --git a/tests/PHPUnit/DatabaseTestCase.php b/tests/PHPUnit/DatabaseTestCase.php index e432767b5b..edce58a99b 100644 --- a/tests/PHPUnit/DatabaseTestCase.php +++ b/tests/PHPUnit/DatabaseTestCase.php @@ -5,8 +5,8 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -use Piwik\Core\Config; -use Piwik\Core\Piwik; +use Piwik\Config; +use Piwik\Piwik; /** * Tests extending DatabaseTestCase are much slower to run: the setUp will diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php index a0a474af1d..8cd88282d5 100644 --- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php +++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.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\Access; /** * Imports visits from several log files using the python log importer. @@ -191,7 +192,7 @@ class Test_Piwik_Fixture_ManySitesImportedLogs extends Test_Piwik_BaseFixture } // needed by tests that use stored segments w/ the proxy index.php -class Test_Piwik_Access_OverrideLogin extends Piwik_Access +class Test_Access_OverrideLogin extends Access { public function getLogin() { diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php index dfb515b713..3f9a92e021 100644 --- a/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php +++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php @@ -5,7 +5,7 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -use Piwik\Core\Common; +use Piwik\Common; require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php'; diff --git a/tests/PHPUnit/Fixtures/TwoSitesWithAnnotations.php b/tests/PHPUnit/Fixtures/TwoSitesWithAnnotations.php index 7344f79f4a..2c986b337c 100644 --- a/tests/PHPUnit/Fixtures/TwoSitesWithAnnotations.php +++ b/tests/PHPUnit/Fixtures/TwoSitesWithAnnotations.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\Access; /** * A fixture that adds two websites and annotations for each website. @@ -31,7 +32,7 @@ class Test_Piwik_Fixture_TwoSitesWithAnnotations extends Test_Piwik_BaseFixture // create fake access for fake username $access = new FakeAccess(); FakeAccess::$superUser = true; - Piwik_Access::setSingletonInstance($access); + Access::setSingletonInstance($access); // add two annotations per week for three months, starring every third annotation // first month in 2011, second two in 2012 diff --git a/tests/PHPUnit/Integration/AnnotationsTest.php b/tests/PHPUnit/Integration/AnnotationsTest.php index 1e9995eeb5..d37d18a359 100755 --- a/tests/PHPUnit/Integration/AnnotationsTest.php +++ b/tests/PHPUnit/Integration/AnnotationsTest.php @@ -6,6 +6,8 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\Access; + class AnnotationsTest extends IntegrationTestCase { public static $fixture = null; @@ -306,7 +308,7 @@ class AnnotationsTest extends IntegrationTestCase FakeAccess::$superUser = false; FakeAccess::$idSitesAdmin = $hasAdminAccess ? array(self::$fixture->idSite1) : array(); FakeAccess::$idSitesView = $hasViewAccess ? array(self::$fixture->idSite1) : array(); - Piwik_Access::setSingletonInstance($access); + Access::setSingletonInstance($access); if ($checkException) { try { diff --git a/tests/PHPUnit/Integration/ArchiveCronTest.php b/tests/PHPUnit/Integration/ArchiveCronTest.php index ad0bbe3aae..eb49013b5d 100644 --- a/tests/PHPUnit/Integration/ArchiveCronTest.php +++ b/tests/PHPUnit/Integration/ArchiveCronTest.php @@ -5,7 +5,8 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -use Piwik\Core\Piwik; +use Piwik\Piwik; +use Piwik\Access; /** * Tests the archive.php cron script. @@ -16,7 +17,7 @@ class Test_Piwik_Integration_ArchiveCronTest extends IntegrationTestCase public static function createAccessInstance() { - Piwik_Access::setSingletonInstance($access = new Test_Piwik_Access_OverrideLogin()); + Access::setSingletonInstance($access = new Test_Access_OverrideLogin()); Piwik_PostEvent('FrontController.initAuthenticationObject'); } diff --git a/tests/PHPUnit/Integration/BlobReportLimitingTest.php b/tests/PHPUnit/Integration/BlobReportLimitingTest.php index 2f0389774a..367bfd21bf 100755 --- a/tests/PHPUnit/Integration/BlobReportLimitingTest.php +++ b/tests/PHPUnit/Integration/BlobReportLimitingTest.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -use Piwik\Core\Config; +use Piwik\Config; require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/MockLocationProvider.php'; diff --git a/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php b/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php index 9ff5d73aba..89eaf8b7f4 100755 --- a/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php +++ b/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php @@ -5,7 +5,7 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -use Piwik\Core\Piwik; +use Piwik\Piwik; /** * Tests API methods after ecommerce orders are tracked. diff --git a/tests/PHPUnit/Integration/ImportLogsTest.php b/tests/PHPUnit/Integration/ImportLogsTest.php index b8a52369b6..795cece9df 100755 --- a/tests/PHPUnit/Integration/ImportLogsTest.php +++ b/tests/PHPUnit/Integration/ImportLogsTest.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\Access; /** * Tests the log importer. @@ -54,7 +55,7 @@ class Test_Piwik_Integration_ImportLogs extends IntegrationTestCase self::$fixture->logVisitsWithDynamicResolver(); // reload access so new sites are viewable - Piwik_Access::getInstance()->setSuperUser(true); + Access::getInstance()->setSuperUser(true); // make sure sites aren't created twice $piwikDotNet = Piwik_SitesManager_API::getInstance()->getSitesIdFromSiteUrl('http://piwik.net'); diff --git a/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRange_ArchivingTestsTest.php b/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRange_ArchivingTestsTest.php index b8a4520456..78efdcaf57 100755 --- a/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRange_ArchivingTestsTest.php +++ b/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRange_ArchivingTestsTest.php @@ -5,8 +5,8 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -use Piwik\Core\Piwik; -use Piwik\Core\Common; +use Piwik\Piwik; +use Piwik\Common; /** * Tests some API using range periods & makes sure the correct amount of blob/numeric diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchVisitorTypeTest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchVisitorTypeTest.php index fa43ef7cea..a36b5ec809 100755 --- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchVisitorTypeTest.php +++ b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchVisitorTypeTest.php @@ -5,7 +5,7 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -use Piwik\Core\Common; +use Piwik\Common; /** * Tests use of custom variable segments. diff --git a/tests/PHPUnit/Integration/UrlNormalizationTest.php b/tests/PHPUnit/Integration/UrlNormalizationTest.php index cf0237bcc3..32fc1fffbd 100644 --- a/tests/PHPUnit/Integration/UrlNormalizationTest.php +++ b/tests/PHPUnit/Integration/UrlNormalizationTest.php @@ -1,5 +1,5 @@ <?php -use Piwik\Core\Common; +use Piwik\Common; /** * Tests the URL normalization. diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php index 624efa9b55..961f8d02a5 100755 --- a/tests/PHPUnit/IntegrationTestCase.php +++ b/tests/PHPUnit/IntegrationTestCase.php @@ -5,9 +5,10 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -use Piwik\Core\Config; -use Piwik\Core\Piwik; -use Piwik\Core\Common; +use Piwik\Config; +use Piwik\Piwik; +use Piwik\Common; +use Piwik\Access; require_once PIWIK_INCLUDE_PATH . '/libs/PiwikTracker/PiwikTracker.php'; @@ -39,8 +40,8 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase */ public static function createAccessInstance() { - Piwik_Access::setSingletonInstance(null); - Piwik_Access::getInstance(); + Access::setSingletonInstance(null); + Access::getInstance(); Piwik_PostEvent('FrontController.initAuthenticationObject'); } diff --git a/tests/PHPUnit/Plugins/LanguagesManagerTest.php b/tests/PHPUnit/Plugins/LanguagesManagerTest.php index 2b0571460c..4f12ebcf63 100755 --- a/tests/PHPUnit/Plugins/LanguagesManagerTest.php +++ b/tests/PHPUnit/Plugins/LanguagesManagerTest.php @@ -5,7 +5,7 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -use Piwik\Core\Common; +use Piwik\Common; require_once 'LanguagesManager/API.php'; diff --git a/tests/PHPUnit/Plugins/LoginTest.php b/tests/PHPUnit/Plugins/LoginTest.php index e6b00deada..39799719fa 100644 --- a/tests/PHPUnit/Plugins/LoginTest.php +++ b/tests/PHPUnit/Plugins/LoginTest.php @@ -5,8 +5,9 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -use Piwik\Core\Config; -use Piwik\Core\Piwik; +use Piwik\Config; +use Piwik\Piwik; +use Piwik\Access; require_once 'Login/Auth.php'; @@ -23,7 +24,7 @@ class LoginTest extends DatabaseTestCase //finally we set the user as a super user by default FakeAccess::$superUser = true; - Piwik_Access::setSingletonInstance($pseudoMockAccess); + Access::setSingletonInstance($pseudoMockAccess); // we make sure the tests don't depend on the config file content Config::getInstance()->superuser = array( @@ -42,7 +43,7 @@ class LoginTest extends DatabaseTestCase // no login; no token auth $auth = new Piwik_Login_Auth(); $rc = $auth->authenticate(); - $this->assertEquals(Piwik_Auth_Result::FAILURE, $rc->getCode()); + $this->assertEquals(AuthResult::FAILURE, $rc->getCode()); } /** @@ -55,7 +56,7 @@ class LoginTest extends DatabaseTestCase $auth = new Piwik_Login_Auth(); $auth->setLogin(''); $rc = $auth->authenticate(); - $this->assertEquals(Piwik_Auth_Result::FAILURE, $rc->getCode()); + $this->assertEquals(AuthResult::FAILURE, $rc->getCode()); } /** @@ -68,7 +69,7 @@ class LoginTest extends DatabaseTestCase $auth = new Piwik_Login_Auth(); $auth->setLogin('nobody'); $rc = $auth->authenticate(); - $this->assertEquals(Piwik_Auth_Result::FAILURE, $rc->getCode()); + $this->assertEquals(AuthResult::FAILURE, $rc->getCode()); } /** @@ -82,7 +83,7 @@ class LoginTest extends DatabaseTestCase $auth->setLogin('anonymous'); $auth->setTokenAuth(''); $rc = $auth->authenticate(); - $this->assertEquals(Piwik_Auth_Result::FAILURE, $rc->getCode()); + $this->assertEquals(AuthResult::FAILURE, $rc->getCode()); } /** @@ -96,7 +97,7 @@ class LoginTest extends DatabaseTestCase $auth->setLogin(''); $auth->setTokenAuth('anonymous'); $rc = $auth->authenticate(); - $this->assertEquals(Piwik_Auth_Result::FAILURE, $rc->getCode()); + $this->assertEquals(AuthResult::FAILURE, $rc->getCode()); } /** @@ -110,7 +111,7 @@ class LoginTest extends DatabaseTestCase $auth->setLogin(null); $auth->setTokenAuth('anonymous'); $rc = $auth->authenticate(); - $this->assertEquals(Piwik_Auth_Result::FAILURE, $rc->getCode()); + $this->assertEquals(AuthResult::FAILURE, $rc->getCode()); } /** @@ -124,7 +125,7 @@ class LoginTest extends DatabaseTestCase $auth->setLogin('anonymous'); $auth->setTokenAuth('anonymous'); $rc = $auth->authenticate(); - $this->assertEquals(Piwik_Auth_Result::FAILURE, $rc->getCode()); + $this->assertEquals(AuthResult::FAILURE, $rc->getCode()); } /** @@ -140,7 +141,7 @@ class LoginTest extends DatabaseTestCase $auth->setLogin('anonymous'); $auth->setTokenAuth(''); $rc = $auth->authenticate(); - $this->assertEquals(Piwik_Auth_Result::FAILURE, $rc->getCode()); + $this->assertEquals(AuthResult::FAILURE, $rc->getCode()); } /** @@ -156,7 +157,7 @@ class LoginTest extends DatabaseTestCase $auth->setLogin(''); $auth->setTokenAuth('anonymous'); $rc = $auth->authenticate(); - $this->assertEquals(Piwik_Auth_Result::FAILURE, $rc->getCode()); + $this->assertEquals(AuthResult::FAILURE, $rc->getCode()); } /** @@ -172,7 +173,7 @@ class LoginTest extends DatabaseTestCase $auth->setLogin('anonymous'); $auth->setTokenAuth(0); $rc = $auth->authenticate(); - $this->assertEquals(Piwik_Auth_Result::FAILURE, $rc->getCode()); + $this->assertEquals(AuthResult::FAILURE, $rc->getCode()); } /** @@ -188,7 +189,7 @@ class LoginTest extends DatabaseTestCase $auth->setLogin(null); $auth->setTokenAuth('anonymous'); $rc = $auth->authenticate(); - $this->assertEquals(Piwik_Auth_Result::SUCCESS, $rc->getCode()); + $this->assertEquals(AuthResult::SUCCESS, $rc->getCode()); } /** @@ -204,7 +205,7 @@ class LoginTest extends DatabaseTestCase $auth->setLogin('anonymous'); $auth->setTokenAuth('anonymous'); $rc = $auth->authenticate(); - $this->assertEquals(Piwik_Auth_Result::SUCCESS, $rc->getCode()); + $this->assertEquals(AuthResult::SUCCESS, $rc->getCode()); } protected function _setUpUser() @@ -232,7 +233,7 @@ class LoginTest extends DatabaseTestCase $auth->setLogin($user['login']); $auth->setTokenAuth(''); $rc = $auth->authenticate(); - $this->assertEquals(Piwik_Auth_Result::FAILURE, $rc->getCode()); + $this->assertEquals(AuthResult::FAILURE, $rc->getCode()); } /** @@ -248,7 +249,7 @@ class LoginTest extends DatabaseTestCase $auth->setLogin($user['login']); $auth->setTokenAuth($user['password']); $rc = $auth->authenticate(); - $this->assertEquals(Piwik_Auth_Result::FAILURE, $rc->getCode()); + $this->assertEquals(AuthResult::FAILURE, $rc->getCode()); } /** @@ -264,7 +265,7 @@ class LoginTest extends DatabaseTestCase $auth->setLogin($user['login']); $auth->setTokenAuth(md5($user['password'])); $rc = $auth->authenticate(); - $this->assertEquals(Piwik_Auth_Result::FAILURE, $rc->getCode()); + $this->assertEquals(AuthResult::FAILURE, $rc->getCode()); } /** @@ -280,7 +281,7 @@ class LoginTest extends DatabaseTestCase $auth->setLogin(''); $auth->setTokenAuth($user['tokenAuth']); $rc = $auth->authenticate(); - $this->assertEquals(Piwik_Auth_Result::FAILURE, $rc->getCode()); + $this->assertEquals(AuthResult::FAILURE, $rc->getCode()); } /** @@ -296,7 +297,7 @@ class LoginTest extends DatabaseTestCase $auth->setLogin(0); $auth->setTokenAuth(0); $rc = $auth->authenticate(); - $this->assertEquals(Piwik_Auth_Result::FAILURE, $rc->getCode()); + $this->assertEquals(AuthResult::FAILURE, $rc->getCode()); } /** @@ -312,7 +313,7 @@ class LoginTest extends DatabaseTestCase $auth->setLogin(0); $auth->setTokenAuth($user['tokenAuth']); $rc = $auth->authenticate(); - $this->assertEquals(Piwik_Auth_Result::FAILURE, $rc->getCode()); + $this->assertEquals(AuthResult::FAILURE, $rc->getCode()); } /** @@ -328,7 +329,7 @@ class LoginTest extends DatabaseTestCase $auth->setLogin($user['login']); $auth->setTokenAuth(0); $rc = $auth->authenticate(); - $this->assertEquals(Piwik_Auth_Result::FAILURE, $rc->getCode()); + $this->assertEquals(AuthResult::FAILURE, $rc->getCode()); } /** @@ -344,7 +345,7 @@ class LoginTest extends DatabaseTestCase $auth->setLogin(null); $auth->setTokenAuth($user['tokenAuth']); $rc = $auth->authenticate(); - $this->assertEquals(Piwik_Auth_Result::SUCCESS, $rc->getCode()); + $this->assertEquals(AuthResult::SUCCESS, $rc->getCode()); } /** @@ -360,7 +361,7 @@ class LoginTest extends DatabaseTestCase $auth->setLogin($user['login']); $auth->setTokenAuth($user['tokenAuth']); $rc = $auth->authenticate(); - $this->assertEquals(Piwik_Auth_Result::SUCCESS, $rc->getCode()); + $this->assertEquals(AuthResult::SUCCESS, $rc->getCode()); } /** @@ -377,7 +378,7 @@ class LoginTest extends DatabaseTestCase $hash = $auth->getHashTokenAuth($user['login'], $user['tokenAuth']); $auth->setTokenAuth($hash); $rc = $auth->authenticate(); - $this->assertEquals(Piwik_Auth_Result::SUCCESS, $rc->getCode()); + $this->assertEquals(AuthResult::SUCCESS, $rc->getCode()); } /** @@ -395,7 +396,7 @@ class LoginTest extends DatabaseTestCase $auth->setLogin($user['login']); $auth->setTokenAuth(''); $rc = $auth->authenticate(); - $this->assertEquals(Piwik_Auth_Result::FAILURE, $rc->getCode()); + $this->assertEquals(AuthResult::FAILURE, $rc->getCode()); } /** @@ -413,7 +414,7 @@ class LoginTest extends DatabaseTestCase $auth->setLogin($user['login']); $auth->setTokenAuth($user['password']); $rc = $auth->authenticate(); - $this->assertEquals(Piwik_Auth_Result::FAILURE, $rc->getCode()); + $this->assertEquals(AuthResult::FAILURE, $rc->getCode()); } /** @@ -431,7 +432,7 @@ class LoginTest extends DatabaseTestCase $auth->setLogin($user['login']); $auth->setTokenAuth($password); $rc = $auth->authenticate(); - $this->assertEquals(Piwik_Auth_Result::FAILURE, $rc->getCode()); + $this->assertEquals(AuthResult::FAILURE, $rc->getCode()); } /** @@ -449,7 +450,7 @@ class LoginTest extends DatabaseTestCase $auth->setLogin(''); $auth->setTokenAuth($tokenAuth); $rc = $auth->authenticate(); - $this->assertEquals(Piwik_Auth_Result::FAILURE, $rc->getCode()); + $this->assertEquals(AuthResult::FAILURE, $rc->getCode()); } /** @@ -467,7 +468,7 @@ class LoginTest extends DatabaseTestCase $auth->setLogin($user['login']); $auth->setTokenAuth(0); $rc = $auth->authenticate(); - $this->assertEquals(Piwik_Auth_Result::FAILURE, $rc->getCode()); + $this->assertEquals(AuthResult::FAILURE, $rc->getCode()); } /** @@ -485,7 +486,7 @@ class LoginTest extends DatabaseTestCase $auth->setLogin(null); $auth->setTokenAuth($tokenAuth); $rc = $auth->authenticate(); - $this->assertEquals(Piwik_Auth_Result::SUCCESS_SUPERUSER_AUTH_CODE, $rc->getCode()); + $this->assertEquals(AuthResult::SUCCESS_SUPERUSER_AUTH_CODE, $rc->getCode()); } /** @@ -503,7 +504,7 @@ class LoginTest extends DatabaseTestCase $auth->setLogin($user['login']); $auth->setTokenAuth($tokenAuth); $rc = $auth->authenticate(); - $this->assertEquals(Piwik_Auth_Result::SUCCESS_SUPERUSER_AUTH_CODE, $rc->getCode()); + $this->assertEquals(AuthResult::SUCCESS_SUPERUSER_AUTH_CODE, $rc->getCode()); } /** @@ -522,6 +523,6 @@ class LoginTest extends DatabaseTestCase $hash = $auth->getHashTokenAuth($user['login'], $tokenAuth); $auth->setTokenAuth($hash); $rc = $auth->authenticate(); - $this->assertEquals(Piwik_Auth_Result::SUCCESS_SUPERUSER_AUTH_CODE, $rc->getCode()); + $this->assertEquals(AuthResult::SUCCESS_SUPERUSER_AUTH_CODE, $rc->getCode()); } } diff --git a/tests/PHPUnit/Plugins/MobileMessagingTest.php b/tests/PHPUnit/Plugins/MobileMessagingTest.php index 648038220f..7460f51cbe 100644 --- a/tests/PHPUnit/Plugins/MobileMessagingTest.php +++ b/tests/PHPUnit/Plugins/MobileMessagingTest.php @@ -6,6 +6,8 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\Access; + class MobileMessagingTest extends DatabaseTestCase { protected $idSiteAccess; @@ -18,7 +20,7 @@ class MobileMessagingTest extends DatabaseTestCase $pseudoMockAccess = new FakeAccess; FakeAccess::$superUser = true; //finally we set the user as a super user by default - Piwik_Access::setSingletonInstance($pseudoMockAccess); + Access::setSingletonInstance($pseudoMockAccess); $this->idSiteAccess = Piwik_SitesManager_API::getInstance()->addSite("test", "http://test"); diff --git a/tests/PHPUnit/Plugins/MultiSitesTest.php b/tests/PHPUnit/Plugins/MultiSitesTest.php index eab6e15bfb..c1765dd08b 100644 --- a/tests/PHPUnit/Plugins/MultiSitesTest.php +++ b/tests/PHPUnit/Plugins/MultiSitesTest.php @@ -6,6 +6,8 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\Access; + class MultiSitesTest extends DatabaseTestCase { protected $idSiteAccess; @@ -14,7 +16,7 @@ class MultiSitesTest extends DatabaseTestCase { parent::setUp(); - $access = Piwik_Access::getInstance(); + $access = Access::getInstance(); $access->setSuperUser(true); $this->idSiteAccess = Piwik_SitesManager_API::getInstance()->addSite("test", "http://test"); diff --git a/tests/PHPUnit/Plugins/PDFReportsTest.php b/tests/PHPUnit/Plugins/PDFReportsTest.php index a643a8bd4c..ce5a7333f7 100644 --- a/tests/PHPUnit/Plugins/PDFReportsTest.php +++ b/tests/PHPUnit/Plugins/PDFReportsTest.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\Access; + require_once 'PDFReports/PDFReports.php'; class PDFReportsTest extends DatabaseTestCase @@ -208,7 +210,7 @@ class PDFReportsTest extends DatabaseTestCase { $anonymousAccess = new FakeAccess; FakeAccess::$identity = 'anonymous'; - Piwik_Access::setSingletonInstance($anonymousAccess); + Access::setSingletonInstance($anonymousAccess); $pdfReportPlugin = new Piwik_PDFReports(); $this->assertEquals( @@ -497,6 +499,6 @@ class PDFReportsTest extends DatabaseTestCase { $pseudoMockAccess = new FakeAccess; FakeAccess::$superUser = true; - Piwik_Access::setSingletonInstance($pseudoMockAccess); + Access::setSingletonInstance($pseudoMockAccess); } } diff --git a/tests/PHPUnit/Plugins/PrivacyManagerTest.php b/tests/PHPUnit/Plugins/PrivacyManagerTest.php index 3c8c32cd10..770efaa445 100755 --- a/tests/PHPUnit/Plugins/PrivacyManagerTest.php +++ b/tests/PHPUnit/Plugins/PrivacyManagerTest.php @@ -5,9 +5,9 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -use Piwik\Core\Config; -use Piwik\Core\Piwik; -use Piwik\Core\Common; +use Piwik\Config; +use Piwik\Piwik; +use Piwik\Common; require_once 'PrivacyManager/PrivacyManager.php'; @@ -754,7 +754,7 @@ class PrivacyManagerTest extends IntegrationTestCase $this->assertEquals(27, $this->_getTableCount('log_action')); $archiveTables = self::_getArchiveTableNames(); -// var_export(Piwik_FetchAll("SELECT * FROM " . Piwik_Common::prefixTable($archiveTables['numeric'][0]))); +// var_export(Piwik_FetchAll("SELECT * FROM " . Common::prefixTable($archiveTables['numeric'][0]))); $janMetricCount = $this->_getExpectedNumericArchiveCountJan(); $this->assertEquals($janMetricCount, $this->_getTableCount($archiveTables['numeric'][0])); // January diff --git a/tests/PHPUnit/Plugins/SEOTest.php b/tests/PHPUnit/Plugins/SEOTest.php index d74c281ed5..23010423a1 100644 --- a/tests/PHPUnit/Plugins/SEOTest.php +++ b/tests/PHPUnit/Plugins/SEOTest.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\Access; + class SEOTest extends PHPUnit_Framework_TestCase { public function setUp() @@ -18,7 +20,7 @@ class SEOTest extends PHPUnit_Framework_TestCase //finally we set the user as a super user by default FakeAccess::$superUser = true; - Piwik_Access::setSingletonInstance($pseudoMockAccess); + Access::setSingletonInstance($pseudoMockAccess); $user_agents = array( 'Mozilla/6.0 (Macintosh; I; Intel Mac OS X 11_7_9; de-LI; rv:1.9b4) Gecko/2012010317 Firefox/10.0a4', diff --git a/tests/PHPUnit/Plugins/SegmentEditorTest.php b/tests/PHPUnit/Plugins/SegmentEditorTest.php index 18b0fabd68..115ff2d057 100644 --- a/tests/PHPUnit/Plugins/SegmentEditorTest.php +++ b/tests/PHPUnit/Plugins/SegmentEditorTest.php @@ -1,5 +1,6 @@ <?php -use Piwik\Core\Piwik; +use Piwik\Piwik; +use Piwik\Access; /** * Piwik - Open source web analytics @@ -24,7 +25,7 @@ class SegmentEditorTest extends DatabaseTestCase //finally we set the user as a super user by default FakeAccess::$superUser = true; FakeAccess::$superUserLogin = 'superusertest'; - Piwik_Access::setSingletonInstance($pseudoMockAccess); + Access::setSingletonInstance($pseudoMockAccess); Piwik_SitesManager_API::getInstance()->addSite('test', 'http://example.org'); } diff --git a/tests/PHPUnit/Plugins/SitesManagerTest.php b/tests/PHPUnit/Plugins/SitesManagerTest.php index 68a3302390..05cfb24095 100644 --- a/tests/PHPUnit/Plugins/SitesManagerTest.php +++ b/tests/PHPUnit/Plugins/SitesManagerTest.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\Access; + class SitesManagerTest extends DatabaseTestCase { public function setUp() @@ -14,7 +16,7 @@ class SitesManagerTest extends DatabaseTestCase // setup the access layer $pseudoMockAccess = new FakeAccess; FakeAccess::$superUser = true; - Piwik_Access::setSingletonInstance($pseudoMockAccess); + Access::setSingletonInstance($pseudoMockAccess); } /** @@ -953,7 +955,7 @@ class SitesManagerTest extends DatabaseTestCase $idsite = Piwik_SitesManager_API::getInstance()->addSite("site2", array("http://piwik.com", "http://piwik.net")); $idsite = Piwik_SitesManager_API::getInstance()->addSite("site3", array("http://piwik.com", "http://piwik.org")); - $saveAccess = Piwik_Access::getInstance(); + $saveAccess = Access::getInstance(); Piwik_UsersManager_API::getInstance()->addUser("user1", "geqgegagae", "tegst@tesgt.com", "alias"); Piwik_UsersManager_API::getInstance()->setUserAccess("user1", "view", array(1)); @@ -971,7 +973,7 @@ class SitesManagerTest extends DatabaseTestCase FakeAccess::$identity = 'user1'; FakeAccess::setIdSitesView(array(1)); FakeAccess::setIdSitesAdmin(array()); - Piwik_Access::setSingletonInstance($pseudoMockAccess); + Access::setSingletonInstance($pseudoMockAccess); $idsites = Piwik_SitesManager_API::getInstance()->getSitesIdFromSiteUrl('http://piwik.com'); $this->assertEquals(1, count($idsites)); @@ -986,7 +988,7 @@ class SitesManagerTest extends DatabaseTestCase FakeAccess::$identity = 'user2'; FakeAccess::setIdSitesView(array(1)); FakeAccess::setIdSitesAdmin(array(3)); - Piwik_Access::setSingletonInstance($pseudoMockAccess); + Access::setSingletonInstance($pseudoMockAccess); $idsites = Piwik_SitesManager_API::getInstance()->getSitesIdFromSiteUrl('http://piwik.com'); $this->assertEquals(2, count($idsites)); @@ -995,11 +997,11 @@ class SitesManagerTest extends DatabaseTestCase FakeAccess::$identity = 'user3'; FakeAccess::setIdSitesView(array(1, 2)); FakeAccess::setIdSitesAdmin(array(3)); - Piwik_Access::setSingletonInstance($pseudoMockAccess); + Access::setSingletonInstance($pseudoMockAccess); $idsites = Piwik_SitesManager_API::getInstance()->getSitesIdFromSiteUrl('http://piwik.com'); $this->assertEquals(3, count($idsites)); - Piwik_Access::setSingletonInstance($saveAccess); + Access::setSingletonInstance($saveAccess); } /** diff --git a/tests/PHPUnit/Plugins/UserCountryTest.php b/tests/PHPUnit/Plugins/UserCountryTest.php index 1f4e20b766..effc0b64a9 100644 --- a/tests/PHPUnit/Plugins/UserCountryTest.php +++ b/tests/PHPUnit/Plugins/UserCountryTest.php @@ -5,7 +5,7 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -use Piwik\Core\Piwik; +use Piwik\Piwik; require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/UserCountry.php'; require_once 'UserCountry/functions.php'; diff --git a/tests/PHPUnit/Plugins/UsersManagerTest.php b/tests/PHPUnit/Plugins/UsersManagerTest.php index e720a0082b..9144c67037 100644 --- a/tests/PHPUnit/Plugins/UsersManagerTest.php +++ b/tests/PHPUnit/Plugins/UsersManagerTest.php @@ -1,5 +1,6 @@ <?php -use Piwik\Core\Config; +use Piwik\Config; +use Piwik\Access; /** * Piwik - Open source web analytics @@ -24,7 +25,7 @@ class UsersManagerTest extends DatabaseTestCase //finally we set the user as a super user by default FakeAccess::$superUser = true; FakeAccess::$superUserLogin = 'superusertest'; - Piwik_Access::setSingletonInstance($pseudoMockAccess); + Access::setSingletonInstance($pseudoMockAccess); // we make sure the tests don't depend on the config file content Config::getInstance()->superuser = array( diff --git a/tests/PHPUnit/UI/UIIntegrationTest.php b/tests/PHPUnit/UI/UIIntegrationTest.php index 905ca23d1f..04cd86d70b 100644 --- a/tests/PHPUnit/UI/UIIntegrationTest.php +++ b/tests/PHPUnit/UI/UIIntegrationTest.php @@ -5,7 +5,8 @@ * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -use Piwik\Core\Piwik; +use Piwik\Piwik; +use Piwik\Access; /** * Tests UI code by grabbing screenshots of webpages and comparing with expected files. @@ -25,7 +26,7 @@ class Test_Piwik_Integration_UIIntegrationTest extends IntegrationTestCase public static function createAccessInstance() { - Piwik_Access::setSingletonInstance($access = new Test_Piwik_Access_OverrideLogin()); + Access::setSingletonInstance($access = new Test_Access_OverrideLogin()); Piwik_PostEvent('FrontController.initAuthenticationObject'); } diff --git a/tests/PHPUnit/bootstrap.php b/tests/PHPUnit/bootstrap.php index e31ac8cc72..67d4e43382 100644 --- a/tests/PHPUnit/bootstrap.php +++ b/tests/PHPUnit/bootstrap.php @@ -102,7 +102,7 @@ Try again. if (strpos($fetched, $expectedString) === false) { echo "\nPiwik should be running at: " . $piwikServerUrl . "\nbut this URL returned an unexpected response: '" - . substr($fetched, 0, 300) . "...'\n\n"; + . substr($fetched, 0, 700) . "...'\n\n"; exit; } } diff --git a/tests/PHPUnit/proxy/piwik.php b/tests/PHPUnit/proxy/piwik.php index 1f4c58258c..b6ccd4711f 100755 --- a/tests/PHPUnit/proxy/piwik.php +++ b/tests/PHPUnit/proxy/piwik.php @@ -11,7 +11,7 @@ // Wrapping the request inside ob_start() calls to ensure that the Test // calling us waits for the full request to process before unblocking -use Piwik\Core\Config; +use Piwik\Config; ob_start(); diff --git a/tests/resources/staticFileServer.php b/tests/resources/staticFileServer.php index 510e1794dc..3860cf1910 100644 --- a/tests/resources/staticFileServer.php +++ b/tests/resources/staticFileServer.php @@ -9,8 +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; -use Piwik\Core\Common; +use Piwik\Piwik; +use Piwik\Common; define('PIWIK_DOCUMENT_ROOT', dirname(__FILE__).'/../../'); if(file_exists(PIWIK_DOCUMENT_ROOT . '/bootstrap.php')) |