diff options
Diffstat (limited to 'tests/PHPUnit/Plugins/SitesManagerTest.php')
| -rw-r--r-- | tests/PHPUnit/Plugins/SitesManagerTest.php | 260 |
1 files changed, 131 insertions, 129 deletions
diff --git a/tests/PHPUnit/Plugins/SitesManagerTest.php b/tests/PHPUnit/Plugins/SitesManagerTest.php index 74d7ca265d..b7b6046394 100644 --- a/tests/PHPUnit/Plugins/SitesManagerTest.php +++ b/tests/PHPUnit/Plugins/SitesManagerTest.php @@ -6,6 +6,8 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ use Piwik\Access; +use Piwik\Plugins\SitesManager\API; +use Piwik\Plugins\UsersManager\API as UsersManagerAPI; use Piwik\Site; class SitesManagerTest extends DatabaseTestCase @@ -29,7 +31,7 @@ class SitesManagerTest extends DatabaseTestCase public function testAddSiteEmptyName() { try { - Piwik_SitesManager_API::getInstance()->addSite("", array("http://piwik.net")); + API::getInstance()->addSite("", array("http://piwik.net")); } catch (Exception $e) { return; } @@ -60,7 +62,7 @@ class SitesManagerTest extends DatabaseTestCase public function testAddSiteWrongUrls($url) { try { - Piwik_SitesManager_API::getInstance()->addSite("name", $url); + API::getInstance()->addSite("name", $url); } catch (Exception $e) { return; } @@ -82,10 +84,10 @@ class SitesManagerTest extends DatabaseTestCase $expectedExcludedQueryParameters = 'p1,P2,P33333'; $excludedUserAgents = " p1,P2, \nP3333 "; $expectedExcludedUserAgents = "p1,P2,P3333"; - $idsite = Piwik_SitesManager_API::getInstance()->addSite("name", "http://piwik.net/", $ecommerce = 1, + $idsite = API::getInstance()->addSite("name", "http://piwik.net/", $ecommerce = 1, $siteSearch = 1, $searchKeywordParameters = 'search,param', $searchCategoryParameters = 'cat,category', $ips, $excludedQueryParameters, $timezone, $currency, $group = null, $startDate = null, $excludedUserAgents); - $siteInfo = Piwik_SitesManager_API::getInstance()->getSiteFromId($idsite); + $siteInfo = API::getInstance()->getSiteFromId($idsite); $this->assertEquals($ips, $siteInfo['excluded_ips']); $this->assertEquals($timezone, $siteInfo['timezone']); $this->assertEquals($currency, $siteInfo['currency']); @@ -125,7 +127,7 @@ class SitesManagerTest extends DatabaseTestCase public function testAddSiteExcludedIpsNotValid($ip) { try { - Piwik_SitesManager_API::getInstance()->addSite("name", "http://piwik.net/", $ecommerce = 0, + API::getInstance()->addSite("name", "http://piwik.net/", $ecommerce = 0, $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, $ip); } catch (Exception $e) { return; @@ -143,14 +145,14 @@ class SitesManagerTest extends DatabaseTestCase { $url = "http://piwik.net/"; $urlOK = "http://piwik.net"; - $idsite = Piwik_SitesManager_API::getInstance()->addSite("name", $url); + $idsite = API::getInstance()->addSite("name", $url); $this->assertInternalType(PHPUnit_Framework_Constraint_IsType::TYPE_INT, $idsite); - $siteInfo = Piwik_SitesManager_API::getInstance()->getSiteFromId($idsite); + $siteInfo = API::getInstance()->getSiteFromId($idsite); $this->assertEquals($urlOK, $siteInfo['main_url']); $this->assertEquals(date('Y-m-d'), date('Y-m-d', strtotime($siteInfo['ts_created']))); - $siteUrls = Piwik_SitesManager_API::getInstance()->getSiteUrlsFromId($idsite); + $siteUrls = API::getInstance()->getSiteUrlsFromId($idsite); $this->assertEquals(1, count($siteUrls)); } @@ -164,13 +166,13 @@ class SitesManagerTest extends DatabaseTestCase { $urls = array("http://piwik.net/", "http://piwik.com", "https://piwik.net/test/"); $urlsOK = array("http://piwik.net", "http://piwik.com", "https://piwik.net/test"); - $idsite = Piwik_SitesManager_API::getInstance()->addSite("super website", $urls); + $idsite = API::getInstance()->addSite("super website", $urls); $this->assertInternalType(PHPUnit_Framework_Constraint_IsType::TYPE_INT, $idsite); - $siteInfo = Piwik_SitesManager_API::getInstance()->getSiteFromId($idsite); + $siteInfo = API::getInstance()->getSiteFromId($idsite); $this->assertEquals($urlsOK[0], $siteInfo['main_url']); - $siteUrls = Piwik_SitesManager_API::getInstance()->getSiteUrlsFromId($idsite); + $siteUrls = API::getInstance()->getSiteUrlsFromId($idsite); $this->assertEquals($urlsOK, $siteUrls); } @@ -183,10 +185,10 @@ class SitesManagerTest extends DatabaseTestCase public function testAddSiteStrangeName() { $name = "supertest(); ~@@()''!£\$'%%^'!£ போ"; - $idsite = Piwik_SitesManager_API::getInstance()->addSite($name, "http://piwik.net"); + $idsite = API::getInstance()->addSite($name, "http://piwik.net"); $this->assertInternalType(PHPUnit_Framework_Constraint_IsType::TYPE_INT, $idsite); - $siteInfo = Piwik_SitesManager_API::getInstance()->getSiteFromId($idsite); + $siteInfo = API::getInstance()->getSiteFromId($idsite); $this->assertEquals($name, $siteInfo['name']); } @@ -198,14 +200,14 @@ class SitesManagerTest extends DatabaseTestCase protected function _addSite() { $name = "website "; - $idsite = Piwik_SitesManager_API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/")); + $idsite = API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/")); $this->assertInternalType(PHPUnit_Framework_Constraint_IsType::TYPE_INT, $idsite); - $siteInfo = Piwik_SitesManager_API::getInstance()->getSiteFromId($idsite); + $siteInfo = API::getInstance()->getSiteFromId($idsite); $this->assertEquals($name, $siteInfo['name']); $this->assertEquals("http://piwik.net", $siteInfo['main_url']); - $siteUrls = Piwik_SitesManager_API::getInstance()->getSiteUrlsFromId($idsite); + $siteUrls = API::getInstance()->getSiteUrlsFromId($idsite); $this->assertEquals(array("http://piwik.net", "http://piwik.com/test"), $siteUrls); return $idsite; @@ -221,7 +223,7 @@ class SitesManagerTest extends DatabaseTestCase { $idsite = $this->_addSite(); - $siteUrlsBefore = Piwik_SitesManager_API::getInstance()->getSiteUrlsFromId($idsite); + $siteUrlsBefore = API::getInstance()->getSiteUrlsFromId($idsite); $toAdd = array("http://piwik1.net", "http://piwik2.net", @@ -239,10 +241,10 @@ class SitesManagerTest extends DatabaseTestCase "http://l42578gqege.f4", "http://super.com/test/test/atqata675675/te"); - $insertedUrls = Piwik_SitesManager_API::getInstance()->addSiteAliasUrls($idsite, $toAdd); + $insertedUrls = API::getInstance()->addSiteAliasUrls($idsite, $toAdd); $this->assertEquals(count($toAdd), $insertedUrls); - $siteUrlsAfter = Piwik_SitesManager_API::getInstance()->getSiteUrlsFromId($idsite); + $siteUrlsAfter = API::getInstance()->getSiteUrlsFromId($idsite); $shouldHave = array_merge($siteUrlsBefore, $toAddValid); sort($shouldHave); @@ -262,14 +264,14 @@ class SitesManagerTest extends DatabaseTestCase { $idsite = $this->_addSite(); - $siteUrlsBefore = Piwik_SitesManager_API::getInstance()->getSiteUrlsFromId($idsite); + $siteUrlsBefore = API::getInstance()->getSiteUrlsFromId($idsite); $toAdd = array_merge($siteUrlsBefore, array("http://piwik1.net", "http://piwik2.net")); - $insertedUrls = Piwik_SitesManager_API::getInstance()->addSiteAliasUrls($idsite, $toAdd); + $insertedUrls = API::getInstance()->addSiteAliasUrls($idsite, $toAdd); $this->assertEquals(count($toAdd) - count($siteUrlsBefore), $insertedUrls); - $siteUrlsAfter = Piwik_SitesManager_API::getInstance()->getSiteUrlsFromId($idsite); + $siteUrlsAfter = API::getInstance()->getSiteUrlsFromId($idsite); $shouldHave = $toAdd; sort($shouldHave); @@ -289,14 +291,14 @@ class SitesManagerTest extends DatabaseTestCase { $idsite = $this->_addSite(); - $siteUrlsBefore = Piwik_SitesManager_API::getInstance()->getSiteUrlsFromId($idsite); + $siteUrlsBefore = API::getInstance()->getSiteUrlsFromId($idsite); $toAdd = array(); - $insertedUrls = Piwik_SitesManager_API::getInstance()->addSiteAliasUrls($idsite, $toAdd); + $insertedUrls = API::getInstance()->addSiteAliasUrls($idsite, $toAdd); $this->assertEquals(count($toAdd), $insertedUrls); - $siteUrlsAfter = Piwik_SitesManager_API::getInstance()->getSiteUrlsFromId($idsite); + $siteUrlsAfter = API::getInstance()->getSiteUrlsFromId($idsite); $shouldHave = $siteUrlsBefore; sort($shouldHave); @@ -316,14 +318,14 @@ class SitesManagerTest extends DatabaseTestCase { $idsite = $this->_addSite(); - $siteUrlsBefore = Piwik_SitesManager_API::getInstance()->getSiteUrlsFromId($idsite); + $siteUrlsBefore = API::getInstance()->getSiteUrlsFromId($idsite); $toAdd = $siteUrlsBefore; - $insertedUrls = Piwik_SitesManager_API::getInstance()->addSiteAliasUrls($idsite, $toAdd); + $insertedUrls = API::getInstance()->addSiteAliasUrls($idsite, $toAdd); $this->assertEquals(0, $insertedUrls); - $siteUrlsAfter = Piwik_SitesManager_API::getInstance()->getSiteUrlsFromId($idsite); + $siteUrlsAfter = API::getInstance()->getSiteUrlsFromId($idsite); $shouldHave = $siteUrlsBefore; sort($shouldHave); @@ -344,7 +346,7 @@ class SitesManagerTest extends DatabaseTestCase try { $idsite = $this->_addSite(); $toAdd = array("http:mpigeq"); - $insertedUrls = Piwik_SitesManager_API::getInstance()->addSiteAliasUrls($idsite, $toAdd); + $insertedUrls = API::getInstance()->addSiteAliasUrls($idsite, $toAdd); } catch (Exception $e) { return; } @@ -361,7 +363,7 @@ class SitesManagerTest extends DatabaseTestCase { try { $toAdd = array("http://pigeq.com/test"); - $insertedUrls = Piwik_SitesManager_API::getInstance()->addSiteAliasUrls(-1, $toAdd); + $insertedUrls = API::getInstance()->addSiteAliasUrls(-1, $toAdd); } catch (Exception $e) { return; } @@ -378,7 +380,7 @@ class SitesManagerTest extends DatabaseTestCase { try { $toAdd = array("http://pigeq.com/test"); - $insertedUrls = Piwik_SitesManager_API::getInstance()->addSiteAliasUrls(155, $toAdd); + $insertedUrls = API::getInstance()->addSiteAliasUrls(155, $toAdd); } catch (Exception $e) { return; } @@ -393,7 +395,7 @@ class SitesManagerTest extends DatabaseTestCase */ public function testGetAllSitesIdNoId() { - $ids = Piwik_SitesManager_API::getInstance()->getAllSitesId(); + $ids = API::getInstance()->getAllSitesId(); $this->assertEquals(array(), $ids); } @@ -407,14 +409,14 @@ class SitesManagerTest extends DatabaseTestCase { $name = "tetq"; $idsites = array( - Piwik_SitesManager_API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/")), - Piwik_SitesManager_API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/")), - Piwik_SitesManager_API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/")), - Piwik_SitesManager_API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/")), - Piwik_SitesManager_API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/")), + API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/")), + API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/")), + API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/")), + API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/")), + API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/")), ); - $ids = Piwik_SitesManager_API::getInstance()->getAllSitesId(); + $ids = API::getInstance()->getAllSitesId(); $this->assertEquals($idsites, $ids); } @@ -427,7 +429,7 @@ class SitesManagerTest extends DatabaseTestCase public function testGetSiteFromIdWrongId1() { try { - $siteInfo = Piwik_SitesManager_API::getInstance()->getSiteFromId(0); + $siteInfo = API::getInstance()->getSiteFromId(0); } catch (Exception $e) { return; } @@ -443,7 +445,7 @@ class SitesManagerTest extends DatabaseTestCase public function testGetSiteFromIdWrongId2() { try { - $siteInfo = Piwik_SitesManager_API::getInstance()->getSiteFromId("x1"); + $siteInfo = API::getInstance()->getSiteFromId("x1"); } catch (Exception $e) { return; } @@ -458,7 +460,7 @@ class SitesManagerTest extends DatabaseTestCase */ public function testGetSiteFromIdWrongId3() { - $idsite = Piwik_SitesManager_API::getInstance()->addSite("site", array("http://piwik.net", "http://piwik.com/test/")); + $idsite = API::getInstance()->addSite("site", array("http://piwik.net", "http://piwik.com/test/")); $this->assertEquals(1, $idsite); // set noaccess to site 1 @@ -466,7 +468,7 @@ class SitesManagerTest extends DatabaseTestCase FakeAccess::setIdSitesAdmin(array()); try { - $siteInfo = Piwik_SitesManager_API::getInstance()->getSiteFromId(1); + $siteInfo = API::getInstance()->getSiteFromId(1); } catch (Exception $e) { return; } @@ -482,10 +484,10 @@ class SitesManagerTest extends DatabaseTestCase public function testGetSiteFromIdNormalId() { $name = "website ''"; - $idsite = Piwik_SitesManager_API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/")); + $idsite = API::getInstance()->addSite($name, array("http://piwik.net", "http://piwik.com/test/")); $this->assertInternalType(PHPUnit_Framework_Constraint_IsType::TYPE_INT, $idsite); - $siteInfo = Piwik_SitesManager_API::getInstance()->getSiteFromId($idsite); + $siteInfo = API::getInstance()->getSiteFromId($idsite); $this->assertEquals($name, $siteInfo['name']); $this->assertEquals("http://piwik.net", $siteInfo['main_url']); } @@ -501,7 +503,7 @@ class SitesManagerTest extends DatabaseTestCase { FakeAccess::setIdSitesAdmin(array()); - $sites = Piwik_SitesManager_API::getInstance()->getSitesWithAdminAccess(); + $sites = API::getInstance()->getSitesWithAdminAccess(); $this->assertEquals(array(), $sites); } @@ -513,9 +515,9 @@ class SitesManagerTest extends DatabaseTestCase */ public function testGetSitesWithAdminAccess() { - $idsite = Piwik_SitesManager_API::getInstance()->addSite("site1", array("http://piwik.net", "http://piwik.com/test/")); - $idsite = Piwik_SitesManager_API::getInstance()->addSite("site2", array("http://piwik.com/test/")); - $idsite = Piwik_SitesManager_API::getInstance()->addSite("site3", array("http://piwik.org")); + $idsite = API::getInstance()->addSite("site1", array("http://piwik.net", "http://piwik.com/test/")); + $idsite = API::getInstance()->addSite("site2", array("http://piwik.com/test/")); + $idsite = API::getInstance()->addSite("site3", array("http://piwik.org")); $resultWanted = array( 0 => array("idsite" => 1, "name" => "site1", "main_url" => "http://piwik.net", "ecommerce" => 0, "excluded_ips" => "", 'sitesearch' => 1, 'sitesearch_keyword_parameters' => '', 'sitesearch_category_parameters' => '', 'excluded_parameters' => '', 'excluded_user_agents' => '', 'timezone' => 'UTC', 'currency' => 'USD', 'group' => '', 'keep_url_fragment' => 0), @@ -524,7 +526,7 @@ class SitesManagerTest extends DatabaseTestCase FakeAccess::setIdSitesAdmin(array(1, 3)); - $sites = Piwik_SitesManager_API::getInstance()->getSitesWithAdminAccess(); + $sites = API::getInstance()->getSitesWithAdminAccess(); // we dont test the ts_created unset($sites[0]['ts_created']); @@ -543,7 +545,7 @@ class SitesManagerTest extends DatabaseTestCase FakeAccess::setIdSitesView(array()); FakeAccess::setIdSitesAdmin(array()); - $sites = Piwik_SitesManager_API::getInstance()->getSitesWithViewAccess(); + $sites = API::getInstance()->getSitesWithViewAccess(); $this->assertEquals(array(), $sites); } @@ -555,9 +557,9 @@ class SitesManagerTest extends DatabaseTestCase */ public function testGetSitesWithViewAccess() { - $idsite = Piwik_SitesManager_API::getInstance()->addSite("site1", array("http://piwik.net", "http://piwik.com/test/")); - $idsite = Piwik_SitesManager_API::getInstance()->addSite("site2", array("http://piwik.com/test/")); - $idsite = Piwik_SitesManager_API::getInstance()->addSite("site3", array("http://piwik.org")); + $idsite = API::getInstance()->addSite("site1", array("http://piwik.net", "http://piwik.com/test/")); + $idsite = API::getInstance()->addSite("site2", array("http://piwik.com/test/")); + $idsite = API::getInstance()->addSite("site3", array("http://piwik.org")); $resultWanted = array( 0 => array("idsite" => 1, "name" => "site1", "main_url" => "http://piwik.net", "ecommerce" => 0, 'sitesearch' => 1, 'sitesearch_keyword_parameters' => '', 'sitesearch_category_parameters' => '', "excluded_ips" => "", 'excluded_parameters' => '', 'excluded_user_agents' => '', 'timezone' => 'UTC', 'currency' => 'USD', 'group' => '', 'keep_url_fragment' => 0), @@ -567,7 +569,7 @@ class SitesManagerTest extends DatabaseTestCase FakeAccess::setIdSitesView(array(1, 3)); FakeAccess::setIdSitesAdmin(array()); - $sites = Piwik_SitesManager_API::getInstance()->getSitesWithViewAccess(); + $sites = API::getInstance()->getSitesWithViewAccess(); // we dont test the ts_created unset($sites[0]['ts_created']); unset($sites[1]['ts_created']); @@ -585,7 +587,7 @@ class SitesManagerTest extends DatabaseTestCase FakeAccess::setIdSitesView(array()); FakeAccess::setIdSitesAdmin(array()); - $sites = Piwik_SitesManager_API::getInstance()->getSitesWithAtLeastViewAccess(); + $sites = API::getInstance()->getSitesWithAtLeastViewAccess(); $this->assertEquals(array(), $sites); } @@ -597,9 +599,9 @@ class SitesManagerTest extends DatabaseTestCase */ public function testGetSitesWithAtLeastViewAccess() { - $idsite = Piwik_SitesManager_API::getInstance()->addSite("site1", array("http://piwik.net", "http://piwik.com/test/"), $ecommerce = 1); - $idsite = Piwik_SitesManager_API::getInstance()->addSite("site2", array("http://piwik.com/test/")); - $idsite = Piwik_SitesManager_API::getInstance()->addSite("site3", array("http://piwik.org")); + $idsite = API::getInstance()->addSite("site1", array("http://piwik.net", "http://piwik.com/test/"), $ecommerce = 1); + $idsite = API::getInstance()->addSite("site2", array("http://piwik.com/test/")); + $idsite = API::getInstance()->addSite("site3", array("http://piwik.org")); $resultWanted = array( 0 => array("idsite" => 1, "name" => "site1", "main_url" => "http://piwik.net", "ecommerce" => 1, "excluded_ips" => "", 'sitesearch' => 1, 'sitesearch_keyword_parameters' => '', 'sitesearch_category_parameters' => '', 'excluded_parameters' => '', 'excluded_user_agents' => '', 'timezone' => 'UTC', 'currency' => 'USD', 'group' => '', 'keep_url_fragment' => 0), @@ -609,7 +611,7 @@ class SitesManagerTest extends DatabaseTestCase FakeAccess::setIdSitesView(array(1, 3)); FakeAccess::setIdSitesAdmin(array()); - $sites = Piwik_SitesManager_API::getInstance()->getSitesWithAtLeastViewAccess(); + $sites = API::getInstance()->getSitesWithAtLeastViewAccess(); // we dont test the ts_created unset($sites[0]['ts_created']); unset($sites[1]['ts_created']); @@ -624,9 +626,9 @@ class SitesManagerTest extends DatabaseTestCase */ public function testGetSiteUrlsFromIdNoUrls() { - $idsite = Piwik_SitesManager_API::getInstance()->addSite("site1", array("http://piwik.net")); + $idsite = API::getInstance()->addSite("site1", array("http://piwik.net")); - $urls = Piwik_SitesManager_API::getInstance()->getSiteUrlsFromId($idsite); + $urls = API::getInstance()->getSiteUrlsFromId($idsite); $this->assertEquals(array("http://piwik.net"), $urls); } @@ -644,13 +646,13 @@ class SitesManagerTest extends DatabaseTestCase "http://piwik.com"); sort($site); - $idsite = Piwik_SitesManager_API::getInstance()->addSite("site1", $site); + $idsite = API::getInstance()->addSite("site1", $site); $siteWanted = array("http://piwik.net", "http://piwik.org", "http://piwik.com"); sort($siteWanted); - $urls = Piwik_SitesManager_API::getInstance()->getSiteUrlsFromId($idsite); + $urls = API::getInstance()->getSiteUrlsFromId($idsite); $this->assertEquals($siteWanted, $urls); @@ -667,7 +669,7 @@ class SitesManagerTest extends DatabaseTestCase try { FakeAccess::setIdSitesView(array(3)); FakeAccess::setIdSitesAdmin(array()); - Piwik_SitesManager_API::getInstance()->getSiteUrlsFromId(1); + API::getInstance()->getSiteUrlsFromId(1); } catch (Exception $e) { return; } @@ -686,34 +688,34 @@ class SitesManagerTest extends DatabaseTestCase "http://piwiknew.net", "http://piwiknew.org", "http://piwiknew.fr"); - $idsite = Piwik_SitesManager_API::getInstance()->addSite("site1", $urls); + $idsite = API::getInstance()->addSite("site1", $urls); $newMainUrl = "http://main.url"; // Also test that the group was set to empty, and is searchable - $websites = Piwik_SitesManager_API::getInstance()->getSitesFromGroup(''); + $websites = API::getInstance()->getSitesFromGroup(''); $this->assertEquals(1, count($websites)); // the Update doesn't change the group field - Piwik_SitesManager_API::getInstance()->updateSite($idsite, "test toto@{}", $newMainUrl); - $websites = Piwik_SitesManager_API::getInstance()->getSitesFromGroup(''); + API::getInstance()->updateSite($idsite, "test toto@{}", $newMainUrl); + $websites = API::getInstance()->getSitesFromGroup(''); $this->assertEquals(1, count($websites)); // Updating the group to something $group = 'something'; - Piwik_SitesManager_API::getInstance()->updateSite($idsite, "test toto@{}", $newMainUrl, $ecommerce = 0, $ss = true, $ss_kwd = null, $ss_cat = '', $ips = null, $parametersExclude = null, $timezone = null, $currency = null, $group); - $websites = Piwik_SitesManager_API::getInstance()->getSitesFromGroup($group); + API::getInstance()->updateSite($idsite, "test toto@{}", $newMainUrl, $ecommerce = 0, $ss = true, $ss_kwd = null, $ss_cat = '', $ips = null, $parametersExclude = null, $timezone = null, $currency = null, $group); + $websites = API::getInstance()->getSitesFromGroup($group); $this->assertEquals(1, count($websites)); $this->assertEquals(date('Y-m-d'), date('Y-m-d', strtotime($websites[0]['ts_created']))); // Updating the group to nothing $group = ''; - Piwik_SitesManager_API::getInstance()->updateSite($idsite, "test toto@{}", $newMainUrl, $ecommerce = 0, $ss = false, $ss_kwd = '', $ss_cat = null, $ips = null, $parametersExclude = null, $timezone = null, $currency = null, $group, $startDate = '2010-01-01'); - $websites = Piwik_SitesManager_API::getInstance()->getSitesFromGroup($group); + API::getInstance()->updateSite($idsite, "test toto@{}", $newMainUrl, $ecommerce = 0, $ss = false, $ss_kwd = '', $ss_cat = null, $ips = null, $parametersExclude = null, $timezone = null, $currency = null, $group, $startDate = '2010-01-01'); + $websites = API::getInstance()->getSitesFromGroup($group); $this->assertEquals(1, count($websites)); $this->assertEquals('2010-01-01', date('Y-m-d', strtotime($websites[0]['ts_created']))); - $allUrls = Piwik_SitesManager_API::getInstance()->getSiteUrlsFromId($idsite); + $allUrls = API::getInstance()->getSiteUrlsFromId($idsite); $this->assertEquals($newMainUrl, $allUrls[0]); $aliasUrls = array_slice($allUrls, 1); $this->assertEquals(array(), $aliasUrls); @@ -727,12 +729,12 @@ class SitesManagerTest extends DatabaseTestCase */ public function testUpdateSiteStrangeNameNoUrl() { - $idsite = Piwik_SitesManager_API::getInstance()->addSite("site1", "http://main.url"); + $idsite = API::getInstance()->addSite("site1", "http://main.url"); $newName = "test toto@{'786'}"; - Piwik_SitesManager_API::getInstance()->updateSite($idsite, $newName); + API::getInstance()->updateSite($idsite, $newName); - $site = Piwik_SitesManager_API::getInstance()->getSiteFromId($idsite); + $site = API::getInstance()->getSiteFromId($idsite); $this->assertEquals($newName, $site['name']); // url didn't change because parameter url NULL in updateSite @@ -754,11 +756,11 @@ class SitesManagerTest extends DatabaseTestCase "http://piwiknew.fr"); $group = 'GROUP Before'; - $idsite = Piwik_SitesManager_API::getInstance()->addSite("site1", $urls, $ecommerce = 1, + $idsite = API::getInstance()->addSite("site1", $urls, $ecommerce = 1, $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, $excludedIps = null, $excludedQueryParameters = null, $timezone = null, $currency = null, $group, $startDate = '2011-01-01'); - $websites = Piwik_SitesManager_API::getInstance()->getSitesFromGroup($group); + $websites = API::getInstance()->getSitesFromGroup($group); $this->assertEquals(1, count($websites)); $newurls = array("http://piwiknew2.com", @@ -767,25 +769,25 @@ class SitesManagerTest extends DatabaseTestCase "http://piwiknew2.fr"); $groupAfter = ' GROUP After'; - Piwik_SitesManager_API::getInstance()->updateSite($idsite, "test toto@{}", $newurls, $ecommerce = 0, + API::getInstance()->updateSite($idsite, "test toto@{}", $newurls, $ecommerce = 0, $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, $excludedIps = null, $excludedQueryParameters = null, $timezone = null, $currency = null, $groupAfter); // no result for the group before update - $websites = Piwik_SitesManager_API::getInstance()->getSitesFromGroup($group); + $websites = API::getInstance()->getSitesFromGroup($group); $this->assertEquals(0, count($websites)); // Testing that the group was updated properly (and testing that the group value is trimmed before inserted/searched) - $websites = Piwik_SitesManager_API::getInstance()->getSitesFromGroup($groupAfter . ' '); + $websites = API::getInstance()->getSitesFromGroup($groupAfter . ' '); $this->assertEquals(1, count($websites)); $this->assertEquals('2011-01-01', date('Y-m-d', strtotime($websites[0]['ts_created']))); // Test fetch website groups $expectedGroups = array(trim($groupAfter)); - $fetched = Piwik_SitesManager_API::getInstance()->getSitesGroups(); + $fetched = API::getInstance()->getSitesGroups(); $this->assertEquals($expectedGroups, $fetched); - $allUrls = Piwik_SitesManager_API::getInstance()->getSiteUrlsFromId($idsite); + $allUrls = API::getInstance()->getSiteUrlsFromId($idsite); sort($allUrls); sort($newurls); $this->assertEquals($newurls, $allUrls); @@ -801,10 +803,10 @@ class SitesManagerTest extends DatabaseTestCase $groups = array('group1', ' group1 ', '', 'group2'); $expectedGroups = array('group1', '', 'group2'); foreach ($groups as $group) { - Piwik_SitesManager_API::getInstance()->addSite("test toto@{}", 'http://example.org', $ecommerce = 1, $siteSearch = null, $searchKeywordParameters = null, $searchCategoryParameters = null, $excludedIps = null, $excludedQueryParameters = null, $timezone = null, $currency = null, $group); + API::getInstance()->addSite("test toto@{}", 'http://example.org', $ecommerce = 1, $siteSearch = null, $searchKeywordParameters = null, $searchCategoryParameters = null, $excludedIps = null, $excludedQueryParameters = null, $timezone = null, $currency = null, $group); } - $this->assertEquals($expectedGroups, Piwik_SitesManager_API::getInstance()->getSitesGroups()); + $this->assertEquals($expectedGroups, API::getInstance()->getSitesGroups()); } @@ -825,7 +827,7 @@ class SitesManagerTest extends DatabaseTestCase public function testAddSitesInvalidTimezone($timezone) { try { - $idsite = Piwik_SitesManager_API::getInstance()->addSite("site1", array('http://example.org'), $ecommerce = 0, + $idsite = API::getInstance()->addSite("site1", array('http://example.org'), $ecommerce = 0, $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, $ip = '', $params = '', $timezone); } catch (Exception $e) { return; @@ -842,7 +844,7 @@ class SitesManagerTest extends DatabaseTestCase { try { $invalidCurrency = '€'; - $idsite = Piwik_SitesManager_API::getInstance()->addSite("site1", array('http://example.org'), $ecommerce = 0, + $idsite = API::getInstance()->addSite("site1", array('http://example.org'), $ecommerce = 0, $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, '', 'UTC', $invalidCurrency); } catch (Exception $e) { return; @@ -858,17 +860,17 @@ class SitesManagerTest extends DatabaseTestCase public function testSetDefaultTimezoneAndCurrencyAndExcludedQueryParametersAndExcludedIps() { // test that they return default values - $defaultTimezone = Piwik_SitesManager_API::getInstance()->getDefaultTimezone(); + $defaultTimezone = API::getInstance()->getDefaultTimezone(); $this->assertEquals('UTC', $defaultTimezone); - $defaultCurrency = Piwik_SitesManager_API::getInstance()->getDefaultCurrency(); + $defaultCurrency = API::getInstance()->getDefaultCurrency(); $this->assertEquals('USD', $defaultCurrency); - $excludedIps = Piwik_SitesManager_API::getInstance()->getExcludedIpsGlobal(); + $excludedIps = API::getInstance()->getExcludedIpsGlobal(); $this->assertEquals('', $excludedIps); - $excludedQueryParameters = Piwik_SitesManager_API::getInstance()->getExcludedQueryParametersGlobal(); + $excludedQueryParameters = API::getInstance()->getExcludedQueryParametersGlobal(); $this->assertEquals('', $excludedQueryParameters); // test that when not specified, defaults are set as expected - $idsite = Piwik_SitesManager_API::getInstance()->addSite("site1", array('http://example.org')); + $idsite = API::getInstance()->addSite("site1", array('http://example.org')); $site = new Site($idsite); $this->assertEquals('UTC', $site->getTimezone()); $this->assertEquals('USD', $site->getCurrency()); @@ -878,33 +880,33 @@ class SitesManagerTest extends DatabaseTestCase // set the global timezone and get it $newDefaultTimezone = 'UTC+5.5'; - Piwik_SitesManager_API::getInstance()->setDefaultTimezone($newDefaultTimezone); - $defaultTimezone = Piwik_SitesManager_API::getInstance()->getDefaultTimezone(); + API::getInstance()->setDefaultTimezone($newDefaultTimezone); + $defaultTimezone = API::getInstance()->getDefaultTimezone(); $this->assertEquals($newDefaultTimezone, $defaultTimezone); // set the default currency and get it $newDefaultCurrency = 'EUR'; - Piwik_SitesManager_API::getInstance()->setDefaultCurrency($newDefaultCurrency); - $defaultCurrency = Piwik_SitesManager_API::getInstance()->getDefaultCurrency(); + API::getInstance()->setDefaultCurrency($newDefaultCurrency); + $defaultCurrency = API::getInstance()->getDefaultCurrency(); $this->assertEquals($newDefaultCurrency, $defaultCurrency); // set the global IPs to exclude and get it $newGlobalExcludedIps = '1.1.1.*,1.1.*.*,150.1.1.1'; - Piwik_SitesManager_API::getInstance()->setGlobalExcludedIps($newGlobalExcludedIps); - $globalExcludedIps = Piwik_SitesManager_API::getInstance()->getExcludedIpsGlobal(); + API::getInstance()->setGlobalExcludedIps($newGlobalExcludedIps); + $globalExcludedIps = API::getInstance()->getExcludedIpsGlobal(); $this->assertEquals($newGlobalExcludedIps, $globalExcludedIps); // set the global URL query params to exclude and get it $newGlobalExcludedQueryParameters = 'PHPSESSID,blabla, TesT'; // removed the space $expectedGlobalExcludedQueryParameters = 'PHPSESSID,blabla,TesT'; - Piwik_SitesManager_API::getInstance()->setGlobalExcludedQueryParameters($newGlobalExcludedQueryParameters); - $globalExcludedQueryParameters = Piwik_SitesManager_API::getInstance()->getExcludedQueryParametersGlobal(); + API::getInstance()->setGlobalExcludedQueryParameters($newGlobalExcludedQueryParameters); + $globalExcludedQueryParameters = API::getInstance()->getExcludedQueryParametersGlobal(); $this->assertEquals($expectedGlobalExcludedQueryParameters, $globalExcludedQueryParameters); // create a website and check that default currency and default timezone are set // however, excluded IPs and excluded query Params are not returned - $idsite = Piwik_SitesManager_API::getInstance()->addSite("site1", array('http://example.org'), $ecommerce = 0, + $idsite = API::getInstance()->addSite("site1", array('http://example.org'), $ecommerce = 0, $siteSearch = 0, $searchKeywordParameters = 'test1,test2', $searchCategoryParameters = 'test2,test1', '', '', $newDefaultTimezone); $site = new Site($idsite); @@ -928,20 +930,20 @@ class SitesManagerTest extends DatabaseTestCase */ public function testGetSitesIdFromSiteUrlSuperUser() { - $idsite = Piwik_SitesManager_API::getInstance()->addSite("site1", array("http://piwik.net", "http://piwik.com")); - $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")); + $idsite = API::getInstance()->addSite("site1", array("http://piwik.net", "http://piwik.com")); + $idsite = API::getInstance()->addSite("site2", array("http://piwik.com", "http://piwik.net")); + $idsite = API::getInstance()->addSite("site3", array("http://piwik.com", "http://piwik.org")); - $idsites = Piwik_SitesManager_API::getInstance()->getSitesIdFromSiteUrl('http://piwik.org'); + $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://piwik.org'); $this->assertTrue(count($idsites) == 1); - $idsites = Piwik_SitesManager_API::getInstance()->getSitesIdFromSiteUrl('http://www.piwik.org'); + $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://www.piwik.org'); $this->assertTrue(count($idsites) == 1); - $idsites = Piwik_SitesManager_API::getInstance()->getSitesIdFromSiteUrl('http://piwik.net'); + $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://piwik.net'); $this->assertTrue(count($idsites) == 2); - $idsites = Piwik_SitesManager_API::getInstance()->getSitesIdFromSiteUrl('http://piwik.com'); + $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://piwik.com'); $this->assertTrue(count($idsites) == 3); } @@ -952,22 +954,22 @@ class SitesManagerTest extends DatabaseTestCase */ public function testGetSitesIdFromSiteUrlUser() { - $idsite = Piwik_SitesManager_API::getInstance()->addSite("site1", array("http://www.piwik.net", "http://piwik.com")); - $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")); + $idsite = API::getInstance()->addSite("site1", array("http://www.piwik.net", "http://piwik.com")); + $idsite = API::getInstance()->addSite("site2", array("http://piwik.com", "http://piwik.net")); + $idsite = API::getInstance()->addSite("site3", array("http://piwik.com", "http://piwik.org")); $saveAccess = Access::getInstance(); - Piwik_UsersManager_API::getInstance()->addUser("user1", "geqgegagae", "tegst@tesgt.com", "alias"); - Piwik_UsersManager_API::getInstance()->setUserAccess("user1", "view", array(1)); + UsersManagerAPI::getInstance()->addUser("user1", "geqgegagae", "tegst@tesgt.com", "alias"); + UsersManagerAPI::getInstance()->setUserAccess("user1", "view", array(1)); - Piwik_UsersManager_API::getInstance()->addUser("user2", "geqgegagae", "tegst2@tesgt.com", "alias"); - Piwik_UsersManager_API::getInstance()->setUserAccess("user2", "view", array(1)); - Piwik_UsersManager_API::getInstance()->setUserAccess("user2", "admin", array(3)); + UsersManagerAPI::getInstance()->addUser("user2", "geqgegagae", "tegst2@tesgt.com", "alias"); + UsersManagerAPI::getInstance()->setUserAccess("user2", "view", array(1)); + UsersManagerAPI::getInstance()->setUserAccess("user2", "admin", array(3)); - Piwik_UsersManager_API::getInstance()->addUser("user3", "geqgegagae", "tegst3@tesgt.com", "alias"); - Piwik_UsersManager_API::getInstance()->setUserAccess("user3", "view", array(1, 2)); - Piwik_UsersManager_API::getInstance()->setUserAccess("user3", "admin", array(3)); + UsersManagerAPI::getInstance()->addUser("user3", "geqgegagae", "tegst3@tesgt.com", "alias"); + UsersManagerAPI::getInstance()->setUserAccess("user3", "view", array(1, 2)); + UsersManagerAPI::getInstance()->setUserAccess("user3", "admin", array(3)); $pseudoMockAccess = new FakeAccess; FakeAccess::$superUser = false; @@ -975,13 +977,13 @@ class SitesManagerTest extends DatabaseTestCase FakeAccess::setIdSitesView(array(1)); FakeAccess::setIdSitesAdmin(array()); Access::setSingletonInstance($pseudoMockAccess); - $idsites = Piwik_SitesManager_API::getInstance()->getSitesIdFromSiteUrl('http://piwik.com'); + $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://piwik.com'); $this->assertEquals(1, count($idsites)); // testing URL normalization - $idsites = Piwik_SitesManager_API::getInstance()->getSitesIdFromSiteUrl('http://www.piwik.com'); + $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://www.piwik.com'); $this->assertEquals(1, count($idsites)); - $idsites = Piwik_SitesManager_API::getInstance()->getSitesIdFromSiteUrl('http://piwik.net'); + $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://piwik.net'); $this->assertEquals(1, count($idsites)); $pseudoMockAccess = new FakeAccess; @@ -990,7 +992,7 @@ class SitesManagerTest extends DatabaseTestCase FakeAccess::setIdSitesView(array(1)); FakeAccess::setIdSitesAdmin(array(3)); Access::setSingletonInstance($pseudoMockAccess); - $idsites = Piwik_SitesManager_API::getInstance()->getSitesIdFromSiteUrl('http://piwik.com'); + $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://piwik.com'); $this->assertEquals(2, count($idsites)); $pseudoMockAccess = new FakeAccess; @@ -999,7 +1001,7 @@ class SitesManagerTest extends DatabaseTestCase FakeAccess::setIdSitesView(array(1, 2)); FakeAccess::setIdSitesAdmin(array(3)); Access::setSingletonInstance($pseudoMockAccess); - $idsites = Piwik_SitesManager_API::getInstance()->getSitesIdFromSiteUrl('http://piwik.com'); + $idsites = API::getInstance()->getSitesIdFromSiteUrl('http://piwik.com'); $this->assertEquals(3, count($idsites)); Access::setSingletonInstance($saveAccess); @@ -1012,11 +1014,11 @@ class SitesManagerTest extends DatabaseTestCase */ public function testGetSitesFromTimezones() { - $idsite1 = Piwik_SitesManager_API::getInstance()->addSite("site3", array("http://piwik.org"), null, $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, null, null, 'UTC'); - $idsite2 = Piwik_SitesManager_API::getInstance()->addSite("site3", array("http://piwik.org"), null, $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, null, null, 'Pacific/Auckland'); - $idsite3 = Piwik_SitesManager_API::getInstance()->addSite("site3", array("http://piwik.org"), null, $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, null, null, 'Pacific/Auckland'); - $idsite4 = Piwik_SitesManager_API::getInstance()->addSite("site3", array("http://piwik.org"), null, $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, null, null, 'UTC+10'); - $result = Piwik_SitesManager_API::getInstance()->getSitesIdFromTimezones(array('UTC+10', 'Pacific/Auckland')); + $idsite1 = API::getInstance()->addSite("site3", array("http://piwik.org"), null, $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, null, null, 'UTC'); + $idsite2 = API::getInstance()->addSite("site3", array("http://piwik.org"), null, $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, null, null, 'Pacific/Auckland'); + $idsite3 = API::getInstance()->addSite("site3", array("http://piwik.org"), null, $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, null, null, 'Pacific/Auckland'); + $idsite4 = API::getInstance()->addSite("site3", array("http://piwik.org"), null, $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, null, null, 'UTC+10'); + $result = API::getInstance()->getSitesIdFromTimezones(array('UTC+10', 'Pacific/Auckland')); $this->assertEquals(array($idsite2, $idsite3, $idsite4), $result); } } |