diff --git a/tests/PHPUnit/Integration/ImportLogsTest.php b/tests/PHPUnit/Integration/ImportLogsTest.php index 5b988cd6901..7972d63015e 100755 --- a/tests/PHPUnit/Integration/ImportLogsTest.php +++ b/tests/PHPUnit/Integration/ImportLogsTest.php @@ -49,9 +49,9 @@ public function getApiForTesting() 'testSuffix' => '_siteIdTwo_TrackedUsingLogReplay')), ); - if (getenv('MYSQL_ADAPTER') != 'MYSQLI') { // Mysqli rounds latitude/longitude - $apis[] = array('Live.getLastVisitsDetails', array( + $apiMethods = array('Live.getLastVisitsDetails', 'Actions', 'VisitorInterest'); + $apis[] = array($apiMethods, array( 'idSite' => self::$fixture->idSite, 'date' => '2012-08-09,2014-04-01', 'periods' => 'range', diff --git a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml index 2ea8c2875fd..7ed2e76aebf 100644 --- a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml @@ -1,15 +1,15 @@ - 38 - 39 - 46 - 36 - 34 - 430 + 27 + 27 + 30 + 25 + 25 + 305 3 - 87% - 1.2 + 93% + 1.1 11 diff --git a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_year.xml b/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_year.xml index 686313becab..46ff0006a89 100644 --- a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_year.xml +++ b/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_year.xml @@ -1,15 +1,15 @@ - 40 - 56 - 37 - 34 - 484 + 28 + 40 + 26 + 25 + 359 10 - 85% + 89% 1.4 - 12 + 13 1 diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getDownload_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getDownload_range.xml new file mode 100644 index 00000000000..c234bed59e9 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getDownload_range.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getDownloads_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getDownloads_month.xml index 9c5b6902684..5eb17eb5321 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getDownloads_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getDownloads_month.xml @@ -59,23 +59,4 @@ - - - 1 - 1 - 0 - 1 - - - - 1 - 1 - 0 - 1 - 1 - 1 - http://builds.piwik.org/latest.zip - - - \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getDownloads_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getDownloads_range.xml new file mode 100644 index 00000000000..9c5b6902684 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getDownloads_range.xml @@ -0,0 +1,81 @@ + + + + + 4 + 4 + 122 + 2 + 4 + 123 + 1 + 2 + + + + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + http://piwik.net/19.pdf + + + + 1 + 1 + 0 + 1 + 1 + 1 + http://piwik.net/other.png + + + + 1 + 1 + 61 + 1 + http://piwik.net/thing.css + + + + 1 + 1 + 61 + 1 + 3 + 123 + 0 + 1 + 1 + http://piwik.net/thing.js + + + + + + 1 + 1 + 0 + 1 + + + + 1 + 1 + 0 + 1 + 1 + 1 + http://builds.piwik.org/latest.zip + + + + \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml index 8482e75ec2b..77e2b649183 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml @@ -1,55 +1,10 @@ - - - 4 - 4 - 34 - 3 - 0.058 - 0.292 - 4 - 7 - 44 - 2 - 2 - 4 - 4 - 2 - 9 - 50% - 50% - 0.177 - - - - 2 - 2 - 0 - 1 - 0.145 - 0.145 - 2 - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 0 - 100% - 100% - 0.145 - 1 1 180 - 0 - - 0 1 2 182 @@ -57,16 +12,12 @@ 180 0% 0% - 0 1 1 180 - 0 - - 1 2 182 @@ -76,7 +27,6 @@ 180 0% 0% - 0 @@ -85,9 +35,6 @@ 1 1 0 - 0 - - 0 1 1 0 @@ -96,16 +43,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 1 1 0 @@ -117,7 +60,6 @@ 0 100% 100% - 0 @@ -126,9 +68,6 @@ 1 1 0 - 0 - - 0 1 1 0 @@ -137,76 +76,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - 0 - - - - - - 1 - 1 - 79 - 0 - - - 1 - 2 - 81 - 0 - 1 - 1 - 79 - 0% - 0% - 0 - - - - 1 - 1 - 0 - 1 - 0.413 - 0.413 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - 0.413 - - - - 1 - 1 - 0 - 1 - 0.413 - 0.413 1 1 0 @@ -218,7 +93,6 @@ 0 100% 100% - 0.413 @@ -227,72 +101,6 @@ 1 1 0 - 0 - - - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - 0 - - - - 1 - 1 - 0 - 1 - 0.134 - 0.134 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - 0.134 - - - - 1 - 1 - 0 - 1 - 0.391 - 0.391 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - 0.391 - - - - 1 - 1 - 0 - 1 - 0.119 - 0.119 1 1 0 @@ -304,16 +112,12 @@ 0 100% 100% - 0.119 1 1 0 - 0 - - 1 1 0 @@ -325,6 +129,5 @@ 0 100% 100% - 0 \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml new file mode 100644 index 00000000000..d8014b0c284 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageTitles_range.xml @@ -0,0 +1,330 @@ + + + + + 4 + 4 + 34 + 3 + 0.058 + 0.292 + 4 + 7 + 44 + 2 + 2 + 4 + 4 + 2 + 9 + 50% + 50% + 0.177 + + + + 2 + 2 + 0 + 1 + 0.145 + 0.145 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 100% + 100% + 0.145 + + + + 1 + 1 + 180 + 0 + + 0 + 1 + 2 + 182 + 0 + 180 + 0% + 0% + 0 + + + + 1 + 1 + 180 + 0 + + + 1 + 2 + 182 + 0 + 1 + 1 + 180 + 0% + 0% + 0 + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + + + + + + 1 + 1 + 79 + 0 + + + 1 + 2 + 81 + 0 + 1 + 1 + 79 + 0% + 0% + 0 + + + + 1 + 1 + 0 + 1 + 0.413 + 0.413 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.413 + + + + 1 + 1 + 0 + 1 + 0.413 + 0.413 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0.413 + + + + + + 1 + 1 + 0 + 1 + 0.134 + 0.134 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0.134 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 1 + 0.391 + 0.391 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0.391 + + + + 1 + 1 + 0 + 1 + 0.119 + 0.119 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0.119 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + + \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml index 283ef2b7910..8845a80655e 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml @@ -2,30 +2,23 @@ - 7 - 7 + 5 + 5 0 - 2 - 0.119 - 0.391 - 7 - 7 + 5 + 5 0 - 7 - 7 + 5 + 5 0 100% 100% - 0.255 4 4 0 - 0 - - 0 4 4 0 @@ -34,16 +27,12 @@ 0 100% 100% - 0 3 3 0 - 0 - - 0 3 3 0 @@ -52,16 +41,12 @@ 0 100% 100% - 0 3 3 0 - 0 - - 0 3 3 0 @@ -73,7 +58,6 @@ 0 100% 100% - 0 http://piwik.net/blog/category/meta/ @@ -83,9 +67,6 @@ 1 1 0 - 0 - - 0 1 1 0 @@ -94,16 +75,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 1 1 0 @@ -115,7 +92,6 @@ 0 100% 100% - 0 http://piwik.net/blog/category/community/ @@ -124,156 +100,9 @@ - 2 - 2 - 0 - 1 - 0.391 - 0.391 - 2 - 2 - 0 - 2 - 2 - 0 - 100% - 100% - 0.391 - - - - 1 - 1 - 0 - 0 - - 0 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - 0 - - - - 1 - 1 - 0 - 0 - - 0 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - 0 - - - - 1 - 1 - 0 - 0 - - - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - 0 - http://piwik.net/blog/2012/08/survey-your-opinion-matters/ - - - - - - - - 1 - 1 - 0 - 1 - 0.391 - 0.391 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - 0.391 - - - - 1 - 1 - 0 - 1 - 0.391 - 0.391 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - 0.391 - - - - 1 - 1 - 0 - 1 - 0.391 - 0.391 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - 0.391 - http://piwik.org/blog/2012/10/integrate-piwik-into-your-rails-application/ - - - - - - - - - 1 1 0 - 1 - 0.119 - 0.119 1 1 0 @@ -282,16 +111,12 @@ 0 100% 100% - 0.119 - + 1 1 0 - 1 - 0.119 - 0.119 1 1 0 @@ -300,16 +125,12 @@ 0 100% 100% - 0.119 - + 1 1 0 - 1 - 0.119 - 0.119 1 1 0 @@ -318,16 +139,12 @@ 0 100% 100% - 0.119 1 1 0 - 1 - 0.119 - 0.119 1 1 0 @@ -339,8 +156,7 @@ 0 100% 100% - 0.119 - http://piwik.org/blog/2014/03/piwik-2-1-massive-performance-reliability-improvements/ + http://piwik.net/blog/2012/08/survey-your-opinion-matters/ @@ -350,54 +166,25 @@ - - - 6 - 6 - 34 - 3 - 0.058 - 0.292 - 6 - 9 - 44 - 4 - 4 - 6 - 6 - 4 - 6 - 67% - 67% - 0.177 - http://piwik.net/ - - 5 - 5 + 4 + 4 0 - 1 - 0.134 - 0.134 - 5 - 5 + 4 + 4 0 - 5 - 5 + 4 + 4 0 100% 100% - 0.134 2 2 0 - 0 - - 0 2 2 0 @@ -406,16 +193,12 @@ 0 100% 100% - 0 2 2 0 - 0 - - 0 2 2 0 @@ -427,7 +210,6 @@ 0 100% 100% - 0 http://piwik.net/docs/manage-websites/ @@ -437,9 +219,6 @@ 1 1 0 - 0 - - 1 1 0 @@ -451,59 +230,13 @@ 0 100% 100% - 0 http://piwik.net/docs/ - - - 1 - 1 - 0 - 1 - 0.134 - 0.134 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - 0.134 - - - - 1 - 1 - 0 - 1 - 0.134 - 0.134 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - 0.134 - http://piwik.org/docs/installation/ - - - 1 1 0 - 0 - - 0 1 1 0 @@ -512,16 +245,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 1 1 0 @@ -533,7 +262,6 @@ 0 100% 100% - 0 http://piwik.net/docs/manage-users/ @@ -545,9 +273,6 @@ 4 4 0 - 0 - - 0 4 4 0 @@ -556,16 +281,12 @@ 0 100% 100% - 0 2 2 0 - 0 - - 0 2 2 0 @@ -577,7 +298,6 @@ 0 100% 100% - 0 http://piwik.net/faq/ @@ -585,9 +305,6 @@ 1 1 0 - 0 - - 0 1 1 0 @@ -596,16 +313,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 1 1 0 @@ -617,7 +330,6 @@ 0 100% 100% - 0 http://piwik.net/faq/how-to/ @@ -627,9 +339,6 @@ 1 1 0 - 0 - - 0 1 1 0 @@ -638,16 +347,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 1 1 0 @@ -659,7 +364,6 @@ 0 100% 100% - 0 http://piwik.net/faq/how-to-install/ @@ -667,117 +371,28 @@ - - 2 - 2 - 7 - 1 - 0.113 - 0.113 - 1 - 1 - 0 - 1 - 1 - 4 - 100% - 50% - 0.113 - - - - 1 - 1 - 0 - 0 - - 0 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - 0 - - - - 1 - 1 - 0 - 0 - - - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - 0 - http://piwik.net/download/counter/ - - - - - - - + 2 2 0 - 1 - 0.145 - 0.145 2 2 0 2 2 + 2 + 2 + 2 0 100% 100% - 0.145 - - - - 2 - 2 - 0 - 1 - 0.145 - 0.145 - 2 - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 0 - 100% - 100% - 0.145 - http://piwik.org/log-analytics/ - - + http://piwik.net/ 1 1 0 - 0 - - 1 1 0 @@ -789,39 +404,13 @@ 0 100% 100% - 0 http://example.org/index.htm - - - 1 - 1 - 0 - 1 - 0.413 - 0.413 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - 0.413 - http://demo.piwik.org/index.php?module=CoreHome&action=index&date=yesterday&period=day&idSite=7 - 1 1 180 - 0 - - 1 2 182 @@ -831,7 +420,6 @@ 180 0% 0% - 0 http://piwik.net/moved-permanently @@ -839,9 +427,6 @@ 1 1 0 - 0 - - 1 1 0 @@ -853,7 +438,6 @@ 0 100% 100% - 0 http://forum.piwik.org/register.php?0,approve=9a94a02145599 @@ -861,9 +445,6 @@ 1 1 0 - 0 - - 1 1 0 @@ -875,45 +456,55 @@ 0 100% 100% - 0 http://piwik.net/to-an-error - + 1 1 - 79 - 0 - - 0 + 0 1 - 2 - 81 - 0 - 79 - 0% - 0% - 0 + 1 + 0 + 1 + 1 + 0 + 100% + 100% - + 1 1 - 79 - 0 - - + 0 1 - 2 - 81 - 0 - 1 - 1 - 79 - 0% - 0% - 0 - http://piwik.org/changelog/ + 1 + 0 + 1 + 1 + 0 + 100% + 100% + + + + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + http://piwik.net/download/counter/ + + @@ -922,9 +513,6 @@ 1 1 0 - 0 - - 0 1 1 0 @@ -933,16 +521,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 1 1 0 @@ -954,7 +538,6 @@ 0 100% 100% - 0 http://piwik.net/hosting/ @@ -964,9 +547,6 @@ 1 1 0 - 0 - - 0 1 1 0 @@ -975,16 +555,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 1 1 0 @@ -996,7 +572,6 @@ 0 100% 100% - 0 http://piwik.net/intranet-analytics/ @@ -1006,9 +581,6 @@ 1 1 0 - 0 - - 0 1 1 0 @@ -1017,16 +589,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 1 1 0 @@ -1038,7 +606,6 @@ 0 100% 100% - 0 http://piwik.net/newsletter/ @@ -1048,9 +615,6 @@ 1 1 0 - 0 - - 0 1 1 0 @@ -1059,16 +623,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 0 1 1 0 @@ -1077,16 +637,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 0 1 1 0 @@ -1095,16 +651,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 0 1 1 0 @@ -1113,16 +665,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 0 1 1 0 @@ -1131,16 +679,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 0 1 1 0 @@ -1149,16 +693,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 0 1 1 0 @@ -1167,16 +707,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 0 1 1 0 @@ -1185,16 +721,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 0 1 1 0 @@ -1203,16 +735,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 1 1 0 @@ -1224,7 +752,6 @@ 0 100% 100% - 0 http://piwik.net/this/is/not/the/page/i/am/looking/for/ @@ -1250,9 +777,6 @@ 1 1 0 - 0 - - 0 1 1 0 @@ -1261,16 +785,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 1 1 0 @@ -1282,7 +802,6 @@ 0 100% 100% - 0 http://piwik.net/translations/ diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml new file mode 100644 index 00000000000..dfce45666db --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml @@ -0,0 +1,1290 @@ + + + + + 9 + 12 + 170 + 7 + 0.023 + 1.324 + 8 + 17 + 54 + 7 + 7 + 19 + 88% + 78% + 0.389 + + + + 6 + 9 + 170 + 5 + 0.023 + 1.324 + 5 + 14 + 54 + 4 + 4 + 28 + 80% + 67% + 0.443 + + + + 4 + 6 + 156 + 3 + 0.023 + 0.123 + 4 + 13 + 54 + 3 + 3 + 39 + 75% + 75% + 0.089 + + + + 4 + 6 + 156 + 3 + 0.023 + 0.123 + 4 + 13 + 54 + 3 + 3 + 3 + 3 + 3 + 39 + 75% + 75% + 0.089 + http://piwik.net/blog/category/meta/ + + + + + + 2 + 3 + 14 + 2 + 0.624 + 1.324 + 1 + 1 + 0 + 1 + 1 + 7 + 100% + 50% + 0.974 + + + + 2 + 3 + 14 + 2 + 0.624 + 1.324 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 7 + 100% + 50% + 0.974 + http://piwik.net/blog/category/community/ + + + + + + + + 2 + 2 + 0 + 1 + 0.391 + 0.391 + 2 + 2 + 0 + 2 + 2 + 0 + 100% + 100% + 0.391 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/blog/2012/08/survey-your-opinion-matters/ + + + + + + + + 1 + 1 + 0 + 1 + 0.391 + 0.391 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.391 + + + + 1 + 1 + 0 + 1 + 0.391 + 0.391 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.391 + + + + 1 + 1 + 0 + 1 + 0.391 + 0.391 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0.391 + http://piwik.org/blog/2012/10/integrate-piwik-into-your-rails-application/ + + + + + + + + + + 1 + 1 + 0 + 1 + 0.119 + 0.119 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.119 + + + + 1 + 1 + 0 + 1 + 0.119 + 0.119 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.119 + + + + 1 + 1 + 0 + 1 + 0.119 + 0.119 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.119 + + + + 1 + 1 + 0 + 1 + 0.119 + 0.119 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0.119 + http://piwik.org/blog/2014/03/piwik-2-1-massive-performance-reliability-improvements/ + + + + + + + + + + + + 6 + 6 + 34 + 3 + 0.058 + 0.292 + 6 + 9 + 44 + 4 + 4 + 2 + 2 + 2 + 6 + 67% + 67% + 0.177 + http://piwik.net/ + + + + 6 + 7 + 0 + 3 + 0.134 + 0.543 + 5 + 5 + 0 + 5 + 5 + 0 + 100% + 83% + 0.34 + + + + 3 + 4 + 0 + 2 + 0.343 + 0.543 + 2 + 2 + 0 + 2 + 2 + 0 + 100% + 67% + 0.443 + + + + 3 + 4 + 0 + 2 + 0.343 + 0.543 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 100% + 67% + 0.443 + http://piwik.net/docs/manage-websites/ + + + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/docs/ + + + + 1 + 1 + 0 + 1 + 0.134 + 0.134 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.134 + + + + 1 + 1 + 0 + 1 + 0.134 + 0.134 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0.134 + http://piwik.org/docs/installation/ + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/docs/manage-users/ + + + + + + + + 5 + 7 + 52 + 3 + 0.234 + 0.294 + 4 + 4 + 0 + 4 + 5 + 10 + 100% + 100% + 0.255 + + + + 3 + 5 + 52 + 3 + 0.234 + 0.294 + 2 + 2 + 0 + 2 + 3 + 2 + 2 + 2 + 17 + 100% + 100% + 0.255 + http://piwik.net/faq/ + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/faq/how-to/ + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/faq/how-to-install/ + + + + + + + + 2 + 2 + 7 + 1 + 0.113 + 0.113 + 1 + 1 + 0 + 1 + 1 + 4 + 100% + 50% + 0.113 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/download/counter/ + + + + + + + + 2 + 2 + 0 + 1 + 0.145 + 0.145 + 2 + 2 + 0 + 2 + 2 + 0 + 100% + 100% + 0.145 + + + + 2 + 2 + 0 + 1 + 0.145 + 0.145 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 100% + 100% + 0.145 + http://piwik.org/log-analytics/ + + + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://example.org/index.htm + + + + 1 + 1 + 0 + 1 + 0.413 + 0.413 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0.413 + http://demo.piwik.org/index.php?module=CoreHome&action=index&date=yesterday&period=day&idSite=7 + + + + 1 + 1 + 180 + 0 + + + 1 + 2 + 182 + 0 + 1 + 1 + 180 + 0% + 0% + 0 + http://piwik.net/moved-permanently + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://forum.piwik.org/register.php?0,approve=9a94a02145599 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/to-an-error + + + + 1 + 1 + 79 + 0 + + 0 + 1 + 2 + 81 + 0 + 79 + 0% + 0% + 0 + + + + 1 + 1 + 79 + 0 + + + 1 + 2 + 81 + 0 + 1 + 1 + 79 + 0% + 0% + 0 + http://piwik.org/changelog/ + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/hosting/ + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/intranet-analytics/ + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/newsletter/ + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/this/is/not/the/page/i/am/looking/for/ + + + + + + + + + + + + + + + + + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/translations/ + + + + \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml index 7a9395ac443..f1b90a5e1d6 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml @@ -1,76 +1,26 @@ - - - 4 - 4 - 34 - 3 - 0.058 - 0.292 - 4 - 7 - 44 - 2 - 2 - 4 - 4 - 2 - 9 - 50% - 50% - 0.177 - - - - 2 - 2 - 0 - 1 - 0.145 - 0.145 - 2 - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 0 - 100% - 100% - 0.145 - 1 1 0 - 0 - - 0 1 0 0% 100% - 0 1 1 0 - 0 - - 1 1 1 0 0% 100% - 0 @@ -79,9 +29,6 @@ 1 1 0 - 0 - - 0 1 1 0 @@ -90,16 +37,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 1 1 0 @@ -111,7 +54,6 @@ 0 100% 100% - 0 @@ -120,9 +62,6 @@ 1 1 0 - 0 - - 0 1 1 0 @@ -131,73 +70,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - 0 - - - - - - 1 - 1 - 0 - 0 - - - 1 - 1 - 1 - 0 - 0% - 100% - 0 - - - - 1 - 1 - 0 - 1 - 0.413 - 0.413 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - 0.413 - - - - 1 - 1 - 0 - 1 - 0.413 - 0.413 1 1 0 @@ -209,34 +87,14 @@ 0 100% 100% - 0.413 - - - 1 - 1 - 7 - 1 - 0.113 - 0.113 - 1 - 1 - 1 - 7 - 0% - 100% - 0.113 - 1 1 0 - 0 - - 1 1 0 @@ -248,79 +106,12 @@ 0 100% 100% - 0 - - - - 1 - 1 - 0 - 1 - 0.134 - 0.134 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - 0.134 - - - - 1 - 1 - 0 - 1 - 0.391 - 0.391 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - 0.391 - - - - 1 - 1 - 0 - 1 - 0.119 - 0.119 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - 0.119 1 1 0 - 0 - - 1 1 0 @@ -332,22 +123,5 @@ 0 100% 100% - 0 - - - - 1 - 1 - 0 - 0 - - - 1 - 1 - 1 - 0 - 0% - 100% - 0 \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml new file mode 100644 index 00000000000..fbb87d260df --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageTitles_range.xml @@ -0,0 +1,353 @@ + + + + + 4 + 4 + 34 + 3 + 0.058 + 0.292 + 4 + 7 + 44 + 2 + 2 + 4 + 4 + 2 + 9 + 50% + 50% + 0.177 + + + + 2 + 2 + 0 + 1 + 0.145 + 0.145 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 100% + 100% + 0.145 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 0 + 0% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 1 + 0 + 0% + 100% + 0 + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + + + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 1 + 0 + 0% + 100% + 0 + + + + 1 + 1 + 0 + 1 + 0.413 + 0.413 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.413 + + + + 1 + 1 + 0 + 1 + 0.413 + 0.413 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0.413 + + + + + + 1 + 1 + 7 + 1 + 0.113 + 0.113 + 1 + 1 + 1 + 7 + 0% + 100% + 0.113 + + + + 1 + 1 + 0 + 1 + 0.134 + 0.134 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0.134 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 1 + 0.391 + 0.391 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0.391 + + + + 1 + 1 + 0 + 1 + 0.119 + 0.119 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0.119 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 1 + 0 + 0% + 100% + 0 + + \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml index 3bebd593bf5..28acca12421 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml @@ -2,30 +2,23 @@ - 7 - 7 + 5 + 5 0 - 2 - 0.119 - 0.391 - 7 - 7 + 5 + 5 0 - 7 - 7 + 5 + 5 0 100% 100% - 0.255 4 4 0 - 0 - - 0 4 4 0 @@ -34,16 +27,12 @@ 0 100% 100% - 0 3 3 0 - 0 - - 0 3 3 0 @@ -52,16 +41,12 @@ 0 100% 100% - 0 3 3 0 - 0 - - 0 3 3 0 @@ -73,7 +58,6 @@ 0 100% 100% - 0 http://piwik.net/blog/category/meta/ @@ -83,9 +67,6 @@ 1 1 0 - 0 - - 0 1 1 0 @@ -94,16 +75,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 1 1 0 @@ -115,7 +92,6 @@ 0 100% 100% - 0 http://piwik.net/blog/category/community/ @@ -124,156 +100,9 @@ - 2 - 2 - 0 - 1 - 0.391 - 0.391 - 2 - 2 - 0 - 2 - 2 - 0 - 100% - 100% - 0.391 - - - - 1 - 1 - 0 - 0 - - 0 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - 0 - - - - 1 - 1 - 0 - 0 - - 0 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - 0 - - - - 1 - 1 - 0 - 0 - - - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - 0 - http://piwik.net/blog/2012/08/survey-your-opinion-matters/ - - - - - - - - 1 - 1 - 0 - 1 - 0.391 - 0.391 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - 0.391 - - - - 1 - 1 - 0 - 1 - 0.391 - 0.391 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - 0.391 - - - - 1 - 1 - 0 - 1 - 0.391 - 0.391 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - 0.391 - http://piwik.org/blog/2012/10/integrate-piwik-into-your-rails-application/ - - - - - - - - - 1 1 0 - 1 - 0.119 - 0.119 1 1 0 @@ -282,16 +111,12 @@ 0 100% 100% - 0.119 - + 1 1 0 - 1 - 0.119 - 0.119 1 1 0 @@ -300,16 +125,12 @@ 0 100% 100% - 0.119 - + 1 1 0 - 1 - 0.119 - 0.119 1 1 0 @@ -318,16 +139,12 @@ 0 100% 100% - 0.119 1 1 0 - 1 - 0.119 - 0.119 1 1 0 @@ -339,8 +156,7 @@ 0 100% 100% - 0.119 - http://piwik.org/blog/2014/03/piwik-2-1-massive-performance-reliability-improvements/ + http://piwik.net/blog/2012/08/survey-your-opinion-matters/ @@ -350,54 +166,25 @@ - - - 6 - 6 - 34 - 3 - 0.058 - 0.292 - 6 - 9 - 44 - 4 - 4 - 6 - 6 - 4 - 6 - 67% - 67% - 0.177 - http://piwik.net/ - - 5 - 5 + 4 + 4 0 - 1 - 0.134 - 0.134 - 5 - 5 + 4 + 4 0 - 5 - 5 + 4 + 4 0 100% 100% - 0.134 2 2 0 - 0 - - 0 2 2 0 @@ -406,16 +193,12 @@ 0 100% 100% - 0 2 2 0 - 0 - - 0 2 2 0 @@ -427,7 +210,6 @@ 0 100% 100% - 0 http://piwik.net/docs/manage-websites/ @@ -437,9 +219,6 @@ 1 1 0 - 0 - - 1 1 0 @@ -451,59 +230,13 @@ 0 100% 100% - 0 http://piwik.net/docs/ - - - 1 - 1 - 0 - 1 - 0.134 - 0.134 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - 0.134 - - - - 1 - 1 - 0 - 1 - 0.134 - 0.134 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - 0.134 - http://piwik.org/docs/installation/ - - - 1 1 0 - 0 - - 0 1 1 0 @@ -512,16 +245,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 1 1 0 @@ -533,7 +262,6 @@ 0 100% 100% - 0 http://piwik.net/docs/manage-users/ @@ -545,9 +273,6 @@ 4 4 0 - 0 - - 0 4 4 0 @@ -556,16 +281,12 @@ 0 100% 100% - 0 2 2 0 - 0 - - 0 2 2 0 @@ -577,7 +298,6 @@ 0 100% 100% - 0 http://piwik.net/faq/ @@ -585,9 +305,6 @@ 1 1 0 - 0 - - 0 1 1 0 @@ -596,16 +313,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 1 1 0 @@ -617,7 +330,6 @@ 0 100% 100% - 0 http://piwik.net/faq/how-to/ @@ -627,9 +339,6 @@ 1 1 0 - 0 - - 0 1 1 0 @@ -638,16 +347,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 1 1 0 @@ -659,7 +364,6 @@ 0 100% 100% - 0 http://piwik.net/faq/how-to-install/ @@ -667,117 +371,28 @@ - - 2 - 2 - 7 - 1 - 0.113 - 0.113 - 1 - 1 - 0 - 1 - 1 - 4 - 100% - 50% - 0.113 - - - - 1 - 1 - 0 - 0 - - 0 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - 0 - - - - 1 - 1 - 0 - 0 - - - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - 0 - http://piwik.net/download/counter/ - - - - - - - + 2 2 0 - 1 - 0.145 - 0.145 2 2 0 2 2 + 2 + 2 + 2 0 100% 100% - 0.145 - - - - 2 - 2 - 0 - 1 - 0.145 - 0.145 - 2 - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 0 - 100% - 100% - 0.145 - http://piwik.org/log-analytics/ - - + http://piwik.net/ 1 1 0 - 0 - - 1 1 0 @@ -789,39 +404,13 @@ 0 100% 100% - 0 http://example.org/index.htm - - - 1 - 1 - 0 - 1 - 0.413 - 0.413 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - 0.413 - http://demo.piwik.org/index.php?module=CoreHome&action=index&date=yesterday&period=day&idSite=7 - 1 1 0 - 0 - - 1 1 0 @@ -833,7 +422,6 @@ 0 100% 100% - 0 http://forum.piwik.org/register.php?0,approve=9a94a02145599 @@ -841,16 +429,12 @@ 1 1 0 - 0 - - 1 1 1 0 0% 100% - 0 http://piwik.net/temp-redirect @@ -858,9 +442,6 @@ 1 1 0 - 0 - - 1 1 0 @@ -872,39 +453,55 @@ 0 100% 100% - 0 http://piwik.net/to-an-error - + 1 1 0 - 0 - - 0 + 1 + 1 + 0 + 1 1 0 - 0% + 100% 100% - 0 - + 1 1 0 - 0 - - + 1 + 1 + 0 + 1 1 - 1 - 1 0 - 0% + 100% 100% - 0 - http://piwik.org/contact/ + + + + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + http://piwik.net/download/counter/ + + @@ -913,9 +510,6 @@ 1 1 0 - 0 - - 0 1 1 0 @@ -924,16 +518,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 1 1 0 @@ -945,7 +535,6 @@ 0 100% 100% - 0 http://piwik.net/hosting/ @@ -955,9 +544,6 @@ 1 1 0 - 0 - - 0 1 1 0 @@ -966,16 +552,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 1 1 0 @@ -987,7 +569,6 @@ 0 100% 100% - 0 http://piwik.net/intranet-analytics/ @@ -997,9 +578,6 @@ 1 1 0 - 0 - - 0 1 1 0 @@ -1008,16 +586,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 1 1 0 @@ -1029,7 +603,6 @@ 0 100% 100% - 0 http://piwik.net/newsletter/ @@ -1039,9 +612,6 @@ 1 1 0 - 0 - - 0 1 1 0 @@ -1050,16 +620,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 0 1 1 0 @@ -1068,16 +634,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 0 1 1 0 @@ -1086,16 +648,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 0 1 1 0 @@ -1104,16 +662,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 0 1 1 0 @@ -1122,16 +676,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 0 1 1 0 @@ -1140,16 +690,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 0 1 1 0 @@ -1158,16 +704,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 0 1 1 0 @@ -1176,16 +718,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 0 1 1 0 @@ -1194,16 +732,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 1 1 0 @@ -1215,7 +749,6 @@ 0 100% 100% - 0 http://piwik.net/this/is/not/the/page/i/am/looking/for/ @@ -1241,9 +774,6 @@ 1 1 0 - 0 - - 0 1 1 0 @@ -1252,16 +782,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 1 1 0 @@ -1273,42 +799,8 @@ 0 100% 100% - 0 http://piwik.net/translations/ - - - 1 - 1 - 0 - 0 - - 0 - 1 - 0 - 0% - 100% - 0 - - - - 1 - 1 - 0 - 0 - - - 1 - 1 - 1 - 0 - 0% - 100% - 0 - http://piwik.org/what-is-piwik/ - - - \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml new file mode 100644 index 00000000000..96456ff943c --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml @@ -0,0 +1,1314 @@ + + + + + 9 + 12 + 170 + 7 + 0.023 + 1.324 + 8 + 17 + 54 + 7 + 7 + 19 + 88% + 78% + 0.389 + + + + 6 + 9 + 170 + 5 + 0.023 + 1.324 + 5 + 14 + 54 + 4 + 4 + 28 + 80% + 67% + 0.443 + + + + 4 + 6 + 156 + 3 + 0.023 + 0.123 + 4 + 13 + 54 + 3 + 3 + 39 + 75% + 75% + 0.089 + + + + 4 + 6 + 156 + 3 + 0.023 + 0.123 + 4 + 13 + 54 + 3 + 3 + 3 + 3 + 3 + 39 + 75% + 75% + 0.089 + http://piwik.net/blog/category/meta/ + + + + + + 2 + 3 + 14 + 2 + 0.624 + 1.324 + 1 + 1 + 0 + 1 + 1 + 7 + 100% + 50% + 0.974 + + + + 2 + 3 + 14 + 2 + 0.624 + 1.324 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 7 + 100% + 50% + 0.974 + http://piwik.net/blog/category/community/ + + + + + + + + 2 + 2 + 0 + 1 + 0.391 + 0.391 + 2 + 2 + 0 + 2 + 2 + 0 + 100% + 100% + 0.391 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/blog/2012/08/survey-your-opinion-matters/ + + + + + + + + 1 + 1 + 0 + 1 + 0.391 + 0.391 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.391 + + + + 1 + 1 + 0 + 1 + 0.391 + 0.391 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.391 + + + + 1 + 1 + 0 + 1 + 0.391 + 0.391 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0.391 + http://piwik.org/blog/2012/10/integrate-piwik-into-your-rails-application/ + + + + + + + + + + 1 + 1 + 0 + 1 + 0.119 + 0.119 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.119 + + + + 1 + 1 + 0 + 1 + 0.119 + 0.119 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.119 + + + + 1 + 1 + 0 + 1 + 0.119 + 0.119 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.119 + + + + 1 + 1 + 0 + 1 + 0.119 + 0.119 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0.119 + http://piwik.org/blog/2014/03/piwik-2-1-massive-performance-reliability-improvements/ + + + + + + + + + + + + 6 + 6 + 34 + 3 + 0.058 + 0.292 + 6 + 9 + 44 + 4 + 4 + 2 + 2 + 2 + 6 + 67% + 67% + 0.177 + http://piwik.net/ + + + + 6 + 7 + 0 + 3 + 0.134 + 0.543 + 5 + 5 + 0 + 5 + 5 + 0 + 100% + 83% + 0.34 + + + + 3 + 4 + 0 + 2 + 0.343 + 0.543 + 2 + 2 + 0 + 2 + 2 + 0 + 100% + 67% + 0.443 + + + + 3 + 4 + 0 + 2 + 0.343 + 0.543 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 100% + 67% + 0.443 + http://piwik.net/docs/manage-websites/ + + + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/docs/ + + + + 1 + 1 + 0 + 1 + 0.134 + 0.134 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.134 + + + + 1 + 1 + 0 + 1 + 0.134 + 0.134 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0.134 + http://piwik.org/docs/installation/ + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/docs/manage-users/ + + + + + + + + 5 + 7 + 52 + 3 + 0.234 + 0.294 + 4 + 4 + 0 + 4 + 5 + 10 + 100% + 100% + 0.255 + + + + 3 + 5 + 52 + 3 + 0.234 + 0.294 + 2 + 2 + 0 + 2 + 3 + 2 + 2 + 2 + 17 + 100% + 100% + 0.255 + http://piwik.net/faq/ + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/faq/how-to/ + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/faq/how-to-install/ + + + + + + + + 2 + 2 + 7 + 1 + 0.113 + 0.113 + 1 + 1 + 0 + 1 + 1 + 4 + 100% + 50% + 0.113 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/download/counter/ + + + + + + + + 2 + 2 + 0 + 1 + 0.145 + 0.145 + 2 + 2 + 0 + 2 + 2 + 0 + 100% + 100% + 0.145 + + + + 2 + 2 + 0 + 1 + 0.145 + 0.145 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 100% + 100% + 0.145 + http://piwik.org/log-analytics/ + + + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://example.org/index.htm + + + + 1 + 1 + 0 + 1 + 0.413 + 0.413 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0.413 + http://demo.piwik.org/index.php?module=CoreHome&action=index&date=yesterday&period=day&idSite=7 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://forum.piwik.org/register.php?0,approve=9a94a02145599 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 1 + 0 + 0% + 100% + 0 + http://piwik.net/temp-redirect + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/to-an-error + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 0 + 0% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 1 + 0 + 0% + 100% + 0 + http://piwik.org/contact/ + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/hosting/ + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/intranet-analytics/ + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/newsletter/ + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/this/is/not/the/page/i/am/looking/for/ + + + + + + + + + + + + + + + + + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/translations/ + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 0 + 0% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 1 + 0 + 0% + 100% + 0 + http://piwik.org/what-is-piwik/ + + + + \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getOutlink_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getOutlink_range.xml new file mode 100644 index 00000000000..c234bed59e9 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getOutlink_range.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getOutlinks_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getOutlinks_month.xml index d03b4e81bb3..c234bed59e9 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getOutlinks_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getOutlinks_month.xml @@ -1,31 +1,2 @@ - - - - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 1 - - - - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - http://demo.piwik.org/ - - - - \ No newline at end of file + \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getOutlinks_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getOutlinks_range.xml new file mode 100644 index 00000000000..d03b4e81bb3 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getOutlinks_range.xml @@ -0,0 +1,31 @@ + + + + + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + + + + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + http://demo.piwik.org/ + + + + \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitle_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitle_range.xml new file mode 100644 index 00000000000..c234bed59e9 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitle_range.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitlesFollowingSiteSearch_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitlesFollowingSiteSearch_range.xml new file mode 100644 index 00000000000..c234bed59e9 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitlesFollowingSiteSearch_range.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_month.xml index 61ef03022a0..143229b5e7a 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_month.xml @@ -5,65 +5,16 @@ 20 20 0 - 0 - - 0 20 0 0% 0% - 0 - - - - 4 - 4 - 34 - 3 - 0.058 - 0.292 - 4 - 7 - 44 - 2 - 2 - 4 - 4 - 2 - 9 - 50% - 50% - 0.177 - - - - 2 - 2 - 0 - 1 - 0.145 - 0.145 - 2 - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 0 - 100% - 100% - 0.145 1 1 180 - 0 - - 0 1 2 182 @@ -71,16 +22,12 @@ 180 0% 0% - 0 1 1 180 - 0 - - 1 2 182 @@ -90,7 +37,6 @@ 180 0% 0% - 0 @@ -99,30 +45,22 @@ 1 1 0 - 0 - - 0 1 0 0% 100% - 0 1 1 0 - 0 - - 1 1 1 0 0% 100% - 0 @@ -131,9 +69,6 @@ 1 1 0 - 0 - - 0 1 1 0 @@ -142,16 +77,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 1 1 0 @@ -163,7 +94,6 @@ 0 100% 100% - 0 @@ -172,9 +102,6 @@ 1 1 0 - 0 - - 0 1 1 0 @@ -183,92 +110,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - 0 - - - - - - 1 - 1 - 79 - 0 - - - 1 - 2 - 81 - 0 - 1 - 1 - 79 - 0% - 0% - 0 - - - - 1 - 1 - 0 - 0 - - - 1 - 1 - 1 - 0 - 0% - 100% - 0 - - - - 1 - 1 - 0 - 1 - 0.413 - 0.413 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - 0.413 - - - - 1 - 1 - 0 - 1 - 0.413 - 0.413 1 1 0 @@ -280,34 +127,14 @@ 0 100% 100% - 0.413 - - - 1 - 1 - 7 - 1 - 0.113 - 0.113 - 1 - 1 - 1 - 7 - 0% - 100% - 0.113 - 1 1 0 - 0 - - 1 1 0 @@ -319,79 +146,12 @@ 0 100% 100% - 0 - - - - 1 - 1 - 0 - 1 - 0.134 - 0.134 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - 0.134 - - - - 1 - 1 - 0 - 1 - 0.391 - 0.391 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - 0.391 - - - - 1 - 1 - 0 - 1 - 0.119 - 0.119 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - 0.119 1 1 0 - 0 - - 1 1 0 @@ -403,22 +163,5 @@ 0 100% 100% - 0 - - - - 1 - 1 - 0 - 0 - - - 1 - 1 - 1 - 0 - 0% - 100% - 0 \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_range.xml new file mode 100644 index 00000000000..510e647f418 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_range.xml @@ -0,0 +1,424 @@ + + + + + 21 + 30 + 0 + 10 + 0.023 + 1.324 + 20 + 0 + 0% + 0% + 0.387 + + + + 4 + 4 + 34 + 3 + 0.058 + 0.292 + 4 + 7 + 44 + 2 + 2 + 4 + 4 + 2 + 9 + 50% + 50% + 0.177 + + + + 2 + 2 + 0 + 1 + 0.145 + 0.145 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 100% + 100% + 0.145 + + + + 1 + 1 + 180 + 0 + + 0 + 1 + 2 + 182 + 0 + 180 + 0% + 0% + 0 + + + + 1 + 1 + 180 + 0 + + + 1 + 2 + 182 + 0 + 1 + 1 + 180 + 0% + 0% + 0 + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 0 + 0% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 1 + 0 + 0% + 100% + 0 + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + + + + + + 1 + 1 + 79 + 0 + + + 1 + 2 + 81 + 0 + 1 + 1 + 79 + 0% + 0% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 1 + 0 + 0% + 100% + 0 + + + + 1 + 1 + 0 + 1 + 0.413 + 0.413 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.413 + + + + 1 + 1 + 0 + 1 + 0.413 + 0.413 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0.413 + + + + + + 1 + 1 + 7 + 1 + 0.113 + 0.113 + 1 + 1 + 1 + 7 + 0% + 100% + 0.113 + + + + 1 + 1 + 0 + 1 + 0.134 + 0.134 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0.134 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 1 + 0.391 + 0.391 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0.391 + + + + 1 + 1 + 0 + 1 + 0.119 + 0.119 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0.119 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 1 + 0 + 0% + 100% + 0 + + \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrl_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrl_range.xml new file mode 100644 index 00000000000..c5d48fa6219 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrl_range.xml @@ -0,0 +1,21 @@ + + + + + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + http://example.org/index.htm + + \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrlsFollowingSiteSearch_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrlsFollowingSiteSearch_range.xml new file mode 100644 index 00000000000..c234bed59e9 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrlsFollowingSiteSearch_range.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_month.xml index 439e7e6105f..c3f7304c254 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_month.xml @@ -2,30 +2,23 @@ - 7 - 7 + 5 + 5 0 - 2 - 0.119 - 0.391 - 7 - 7 + 5 + 5 0 - 7 - 7 + 5 + 5 0 100% 100% - 0.255 4 4 0 - 0 - - 0 4 4 0 @@ -34,16 +27,12 @@ 0 100% 100% - 0 3 3 0 - 0 - - 0 3 3 0 @@ -52,16 +41,12 @@ 0 100% 100% - 0 3 3 0 - 0 - - 0 3 3 0 @@ -73,7 +58,6 @@ 0 100% 100% - 0 http://piwik.net/blog/category/meta/ @@ -83,9 +67,6 @@ 1 1 0 - 0 - - 0 1 1 0 @@ -94,16 +75,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 1 1 0 @@ -115,7 +92,6 @@ 0 100% 100% - 0 http://piwik.net/blog/category/community/ @@ -124,156 +100,9 @@ - 2 - 2 - 0 - 1 - 0.391 - 0.391 - 2 - 2 - 0 - 2 - 2 - 0 - 100% - 100% - 0.391 - - - - 1 - 1 - 0 - 0 - - 0 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - 0 - - - - 1 - 1 - 0 - 0 - - 0 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - 0 - - - - 1 - 1 - 0 - 0 - - - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - 0 - http://piwik.net/blog/2012/08/survey-your-opinion-matters/ - - - - - - - - 1 - 1 - 0 - 1 - 0.391 - 0.391 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - 0.391 - - - - 1 - 1 - 0 - 1 - 0.391 - 0.391 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - 0.391 - - - - 1 - 1 - 0 - 1 - 0.391 - 0.391 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - 0.391 - http://piwik.org/blog/2012/10/integrate-piwik-into-your-rails-application/ - - - - - - - - - 1 1 0 - 1 - 0.119 - 0.119 1 1 0 @@ -282,16 +111,12 @@ 0 100% 100% - 0.119 - + 1 1 0 - 1 - 0.119 - 0.119 1 1 0 @@ -300,16 +125,12 @@ 0 100% 100% - 0.119 - + 1 1 0 - 1 - 0.119 - 0.119 1 1 0 @@ -318,16 +139,12 @@ 0 100% 100% - 0.119 1 1 0 - 1 - 0.119 - 0.119 1 1 0 @@ -339,8 +156,7 @@ 0 100% 100% - 0.119 - http://piwik.org/blog/2014/03/piwik-2-1-massive-performance-reliability-improvements/ + http://piwik.net/blog/2012/08/survey-your-opinion-matters/ @@ -350,54 +166,25 @@ - - - 6 - 6 - 34 - 3 - 0.058 - 0.292 - 6 - 9 - 44 - 4 - 4 - 6 - 6 - 4 - 6 - 67% - 67% - 0.177 - http://piwik.net/ - - 5 - 5 + 4 + 4 0 - 1 - 0.134 - 0.134 - 5 - 5 + 4 + 4 0 - 5 - 5 + 4 + 4 0 100% 100% - 0.134 2 2 0 - 0 - - 0 2 2 0 @@ -406,16 +193,12 @@ 0 100% 100% - 0 2 2 0 - 0 - - 0 2 2 0 @@ -427,7 +210,6 @@ 0 100% 100% - 0 http://piwik.net/docs/manage-websites/ @@ -437,9 +219,6 @@ 1 1 0 - 0 - - 1 1 0 @@ -451,59 +230,13 @@ 0 100% 100% - 0 http://piwik.net/docs/ - - - 1 - 1 - 0 - 1 - 0.134 - 0.134 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - 0.134 - - - - 1 - 1 - 0 - 1 - 0.134 - 0.134 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - 0.134 - http://piwik.org/docs/installation/ - - - 1 1 0 - 0 - - 0 1 1 0 @@ -512,16 +245,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 1 1 0 @@ -533,7 +262,6 @@ 0 100% 100% - 0 http://piwik.net/docs/manage-users/ @@ -545,9 +273,6 @@ 4 4 0 - 0 - - 0 4 4 0 @@ -556,16 +281,12 @@ 0 100% 100% - 0 2 2 0 - 0 - - 0 2 2 0 @@ -577,7 +298,6 @@ 0 100% 100% - 0 http://piwik.net/faq/ @@ -585,9 +305,6 @@ 1 1 0 - 0 - - 0 1 1 0 @@ -596,16 +313,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 1 1 0 @@ -617,7 +330,6 @@ 0 100% 100% - 0 http://piwik.net/faq/how-to/ @@ -627,9 +339,6 @@ 1 1 0 - 0 - - 0 1 1 0 @@ -638,16 +347,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 1 1 0 @@ -659,7 +364,6 @@ 0 100% 100% - 0 http://piwik.net/faq/how-to-install/ @@ -667,132 +371,28 @@ - - 2 - 2 - 7 - 1 - 0.113 - 0.113 - 1 - 1 - 0 - 1 - 1 - 4 - 100% - 50% - 0.113 - - - - 1 - 1 - 7 - 1 - 0.113 - 0.113 - 1 - 7 - 0% - 0% - 0.113 - http://piwik.org/download/ - - - - 1 - 1 - 0 - 0 - - 0 - 1 - 1 - 0 - 1 - 1 - 0 - 100% - 100% - 0 - - - - 1 - 1 - 0 - 0 - - - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - 0 - http://piwik.net/download/counter/ - - - - - - - + 2 2 0 - 1 - 0.145 - 0.145 2 2 0 2 2 + 2 + 2 + 2 0 100% 100% - 0.145 - - - - 2 - 2 - 0 - 1 - 0.145 - 0.145 - 2 - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 0 - 100% - 100% - 0.145 - http://piwik.org/log-analytics/ - - + http://piwik.net/ 1 1 0 - 0 - - 1 1 0 @@ -804,39 +404,13 @@ 0 100% 100% - 0 http://example.org/index.htm - - - 1 - 1 - 0 - 1 - 0.413 - 0.413 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 100% - 100% - 0.413 - http://demo.piwik.org/index.php?module=CoreHome&action=index&date=yesterday&period=day&idSite=7 - 1 1 180 - 0 - - 1 2 182 @@ -846,7 +420,6 @@ 180 0% 0% - 0 http://piwik.net/moved-permanently @@ -854,9 +427,6 @@ 1 1 0 - 0 - - 1 1 0 @@ -868,7 +438,6 @@ 0 100% 100% - 0 http://forum.piwik.org/register.php?0,approve=9a94a02145599 @@ -876,16 +445,12 @@ 1 1 0 - 0 - - 1 1 1 0 0% 100% - 0 http://piwik.net/temp-redirect @@ -893,9 +458,6 @@ 1 1 0 - 0 - - 1 1 0 @@ -907,78 +469,55 @@ 0 100% 100% - 0 http://piwik.net/to-an-error - - 1 - 1 - 79 - 0 - - 0 - 1 - 2 - 81 - 0 - 79 - 0% - 0% - 0 - - - - 1 - 1 - 79 - 0 - - - 1 - 2 - 81 - 0 - 1 - 1 - 79 - 0% - 0% - 0 - http://piwik.org/changelog/ - - - - - + 1 1 0 - 0 - - 0 + 1 + 1 + 0 + 1 1 0 - 0% + 100% 100% - 0 - + 1 1 0 - 0 - - + 1 + 1 + 0 + 1 1 - 1 - 1 0 - 0% + 100% 100% - 0 - http://piwik.org/contact/ + + + + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + http://piwik.net/download/counter/ + + @@ -987,9 +526,6 @@ 1 1 0 - 0 - - 0 1 1 0 @@ -998,16 +534,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 1 1 0 @@ -1019,7 +551,6 @@ 0 100% 100% - 0 http://piwik.net/hosting/ @@ -1029,9 +560,6 @@ 1 1 0 - 0 - - 0 1 1 0 @@ -1040,16 +568,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 1 1 0 @@ -1061,7 +585,6 @@ 0 100% 100% - 0 http://piwik.net/intranet-analytics/ @@ -1071,9 +594,6 @@ 1 1 0 - 0 - - 0 1 1 0 @@ -1082,16 +602,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 1 1 0 @@ -1103,7 +619,6 @@ 0 100% 100% - 0 http://piwik.net/newsletter/ @@ -1113,9 +628,6 @@ 1 1 0 - 0 - - 0 1 1 0 @@ -1124,16 +636,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 0 1 1 0 @@ -1142,16 +650,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 0 1 1 0 @@ -1160,16 +664,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 0 1 1 0 @@ -1178,16 +678,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 0 1 1 0 @@ -1196,16 +692,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 0 1 1 0 @@ -1214,16 +706,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 0 1 1 0 @@ -1232,16 +720,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 0 1 1 0 @@ -1250,16 +734,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 0 1 1 0 @@ -1268,16 +748,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 1 1 0 @@ -1289,7 +765,6 @@ 0 100% 100% - 0 http://piwik.net/this/is/not/the/page/i/am/looking/for/ @@ -1315,9 +790,6 @@ 1 1 0 - 0 - - 0 1 1 0 @@ -1326,16 +798,12 @@ 0 100% 100% - 0 1 1 0 - 0 - - 1 1 0 @@ -1347,42 +815,8 @@ 0 100% 100% - 0 http://piwik.net/translations/ - - - 1 - 1 - 0 - 0 - - 0 - 1 - 0 - 0% - 100% - 0 - - - - 1 - 1 - 0 - 0 - - - 1 - 1 - 1 - 0 - 0% - 100% - 0 - http://piwik.org/what-is-piwik/ - - - \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_range.xml new file mode 100644 index 00000000000..5cba0e475ee --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_range.xml @@ -0,0 +1,1388 @@ + + + + + 9 + 12 + 170 + 7 + 0.023 + 1.324 + 8 + 17 + 54 + 7 + 7 + 19 + 88% + 78% + 0.389 + + + + 6 + 9 + 170 + 5 + 0.023 + 1.324 + 5 + 14 + 54 + 4 + 4 + 28 + 80% + 67% + 0.443 + + + + 4 + 6 + 156 + 3 + 0.023 + 0.123 + 4 + 13 + 54 + 3 + 3 + 39 + 75% + 75% + 0.089 + + + + 4 + 6 + 156 + 3 + 0.023 + 0.123 + 4 + 13 + 54 + 3 + 3 + 3 + 3 + 3 + 39 + 75% + 75% + 0.089 + http://piwik.net/blog/category/meta/ + + + + + + 2 + 3 + 14 + 2 + 0.624 + 1.324 + 1 + 1 + 0 + 1 + 1 + 7 + 100% + 50% + 0.974 + + + + 2 + 3 + 14 + 2 + 0.624 + 1.324 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 7 + 100% + 50% + 0.974 + http://piwik.net/blog/category/community/ + + + + + + + + 2 + 2 + 0 + 1 + 0.391 + 0.391 + 2 + 2 + 0 + 2 + 2 + 0 + 100% + 100% + 0.391 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/blog/2012/08/survey-your-opinion-matters/ + + + + + + + + 1 + 1 + 0 + 1 + 0.391 + 0.391 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.391 + + + + 1 + 1 + 0 + 1 + 0.391 + 0.391 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.391 + + + + 1 + 1 + 0 + 1 + 0.391 + 0.391 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0.391 + http://piwik.org/blog/2012/10/integrate-piwik-into-your-rails-application/ + + + + + + + + + + 1 + 1 + 0 + 1 + 0.119 + 0.119 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.119 + + + + 1 + 1 + 0 + 1 + 0.119 + 0.119 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.119 + + + + 1 + 1 + 0 + 1 + 0.119 + 0.119 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.119 + + + + 1 + 1 + 0 + 1 + 0.119 + 0.119 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0.119 + http://piwik.org/blog/2014/03/piwik-2-1-massive-performance-reliability-improvements/ + + + + + + + + + + + + 6 + 6 + 34 + 3 + 0.058 + 0.292 + 6 + 9 + 44 + 4 + 4 + 2 + 2 + 2 + 6 + 67% + 67% + 0.177 + http://piwik.net/ + + + + 6 + 7 + 0 + 3 + 0.134 + 0.543 + 5 + 5 + 0 + 5 + 5 + 0 + 100% + 83% + 0.34 + + + + 3 + 4 + 0 + 2 + 0.343 + 0.543 + 2 + 2 + 0 + 2 + 2 + 0 + 100% + 67% + 0.443 + + + + 3 + 4 + 0 + 2 + 0.343 + 0.543 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 100% + 67% + 0.443 + http://piwik.net/docs/manage-websites/ + + + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/docs/ + + + + 1 + 1 + 0 + 1 + 0.134 + 0.134 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0.134 + + + + 1 + 1 + 0 + 1 + 0.134 + 0.134 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0.134 + http://piwik.org/docs/installation/ + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/docs/manage-users/ + + + + + + + + 5 + 7 + 52 + 3 + 0.234 + 0.294 + 4 + 4 + 0 + 4 + 5 + 10 + 100% + 100% + 0.255 + + + + 3 + 5 + 52 + 3 + 0.234 + 0.294 + 2 + 2 + 0 + 2 + 3 + 2 + 2 + 2 + 17 + 100% + 100% + 0.255 + http://piwik.net/faq/ + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/faq/how-to/ + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/faq/how-to-install/ + + + + + + + + 2 + 2 + 7 + 1 + 0.113 + 0.113 + 1 + 1 + 0 + 1 + 1 + 4 + 100% + 50% + 0.113 + + + + 1 + 1 + 7 + 1 + 0.113 + 0.113 + 1 + 7 + 0% + 0% + 0.113 + http://piwik.org/download/ + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/download/counter/ + + + + + + + + 2 + 2 + 0 + 1 + 0.145 + 0.145 + 2 + 2 + 0 + 2 + 2 + 0 + 100% + 100% + 0.145 + + + + 2 + 2 + 0 + 1 + 0.145 + 0.145 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 100% + 100% + 0.145 + http://piwik.org/log-analytics/ + + + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://example.org/index.htm + + + + 1 + 1 + 0 + 1 + 0.413 + 0.413 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0.413 + http://demo.piwik.org/index.php?module=CoreHome&action=index&date=yesterday&period=day&idSite=7 + + + + 1 + 1 + 180 + 0 + + + 1 + 2 + 182 + 0 + 1 + 1 + 180 + 0% + 0% + 0 + http://piwik.net/moved-permanently + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://forum.piwik.org/register.php?0,approve=9a94a02145599 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 1 + 0 + 0% + 100% + 0 + http://piwik.net/temp-redirect + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/to-an-error + + + + 1 + 1 + 79 + 0 + + 0 + 1 + 2 + 81 + 0 + 79 + 0% + 0% + 0 + + + + 1 + 1 + 79 + 0 + + + 1 + 2 + 81 + 0 + 1 + 1 + 79 + 0% + 0% + 0 + http://piwik.org/changelog/ + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 0 + 0% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 1 + 0 + 0% + 100% + 0 + http://piwik.org/contact/ + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/hosting/ + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/intranet-analytics/ + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/newsletter/ + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/this/is/not/the/page/i/am/looking/for/ + + + + + + + + + + + + + + + + + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 100% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 0 + 100% + 100% + 0 + http://piwik.net/translations/ + + + + + + 1 + 1 + 0 + 0 + + 0 + 1 + 0 + 0% + 100% + 0 + + + + 1 + 1 + 0 + 0 + + + 1 + 1 + 1 + 0 + 0% + 100% + 0 + http://piwik.org/what-is-piwik/ + + + + \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getSiteSearchCategories_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getSiteSearchCategories_range.xml new file mode 100644 index 00000000000..c234bed59e9 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getSiteSearchCategories_range.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getSiteSearchKeywords_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getSiteSearchKeywords_range.xml new file mode 100644 index 00000000000..c234bed59e9 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getSiteSearchKeywords_range.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getSiteSearchNoResultKeywords_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getSiteSearchNoResultKeywords_range.xml new file mode 100644 index 00000000000..c234bed59e9 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getSiteSearchNoResultKeywords_range.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.get_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.get_month.xml index 1f9b082a777..1f9e1351ba7 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.get_month.xml @@ -1,12 +1,12 @@ - 40 - 40 - 5 - 5 - 1 - 1 + 26 + 26 + 4 + 4 + 0 + 0 0 0 - 0.206 + 0 \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.get_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.get_range.xml new file mode 100644 index 00000000000..a87ec05ee33 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.get_range.xml @@ -0,0 +1,12 @@ + + + 50 + 44 + 5 + 5 + 1 + 1 + 0 + 0 + 0.301 + \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml index 87a36dc1b1f..df0aed82399 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml @@ -1,43 +1,5 @@ - - - 12 - 16 - 3 - 125 - 9 - - - 11 - 11 - 55 - - - 11 - 55 - 12 - - - - 12 - 16 - 3 - 125 - 9 - - - 11 - 11 - 55 - - - 11 - 55 - 12 - - - 7 @@ -190,44 +152,6 @@ - - - 1 - 1 - 1 - 0 - 1 - - - 1 - 1 - 5 - - - 1 - 5 - 1 - - - - 1 - 1 - 1 - 0 - 1 - - - 1 - 1 - 5 - - - 1 - 5 - 1 - - - 1 diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml index 3151d8bdcf1..2a4ba83f06e 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml @@ -2,13 +2,13 @@ - 37 - 44 + 25 + 28 3 - 430 - 32 - 34 - 37 + 305 + 23 + 23 + 25 plugins/DevicesDetection/images/brand/unknown.ico diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml index 486584b6cc7..c8cf2933a20 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml @@ -1,27 +1,27 @@ + + + 6 + 6 + 1 + 0 + 6 + 6 + 6 + plugins/UserSettings/images/browsers/IE.gif + - 16 - 19 + 10 + 13 3 305 - 14 - 14 - 16 + 8 + 9 + 10 plugins/UserSettings/images/browsers/CH.gif - - - 7 - 8 - 2 - 81 - 6 - 7 - 7 - plugins/UserSettings/images/browsers/IE.gif - 7 @@ -33,17 +33,6 @@ 7 plugins/UserSettings/images/browsers/UNK.gif - - - 5 - 7 - 3 - 10 - 4 - 5 - 5 - plugins/UserSettings/images/browsers/FF.gif - 2 @@ -56,14 +45,14 @@ plugins/UserSettings/images/browsers/AN.gif - + 2 - 3 - 2 - 34 - 1 + 2 + 1 + 0 + 2 2 2 - plugins/UserSettings/images/browsers/SF.gif + plugins/UserSettings/images/browsers/FF.gif \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml index 05aacf6b014..445c00fe4aa 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml @@ -1,16 +1,5 @@ - - - 5 - 5 - 1 - 0 - 5 - 4 - 5 - plugins/UserSettings/images/browsers/CH.gif - 5 @@ -44,17 +33,6 @@ 5 plugins/UserSettings/images/browsers/CH.gif - - - 3 - 5 - 3 - 10 - 2 - 3 - 3 - plugins/UserSettings/images/browsers/FF.gif - 2 @@ -99,17 +77,6 @@ 2 plugins/UserSettings/images/browsers/FF.gif - - - 2 - 3 - 2 - 34 - 1 - 2 - 2 - plugins/UserSettings/images/browsers/SF.gif - 2 @@ -132,17 +99,6 @@ 1 plugins/UserSettings/images/browsers/CH.gif - - - 1 - 1 - 1 - 0 - 1 - 1 - 1 - plugins/UserSettings/images/browsers/CH.gif - 1 @@ -154,15 +110,4 @@ 1 plugins/UserSettings/images/browsers/IE.gif - - - 1 - 2 - 2 - 81 - 0 - 1 - 1 - plugins/UserSettings/images/browsers/IE.gif - \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getModel_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getModel_month.xml index 6135f1fa607..09ce9b347f3 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getModel_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getModel_month.xml @@ -2,13 +2,13 @@ - 37 - 44 + 25 + 28 3 - 430 - 32 - 34 - 37 + 305 + 23 + 23 + 25 diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml index 44393b8b122..0fb3a2deda5 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml @@ -1,27 +1,5 @@ - - - 17 - 20 - 3 - 91 - 15 - 16 - 17 - plugins/UserSettings/images/os/WI7.gif - - - - 9 - 13 - 3 - 339 - 6 - 8 - 9 - plugins/UserSettings/images/os/MAC.gif - 8 @@ -33,15 +11,37 @@ 8 plugins/UserSettings/images/os/LIN.gif + + + 9 + 9 + 1 + 0 + 9 + 9 + 9 + plugins/UserSettings/images/os/WI7.gif + + + + 6 + 9 + 3 + 305 + 4 + 5 + 6 + plugins/UserSettings/images/os/MAC.gif + - 3 - 3 + 2 + 2 1 0 - 3 - 3 - 3 + 2 + 2 + 2 plugins/UserSettings/images/os/AND.gif diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml index 306f0cad9db..088b8ed0afa 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml @@ -1,16 +1,5 @@ - - - 13 - 14 - 2 - 81 - 12 - 12 - 13 - plugins/UserSettings/images/os/WI7.gif - 8 @@ -22,6 +11,17 @@ 8 plugins/UserSettings/images/os/LIN.gif + + + 7 + 7 + 1 + 0 + 7 + 7 + 7 + plugins/UserSettings/images/os/WI7.gif + 5 @@ -33,17 +33,6 @@ 5 plugins/UserSettings/images/os/MAC.gif - - - 3 - 4 - 2 - 34 - 2 - 3 - 3 - plugins/UserSettings/images/os/MAC.gif - 2 @@ -55,17 +44,6 @@ 2 plugins/UserSettings/images/os/AND.gif - - - 2 - 4 - 3 - 10 - 1 - 2 - 2 - plugins/UserSettings/images/os/WI8.gif - 2 @@ -77,17 +55,6 @@ 2 plugins/UserSettings/images/os/WXP.gif - - - 1 - 1 - 1 - 0 - 1 - 1 - 1 - plugins/UserSettings/images/os/AND.gif - 1 diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getType_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getType_month.xml index c315c8397bb..bc13cbdb128 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getType_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getType_month.xml @@ -2,13 +2,13 @@ - 37 - 44 + 25 + 28 3 - 430 - 32 - 34 - 37 + 305 + 23 + 23 + 25 plugins/DevicesDetection/images/screens/normal.gif diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml index 47da9e182e6..1ba1449d50c 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml @@ -2,7 +2,7 @@ - 35 + 24 diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml index 61700b72e69..0a94d5f36db 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml @@ -2,11 +2,11 @@ - 32 + 25 - 2 + 0 @@ -14,11 +14,11 @@ - 1 + 0 - 1 + 0 diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.get_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.get_month.xml index 2037491b8fc..fc80cf81c0d 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.get_month.xml @@ -1,7 +1,7 @@ - 36 - 36 - 92.31 - 180 + 25 + 25 + 92.59 + 125 \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml similarity index 95% rename from tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_month.xml rename to tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml index a11dd3922fb..e276064efeb 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -180,8 +180,8 @@ 81 1 min 21s 2 - 0 - 0 + 181 + 181 0 North America amn @@ -419,7 +419,7 @@ 34 34s 1 - 7 + 579 0 0 North America @@ -772,8 +772,8 @@ 0 0s 4 - 0 - 0 + 1 + 3 0 Asia asi @@ -1228,7 +1228,7 @@ action http://piwik.org/docs/installation/ - Installing Piwik - Analytics - Piwik + Hello Installing Piwik - Analytics - Piwik 36 34 @@ -1255,8 +1255,8 @@ 0 0s 5 - 0 - 0 + 8 + 30 0 Europe eur @@ -1437,6 +1437,212 @@ + + + 1 + 41 + 175.41.192.40 + + new + + 1 + plugins/Zeitgeist/images/goal.png + none + + 0 + 0 + 10 + + + goal + all + 1 + 5 + 48 + + http://piwik.net/blog/category/meta/ + plugins/Zeitgeist/images/goal.png + + + action + http://piwik.net/blog/category/meta/ + + 1 + + 56 + 0.02s + 52 + 52s + + + + action + http://piwik.net/blog/category/meta/ + + 1 + + 52 + 0.12s + 0 + 0s + + + + action + http://piwik.net/blog/category/meta/ + + 1 + + 48 + 0.12s + 0 + 0s + + + + action + http://piwik.net/faq/ + + 2 + + 57 + 0.24s + 26 + 26s + + + + action + http://piwik.net/faq/ + + 2 + + 49 + 0.23s + 52 + 52s + + + + action + http://piwik.net/faq/ + + 2 + + 53 + 0.29s + 52 + 52s + + + + action + http://piwik.net/blog/category/community/ + + 3 + + 54 + 0.62s + 7 + 7s + + + + action + http://piwik.net/blog/category/community/ + + 3 + + 50 + 1.32s + 26 + 26s + + + + action + http://piwik.net/docs/manage-websites/ + + 4 + + 55 + 0.34s + + + + action + http://piwik.net/docs/manage-websites/ + + 4 + + 51 + 0.54s + 7 + 7s + + + + + + 1 + USD + $ + + 08:10:38 + 8 + + + + + 54 + 54s + 1 + 0 + 0 + 0 + Asia + asi + Japan + jp + plugins/UserCountry/images/flags/jp.png + + + + Japan + 36 + 138 + Unknown + Unknown + http://piwik.org/faq/general/#faq_52 + direct + Direct Entry + + + + + + + Unknown + UNK + Unknown + plugins/UserSettings/images/os/UNK.gif + unknown + Unknown + Unknown + plugins/UserSettings/images/browsers/UNK.gif + UNK + UNK + unknown + Desktop + unknown + plugins/UserSettings/images/screens/unknown.gif + + + + + + + 1 diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getAll_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getAll_month.xml index 358869c4379..eb2209a224e 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getAll_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getAll_month.xml @@ -2,10 +2,10 @@ - 39 - 46 - 40 - 180 + 27 + 30 + 26 + 125 100% 100% 100% diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml index f04a57ef02a..1fb93e2a2ab 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml @@ -1,11 +1,11 @@ - 39 - 46 + 27 + 30 100% 100% 100% 100% - 40 - 180 + 26 + 125 \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml index a6516309e56..3ac22f787ed 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml @@ -2,13 +2,13 @@ - 39 - 46 + 27 + 30 3 - 430 - 34 - 36 - 39 + 305 + 25 + 25 + 27 http://piwik.org/faq/general/#faq_52 \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getAll_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getAll_month.xml index d6dd56e9887..c4568e07026 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getAll_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getAll_month.xml @@ -19,39 +19,6 @@ 1 3 - - - - - 1 - 1 - 5 - - - 1 - 5 - 0 - 3 - - - - 4 - 7 - 3 - 44 - 2 - - - 5 - 5 - 25 - - - 5 - 25 - 4 - 2 - 1 @@ -71,81 +38,4 @@ 1 3 - - - 1 - 1 - 1 - 0 - 1 - - - 1 - 1 - 5 - - - 1 - 5 - 1 - 3 - - - - 1 - 1 - 1 - 0 - 1 - - - 1 - 1 - 5 - - - 1 - 5 - 1 - 3 - - - - 1 - 1 - 1 - 0 - 1 - - - 1 - 1 - 5 - - - 1 - 5 - 1 - 3 - - - - 2 - 2 - 1 - 0 - 2 - - - 1 - 1 - 5 - - - 1 - 5 - 0 - 2 - 3 - \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getKeywords_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getKeywords_month.xml index 7640e28b0e0..c234bed59e9 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getKeywords_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getKeywords_month.xml @@ -1,33 +1,2 @@ - - - - 4 - 7 - 3 - 44 - 2 - - - 5 - 5 - 25 - - - 5 - 25 - 4 - - - - 4 - 7 - 3 - 44 - 2 - 4 - 4 - - - - \ No newline at end of file + \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctKeywords_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctKeywords_month.xml index 606fbb52418..f5722c2b947 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctKeywords_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctKeywords_month.xml @@ -1,2 +1,2 @@ -1 \ No newline at end of file +0 \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctSearchEngines_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctSearchEngines_month.xml index 606fbb52418..f5722c2b947 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctSearchEngines_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctSearchEngines_month.xml @@ -1,2 +1,2 @@ -1 \ No newline at end of file +0 \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsitesUrls_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsitesUrls_month.xml index 773871bab0c..13002b20179 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsitesUrls_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsitesUrls_month.xml @@ -1,2 +1,2 @@ -7 \ No newline at end of file +2 \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsites_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsites_month.xml index 773871bab0c..13002b20179 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsites_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getNumberOfDistinctWebsites_month.xml @@ -1,2 +1,2 @@ -7 \ No newline at end of file +2 \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getReferrerType_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getReferrerType_month.xml index 1a409ad5cf3..c580231b96a 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getReferrerType_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getReferrerType_month.xml @@ -2,113 +2,40 @@ - 28 - 32 + 25 + 28 3 - 386 - 25 + 305 + 23 - 24 - 24 - 120 + 23 + 23 + 115 - 24 - 120 - 28 + 23 + 115 + 25 - 7 - 7 + 2 + 2 1 0 - 7 + 2 - 7 - 7 - 35 + 2 + 2 + 10 - 7 - 35 - 7 + 2 + 10 + 2 - - - 2 - 2 - 1 - 0 - 2 - - - 1 - 1 - 5 - - - 1 - 5 - 0 - 2 - - - - 1 - 1 - 1 - 0 - 1 - - - 1 - 1 - 5 - - - 1 - 5 - 1 - - - - 1 - 1 - 1 - 0 - 1 - - - 1 - 1 - 5 - - - 1 - 5 - 1 - - - - 1 - 1 - 1 - 0 - 1 - - - 1 - 1 - 5 - - - 1 - 5 - 1 - 1 @@ -145,57 +72,6 @@ 5 1 - - - - - 1 - 1 - 5 - - - 1 - 5 - 0 - - - - - - 4 - 7 - 3 - 44 - 2 - - - 5 - 5 - 25 - - - 5 - 25 - 4 - - - - 4 - 7 - 3 - 44 - 2 - - - 5 - 5 - 25 - - - 5 - 25 - 4 - \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getSearchEngines_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getSearchEngines_month.xml index 80435f5d915..c234bed59e9 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getSearchEngines_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getSearchEngines_month.xml @@ -1,35 +1,2 @@ - - - - 4 - 7 - 3 - 44 - 2 - - - 5 - 5 - 25 - - - 5 - 25 - 4 - http://google.com - plugins/Referrers/images/searchEngines/google.com.png - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getWebsites_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getWebsites_month.xml index 7f61ae72cd8..51a1e169f8d 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getWebsites_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getWebsites_month.xml @@ -1,126 +1,5 @@ - - - 2 - 2 - 1 - 0 - 2 - - - 1 - 1 - 5 - - - 1 - 5 - 0 - 2 - - - - 2 - 2 - 1 - 0 - 2 - 1 - 2 - - - - - - 1 - 1 - 1 - 0 - 1 - - - 1 - 1 - 5 - - - 1 - 5 - 1 - - - - 1 - 1 - 1 - 0 - 1 - 1 - 1 - - - - - - 1 - 1 - 1 - 0 - 1 - - - 1 - 1 - 5 - - - 1 - 5 - 1 - - - - 1 - 1 - 1 - 0 - 1 - 1 - 1 - - - - - - 1 - 1 - 1 - 0 - 1 - - - 1 - 1 - 5 - - - 1 - 5 - 1 - - - - 1 - 1 - 1 - 0 - 1 - 1 - 1 - - - 1 @@ -181,29 +60,4 @@ - - - - - 1 - 1 - 5 - - - 1 - 5 - 0 - - - - 1 - 1 - 1 - 0 - 1 - 0 - 1 - - - \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml index 23c0b5749b5..267e90de6f9 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml @@ -2,21 +2,21 @@ - 24 - 28 + 22 + 25 3 - 339 - 21 + 305 + 20 - 22 - 22 - 110 + 20 + 20 + 100 - 22 - 110 - 24 + 20 + 100 + 22 Unknown xx xx @@ -51,239 +51,4 @@ Virginia plugins/UserCountry/images/flags/us.png - - - 2 - 2 - 1 - 0 - 2 - - - 1 - 1 - 5 - - - 1 - 5 - 0 - 2 - 51.1 - 5.8 - Maaseik - 05 - be - Belgium - Limburg - plugins/UserCountry/images/flags/be.png - - - - 1 - 1 - 1 - 0 - 1 - - - 1 - 1 - 5 - - - 1 - 5 - 1 - 40.979 - 40.415 - Esentepe - 53 - tr - Turkey - Rize - plugins/UserCountry/images/flags/tr.png - - - - 1 - 2 - 2 - 81 - 0 - - - 1 - 1 - 5 - - - 1 - 5 - 1 - 33.645 - -117.679 - Lake Forest - CA - us - United States - California - plugins/UserCountry/images/flags/us.png - - - - 1 - 1 - 1 - 0 - 1 - - - 1 - 1 - 5 - - - 1 - 5 - 1 - 50 - 8.271 - Mainz - 08 - de - Germany - Rheinland-Pfalz - plugins/UserCountry/images/flags/de.png - - - - 1 - 3 - 3 - 10 - 0 - - - 1 - 1 - 5 - - - 1 - 5 - 1 - 55.752 - 37.616 - Moscow - 48 - ru - Russian Federation - Moscow City - plugins/UserCountry/images/flags/ru.png - - - - 1 - 1 - 1 - 0 - 1 - - - 1 - 1 - 5 - - - 1 - 5 - 1 - 35.45 - 139.65 - Nihon'odori - 19 - jp - Japan - Kanagawa - plugins/UserCountry/images/flags/jp.png - - - - 1 - 1 - 1 - 0 - 1 - - - 1 - 1 - 5 - - - 1 - 5 - 1 - 35.772 - -78.639 - Raleigh - NC - us - United States - North Carolina - plugins/UserCountry/images/flags/us.png - - - - 1 - 1 - 1 - 0 - 1 - - - 1 - 1 - 5 - - - 1 - 5 - 1 - 37.792 - -122.409 - San Francisco - CA - us - United States - California - plugins/UserCountry/images/flags/us.png - - - - 1 - 1 - 1 - 0 - 1 - - - 1 - 1 - 5 - - - 1 - 5 - 1 - 50.767 - 6.833 - Weilerswist - 07 - de - Germany - Nordrhein-Westfalen - plugins/UserCountry/images/flags/de.png - \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml index 4b973c63814..bb4a48d22d4 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml @@ -2,42 +2,23 @@ - 12 - 15 + 11 + 14 3 305 - 10 + 9 - 11 - 11 - 55 + 10 + 10 + 50 - 11 - 55 - 12 + 10 + 50 + 11 Asia - - - 9 - 11 - 2 - 115 - 7 - - - 9 - 9 - 45 - - - 9 - 45 - 9 - North America - 7 @@ -57,6 +38,25 @@ 7 Unknown + + + 5 + 5 + 1 + 0 + 5 + + + 5 + 5 + 25 + + + 5 + 25 + 5 + North America + 3 @@ -76,26 +76,6 @@ 3 South America - - - 7 - 9 - 3 - 10 - 6 - - - 6 - 6 - 30 - - - 6 - 30 - 7 - 0 - Europe - 1 diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml index 2febd04aa78..eb13f78f0f5 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml @@ -2,48 +2,26 @@ - 12 - 15 + 11 + 14 3 305 - 10 + 9 - 11 - 11 - 55 + 10 + 10 + 50 - 11 - 55 - 12 + 10 + 50 + 11 jp plugins/UserCountry/images/flags/jp.png 16 11 - - - 9 - 11 - 2 - 115 - 7 - - - 9 - 9 - 45 - - - 9 - 45 - 9 - us - plugins/UserCountry/images/flags/us.png - 16 - 11 - 7 @@ -67,29 +45,29 @@ 11 - - 3 - 3 + + 5 + 5 1 0 - 3 + 5 - 3 - 3 - 15 + 5 + 5 + 25 - 3 - 15 - 3 - br - plugins/UserCountry/images/flags/br.png + 5 + 25 + 5 + us + plugins/UserCountry/images/flags/us.png 16 11 - + 3 3 1 @@ -105,31 +83,8 @@ 3 15 3 - de - plugins/UserCountry/images/flags/de.png - 16 - 11 - - - - 2 - 2 - 1 - 0 - 2 - - - 1 - 1 - 5 - - - 1 - 5 - 0 - 2 - be - plugins/UserCountry/images/flags/be.png + br + plugins/UserCountry/images/flags/br.png 16 11 @@ -147,48 +102,4 @@ 16 11 - - - 1 - 3 - 3 - 10 - 0 - - - 1 - 1 - 5 - - - 1 - 5 - 1 - ru - plugins/UserCountry/images/flags/ru.png - 16 - 11 - - - - 1 - 1 - 1 - 0 - 1 - - - 1 - 1 - 5 - - - 1 - 5 - 1 - tr - plugins/UserCountry/images/flags/tr.png - 16 - 11 - \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getNumberOfDistinctCountries_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getNumberOfDistinctCountries_month.xml index 39535fab286..17feb622cc6 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getNumberOfDistinctCountries_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getNumberOfDistinctCountries_month.xml @@ -1,2 +1,2 @@ -9 \ No newline at end of file +5 \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml index a47b34141d1..c4c562795c0 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml @@ -2,21 +2,21 @@ - 24 - 28 + 22 + 25 3 - 339 - 21 + 305 + 20 - 22 - 22 - 110 + 20 + 20 + 100 - 22 - 110 - 24 + 20 + 100 + 22 xx xx Unknown @@ -46,189 +46,4 @@ Virginia plugins/UserCountry/images/flags/us.png - - - 2 - 2 - 1 - 0 - 2 - - - 1 - 1 - 5 - - - 1 - 5 - 0 - 2 - 05 - be - Belgium - Limburg - plugins/UserCountry/images/flags/be.png - - - - 2 - 3 - 2 - 81 - 1 - - - 2 - 2 - 10 - - - 2 - 10 - 2 - CA - us - United States - California - plugins/UserCountry/images/flags/us.png - - - - 1 - 1 - 1 - 0 - 1 - - - 1 - 1 - 5 - - - 1 - 5 - 1 - 07 - de - Germany - Nordrhein-Westfalen - plugins/UserCountry/images/flags/de.png - - - - 1 - 1 - 1 - 0 - 1 - - - 1 - 1 - 5 - - - 1 - 5 - 1 - 08 - de - Germany - Rheinland-Pfalz - plugins/UserCountry/images/flags/de.png - - - - 1 - 1 - 1 - 0 - 1 - - - 1 - 1 - 5 - - - 1 - 5 - 1 - 19 - jp - Japan - Kanagawa - plugins/UserCountry/images/flags/jp.png - - - - 1 - 3 - 3 - 10 - 0 - - - 1 - 1 - 5 - - - 1 - 5 - 1 - 48 - ru - Russian Federation - Moscow City - plugins/UserCountry/images/flags/ru.png - - - - 1 - 1 - 1 - 0 - 1 - - - 1 - 1 - 5 - - - 1 - 5 - 1 - 53 - tr - Turkey - Rize - plugins/UserCountry/images/flags/tr.png - - - - 1 - 1 - 1 - 0 - 1 - - - 1 - 1 - 5 - - - 1 - 5 - 1 - NC - us - United States - North Carolina - plugins/UserCountry/images/flags/us.png - \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml index b222db93489..7ecb163f870 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml @@ -2,13 +2,13 @@ - 18 - 19 - 2 - 34 - 17 - 17 - 18 + 10 + 10 + 1 + 0 + 10 + 10 + 10 Webkit @@ -24,24 +24,24 @@ - 7 - 8 - 2 - 81 + 6 + 6 + 1 + 0 6 - 7 - 7 + 6 + 6 Ie - 5 - 7 - 3 - 10 - 4 - 5 - 5 + 2 + 2 + 1 + 0 + 2 + 2 + 2 Gecko \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml index f1ee8f770b3..dfada1bb899 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml @@ -1,17 +1,5 @@ - - - 5 - 5 - 1 - 0 - 5 - 4 - 5 - plugins/UserSettings/images/browsers/CH.gif - Chrome 33.0 - 5 @@ -48,18 +36,6 @@ plugins/UserSettings/images/browsers/UNK.gif RockMelt 0.9 - - - 3 - 5 - 3 - 10 - 2 - 3 - 3 - plugins/UserSettings/images/browsers/FF.gif - Firefox 27.0 - 2 @@ -108,18 +84,6 @@ plugins/UserSettings/images/browsers/FF.gif Firefox 6.0 - - - 2 - 3 - 2 - 34 - 1 - 2 - 2 - plugins/UserSettings/images/browsers/SF.gif - Safari 7.0 - 2 @@ -144,18 +108,6 @@ plugins/UserSettings/images/browsers/CH.gif Chrome 11.0 - - - 1 - 1 - 1 - 0 - 1 - 1 - 1 - plugins/UserSettings/images/browsers/CH.gif - Chrome 34.0 - 1 @@ -168,16 +120,4 @@ plugins/UserSettings/images/browsers/IE.gif Internet Explorer 6.0 - - - 1 - 2 - 2 - 81 - 0 - 1 - 1 - plugins/UserSettings/images/browsers/IE.gif - Internet Explorer 8.0 - \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml index 807d9c3032f..95f3291088d 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml @@ -1,16 +1,5 @@ - - - 11 - 11 - 1 - 0 - 11 - 10 - 11 - plugins/UserSettings/images/browsers/CH.gif - 5 @@ -24,13 +13,13 @@ - 7 - 8 - 2 - 81 + 6 + 6 + 1 + 0 6 - 7 - 7 + 6 + 6 plugins/UserSettings/images/browsers/IE.gif @@ -44,17 +33,6 @@ 5 plugins/UserSettings/images/browsers/UNK.gif - - - 5 - 7 - 3 - 10 - 4 - 5 - 5 - plugins/UserSettings/images/browsers/FF.gif - 2 @@ -67,15 +45,26 @@ plugins/UserSettings/images/browsers/AN.gif - + + 5 + 5 + 1 + 0 + 5 + 5 + 5 + plugins/UserSettings/images/browsers/CH.gif + + + 2 - 3 - 2 - 34 - 1 + 2 + 1 + 0 + 2 2 2 - plugins/UserSettings/images/browsers/SF.gif + plugins/UserSettings/images/browsers/FF.gif diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml index 590b4874719..e02a1136d9d 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml @@ -50,16 +50,6 @@ 2 2 - - - 2 - 2 - 1 - 0 - 2 - 1 - 2 - 2 @@ -70,16 +60,6 @@ 2 2 - - - 1 - 1 - 1 - 0 - 1 - 1 - 1 - 1 @@ -100,16 +80,6 @@ 1 1 - - - 1 - 1 - 1 - 0 - 1 - 1 - 1 - 1 @@ -120,26 +90,6 @@ 1 1 - - - 1 - 1 - 1 - 0 - 1 - 1 - 1 - - - - 1 - 2 - 2 - 34 - 0 - 1 - 1 - 1 @@ -150,66 +100,6 @@ 0 1 - - - 1 - 1 - 1 - 0 - 1 - 1 - 1 - - - - 1 - 1 - 1 - 0 - 1 - 1 - 1 - - - - 1 - 1 - 1 - 0 - 1 - 1 - 1 - - - - 1 - 2 - 2 - 81 - 0 - 1 - 1 - - - - 1 - 1 - 1 - 0 - 1 - 1 - 1 - - - - 1 - 3 - 3 - 10 - 0 - 1 - 1 - 1 diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml index 4c8ddc785d7..fd38898a644 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml @@ -2,12 +2,12 @@ - 39 - 46 + 27 + 30 3 - 430 - 34 - 36 - 39 + 305 + 25 + 25 + 27 \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml index a93a160b3d9..ba10c9516f1 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml @@ -2,24 +2,24 @@ - 34 - 41 + 23 + 26 3 - 430 - 29 - 32 - 34 + 305 + 21 + 22 + 23 plugins/UserSettings/images/screens/normal.gif - 3 - 3 + 2 + 2 1 0 - 3 - 3 - 3 + 2 + 2 + 2 plugins/UserSettings/images/screens/mobile.gif diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml index a6f40cf25c5..17ff53a3864 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml @@ -1,27 +1,5 @@ - - - 17 - 20 - 3 - 91 - 15 - 16 - 17 - plugins/UserSettings/images/os/WI8.gif - - - - 9 - 13 - 3 - 339 - 6 - 8 - 9 - plugins/UserSettings/images/os/MAC.gif - 8 @@ -33,15 +11,37 @@ 8 plugins/UserSettings/images/os/LIN.gif + + + 9 + 9 + 1 + 0 + 9 + 9 + 9 + plugins/UserSettings/images/os/WXP.gif + + + + 6 + 9 + 3 + 305 + 4 + 5 + 6 + plugins/UserSettings/images/os/MAC.gif + - 3 - 3 + 2 + 2 1 0 - 3 - 3 - 3 + 2 + 2 + 2 plugins/UserSettings/images/os/AND.gif diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml index 07514ed96da..108d617d79b 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml @@ -1,29 +1,5 @@ - - - 13 - 14 - 2 - 81 - 12 - 12 - 13 - plugins/UserSettings/images/os/WI7.gif - Win 7 - - - - 9 - 13 - 3 - 339 - 6 - 8 - 9 - plugins/UserSettings/images/os/MAC.gif - Mac OS - 8 @@ -37,28 +13,40 @@ Linux - - 3 - 3 + + 7 + 7 1 0 - 3 - 3 - 3 - plugins/UserSettings/images/os/AND.gif - Android + 7 + 7 + 7 + plugins/UserSettings/images/os/WI7.gif + Win 7 - - 2 - 4 + + 6 + 9 3 - 10 - 1 + 305 + 4 + 5 + 6 + plugins/UserSettings/images/os/MAC.gif + Mac OS + + + + 2 + 2 + 1 + 0 + 2 2 2 - plugins/UserSettings/images/os/WI8.gif - Win 8 + plugins/UserSettings/images/os/AND.gif + Android diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getPlugin_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getPlugin_month.xml index 9f891956397..7079af54134 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getPlugin_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getPlugin_month.xml @@ -2,57 +2,51 @@ - 13 - 40.6% + 2 + 9.5% plugins/UserSettings/images/plugins/cookie.gif - 12 - 37.5% + 2 + 9.5% plugins/UserSettings/images/plugins/flash.gif - 12 - 37.5% + 2 + 9.5% plugins/UserSettings/images/plugins/java.gif - - 10 - 31.3% - plugins/UserSettings/images/plugins/pdf.gif + + 1 + 4.8% + plugins/UserSettings/images/plugins/director.gif - - 6 - 18.8% - plugins/UserSettings/images/plugins/silverlight.gif + + 1 + 4.8% + plugins/UserSettings/images/plugins/gears.gif - - 5 - 15.6% - plugins/UserSettings/images/plugins/quicktime.gif + + 1 + 4.8% + plugins/UserSettings/images/plugins/pdf.gif - 3 - 9.4% - plugins/UserSettings/images/plugins/windowsmedia.gif - - - 1 - 3.1% - plugins/UserSettings/images/plugins/director.gif + 4.8% + plugins/UserSettings/images/plugins/windowsmedia.gif - - 1 - 3.1% - plugins/UserSettings/images/plugins/gears.gif + + 0 + 0% + plugins/UserSettings/images/plugins/quicktime.gif @@ -60,4 +54,10 @@ 0% plugins/UserSettings/images/plugins/realplayer.gif + + + 0 + 0% + plugins/UserSettings/images/plugins/silverlight.gif + \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml index 6074f6e1cce..2ba37987cc1 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml @@ -10,46 +10,6 @@ 23 25 - - - 3 - 5 - 3 - 10 - 2 - 2 - 3 - - - - 2 - 2 - 1 - 0 - 2 - 2 - 2 - - - - 2 - 2 - 1 - 0 - 2 - 2 - 2 - - - - 1 - 1 - 1 - 0 - 1 - 1 - 1 - 1 @@ -70,44 +30,4 @@ 1 1 - - - 1 - 1 - 1 - 0 - 1 - 1 - 1 - - - - 1 - 2 - 2 - 81 - 0 - 1 - 1 - - - - 1 - 1 - 1 - 0 - 1 - 1 - 1 - - - - 1 - 2 - 2 - 34 - 0 - 1 - 1 - \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml index bc90fedd6c1..685578ed446 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml @@ -12,18 +12,7 @@ plugins/UserSettings/images/screens/unknown.gif - - 12 - 16 - 3 - 125 - 9 - 11 - 12 - plugins/UserSettings/images/screens/wide.gif - - - + 1 1 1 @@ -31,10 +20,10 @@ 1 1 1 - plugins/UserSettings/images/screens/mobile.gif + plugins/UserSettings/images/screens/normal.gif - + 1 1 1 @@ -42,6 +31,6 @@ 1 1 1 - plugins/UserSettings/images/screens/normal.gif + plugins/UserSettings/images/screens/wide.gif \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_month.xml index a73873a32e0..eb4e37fdf70 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_month.xml @@ -1,13 +1,13 @@ - 7 - 7 - 9 - 6 - 5 - 115 - 2 - 71% - 1.3 - 16 + 1 + 1 + 1 + 1 + 1 + 0 + 1 + 100% + 1 + 0 \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml index a2500cddf02..4dd0cef2d8e 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml @@ -32,22 +32,22 @@ - 7 - 7 - 7 + 6 + 6 + 6 0 - 7 - 7 + 6 + 6 5 - 21 - 21 - 28 - 430 - 16 - 18 + 10 + 10 + 13 + 305 + 8 + 8 6 diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml index 47b4378814d..5c585c10cc6 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml @@ -12,23 +12,23 @@ - 5 - 5 - 1 + 0 + 0 + 0 0 - 5 - 4 - 5 + 0 + 0 + 0 - 1 - 1 - 1 + 0 + 0 + 0 0 - 1 - 1 - 1 + 0 + 0 + 0 @@ -42,13 +42,13 @@ - 1 - 3 - 3 - 10 + 0 + 0 + 0 + 0 0 - 1 - 1 + 0 + 0 @@ -92,13 +92,13 @@ - 1 - 1 - 1 + 0 + 0 + 0 0 - 1 - 1 - 1 + 0 + 0 + 0 @@ -172,13 +172,13 @@ - 5 - 6 - 2 - 81 - 4 - 4 - 5 + 3 + 3 + 1 + 0 + 3 + 2 + 3 @@ -192,23 +192,23 @@ - 3 - 5 + 2 + 3 2 - 216 + 182 1 - 3 - 3 + 2 + 2 - 7 - 7 + 6 + 6 1 0 - 7 - 7 - 7 + 6 + 6 + 6 diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml index 776dffd8efd..8662f1ca3d8 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml @@ -2,22 +2,13 @@ - 12 - 16 - 3 - 125 - 9 + 0 + 0 + 0 + 0 + 0 0 - - - 11 - 11 - 55 - - - 11 - 55 - 12 + 0 diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml index 831a4a0aff4..c47de22fc42 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml @@ -2,11 +2,11 @@ - 32 + 26 - 5 + 0 @@ -34,7 +34,7 @@ - 1 + 0 diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml new file mode 100644 index 00000000000..96226166244 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml @@ -0,0 +1,63 @@ + + + + + 33 + + + + 2 + + + + 1 + + + + 0 + + + + 0 + + + + 0 + + + + 0 + + + + 0 + + + + 0 + + + + 1 + + + + 0 + + + + 0 + + + + 0 + + + + 1 + + + + 2 + + \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml index acd84cb1e70..0830ca0d100 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml @@ -2,13 +2,13 @@ - 35 - 90% + 27 + 100% - 2 - 5% + 0 + 0% @@ -17,13 +17,13 @@ - 1 - 3% + 0 + 0% - 1 - 3% + 0 + 0% diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml new file mode 100644 index 00000000000..af11799d548 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml @@ -0,0 +1,73 @@ + + + + + 36 + 90% + + + + 2 + 5% + + + + 0 + 0% + + + + 1 + 3% + + + + 1 + 3% + + + + 0 + 0% + + + + 0 + 0% + + + + 0 + 0% + + + + 0 + 0% + + + + 0 + 0% + + + + 0 + 0% + + + + 0 + 0% + + + + 0 + 0% + + + + 0 + 0% + + \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml index 174a8d90d06..4e6a9ab29ed 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml @@ -2,15 +2,15 @@ - 34 + 25 - 3 + 1 - 2 + 1 diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml new file mode 100644 index 00000000000..11e27426c02 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml @@ -0,0 +1,43 @@ + + + + + 34 + + + + 3 + + + + 2 + + + + 0 + + + + 0 + + + + 0 + + + + 1 + + + + 0 + + + + 0 + + + + 0 + + \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml index 9154335b0ca..a64c14a9673 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml @@ -2,7 +2,7 @@ - 35 + 25 @@ -10,11 +10,11 @@ - 1 + 0 - 1 + 0 diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml new file mode 100644 index 00000000000..a0cba6d294a --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml @@ -0,0 +1,43 @@ + + + + + 35 + + + + 0 + + + + 2 + + + + 1 + + + + 2 + + + + 0 + + + + 0 + + + + 0 + + + + 0 + + + + 0 + + \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getActions_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getActions_month.xml index 0e7e4e3d09a..3fb94696674 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getActions_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getActions_month.xml @@ -1,2 +1,2 @@ -46 \ No newline at end of file +30 \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml index 5c61a821373..4c77f1f6e60 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml @@ -1,2 +1,2 @@ -34 \ No newline at end of file +25 \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml index c3b0e95397b..2c93902a53c 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getSumVisitsLengthPretty_month.xml @@ -1,2 +1,2 @@ -7 min 10s \ No newline at end of file +5 min 5s \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml index 041729400fe..df25f1c1f33 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getSumVisitsLength_month.xml @@ -1,2 +1,2 @@ -430 \ No newline at end of file +305 \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml index 962fbe983a7..40bd2e592a5 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml @@ -1,2 +1,2 @@ -38 \ No newline at end of file +27 \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml index 8af80c337fc..4c77f1f6e60 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml @@ -1,2 +1,2 @@ -36 \ No newline at end of file +25 \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml index f24432d1a4c..40bd2e592a5 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml @@ -1,2 +1,2 @@ -39 \ No newline at end of file +27 \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml index 4b7eff08209..4c5729d4b1b 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitsSummary.get_month.xml @@ -1,13 +1,13 @@ - 38 - 39 - 46 - 36 - 34 - 430 + 27 + 27 + 30 + 25 + 25 + 305 3 - 87% - 1.2 + 93% + 1.1 11 \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml index 40b7ad88514..0fb183d46f3 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml @@ -3,11 +3,11 @@ - 39 - 46 - 40 - 180 - 36 + 27 + 30 + 26 + 125 + 25 100% 100% 100% @@ -42,11 +42,11 @@ 10 5 1 - -97.4% - -78.3% - -75% - -97.2% - -97.2% + -96.3% + -66.7% + -61.5% + -96% + -96% http://piwik.net 1