diff options
Diffstat (limited to 'tests/PHPUnit/Fixtures')
22 files changed, 156 insertions, 132 deletions
diff --git a/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorId.php b/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorId.php index 3768205fc6..b1f7828610 100644 --- a/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorId.php +++ b/tests/PHPUnit/Fixtures/FewVisitsWithSetVisitorId.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\Date; /** * Adds one site and tracks a couple visits using a custom visitor ID. @@ -48,13 +49,13 @@ class Test_Piwik_Fixture_FewVisitsWithSetVisitorId extends Test_Piwik_BaseFixtur // VISITOR B: few minutes later, we trigger the same tracker but with a custom visitor ID, // => this will create a new visit B - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.05)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.05)->getDatetime()); $t->setUrl('http://example.org/index2.htm'); $t->setVisitorId(Piwik_Tracker_Visit::generateUniqueVisitorId()); self::checkResponse($t->doTrackPageView('incredible title!')); // This new visit B will have 2 page views - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.1)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.1)->getDatetime()); $t->setUrl('http://example.org/index3.htm'); self::checkResponse($t->doTrackPageView('incredible title!')); diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php index 9458ccb12e..074433d85f 100644 --- a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php +++ b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php @@ -6,6 +6,8 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\Date; + require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/MockLocationProvider.php'; /** @@ -89,7 +91,7 @@ class Test_Piwik_Fixture_ManyVisitsWithGeoIP extends Test_Piwik_BaseFixture } // first visit - $date = Piwik_Date::factory($dateTime)->addDay($i); + $date = Date::factory($dateTime)->addDay($i); $t->setForceVisitDateTime($date->getDatetime()); $t->setUrl("http://piwik.net/grue/lair"); $t->setCustomVariable(1, 'Cvar 1 name', 'Cvar1 value is ' .$i , 'visit'); @@ -151,7 +153,7 @@ class Test_Piwik_Fixture_ManyVisitsWithGeoIP extends Test_Piwik_BaseFixture $t = self::getTracker($idSite, $dateTime, $defaultInit = true); $t->setVisitorId('fed33392d3a48ab2'); $t->setTokenAuth(self::getTokenAuth()); - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addDay(20)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addDay(20)->getDatetime()); $t->setIp('194.57.91.215'); $t->setCountry('us'); $t->setRegion('CA'); diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithMockLocationProvider.php b/tests/PHPUnit/Fixtures/ManyVisitsWithMockLocationProvider.php index 1d7d2f240b..be3d29c30f 100644 --- a/tests/PHPUnit/Fixtures/ManyVisitsWithMockLocationProvider.php +++ b/tests/PHPUnit/Fixtures/ManyVisitsWithMockLocationProvider.php @@ -6,6 +6,8 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ +use Piwik\Date; + require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/MockLocationProvider.php'; /** @@ -19,7 +21,7 @@ class Test_Piwik_Fixture_ManyVisitsWithMockLocationProvider extends Test_Piwik_B public function __construct() { - $this->nextDay = Piwik_Date::factory($this->dateTime)->addDay(1)->getDatetime(); + $this->nextDay = Date::factory($this->dateTime)->addDay(1)->getDatetime(); } public function setUp() @@ -122,7 +124,7 @@ class Test_Piwik_Fixture_ManyVisitsWithMockLocationProvider extends Test_Piwik_B $referrers = null, $customVars = null) { for ($i = 0; $i != 5; ++$i, ++$visitorCounter) { - $visitDate = Piwik_Date::factory($this->dateTime); + $visitDate = Date::factory($this->dateTime); $t->setNewVisitorId(); $t->setIp("156.5.3.$visitorCounter"); @@ -171,7 +173,7 @@ class Test_Piwik_Fixture_ManyVisitsWithMockLocationProvider extends Test_Piwik_B private function trackOrders($t) { - $nextDay = Piwik_Date::factory($this->nextDay); + $nextDay = Date::factory($this->nextDay); $t->setForceVisitDateTime($nextDay); for ($i = 0; $i != 25; ++$i) { diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithSubDirReferrersAndCustomVars.php b/tests/PHPUnit/Fixtures/ManyVisitsWithSubDirReferrersAndCustomVars.php index 44f19e6664..f5512fa254 100644 --- a/tests/PHPUnit/Fixtures/ManyVisitsWithSubDirReferrersAndCustomVars.php +++ b/tests/PHPUnit/Fixtures/ManyVisitsWithSubDirReferrersAndCustomVars.php @@ -6,6 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ # +use Piwik\Date; /** * Adds one site and tracks 13 visits all with custom variables and referrer URLs @@ -40,7 +41,7 @@ class Test_Piwik_Fixture_ManyVisitsWithSubDirReferrersAndCustomVars extends Test for ($referrerSite = 1; $referrerSite < 4; $referrerSite++) { for ($referrerPage = 1; $referrerPage < 3; $referrerPage++) { $offset = $referrerSite * 3 + $referrerPage; - $t = self::getTracker($idSite, Piwik_Date::factory($dateTime)->addHour($offset)->getDatetime()); + $t = self::getTracker($idSite, Date::factory($dateTime)->addHour($offset)->getDatetime()); $t->setUrlReferrer('http://www.referrer' . $referrerSite . '.com/sub/dir/page' . $referrerPage . '.html'); $t->setCustomVariable(1, 'CustomVarVisit', 'CustomVarValue' . $referrerPage, 'visit'); for ($page = 0; $page < 3; $page++) { @@ -52,7 +53,7 @@ class Test_Piwik_Fixture_ManyVisitsWithSubDirReferrersAndCustomVars extends Test } } - $t = self::getTracker($idSite, Piwik_Date::factory($dateTime)->addHour(24)->getDatetime()); + $t = self::getTracker($idSite, Date::factory($dateTime)->addHour(24)->getDatetime()); $t->setCustomVariable(1, 'CustomVarVisit', 'CustomVarValue1', 'visit'); $t->setUrl('http://example.org/sub/dir/dir1/page1.html'); $t->setCustomVariable(1, 'CustomVarPage', 'CustomVarValue1', 'page'); diff --git a/tests/PHPUnit/Fixtures/OneVisitSeveralPageViews.php b/tests/PHPUnit/Fixtures/OneVisitSeveralPageViews.php index 5570057dea..53c8dfb538 100644 --- a/tests/PHPUnit/Fixtures/OneVisitSeveralPageViews.php +++ b/tests/PHPUnit/Fixtures/OneVisitSeveralPageViews.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\Date; /** * Adds one site and tracks one visit with several pageviews. @@ -42,22 +43,22 @@ class Test_Piwik_Fixture_OneVisitSeveralPageViews extends Test_Piwik_BaseFixture self::checkResponse($t->doTrackPageView('incredible title! <>,;')); $t->setUrl('http://example.org/dir/file.php?foo=bar&foo2=bar'); - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.2)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.2)->getDatetime()); $t->setGenerationTime(123); self::checkResponse($t->doTrackPageView('incredible title! <>,;')); $t->setUrl('http://example.org/dir/file.php?foo=bar&foo2=bar2'); - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.3)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.3)->getDatetime()); $t->setGenerationTime(153); self::checkResponse($t->doTrackPageView('incredible parent title! <>,; / subtitle <>,;')); $t->setUrl('http://example.org/dir2/file.php?foo=bar&foo2=bar'); - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.4)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.4)->getDatetime()); $t->setGenerationTime(1233); self::checkResponse($t->doTrackPageView('incredible title! <>,;')); $t->setUrl('http://example.org/dir2/sub/0/file.php'); - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.4)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.4)->getDatetime()); // Very high Generation time should be ignored $t->setGenerationTime(6350000); @@ -65,7 +66,7 @@ class Test_Piwik_Fixture_OneVisitSeveralPageViews extends Test_Piwik_BaseFixture $t->setUrl('http://example.org/0'); - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.4)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.4)->getDatetime()); $t->setGenerationTime(635); self::checkResponse($t->doTrackPageView('I am URL zero!')); diff --git a/tests/PHPUnit/Fixtures/OneVisitWithAbnormalPageviewUrls.php b/tests/PHPUnit/Fixtures/OneVisitWithAbnormalPageviewUrls.php index ac67e3cb0f..638a35d5b2 100644 --- a/tests/PHPUnit/Fixtures/OneVisitWithAbnormalPageviewUrls.php +++ b/tests/PHPUnit/Fixtures/OneVisitWithAbnormalPageviewUrls.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\Date; /** * Adds one site and tracks one visit w/ pageview URLs that are not normalized. @@ -42,23 +43,23 @@ class Test_Piwik_Fixture_OneVisitWithAbnormalPageviewUrls extends Test_Piwik_Bas self::checkResponse($t->doTrackPageView('http://incredible.title/')); $t->setUrl('https://example.org/foo/bar.html'); - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.2)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.2)->getDatetime()); self::checkResponse($t->doTrackPageView('https://incredible.title/')); $t->setUrl('https://wWw.example.org/foo/bar2.html'); - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.3)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.3)->getDatetime()); self::checkResponse($t->doTrackPageView('http://www.incredible.title/')); $t->setUrl('http://WwW.example.org/foo/bar2.html'); - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.4)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.4)->getDatetime()); self::checkResponse($t->doTrackPageView('https://www.incredible.title/')); $t->setUrl('http://www.example.org/foo/bar3.html'); - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.5)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.5)->getDatetime()); self::checkResponse($t->doTrackPageView('incredible.title/')); $t->setUrl('https://example.org/foo/bar4.html'); - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.6)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.6)->getDatetime()); self::checkResponse($t->doTrackPageView('incredible.title/')); } } diff --git a/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php b/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php index fa4f246e94..64c3312628 100644 --- a/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.php +++ b/tests/PHPUnit/Fixtures/OneVisitorTwoVisits.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\Date; /** * This fixture adds one website and tracks two visits by one visitor. @@ -81,54 +82,54 @@ class Test_Piwik_Fixture_OneVisitorTwoVisits extends Test_Piwik_BaseFixture // testing that / and index.htm above record with different URLs // Recording the 2nd page after 3 minutes - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.05)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.05)->getDatetime()); $t->setUrl('http://example.org/'); $t->setGenerationTime(224); self::checkResponse($t->doTrackPageView('Second page view - should be registered as URL /')); // Click on external link after 6 minutes (3rd action) - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.1)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.1)->getDatetime()); self::checkResponse($t->doTrackAction('http://dev.piwik.org/svn', 'link')); // Click on file download after 12 minutes (4th action) - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.2)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.2)->getDatetime()); self::checkResponse($t->doTrackAction('http://piwik.org/path/again/latest.zip', 'download')); // Click on two more external links, one the same as before (5th & 6th actions) - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.22)->getDateTime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.22)->getDateTime()); self::checkResponse($t->doTrackAction('http://outlinks.org/other_outlink', 'link')); - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.25)->getDateTime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.25)->getDateTime()); self::checkResponse($t->doTrackAction('http://dev.piwik.org/svn', 'link')); // Create Goal 1: Triggered by JS, after 18 minutes $idGoal = Piwik_Goals_API::getInstance()->addGoal($idSite, 'triggered js', 'manually', '', ''); - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.3)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.3)->getDatetime()); // Change to Thai browser to ensure the conversion is credited to FR instead (the visitor initial country) $t->setBrowserLanguage('th'); self::checkResponse($t->doTrackGoal($idGoal, $revenue = 42)); // Track same Goal twice (after 24 minutes), should only be tracked once - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.4)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.4)->getDatetime()); self::checkResponse($t->doTrackGoal($idGoal, $revenue = 42)); $t->setBrowserLanguage('fr'); if ($this->useSiteSearch) { // Site Search request - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.42)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.42)->getDatetime()); $t->setUrl('http://example.org/index.htm?q=Banks Own The World'); $t->setGenerationTime(812); self::checkResponse($t->doTrackPageView('Site Search request')); // Final page view (after 27 min) - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.45)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.45)->getDatetime()); $t->setUrl('http://example.org/index.htm'); $t->setGenerationTime(24); self::checkResponse($t->doTrackPageView('Looking at homepage after site search...')); } else { // Final page view (after 27 min) - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.45)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.45)->getDatetime()); $t->setUrl('http://example.org/index.htm#ignoredFragment#'); $t->setGenerationTime(23); self::checkResponse($t->doTrackPageView('Looking at homepage (again)...')); @@ -142,7 +143,7 @@ class Test_Piwik_Fixture_OneVisitorTwoVisits extends Test_Piwik_BaseFixture // - // Start of returning visit, 1 hour after first page view - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(1)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(1)->getDatetime()); $t->setUrl('http://example.org/store/purchase.htm'); $t->setUrlReferrer('http://search.yahoo.com/search?p=purchase'); // Temporary, until we implement 1st party cookies in PiwikTracker diff --git a/tests/PHPUnit/Fixtures/SomeVisitsAllConversions.php b/tests/PHPUnit/Fixtures/SomeVisitsAllConversions.php index 670bc635df..ad47b32696 100644 --- a/tests/PHPUnit/Fixtures/SomeVisitsAllConversions.php +++ b/tests/PHPUnit/Fixtures/SomeVisitsAllConversions.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\Date; /** * Adds one site and tracks a couple conversions. @@ -55,15 +56,15 @@ class Piwik_Test_Fixture_SomeVisitsAllConversions extends Test_Piwik_BaseFixture // Record 1st goal, should only have 1 conversion $t->setUrl('http://example.org/index.htm'); - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.3)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.3)->getDatetime()); self::checkResponse($t->doTrackPageView('Thank you mate')); - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.4)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.4)->getDatetime()); self::checkResponse($t->doTrackGoal($idGoal_OneConversionPerVisit, $revenue = 10000000)); // Record 2nd goal, should record both conversions - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.5)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.5)->getDatetime()); self::checkResponse($t->doTrackGoal($idGoal_MultipleConversionPerVisit, $revenue = 300)); - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.6)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.6)->getDatetime()); self::checkResponse($t->doTrackGoal($idGoal_MultipleConversionPerVisit, $revenue = 366)); // Update & set to not allow multiple @@ -74,7 +75,7 @@ class Piwik_Test_Fixture_SomeVisitsAllConversions extends Test_Piwik_BaseFixture self::assertTrue($goal['allow_multiple'] == 1); // 1st goal should Now be tracked - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.61)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.61)->getDatetime()); self::checkResponse($t->doTrackGoal($idGoal_OneConversionPerVisit, $revenue = 656)); } } diff --git a/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php b/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php index a3752ad05c..be0e42eed9 100644 --- a/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.php +++ b/tests/PHPUnit/Fixtures/SomeVisitsCustomVariablesCampaignsNotHeuristics.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\Date; /** * Add one site and track many visits with custom variables & campaign IDs and @@ -76,13 +77,13 @@ class Test_Piwik_Fixture_SomeVisitsCustomVariablesCampaignsNotHeuristics extends $t2->setVisitorId($visitorId); // And Record a Goal: The previous visit should be updated rather than a new visit Created - $t2->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.3)->getDatetime()); + $t2->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.3)->getDatetime()); self::checkResponse($t2->doTrackGoal($idGoal, $revenue = 42.256)); // Yet another visitor, this time with a manual goal conversion, which should be credited to the campaign $t3 = self::getTracker($idSite, $dateTime); $t3->setUrlReferrer('http://example.org/referrer'); - $t3->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(1.3)->getDatetime()); + $t3->setForceVisitDateTime(Date::factory($dateTime)->addHour(1.3)->getDatetime()); // fake a website ref cookie, the campaign should be credited for conversion, not referrer.example.com nor example.org $t3->DEBUG_APPEND_URL = '&_ref=http%3A%2F%2Freferrer.example.com%2Fpage%2Fsub%3Fquery%3Dtest%26test2%3Dtest3'; $t3->setUrl('http://example.org/index.htm#pk_campaign=CREDITED TO GOAL PLEASE'); @@ -90,27 +91,27 @@ class Test_Piwik_Fixture_SomeVisitsCustomVariablesCampaignsNotHeuristics extends // visitor #4, test for blank referrer campaign keyword $t4 = self::getTracker($idSite, $dateTime); - $t4->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(3)->getDatetime()); + $t4->setForceVisitDateTime(Date::factory($dateTime)->addHour(3)->getDatetime()); $t4->setUrlReferrer('http://bing.com/search?q=whatever'); $t4->setUrl('http://example.org/index.html?utm_campaign=GA+Campaign'); self::checkResponse($t4->doTrackPageView('first page')); // No campaign keyword specified, will use the referrer hostname - $t4->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(4)->getDatetime()); + $t4->setForceVisitDateTime(Date::factory($dateTime)->addHour(4)->getDatetime()); $t4->setUrlReferrer('http://thing1.com/a/b/c.html?a=b&d=c'); $t4->setUrl('http://example.org/index.html?utm_campaign=GA+Campaign'); self::checkResponse($t4->doTrackPageView('second page')); // Test with Google adsense type URL: $adsenseRefererUrl = 'http://googleads.g.doubleclick.net/pagead/ads?client=ca-pub-12345&output=html&h=280&slotname=123&w=336&lmt=1359388321&202&url=http%3A%2F%2Fwww.adsense-publisher-website.org%2F&dt=123&bpp=13&shv=r22&jsv=1565606614&correlator=ss&ga_vid=aaa&ga_sid=1359435122&ga_hid=1801871121&ga_fc=0&u_tz=780&u_his=4&u_java=1&u_h=900&u_w=1600&u_ah=876&u_aw=1551&u_cd=24&u_nplug=4&u_nmime=5&dff=georgia&dfs=16&adx=33&ady=201&biw=1551&bih=792&oid=3&fu=0&ifi=1&dtd=608&p=http%3A//www.adsense-publisher-website.com'; - $t4->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(5)->getDatetime()); + $t4->setForceVisitDateTime(Date::factory($dateTime)->addHour(5)->getDatetime()); $t4->setUrlReferrer($adsenseRefererUrl); $t4->setUrl('http://example.org/index.html?utm_campaign=Adsense campaign'); self::checkResponse($t4->doTrackPageView('second page')); // Test with google Adwords URL $adwordsUrl = 'http://www.google.co.nz/aclk?sa=L&ai=uYmFyiZgAf0oO0J&num=3&sig=EpOCR4xQ&ved=ENEM&adurl=http://pixel.everesttech.net/3163/cq%3Fev_sid%3D3%26ev_cmpid%3D33%26ev_ln%3Dused%2520wii%2520consoles%26ev_crx%528386%26ev_mt%3Db%26ev_n%3Dg%26ev_ltx%3D%26ev_pl%3D%26ev_pos%3D1s2%26url%3Dhttp%253A//au.shopping.com/used%2520wii%2520consoles/products%253Flinkin_id%253D8077872&rct=j&q=nintendo+consoles+second+hand'; - $t4->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(6)->getDatetime()); + $t4->setForceVisitDateTime(Date::factory($dateTime)->addHour(6)->getDatetime()); $t4->setUrlReferrer($adwordsUrl); $t4->setUrl('http://example.org/index.html?utm_campaign=Adwords campaign'); self::checkResponse($t4->doTrackPageView('second page')); diff --git a/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php b/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php index e669ccc638..e0d3de9e6d 100644 --- a/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php +++ b/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.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\Date; /** * Adds one site and tracks a couple visits with many pageviews. The @@ -101,7 +102,7 @@ class Test_Piwik_Fixture_SomeVisitsManyPageviewsWithTransitions extends Test_Piw $this->trackPageView($tracker, 0.6, 'to/outlink/page2.html', $this->dateTime, $pageViewType = 'outlink'); // perform new searches/outlinks before & after in later date to test 'month' period - $laterDate = Piwik_Date::factory($this->dateTime)->addDay(8)->getDatetime(); + $laterDate = Date::factory($this->dateTime)->addDay(8)->getDatetime(); $tracker->setIp('156.5.3.7'); $tracker->setNewVisitorId(); $this->trackPageView($tracker, 0, 'page/search.html#q=thirdkwd', $laterDate, $pageViewType = 'site-search', @@ -132,7 +133,7 @@ class Test_Piwik_Fixture_SomeVisitsManyPageviewsWithTransitions extends Test_Piw /** @var $visit PiwikTracker */ $visit->setUrl($prefix . 'example.org/' . $path); - $visit->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour($timeOffset)->getDatetime()); + $visit->setForceVisitDateTime(Date::factory($dateTime)->addHour($timeOffset)->getDatetime()); if ($pageViewType == 'normal') { self::assertTrue($visit->doTrackPageView('page title - ' . $path)); diff --git a/tests/PHPUnit/Fixtures/SomeVisitsWithLongUrls.php b/tests/PHPUnit/Fixtures/SomeVisitsWithLongUrls.php index 9eb839ad53..c78a3fb9da 100644 --- a/tests/PHPUnit/Fixtures/SomeVisitsWithLongUrls.php +++ b/tests/PHPUnit/Fixtures/SomeVisitsWithLongUrls.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\Date; /** * Adds one site and tracks 7 visits w/ some long-ish urls (as page urls and @@ -70,32 +71,32 @@ class Test_Piwik_Fixture_SomeVisitsWithLongUrls extends Test_Piwik_BaseFixture self::checkResponse($t->doTrackPageView('Hello')); // VISIT 2 = Another keyword - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(1)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(1)->getDatetime()); $t->setUrlReferrer('http://www.google.com.vn/url?q=Salut'); self::checkResponse($t->doTrackPageView('incredible title!')); // Visit 3 = Another keyword - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(2)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(2)->getDatetime()); $t->setUrlReferrer('http://www.google.com.vn/url?q=Kia Ora'); self::checkResponse($t->doTrackPageView('incredible title!')); // Visit 4 = Kia Ora again - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(3)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(3)->getDatetime()); $t->setUrlReferrer('http://www.google.com.vn/url?q=Kia Ora'); self::checkResponse($t->doTrackPageView('incredible title!')); // Visit 5 = Another search engine - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(4)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(4)->getDatetime()); $t->setUrlReferrer('http://nz.search.yahoo.com/search?p=Kia Ora'); self::checkResponse($t->doTrackPageView('incredible title!')); // Visit 6 = Another search engine - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(5)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(5)->getDatetime()); $t->setUrlReferrer('http://images.search.yahoo.com/search/images;_ylt=A2KcWcNKJzF?p=Kia%20Ora%20'); self::checkResponse($t->doTrackPageView('incredible title!')); // Visit 7 = Another search engine - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(6)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(6)->getDatetime()); $t->setUrlReferrer('http://nz.bing.com/images/search?q=+++Kia+ora+++'); self::checkResponse($t->doTrackPageView('incredible title!')); } diff --git a/tests/PHPUnit/Fixtures/SomeVisitsWithNonUnicodePageTitles.php b/tests/PHPUnit/Fixtures/SomeVisitsWithNonUnicodePageTitles.php index b0dac3c1a8..199fc69123 100644 --- a/tests/PHPUnit/Fixtures/SomeVisitsWithNonUnicodePageTitles.php +++ b/tests/PHPUnit/Fixtures/SomeVisitsWithNonUnicodePageTitles.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\Date; /** * Adds one website and some visits with non unicode page titles. @@ -33,7 +34,7 @@ class Test_Piwik_Fixture_SomeVisitsWithNonUnicodePageTitles extends Test_Piwik_B private function setUpWebsites() { Piwik_SitesManager_API::getInstance()->setGlobalSearchParameters($searchKeywordParameters = 'gkwd', $searchCategoryParameters = 'gcat'); - self::createWebsite(Piwik_Date::factory($this->dateTime)->getDatetime(), 0, "Site 1 - Site search", $siteurl = false, $search = 1, $searchKwd = 'q,mykwd,p', $searchCat = 'cats'); + self::createWebsite(Date::factory($this->dateTime)->getDatetime(), 0, "Site 1 - Site search", $siteurl = false, $search = 1, $searchKwd = 'q,mykwd,p', $searchCat = 'cats'); } private function trackVisits() @@ -48,7 +49,7 @@ class Test_Piwik_Fixture_SomeVisitsWithNonUnicodePageTitles extends Test_Piwik_B $visitor = self::getTracker($idSite1, $dateTime, $defaultInit = true); // Test w/ iso-8859-15 - $visitor->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.3)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.3)->getDatetime()); $visitor->setUrlReferrer('http://anothersite.com/whatever.html?whatever=Ato%FC'); // Also testing that the value is encoded when passed as an array $visitor->setUrl('http://example.org/index.htm?random=param&mykwd[]=Search 2%FC&test&cats= Search Kategory &search_count=INCORRECT!'); @@ -58,13 +59,13 @@ class Test_Piwik_Fixture_SomeVisitsWithNonUnicodePageTitles extends Test_Piwik_B // Test w/ windows-1251 $visitor = self::getTracker($idSite1, $dateTime, $defaultInit = true); - $visitor->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.3)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.3)->getDatetime()); $visitor->setUrlReferrer('http://anothersite.com/whatever.html?txt=%EC%E5%F8%EA%EE%E2%FB%E5'); $visitor->setUrl('http://example.org/page/index.htm?whatever=%EC%E5%F8%EA%EE%E2%FB%E5'); $visitor->setPageCharset('windows-1251'); self::checkResponse($visitor->doTrackPageView('Page title is always UTF-8')); - $visitor->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.4)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.4)->getDatetime()); $nonUnicodeKeyword = '%EC%E5%F8%EA%EE%E2%FB%E5'; $visitor->setUrl('http://example.org/page/index.htm?q=' . $nonUnicodeKeyword); $visitor->setPageCharset('windows-1251'); @@ -72,7 +73,7 @@ class Test_Piwik_Fixture_SomeVisitsWithNonUnicodePageTitles extends Test_Piwik_B // Test URL with non unicode Site Search keyword - $visitor->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.5)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.5)->getDatetime()); //TESTS: on jenkins somehow the "<-was here" was cut off so removing this test case and simply append the wrong keyword // $visitor->setUrl('http://example.org/page/index.htm?q=non unicode keyword %EC%E5%F8%EAe%EE%E2%FBf%E5 <-was here'); $visitor->setUrl('http://example.org/page/index.htm?q=non unicode keyword %EC%E5%F8%EA%EE%E2%FB%E5'); @@ -81,13 +82,13 @@ class Test_Piwik_Fixture_SomeVisitsWithNonUnicodePageTitles extends Test_Piwik_B $visitor->setPageCharset(''); - $visitor->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.5)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.5)->getDatetime()); $visitor->setUrl('http://example.org/exit-page'); self::checkResponse($visitor->doTrackPageView('Page title is always UTF-8')); // Test set invalid page char set $visitor = self::getTracker($idSite1, $dateTime, $defaultInit = true); - $visitor->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(1)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($dateTime)->addHour(1)->getDatetime()); $visitor->setUrlReferrer('http://anothersite.com/whatever.html'); $visitor->setUrl('http://example.org/index.htm?random=param&mykwd=a+keyword&test&cats= Search Kategory &search_count=INCORRECT!'); $visitor->setPageCharset('GTF-42'); // galactic transformation format diff --git a/tests/PHPUnit/Fixtures/ThreeGoalsOnePageview.php b/tests/PHPUnit/Fixtures/ThreeGoalsOnePageview.php index 7f055f4de6..3ef00a5188 100644 --- a/tests/PHPUnit/Fixtures/ThreeGoalsOnePageview.php +++ b/tests/PHPUnit/Fixtures/ThreeGoalsOnePageview.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\Date; /** * Fixture that adds one site with three goals and tracks one pageview & one manual @@ -53,7 +54,7 @@ class Test_Piwik_Fixture_ThreeGoalsOnePageview extends Test_Piwik_BaseFixture $t->setUrl('http://example.org/index.htm'); self::checkResponse($t->doTrackPageView('0')); - $t->setForceVisitDateTime(Piwik_Date::factory($this->dateTime)->addHour(0.3)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.3)->getDatetime()); self::checkResponse($t->doTrackGoal($this->idGoal3, $revenue = 42.256)); } } diff --git a/tests/PHPUnit/Fixtures/ThreeSitesWithManyVisitsWithSiteSearch.php b/tests/PHPUnit/Fixtures/ThreeSitesWithManyVisitsWithSiteSearch.php index ac93543b42..a5b747debf 100644 --- a/tests/PHPUnit/Fixtures/ThreeSitesWithManyVisitsWithSiteSearch.php +++ b/tests/PHPUnit/Fixtures/ThreeSitesWithManyVisitsWithSiteSearch.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\Date; /** * Adds three websites with different site search configurations and adds @@ -36,9 +37,9 @@ class Test_Piwik_Fixture_ThreeSitesWithManyVisitsWithSiteSearch extends Test_Piw protected function setUpWebsites() { Piwik_SitesManager_API::getInstance()->setGlobalSearchParameters($searchKeywordParameters = 'gkwd', $searchCategoryParameters = 'gcat'); - self::createWebsite(Piwik_Date::factory($this->dateTime)->subHour(200)->getDatetime(), 0, "Site 1 - Site search", $siteurl = false, $search = 1, $searchKwd = 'q,mykwd,p', $searchCat = 'cats'); - self::createWebsite(Piwik_Date::factory($this->dateTime)->subHour(400)->getDatetime(), 0, "Site 2 - Site search use default", $siteurl = false, $search = 1, $searchKwd = '', $searchCat = ''); - self::createWebsite(Piwik_Date::factory($this->dateTime)->subHour(600)->getDatetime(), 0, "Site 3 - No site search", $siteurl = false, $search = 0); + self::createWebsite(Date::factory($this->dateTime)->subHour(200)->getDatetime(), 0, "Site 1 - Site search", $siteurl = false, $search = 1, $searchKwd = 'q,mykwd,p', $searchCat = 'cats'); + self::createWebsite(Date::factory($this->dateTime)->subHour(400)->getDatetime(), 0, "Site 2 - Site search use default", $siteurl = false, $search = 1, $searchKwd = '', $searchCat = ''); + self::createWebsite(Date::factory($this->dateTime)->subHour(600)->getDatetime(), 0, "Site 3 - No site search", $siteurl = false, $search = 0); } protected function trackVisits() @@ -54,68 +55,68 @@ class Test_Piwik_Fixture_ThreeSitesWithManyVisitsWithSiteSearch extends Test_Piw // Visitor site1 $visitor = self::getTracker($this->idSite1, $this->dateTime, $defaultInit = true); - $visitor->setForceVisitDateTime(Piwik_Date::factory($this->dateTime)->addHour(0.2)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.2)->getDatetime()); $visitor->setUrl('http://example.org/index.htm?q=Search 1 '); self::checkResponse($visitor->doTrackPageView('Site Search results')); // Normal page view - $visitor->setForceVisitDateTime(Piwik_Date::factory($this->dateTime)->addHour(0.22)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.22)->getDatetime()); $visitor->setUrl('http://example.org/index.htm'); self::checkResponse($visitor->doTrackPageView('Im just a page')); // IS_FOLLOWING_SEARCH: Not this time - $visitor->setForceVisitDateTime(Piwik_Date::factory($this->dateTime)->addHour(0.23)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.23)->getDatetime()); $visitor->setUrl('http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE'); self::checkResponse($visitor->doTrackPageView('This is a pageview, not a Search - IS_FOLLOWING_SEARCH ONCE')); - $visitor->setForceVisitDateTime(Piwik_Date::factory($this->dateTime)->addHour(0.25)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.25)->getDatetime()); $visitor->setUrl('http://example.org/index.htm?standard=query&but=also#hash&q=' . urlencode('Search 1')); self::checkResponse($visitor->doTrackPageView('Site Search results - URL Fragment')); - $visitor->setForceVisitDateTime(Piwik_Date::factory($this->dateTime)->addHour(0.26)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.26)->getDatetime()); $visitor->setUrl('http://example.org/index.htm#q=Search 1&search_count=10'); self::checkResponse($visitor->doTrackPageView('Site Search results - URL Fragment')); // &search_count=0 so it's a "No Result" keyword, but it will not appear in the report, because it also has other seraches with results // and the archiving does a MAX() - $visitor->setForceVisitDateTime(Piwik_Date::factory($this->dateTime)->addHour(0.27)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.27)->getDatetime()); $visitor->setUrl('http://example.org/index.htm?hello=world#q=Search 1&search_count=0'); self::checkResponse($visitor->doTrackPageView('Site Search results - URL Fragment')); // Testing with non urlencoded values - $visitor->setForceVisitDateTime(Piwik_Date::factory($this->dateTime)->addHour(0.3)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.3)->getDatetime()); // ALso testing that array[] notation is detected $visitor->setUrl('http://example.org/index.htm?random=param&mykwd[]=Search 2&test&cats= Search Category &search_count=INCORRECT!'); self::checkResponse($visitor->doTrackPageView('Site Search results')); // Testing with urlencoded values - $visitor->setForceVisitDateTime(Piwik_Date::factory($this->dateTime)->addHour(0.32)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.32)->getDatetime()); // Also testing with random case 'myKwd' $visitor->setUrl('http://example.org/index.htm?random=param&myKwd=Search 1&test&cats=' . urlencode(' Search Category ') . ' &search_count=0'); self::checkResponse($visitor->doTrackPageView('Site Search results')); // IS_FOLLOWING_SEARCH: Yes - $visitor->setForceVisitDateTime(Piwik_Date::factory($this->dateTime)->addHour(0.35)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.35)->getDatetime()); $visitor->setUrl('http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE'); self::checkResponse($visitor->doTrackPageView('This is a pageview, not a Search - IS_FOLLOWING_SEARCH ONCE')); - $visitor->setForceVisitDateTime(Piwik_Date::factory($this->dateTime)->addHour(0.4)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.4)->getDatetime()); $visitor->setUrl('http://example.org/index.htm?gkwd=SHOULD be a PageView, NOT a search'); self::checkResponse($visitor->doTrackPageView('Pageview, not search')); $visitor->setUrl('http://example.org/hello?THIS IS A SITE SEARCH TRACKING API, NOT PAGEVIEW!'); - $visitor->setForceVisitDateTime(Piwik_Date::factory($this->dateTime)->addHour(24.41)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(24.41)->getDatetime()); self::checkResponse($visitor->doTrackSiteSearch("Keyword - Tracking API")); - $visitor->setForceVisitDateTime(Piwik_Date::factory($this->dateTime)->addHour(24.42)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(24.42)->getDatetime()); self::checkResponse($visitor->doTrackSiteSearch("Keyword - Tracking API", "Category", $count = 5)); - $visitor->setForceVisitDateTime(Piwik_Date::factory($this->dateTime)->addHour(24.43)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(24.43)->getDatetime()); self::checkResponse($visitor->doTrackSiteSearch("No Result Keyword!", "Bad No Result Category :(", $count = 0)); // Keyword in iso-8859-15 charset with funny character - $visitor->setForceVisitDateTime(Piwik_Date::factory($this->dateTime)->addHour(24.5)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(24.5)->getDatetime()); $visitor->setPageCharset('iso-8859-15'); $visitor->setUrl('http://example.org/index.htm?q=Final%20t%FCte%20Keyword%20Searched%20for%20now&search_count=10'); self::checkResponse($visitor->doTrackPageView(false)); @@ -126,15 +127,15 @@ class Test_Piwik_Fixture_ThreeSitesWithManyVisitsWithSiteSearch extends Test_Piw $visitorB->setIp('156.66.6.66'); $visitorB->setResolution(1600, 1000); - $visitorB->setForceVisitDateTime(Piwik_Date::factory($this->dateTime)->addHour(2.26)->getDatetime()); + $visitorB->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(2.26)->getDatetime()); $visitorB->setUrl('http://example.org/index.htm#q=' . urlencode('No Result Keyword!') . '&search_count=0'); self::checkResponse($visitorB->doTrackPageView('Site Search results - URL Fragment')); - $visitorB->setForceVisitDateTime(Piwik_Date::factory($this->dateTime)->addHour(2.27)->getDatetime()); + $visitorB->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(2.27)->getDatetime()); $visitorB->setUrl('http://example.org/index.htm?hello=world#q=Search 1&search_count=10'); self::checkResponse($visitorB->doTrackPageView('Site Search results - URL Fragment')); - $visitorB->setForceVisitDateTime(Piwik_Date::factory($this->dateTime)->addHour(2.3)->getDatetime()); + $visitorB->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(2.3)->getDatetime()); $visitorB->setUrl('http://example.org/index.htm?random=param&mykwd=Search 2&test&cats= Search Category &search_count=10'); self::checkResponse($visitorB->doTrackPageView('Site Search results')); } @@ -145,12 +146,12 @@ class Test_Piwik_Fixture_ThreeSitesWithManyVisitsWithSiteSearch extends Test_Piw $visitor = self::getTracker($this->idSite3, $this->dateTime, $defaultInit = true); $visitor->setResolution(1801, 1301); - $visitor->setForceVisitDateTime(Piwik_Date::factory($this->dateTime)->addHour(0.2)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.2)->getDatetime()); $visitor->setUrl('http://example.org/index.htm?q=Search 1&IsPageView=1'); $visitor->setCustomVariable(1, 'test cvar name', 'test cvar value'); self::checkResponse($visitor->doTrackPageView('IsPageView')); - $visitor->setForceVisitDateTime(Piwik_Date::factory($this->dateTime)->addHour(0.35)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.35)->getDatetime()); $visitor->setUrl('http://example.org/index.htm?gkwd=test not a keyword&gcat=Cat not but not keyword, so this is not search'); self::checkResponse($visitor->doTrackPageView('This is a pageview, not a Search')); @@ -165,25 +166,25 @@ class Test_Piwik_Fixture_ThreeSitesWithManyVisitsWithSiteSearch extends Test_Piw $visitor = self::getTracker($this->idSite2, $this->dateTime, $defaultInit = true); $visitor->setResolution(801, 301); - $visitor->setForceVisitDateTime(Piwik_Date::factory($this->dateTime)->addHour(0.2)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.2)->getDatetime()); $visitor->setUrl('http://example.org/index.htm?q=Search 1&IsPageView=1'); self::checkResponse($visitor->doTrackPageView('IsPageView')); - $visitor->setForceVisitDateTime(Piwik_Date::factory($this->dateTime)->addHour(0.35)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.35)->getDatetime()); $visitor->setUrl('http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&gcat=Cat not but not keyword, so this is not search'); self::checkResponse($visitor->doTrackPageView('This is a pageview, not a Search')); - $visitor->setForceVisitDateTime(Piwik_Date::factory($this->dateTime)->addHour(0.4)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.4)->getDatetime()); $visitor->setUrl('http://example.org/index.htm?gkwd=SHOULD be a Search with no result!&search_count=0'); self::checkResponse($visitor->doTrackPageView('This is a Search')); // Testing UTF8 keywords - $visitor->setForceVisitDateTime(Piwik_Date::factory($this->dateTime)->addHour(0.45)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.45)->getDatetime()); $crazySearchTerm = 'You%20can%20use%20Piwik%20in%3A%20%E1%8A%A0%E1%88%9B%E1%88%AD%E1%8A%9B%2C%20%D8%A7%D9%84%D8%B9%D8%B1%D8%A8%D9%8A%D8%A9%2C%20%D0%91%D0%B5%D0%BB%D0%B0%D1%80%D1%83%D1%81%D0%BA%D0%B0%D1%8F%2C%20%D0%91%D1%8A%D0%BB%D0%B3%D0%B0%D1%80%D1%81%D0%BA%D0%B8%2C%20Catal%C3%A0%2C%20%C4%8Cesky%2C%20Dansk%2C%20Deutsch%2C%20%CE%95%CE%BB%CE%BB%CE%B7%CE%BD%CE%B9%CE%BA%CE%AC%2C%20English%2C%20Espa%C3%B1ol%2C%20Eesti%20keel%2C%20Euskara%2C%20%D9%81%D8%A7%D8%B1%D8%B3%DB%8C%2C%20Suomi%2C%20Fran%C3%A7ais%2C%20Galego%2C%20%D7%A2%D7%91%D7%A8%D7%99%D7%AA%2C%20Magyar%2C%20Bahasa%20Indonesia%2C%20%C3%8Dslenska%2C%20Italiano%2C%20%E6%97%A5%E6%9C%AC%E8%AA%9E%2C%20%E1%83%A5%E1%83%90%E1%83%A0%E1%83%97%E1%83%A3%E1%83%9A%E1%83%98%2C%20%ED%95%9C%EA%B5%AD%EC%96%B4%2C%20Lietuvi%C5%B3%2C%20Latvie%C5%A1u%2C%20Norsk%20(bokm%C3%A5l)%2C%20Nederlands%2C%20Norsk%20(nynorsk)%2C%20Polski%2C%20Portugu%C3%AAs%20brasileiro%2C%20Portugu%C3%AAs%2C%20Rom%C3%A2n%C4%83%2C%20%D0%A0%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9%2C%20Slovensky%2C%20Sloven%C5%A1%C4%8Dina%2C%20Shqip%2C%20Srpski%2C%20Svenska%2C%20%E0%B0%A4%E0%B1%86%E0%B0%B2%E0%B1%81%E0%B0%97%E0%B1%81%2C%20%E0%B8%A0%E0%B8%B2%E0%B8%A9%E0%B8%B2%E0%B9%84%E0%B8%97%E0%B8%A2%2C%20T%C3%BCrk%C3%A7e%2C%20%D0%A3%D0%BA%D1%80%D0%B0%D1%97%D0%BD%D1%81%D1%8C%D0%BA%D0%B0%2C%20%E7%AE%80%E4%BD%93%E4%B8%AD%E6%96%87%2C%20%E7%B9%81%E9%AB%94%E4%B8%AD%E6%96%87.'; $visitor->setUrl('http://example.org/index.htm?gkwd=' . $crazySearchTerm . '&gcat=' . $crazySearchTerm . '&search_count=1'); self::checkResponse($visitor->doTrackPageView('Site Search with 1 result')); - $visitor->setForceVisitDateTime(Piwik_Date::factory($this->dateTime)->addHour(0.5)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(0.5)->getDatetime()); self::checkResponse($visitor->doTrackSiteSearch("No Result Keyword!", "Bad No Result Category bis :(", $count = 0)); return array($defaultInit, $visitor); } diff --git a/tests/PHPUnit/Fixtures/TwoSitesEcommerceOrderWithItems.php b/tests/PHPUnit/Fixtures/TwoSitesEcommerceOrderWithItems.php index 2000580da8..33e244d7ca 100644 --- a/tests/PHPUnit/Fixtures/TwoSitesEcommerceOrderWithItems.php +++ b/tests/PHPUnit/Fixtures/TwoSitesEcommerceOrderWithItems.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\Date; /** * Adds two sites and tracks some visits with ecommerce orders. @@ -61,16 +62,16 @@ class Test_Piwik_Fixture_TwoSitesEcommerceOrderWithItems extends Test_Piwik_Base self::assertEquals(array('VisitorType', 'NewLoggedOut'), $t->getCustomVariable(5, 'visit')); self::checkResponse($t->doTrackPageView('incredible title!')); - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.1)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.1)->getDatetime()); $t->setEcommerceView($sku = 'SKU VERY nice indeed', $name = 'PRODUCT name', $category, $price = 666); self::checkResponse($t->doTrackPageView('Another Product page')); // Note: here testing to pass a timestamp to the tracking API rather than the datetime string - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.2)->getTimestampUTC()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.2)->getTimestampUTC()); $t->setEcommerceView($sku = 'SKU VERY nice indeed', $name = 'PRODUCT name', ''); self::checkResponse($t->doTrackPageView('Another Product page with no category')); - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.2)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.2)->getDatetime()); $t->setEcommerceView($sku = 'SKU VERY nice indeed', $name = 'PRODUCT name', $categories = array('Multiple Category 1', '', 0, 'Multiple Category 2', 'Electronics & Cameras', 'Multiple Category 4', 'Multiple Category 5', 'SHOULD NOT BE REPORTEDSSSSSSSSSSSSSSssssssssssssssssssssssssssstttttttttttttttttttttttuuuu!')); self::checkResponse($t->doTrackPageView('Another Product page with multiple categories')); @@ -80,22 +81,22 @@ class Test_Piwik_Fixture_TwoSitesEcommerceOrderWithItems extends Test_Piwik_Base $t->setDebugStringAppend("&_idvc=2"); // VIEW category page - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(1.6)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(1.6)->getDatetime()); $t->setEcommerceView('', '', $category); self::checkResponse($t->doTrackPageView('Looking at ' . $category . ' page with a page level custom variable')); // VIEW category page again - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(1.7)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(1.7)->getDatetime()); $t->setEcommerceView('', '', $category); self::checkResponse($t->doTrackPageView('Looking at ' . $category . ' page again')); // VIEW product page - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(1.8)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(1.8)->getDatetime()); $t->setEcommerceView($sku = 'SKU VERY nice indeed', $name = 'PRODUCT name', $category = 'Electronics & Cameras', $price = 666); self::checkResponse($t->doTrackPageView('Looking at product page')); // ADD TO CART - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(1.9)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(1.9)->getDatetime()); $t->setCustomVariable(3, 'VisitorName', 'Great name!', 'visit'); $t->addEcommerceItem($sku = 'SKU VERY nice indeed', $name = 'PRODUCT name', $category = 'Electronics & Cameras', $price = 500, $quantity = 1); $t->addEcommerceItem($sku = 'SKU VERY nice indeed', $name = 'PRODUCT name', $category = 'Electronics & Cameras', $price = 500, $quantity = 2); @@ -103,13 +104,13 @@ class Test_Piwik_Fixture_TwoSitesEcommerceOrderWithItems extends Test_Piwik_Base self::checkResponse($t->doTrackEcommerceCartUpdate($grandTotal = 1000)); // ORDER NO 1 - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(2)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(2)->getDatetime()); $t->addEcommerceItem($sku = 'SKU VERY nice indeed', $name = 'PRODUCT name', $categories, $price = 500, $quantity = 2); $t->addEcommerceItem($sku = 'ANOTHER SKU HERE', $name = 'PRODUCT name BIS', $category = '', $price = 100, $quantity = 6); self::checkResponse($t->doTrackEcommerceOrder($orderId = '937nsjusu 3894', $grandTotal = 1111.11, $subTotal = 1000, $tax = 111, $shipping = 0.11, $discount = 666)); // ORDER NO 2 - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(2.1)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(2.1)->getDatetime()); $t->addEcommerceItem($sku = 'SKU2', $name = 'Canon SLR', $category = 'Electronics & Cameras', $price = 1500, $quantity = 1); // Product bought with empty category $t->addEcommerceItem($sku = 'SKU VERY nice indeed', $name = 'PRODUCT name', '', $price = 11.22, $quantity = 1); @@ -125,19 +126,19 @@ class Test_Piwik_Fixture_TwoSitesEcommerceOrderWithItems extends Test_Piwik_Base // ORDER SHOULD DEDUPE // Refresh the page with the receipt for the second order, should be ignored // we test that both the order, and the products, are not updated on subsequent "Receipt" views - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(2.2)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(2.2)->getDatetime()); $t->addEcommerceItem($sku = 'SKU2', $name = 'Canon SLR NOT!', $category = 'Electronics & Cameras NOT!', $price = 15000000000, $quantity = 10000); self::checkResponse($t->doTrackEcommerceOrder($orderId = '1037nsjusu4s3894', $grandTotal = 20000000, $subTotal = 1500, $tax = 400, $shipping = 100, $discount = 0)); // Leave with an opened cart // No category - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(2.3)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(2.3)->getDatetime()); $t->addEcommerceItem($sku = 'SKU IN ABANDONED CART ONE', $name = 'PRODUCT ONE LEFT in cart', $category = '', $price = 500.11111112, $quantity = 2); self::checkResponse($t->doTrackEcommerceCartUpdate($grandTotal = 1000)); // Record the same visit leaving twice an abandoned cart foreach (array(0, 5, 24) as $offsetHour) { - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour($offsetHour + 2.4)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour($offsetHour + 2.4)->getDatetime()); // Also recording an order the day after if ($offsetHour >= 24) { $t->setDebugStringAppend("&_idvc=1"); @@ -146,20 +147,20 @@ class Test_Piwik_Fixture_TwoSitesEcommerceOrderWithItems extends Test_Piwik_Base } // VIEW PRODUCT PAGES - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour($offsetHour + 2.5)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour($offsetHour + 2.5)->getDatetime()); $t->setEcommerceView($sku = 'SKU VERY nice indeed', $name = 'PRODUCT THREE LEFT in cart', $category = '', $price = 999); self::checkResponse($t->doTrackPageView("View product left in cart")); - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour($offsetHour + 2.55)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour($offsetHour + 2.55)->getDatetime()); $t->setEcommerceView($sku = 'SKU VERY nice indeed', $name = 'PRODUCT THREE LEFT in cart', $category = '', $price = 333); self::checkResponse($t->doTrackPageView("View product left in cart")); - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour($offsetHour + 2.6)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour($offsetHour + 2.6)->getDatetime()); $t->setEcommerceView($sku = 'SKU IN ABANDONED CART TWO', $name = 'PRODUCT TWO LEFT in cart', $category = 'Category TWO LEFT in cart'); self::checkResponse($t->doTrackPageView("View product left in cart")); // ABANDONED CART - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour($offsetHour + 2.7)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour($offsetHour + 2.7)->getDatetime()); $t->addEcommerceItem($sku = 'SKU IN ABANDONED CART ONE', $name = 'PRODUCT ONE LEFT in cart', $category = '', $price = 500.11111112, $quantity = 1); $t->addEcommerceItem($sku = 'SKU IN ABANDONED CART TWO', $name = 'PRODUCT TWO LEFT in cart', $category = 'Category TWO LEFT in cart', $price = 1000, $quantity = 2); $t->addEcommerceItem($sku = 'SKU VERY nice indeed', $name = 'PRODUCT THREE LEFT in cart', $category = 'Electronics & Cameras', $price = 10, $quantity = 1); @@ -167,17 +168,17 @@ class Test_Piwik_Fixture_TwoSitesEcommerceOrderWithItems extends Test_Piwik_Base } // One more Ecommerce order to check weekly archiving works fine on orders - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(30.7)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(30.7)->getDatetime()); $t->addEcommerceItem($sku = 'TRIPOD SKU', $name = 'TRIPOD - bought day after', $category = 'Tools', $price = 100, $quantity = 2); self::checkResponse($t->doTrackEcommerceOrder($orderId = '666', $grandTotal = 240, $subTotal = 200, $tax = 20, $shipping = 20, $discount = 20)); // One more Ecommerce order, without any product in it, because we still track orders without products - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(30.8)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(30.8)->getDatetime()); self::checkResponse($t->doTrackEcommerceOrder($orderId = '777', $grandTotal = 10000)); // testing the same order in a different website should record $t = self::getTracker($idSite2, $dateTime, $defaultInit = true); - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(30.9)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(30.9)->getDatetime()); $t->addEcommerceItem($sku = 'TRIPOD SKU', $name = 'TRIPOD - bought day after', $category = 'Tools', $price = 100, $quantity = 2); self::checkResponse($t->doTrackEcommerceOrder($orderId = '777', $grandTotal = 250)); //------------------------------------- End tracking diff --git a/tests/PHPUnit/Fixtures/TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers.php b/tests/PHPUnit/Fixtures/TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers.php index faf3d45696..a122bb5436 100644 --- a/tests/PHPUnit/Fixtures/TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers.php +++ b/tests/PHPUnit/Fixtures/TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers.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\Date; /** * Adds one website and tracks visits on different days over a month @@ -58,7 +59,7 @@ class Test_Piwik_Fixture_TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferr $t->enableBulkTracking(); for ($daysIntoPast = 30; $daysIntoPast >= 0; $daysIntoPast--) { // Visit 1: referrer website + test page views - $visitDateTime = Piwik_Date::factory($dateTime)->subDay($daysIntoPast)->getDatetime(); + $visitDateTime = Date::factory($dateTime)->subDay($daysIntoPast)->getDatetime(); $t->setNewVisitorId(); $t->setIdSite($idSite); @@ -75,11 +76,11 @@ class Test_Piwik_Fixture_TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferr // Trigger goal n°2 twice self::assertTrue($t->doTrackGoal(2)); - $t->setForceVisitDateTime(Piwik_Date::factory($visitDateTime)->addHour(0.1)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($visitDateTime)->addHour(0.1)->getDatetime()); self::assertTrue($t->doTrackGoal(2)); // VISIT 2: search engine - $t->setForceVisitDateTime(Piwik_Date::factory($visitDateTime)->addHour(3)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($visitDateTime)->addHour(3)->getDatetime()); $t->setUrlReferrer('http://google.com/search?q=' . urlencode($this->keywords[$daysIntoPast % 3])); $t->setGenerationTime($daysIntoPast * 100 + 200); self::assertTrue($t->doTrackPageView('not an incredible title ')); diff --git a/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php b/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php index 3c42391c1a..ad7dfa0476 100644 --- a/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php +++ b/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.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\Date; /** * Adds two websites and tracks visits from two visitors on different days. @@ -68,11 +69,11 @@ class Test_Piwik_Fixture_TwoSitesTwoVisitorsDifferentDays extends Test_Piwik_Bas $visitorA = self::getTracker($idSite, $datetimeSpanOverTwoDays, $defaultInit = true); $visitorA->setUrlReferrer('http://referer.com/page.htm?param=valuewith some spaces'); $visitorA->setUrl('http://example.org/index.htm#ignoredFragment'); - $visitorA->DEBUG_APPEND_URL = '&_idts=' . Piwik_Date::factory($datetimeSpanOverTwoDays)->getTimestamp(); + $visitorA->DEBUG_APPEND_URL = '&_idts=' . Date::factory($datetimeSpanOverTwoDays)->getTimestamp(); $visitorA->setGenerationTime(123); self::checkResponse($visitorA->doTrackPageView('first page view')); - $visitorA->setForceVisitDateTime(Piwik_Date::factory($datetimeSpanOverTwoDays)->addHour(0.1)->getDatetime()); + $visitorA->setForceVisitDateTime(Date::factory($datetimeSpanOverTwoDays)->addHour(0.1)->getDatetime()); // testing with empty URL and empty page title $visitorA->setUrl(' '); $visitorA->setGenerationTime(223); @@ -85,50 +86,50 @@ class Test_Piwik_Fixture_TwoSitesTwoVisitorsDifferentDays extends Test_Piwik_Bas $visitorB->setTokenAuth(self::getTokenAuth()); $visitorB->setIp('100.52.156.83'); $visitorB->setResolution(800, 300); - $visitorB->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(1)->getDatetime()); + $visitorB->setForceVisitDateTime(Date::factory($dateTime)->addHour(1)->getDatetime()); $visitorB->setUrlReferrer(''); $visitorB->setUserAgent('Opera/9.63 (Windows NT 5.1; U; en) Presto/2.1.1'); $visitorB->setUrl('http://example.org/products'); - $visitorB->DEBUG_APPEND_URL = '&_idts=' . Piwik_Date::factory($dateTime)->addHour(1)->getTimestamp(); + $visitorB->DEBUG_APPEND_URL = '&_idts=' . Date::factory($dateTime)->addHour(1)->getTimestamp(); $visitorB->setGenerationTime(153); self::assertTrue($visitorB->doTrackPageView('first page view')); // - // Second visitor again on Idsite 1: 2 page views 2 days later, 2010-01-05 - $visitorB->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(48)->getDatetime()); + $visitorB->setForceVisitDateTime(Date::factory($dateTime)->addHour(48)->getDatetime()); // visitor_returning is set to 1 only when visit count more than 1 // Temporary, until we implement 1st party cookies in PiwikTracker - $visitorB->DEBUG_APPEND_URL .= '&_idvc=2&_viewts=' . Piwik_Date::factory($dateTime)->getTimestamp(); + $visitorB->DEBUG_APPEND_URL .= '&_idvc=2&_viewts=' . Date::factory($dateTime)->getTimestamp(); $visitorB->setUrlReferrer('http://referer.com/Other_Page.htm'); $visitorB->setUrl('http://example.org/index.htm'); $visitorB->setGenerationTime(323); self::assertTrue($visitorB->doTrackPageView('second visitor/two days later/a new visit')); // Second page view 6 minutes later - $visitorB->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(48)->addHour(0.1)->getDatetime()); + $visitorB->setForceVisitDateTime(Date::factory($dateTime)->addHour(48)->addHour(0.1)->getDatetime()); $visitorB->setUrl('http://example.org/thankyou'); $visitorB->setGenerationTime(173); self::assertTrue($visitorB->doTrackPageView('second visitor/two days later/second page view')); // testing a strange combination causing an error in r3767 - $visitorB->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(48)->addHour(0.2)->getDatetime()); + $visitorB->setForceVisitDateTime(Date::factory($dateTime)->addHour(48)->addHour(0.2)->getDatetime()); self::assertTrue($visitorB->doTrackAction('mailto:test@example.org', 'link')); - $visitorB->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(48)->addHour(0.25)->getDatetime()); + $visitorB->setForceVisitDateTime(Date::factory($dateTime)->addHour(48)->addHour(0.25)->getDatetime()); self::assertTrue($visitorB->doTrackAction('mailto:test@example.org/strangelink', 'link')); // Actions.getPageTitle tested with this title - $visitorB->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(48)->addHour(0.25)->getDatetime()); + $visitorB->setForceVisitDateTime(Date::factory($dateTime)->addHour(48)->addHour(0.25)->getDatetime()); $visitorB->setGenerationTime(452); self::assertTrue($visitorB->doTrackPageView('Checkout / Purchasing...')); self::checkResponse($visitorB->doBulkTrack()); // - // First visitor on Idsite 2: one page view, with Website referer - $visitorAsite2 = self::getTracker($idSite2, Piwik_Date::factory($dateTime)->addHour(24)->getDatetime(), $defaultInit = true); + $visitorAsite2 = self::getTracker($idSite2, Date::factory($dateTime)->addHour(24)->getDatetime(), $defaultInit = true); $visitorAsite2->setUserAgent('Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0;)'); $visitorAsite2->setUrlReferrer('http://only-homepage-referer.com/'); $visitorAsite2->setUrl('http://example2.com/home#notIgnoredFragment#'); - $visitorAsite2->DEBUG_APPEND_URL = '&_idts=' . Piwik_Date::factory($dateTime)->addHour(24)->getTimestamp(); + $visitorAsite2->DEBUG_APPEND_URL = '&_idts=' . Date::factory($dateTime)->addHour(24)->getTimestamp(); $visitorAsite2->setGenerationTime(193); self::checkResponse($visitorAsite2->doTrackPageView('Website 2 page view')); // test with invalid URL diff --git a/tests/PHPUnit/Fixtures/TwoSitesVisitsInPast.php b/tests/PHPUnit/Fixtures/TwoSitesVisitsInPast.php index d476bb7933..eae1b9749f 100644 --- a/tests/PHPUnit/Fixtures/TwoSitesVisitsInPast.php +++ b/tests/PHPUnit/Fixtures/TwoSitesVisitsInPast.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\Date; /** * Adds two sites and tracks several visits all in the past. @@ -97,7 +98,7 @@ class Test_Piwik_Fixture_TwoSitesVisitsInPast extends Test_Piwik_BaseFixture self::checkResponse($t->doTrackPageView('Hello')); $t->setUrl('http://example.org/category/Pageyy'); self::checkResponse($t->doTrackPageView('Blabla')); - $t->setForceVisitDateTime(Piwik_Date::factory($this->dateTimeDateInPastWebsite2)->addHour(0.1)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($this->dateTimeDateInPastWebsite2)->addHour(0.1)->getDatetime()); $t->setUrl('http://example.org/category/Pageyy'); self::checkResponse($t->doTrackPageView('Blabla')); } diff --git a/tests/PHPUnit/Fixtures/TwoSitesWithAnnotations.php b/tests/PHPUnit/Fixtures/TwoSitesWithAnnotations.php index 2c986b337c..83b4eded01 100644 --- a/tests/PHPUnit/Fixtures/TwoSitesWithAnnotations.php +++ b/tests/PHPUnit/Fixtures/TwoSitesWithAnnotations.php @@ -6,6 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ use Piwik\Access; +use Piwik\Date; /** * A fixture that adds two websites and annotations for each website. @@ -37,8 +38,8 @@ class Test_Piwik_Fixture_TwoSitesWithAnnotations extends Test_Piwik_BaseFixture // add two annotations per week for three months, starring every third annotation // first month in 2011, second two in 2012 $count = 0; - $dateStart = Piwik_Date::factory('2011-12-01'); - $dateEnd = Piwik_Date::factory('2012-03-01'); + $dateStart = Date::factory('2011-12-01'); + $dateEnd = Date::factory('2012-03-01'); while ($dateStart->getTimestamp() < $dateEnd->getTimestamp()) { $starred = $count % 3 == 0 ? 1 : 0; $site1Text = "$count: Site 1 annotation for " . $dateStart->toString(); diff --git a/tests/PHPUnit/Fixtures/TwoVisitsNoKeywordWithBot.php b/tests/PHPUnit/Fixtures/TwoVisitsNoKeywordWithBot.php index c4399d7f66..fe28c492d9 100644 --- a/tests/PHPUnit/Fixtures/TwoVisitsNoKeywordWithBot.php +++ b/tests/PHPUnit/Fixtures/TwoVisitsNoKeywordWithBot.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\Date; /** * Adds one site and tracks two visits. One visit is a bot and one has no keyword @@ -49,12 +50,12 @@ class Test_Piwik_Fixture_TwoVisitsNoKeywordWithBot extends Test_Piwik_BaseFixtur $t->setUrl('http://example.org/this%20is%20cool!'); self::checkResponse($t->doTrackPageView('incredible title!')); $idGoal = Piwik_Goals_API::getInstance()->addGoal($idSite, 'triggered js', 'manually', '', ''); - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.3)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.3)->getDatetime()); self::checkResponse($t->doTrackGoal($idGoal, $revenue = 42)); // VISIT 2 = Referrer has keyword, but the URL should be rewritten // in Live Output to point to google search result page - $t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(2)->getDatetime()); + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(2)->getDatetime()); $t->setUrlReferrer('http://www.google.com.vn/url?sa=t&rct=j&q=%3C%3E%26%5C%22the%20pdo%20extension%20is%20required%20for%20this%20adapter%20but%20the%20extension%20is%20not%20loaded&source=web&cd=4&ved=0FjAD&url=http%3A%2F%2Fforum.piwik.org%2Fread.php%3F2%2C1011&ei=y-HHAQ&usg=AFQjCN2-nt5_GgDeg&cad=rja'); // Test with empty title, that the output of Live is valid diff --git a/tests/PHPUnit/Fixtures/TwoVisitsWithCustomVariables.php b/tests/PHPUnit/Fixtures/TwoVisitsWithCustomVariables.php index 070d266ecf..5ab144c115 100644 --- a/tests/PHPUnit/Fixtures/TwoVisitsWithCustomVariables.php +++ b/tests/PHPUnit/Fixtures/TwoVisitsWithCustomVariables.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\Date; /** * Adds one site with two goals and tracks two visits with custom variables. @@ -65,14 +66,14 @@ class Test_Piwik_Fixture_TwoVisitsWithCustomVariables extends Test_Piwik_BaseFix $visitorA->setResolution($this->resolutionWidthToUse, $this->resolutionHeightToUse); // At first, visitor custom var is set to LoggedOut - $visitorA->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.1)->getDatetime()); + $visitorA->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.1)->getDatetime()); $visitorA->setUrl('http://example.org/homepage'); $visitorA->setCustomVariable($id = 1, $name = 'VisitorType', $value = 'LoggedOut'); self::checkResponse($visitorA->doTrackPageView('Homepage')); self::checkResponse($visitorA->doTrackGoal($idGoal2)); // After login, set to LoggedIn, should overwrite previous value - $visitorA->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.2)->getDatetime()); + $visitorA->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.2)->getDatetime()); $visitorA->setUrl('http://example.org/user/profile'); $visitorA->setCustomVariable($id = 1, $name = 'VisitorType', $value = 'LoggedIn'); $visitorA->setCustomVariable($id = 4, $name = 'Status user', $value = 'Loggedin', $scope = 'page'); @@ -119,7 +120,7 @@ class Test_Piwik_Fixture_TwoVisitsWithCustomVariables extends Test_Piwik_BaseFix $visitorB->setAttributionInfo(json_encode($attribution)); $visitorB->setResolution($this->resolutionWidthToUse, $this->resolutionHeightToUse); $visitorB->setUserAgent('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.9.0.6) Gecko/2009011913 Firefox/3.0.6'); - $visitorB->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(1)->getDatetime()); + $visitorB->setForceVisitDateTime(Date::factory($dateTime)->addHour(1)->getDatetime()); $visitorB->setCustomVariable($id = 1, $name = 'VisitorType', $value = 'LoggedOut'); $visitorB->setCustomVariable($id = 2, $name = 'Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz', $value = 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz'); $visitorB->setCustomVariable($id = -2, $name = 'not tracked', $value = 'not tracked'); @@ -128,12 +129,12 @@ class Test_Piwik_Fixture_TwoVisitsWithCustomVariables extends Test_Piwik_BaseFix $visitorB->setUrl('http://example.org/homepage'); self::checkResponse($visitorB->doTrackGoal($idGoal, 1000)); - $visitorB->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(1.1)->getDatetime()); + $visitorB->setForceVisitDateTime(Date::factory($dateTime)->addHour(1.1)->getDatetime()); self::checkResponse($visitorB->doTrackPageView('Homepage')); // DIFFERENT test - // testing that starting the visit with an outlink works (doesn't trigger errors) - $visitorB->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(2)->getDatetime()); + $visitorB->setForceVisitDateTime(Date::factory($dateTime)->addHour(2)->getDatetime()); self::checkResponse($visitorB->doTrackAction('http://test.com', 'link')); } } diff --git a/tests/PHPUnit/Fixtures/VisitsOverSeveralDays.php b/tests/PHPUnit/Fixtures/VisitsOverSeveralDays.php index f38fa6a7f1..c845fabbf1 100644 --- a/tests/PHPUnit/Fixtures/VisitsOverSeveralDays.php +++ b/tests/PHPUnit/Fixtures/VisitsOverSeveralDays.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\Date; /** * Adds one website and tracks several visits from one visitor on @@ -70,7 +71,7 @@ class Test_Piwik_Fixture_VisitsOverSeveralDays extends Test_Piwik_BaseFixture $visitor = $this->makeTracker($this->idSite, $dateTime, $debugStringAppend); // FIRST VISIT THIS DAY - $visitor->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.1)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.1)->getDatetime()); $visitor->setUrl('http://example.org/homepage'); $visitor->setUrlReferrer($this->referrerUrls[$ridx++]); self::checkResponse($visitor->doTrackPageView('ou pas')); @@ -78,19 +79,19 @@ class Test_Piwik_Fixture_VisitsOverSeveralDays extends Test_Piwik_BaseFixture // Test change the IP, the visit should not be split but recorded to the same idvisitor $visitor->setIp('200.1.15.22'); - $visitor->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.2)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.2)->getDatetime()); $visitor->setUrl('http://example.org/news'); self::checkResponse($visitor->doTrackPageView('ou pas')); // SECOND VISIT THIS DAY - $visitor->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(1)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($dateTime)->addHour(1)->getDatetime()); $visitor->setUrl('http://example.org/news'); $visitor->setUrlReferrer($this->referrerUrls[$ridx++]); self::checkResponse($visitor->doTrackPageView('ou pas')); if ($days <= 3) { $visitor = $this->makeTracker($this->idSite2, $dateTime); - $visitor->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.1)->getDatetime()); + $visitor->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.1)->getDatetime()); $visitor->setUrl('http://example.org/homepage'); $visitor->setUrlReferrer($this->referrerUrls[$ridx - 1]); self::checkResponse($visitor->doTrackPageView('Second website')); |