From fd13666a79962545ac878e4a18d5909ac3923eb8 Mon Sep 17 00:00:00 2001 From: mattab Date: Thu, 13 Mar 2014 15:28:08 +1300 Subject: [PATCH] Refs #3632 Creating a test case: same visitor (same IP + idvisitor) visits the website on two different days. Visitors on second day is marked as "new" because window_look_back_for_visitor is not set. --- ...Logs__Actions.getEntryPageTitles_month.xml | 12 +- ...rtLogs__Actions.getEntryPageUrls_month.xml | 18 +- ...tLogs__Actions.getExitPageTitles_month.xml | 12 +- ...ortLogs__Actions.getExitPageUrls_month.xml | 18 +- ..._ImportLogs__Actions.getOutlinks_month.xml | 9 + ...mportLogs__Actions.getPageTitles_month.xml | 12 +- ..._ImportLogs__Actions.getPageUrls_month.xml | 18 +- ...stomVariables.getCustomVariables_month.xml | 16 +- ...tLogs__DevicesDetection.getBrand_month.xml | 8 +- ...icesDetection.getBrowserFamilies_month.xml | 8 +- ...icesDetection.getBrowserVersions_month.xml | 22 +- ...tLogs__DevicesDetection.getModel_month.xml | 8 +- ...__DevicesDetection.getOsFamilies_month.xml | 8 +- ...__DevicesDetection.getOsVersions_month.xml | 8 +- ...rtLogs__DevicesDetection.getType_month.xml | 8 +- .../test_ImportLogs__Goals.get_month.xml | 2 +- ...tLogs__Live.getLastVisitsDetails_month.xml | 219 +++++++++++++----- ...st_ImportLogs__MultiSites.getAll_month.xml | 2 +- ...st_ImportLogs__MultiSites.getOne_month.xml | 2 +- ...ImportLogs__Provider.getProvider_month.xml | 8 +- ...est_ImportLogs__Referrers.getAll_month.xml | 25 +- ...tLogs__Referrers.getReferrerType_month.xml | 35 +-- ...mportLogs__Referrers.getWebsites_month.xml | 59 ++--- ..._ImportLogs__UserCountry.getCity_month.xml | 53 ++--- ...rtLogs__UserCountry.getContinent_month.xml | 9 +- ...portLogs__UserCountry.getCountry_month.xml | 39 ++-- ...mportLogs__UserCountry.getRegion_month.xml | 47 ++-- ...ogs__UserSettings.getBrowserType_month.xml | 8 +- ...__UserSettings.getBrowserVersion_month.xml | 24 +- ...ortLogs__UserSettings.getBrowser_month.xml | 22 +- ...s__UserSettings.getConfiguration_month.xml | 20 +- ...rtLogs__UserSettings.getLanguage_month.xml | 8 +- ..._UserSettings.getMobileVsDesktop_month.xml | 8 +- ...rtLogs__UserSettings.getOSFamily_month.xml | 8 +- ...t_ImportLogs__UserSettings.getOS_month.xml | 8 +- ...portLogs__UserSettings.getPlugin_month.xml | 36 +-- ...Logs__UserSettings.getResolution_month.xml | 20 +- ...Logs__UserSettings.getWideScreen_month.xml | 8 +- ...t_ImportLogs__VisitFrequency.get_month.xml | 16 +- ...rtLogs__VisitTime.getByDayOfWeek_month.xml | 18 +- ....getVisitInformationPerLocalTime_month.xml | 10 +- ...getVisitInformationPerServerTime_month.xml | 8 +- ...getNumberOfVisitsByDaysSinceLast_month.xml | 2 +- ...st.getNumberOfVisitsByVisitCount_month.xml | 4 +- ...nterest.getNumberOfVisitsPerPage_month.xml | 4 +- ...etNumberOfVisitsPerVisitDuration_month.xml | 2 +- ...gs__VisitsSummary.getBounceCount_month.xml | 2 +- ...Summary.getSumVisitsLengthPretty_month.xml | 2 +- ...VisitsSummary.getSumVisitsLength_month.xml | 2 +- ...ortLogs__VisitsSummary.getVisits_month.xml | 2 +- ...st_ImportLogs__VisitsSummary.get_month.xml | 10 +- ...ancedAndLast7__MultiSites.getAll_month.xml | 2 +- .../access-logs/fake_logs_replay.log | 4 +- 53 files changed, 528 insertions(+), 415 deletions(-) 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 3e63bec8a81..8482e75ec2b 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageTitles_month.xml @@ -4,20 +4,20 @@ 4 4 - 40 + 34 3 0.058 0.292 4 - 8 - 51 - 1 + 7 + 44 + 2 2 4 4 2 - 10 - 25% + 9 + 50% 50% 0.177 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 17b69f28190..283ef2b7910 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml @@ -354,21 +354,21 @@ 6 6 - 40 + 34 3 0.058 0.292 6 - 10 - 51 - 3 - 3 + 9 + 44 + 4 + 4 6 6 - 3 - 7 - 50% - 50% + 4 + 6 + 67% + 67% 0.177 http://piwik.net/ 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 ecd4b31c509..7a9395ac443 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageTitles_month.xml @@ -4,20 +4,20 @@ 4 4 - 40 + 34 3 0.058 0.292 4 - 8 - 51 - 1 + 7 + 44 + 2 2 4 4 2 - 10 - 25% + 9 + 50% 50% 0.177 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 986aa682077..3bebd593bf5 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml @@ -354,21 +354,21 @@ 6 6 - 40 + 34 3 0.058 0.292 6 - 10 - 51 - 3 - 3 + 9 + 44 + 4 + 4 6 6 - 3 - 7 - 50% - 50% + 4 + 6 + 67% + 67% 0.177 http://piwik.net/ 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 d7df2dd939a..d03b4e81bb3 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getOutlinks_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getOutlinks_month.xml @@ -5,6 +5,10 @@ 1 1 0 + 1 + 1 + 0 + 1 1 @@ -12,8 +16,13 @@ 1 1 0 + 1 + 1 + 0 + 1 1 1 + 1 1 http://demo.piwik.org/ 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 c5dfd4d99ba..61ef03022a0 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageTitles_month.xml @@ -18,20 +18,20 @@ 4 4 - 40 + 34 3 0.058 0.292 4 - 8 - 51 - 1 + 7 + 44 + 2 2 4 4 2 - 10 - 25% + 9 + 50% 50% 0.177 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 7318f199a1f..439e7e6105f 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Actions.getPageUrls_month.xml @@ -354,21 +354,21 @@ 6 6 - 40 + 34 3 0.058 0.292 6 - 10 - 51 - 3 - 3 + 9 + 44 + 4 + 4 6 6 - 3 - 7 - 50% - 50% + 4 + 6 + 67% + 67% 0.177 http://piwik.net/ 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 b46d7c8d41c..87a36dc1b1f 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml @@ -2,11 +2,11 @@ - 11 + 12 16 3 - 132 - 7 + 125 + 9 11 @@ -16,15 +16,15 @@ 11 55 - 11 + 12 - 11 + 12 16 3 - 132 - 7 + 125 + 9 11 @@ -34,7 +34,7 @@ 11 55 - 11 + 12 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 42229f986ab..3151d8bdcf1 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 @@ - 36 + 37 44 3 - 437 - 30 + 430 + 32 34 - 36 + 37 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 ca72d70ce0d..486584b6cc7 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml @@ -2,13 +2,13 @@ - 15 + 16 19 3 - 312 - 12 + 305 + 14 14 - 15 + 16 plugins/UserSettings/images/browsers/CH.gif 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 b9a34879ae6..05aacf6b014 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml @@ -1,5 +1,16 @@ + + + 5 + 5 + 1 + 0 + 5 + 4 + 5 + plugins/UserSettings/images/browsers/CH.gif + 5 @@ -33,17 +44,6 @@ 5 plugins/UserSettings/images/browsers/CH.gif - - - 4 - 5 - 2 - 7 - 3 - 4 - 4 - plugins/UserSettings/images/browsers/CH.gif - 3 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 30a2c0b191f..6135f1fa607 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 @@ - 36 + 37 44 3 - 437 - 30 + 430 + 32 34 - 36 + 37 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 9914b04ba22..44393b8b122 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml @@ -2,13 +2,13 @@ - 16 + 17 20 3 - 98 - 13 + 91 + 15 16 - 16 + 17 plugins/UserSettings/images/os/WI7.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 6cfffff1545..306f0cad9db 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml @@ -2,13 +2,13 @@ - 12 + 13 14 2 - 88 - 10 + 81 + 12 12 - 12 + 13 plugins/UserSettings/images/os/WI7.gif 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 9f0ba2794b5..c315c8397bb 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 @@ - 36 + 37 44 3 - 437 - 30 + 430 + 32 34 - 36 + 37 plugins/DevicesDetection/images/screens/normal.gif 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 65648cad8c1..2037491b8fc 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Goals.get_month.xml @@ -2,6 +2,6 @@ 36 36 - 94.74 + 92.31 180 \ 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_month.xml index daaf9889db7..50b207b2a61 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_month.xml @@ -2,7 +2,7 @@ 1 - 39 + 40 174.97.139.63 new @@ -117,7 +117,7 @@ 1 - 32 + 33 206.190.75.8 returning @@ -136,7 +136,7 @@ Changelog Archive - Analytics - Piwik 43 - 37 + 38 79 1 min 19s @@ -146,7 +146,7 @@ all 1 5 - 37 + 38 http://piwik.org/changelog/ plugins/Zeitgeist/images/goal.png @@ -229,7 +229,7 @@ 1 - 38 + 39 193.159.20.129 new @@ -356,11 +356,11 @@ 1 - 36 + 37 50.244.17.130 - new - + returning + plugins/Live/images/returningVisitor.gif 1 plugins/Zeitgeist/images/goal.png none @@ -375,7 +375,7 @@ Liberate Web Analytics - Analytics - Piwik 34 - 41 + 42 32 32s @@ -385,7 +385,7 @@ all 1 5 - 41 + 42 http://piwik.org/ plugins/Zeitgeist/images/goal.png @@ -419,7 +419,7 @@ 34 34s 1 - 0 + 7 0 0 North America @@ -485,41 +485,19 @@ 1 - 37 + 38 84.194.72.21 new - 1 - plugins/Zeitgeist/images/goal.png + 0 + none 0 0 - 2 + 1 - - action - http://piwik.org/ - Liberate Web Analytics - Analytics - Piwik - 34 - - 42 - 0.06s - 6 - 6s - - - - goal - all - 1 - 5 - 42 - - http://piwik.org/ - plugins/Zeitgeist/images/goal.png - outlink http://demo.piwik.org/ @@ -536,18 +514,18 @@ piwik.org - 1 + 0 USD $ - 01:34:18 + 01:34:24 1 - 7 - 7s + 0 + 0s 1 0 0 @@ -615,7 +593,7 @@ 1 - 35 + 36 108.211.181.12 new @@ -633,7 +611,7 @@ all 1 5 - 40 + 41 http://piwik.org/blog/2012/10/integrate-piwik-into-your-rails-application/ plugins/Zeitgeist/images/goal.png @@ -644,7 +622,7 @@ Integrate Piwik into your Rails Application - Analytics - Piwik 47 - 40 + 41 0.39s @@ -742,7 +720,7 @@ 1 - 34 + 35 219.101.46.222 returning @@ -760,7 +738,7 @@ all 1 5 - 39 + 40 https://piwik.org/log-analytics/ plugins/Zeitgeist/images/goal.png @@ -771,7 +749,7 @@ Log Analytics - Analytics - Piwik 41 - 39 + 40 @@ -856,7 +834,7 @@ 1 - 33 + 34 80.136.160.65 returning @@ -874,7 +852,7 @@ all 1 5 - 38 + 39 http://piwik.org/blog/2014/03/piwik-2-1-massive-performance-reliability-improvements/ plugins/Zeitgeist/images/goal.png @@ -885,7 +863,7 @@ Piwik 2.1 — Massive Performance and Reliability Improvements - Analytics - Piwik 45 - 38 + 39 0.12s @@ -963,7 +941,7 @@ 1 - 31 + 32 188.107.238.9 new @@ -981,7 +959,7 @@ all 1 5 - 36 + 37 http://piwik.org/log-analytics/ plugins/Zeitgeist/images/goal.png @@ -992,7 +970,7 @@ Log Analytics - Analytics - Piwik 41 - 36 + 37 0.15s @@ -1090,7 +1068,7 @@ 1 - 29 + 30 93.80.130.163 new @@ -1109,7 +1087,7 @@ Liberate Web Analytics - Analytics - Piwik 34 - 32 + 33 0.18s 2 2s @@ -1120,7 +1098,7 @@ all 1 5 - 32 + 33 http://piwik.org/ plugins/Zeitgeist/images/goal.png @@ -1131,7 +1109,7 @@ Download - Analytics - Piwik 38 - 34 + 35 0.11s 7 7s @@ -1143,7 +1121,7 @@ 39 - 35 + 36 plugins/Zeitgeist/images/download.png @@ -1224,7 +1202,7 @@ 1 - 30 + 31 176.41.226.154 returning @@ -1242,7 +1220,7 @@ all 1 5 - 33 + 34 http://piwik.org/docs/installation/ plugins/Zeitgeist/images/goal.png @@ -1253,7 +1231,7 @@ Installing Piwik - Analytics - Piwik 36 - 33 + 34 0.13s @@ -1340,6 +1318,125 @@ + + + 1 + 29 + 84.194.72.21 + + new + + 1 + plugins/Zeitgeist/images/goal.png + none + + 0 + 0 + 1 + + + goal + all + 1 + 5 + 32 + + http://piwik.org/ + plugins/Zeitgeist/images/goal.png + + + action + http://piwik.org/ + Liberate Web Analytics - Analytics - Piwik + 34 + + 32 + 0.06s + + + + + + Domain landed + piwik.org + + + 1 + USD + $ + + 01:34:18 + 1 + + + + + 0 + 0s + 1 + 0 + 0 + 0 + Europe + eur + Belgium + be + plugins/UserCountry/images/flags/be.png + Limburg + 05 + Maaseik + Maaseik, Limburg, Belgium + 51.099998 + 5.800000 + Unknown + Unknown + http://piwik.org/faq/general/#faq_52 + website + Websites + musicforeveryoneradio.be + + + http://musicforeveryoneradio.be:2222/CMD_PLUGINS/installatron/index.raw + + + Windows 7 + WI7 + Win 7 + plugins/UserSettings/images/os/WI7.gif + webkit + WebKit (Safari, Chrome) + Chrome 33.0 + plugins/UserSettings/images/browsers/CH.gif + CH + 33.0 + wide + Desktop + 1920x1080 + plugins/UserSettings/images/screens/wide.gif + pdf, flash, java, silverlight + + + plugins/UserSettings/images/plugins/pdf.gif + pdf + + + plugins/UserSettings/images/plugins/flash.gif + flash + + + plugins/UserSettings/images/plugins/java.gif + java + + + plugins/UserSettings/images/plugins/silverlight.gif + silverlight + + + + + + + 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 1219929b333..358869c4379 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getAll_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getAll_month.xml @@ -2,7 +2,7 @@ - 38 + 39 46 40 180 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 1d06c0cc4c6..f04a57ef02a 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__MultiSites.getOne_month.xml @@ -1,6 +1,6 @@ - 38 + 39 46 100% 100% 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 9cf3e0e9f74..a6516309e56 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 @@ - 38 + 39 46 3 - 437 - 32 + 430 + 34 36 - 38 + 39 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 496802df19a..d6dd56e9887 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getAll_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getAll_month.xml @@ -72,12 +72,12 @@ 3 - + 1 - 2 - 2 - 7 - 0 + 1 + 1 + 0 + 1 1 @@ -91,7 +91,7 @@ 3 - + 1 1 1 @@ -110,7 +110,7 @@ 3 - + 1 1 1 @@ -129,12 +129,12 @@ 3 - - 1 - 1 + + 2 + 2 1 0 - 1 + 2 1 @@ -144,7 +144,8 @@ 1 5 - 1 + 0 + 2 3 \ 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 cf6b4d7eaec..1a409ad5cf3 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getReferrerType_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getReferrerType_month.xml @@ -20,11 +20,11 @@ - 6 + 7 7 - 2 - 7 - 5 + 1 + 0 + 7 7 @@ -34,15 +34,15 @@ 7 35 - 6 + 7 - - 1 - 1 + + 2 + 2 1 0 - 1 + 2 1 @@ -52,10 +52,11 @@ 1 5 - 1 + 0 + 2 - + 1 1 1 @@ -73,7 +74,7 @@ 1 - + 1 1 1 @@ -91,12 +92,12 @@ 1 - + 1 - 2 - 2 - 7 - 0 + 1 + 1 + 0 + 1 1 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 7181d1905ab..7f61ae72cd8 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getWebsites_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getWebsites_month.xml @@ -1,12 +1,12 @@ - - 1 - 1 + + 2 + 2 1 0 - 1 + 2 1 @@ -16,22 +16,23 @@ 1 5 - 1 + 0 + 2 - - 1 - 1 + + 2 + 2 1 0 - 1 + 2 1 - 1 + 2 - + 1 1 1 @@ -49,7 +50,7 @@ 1 - + 1 1 1 @@ -61,7 +62,7 @@ - + 1 1 1 @@ -79,7 +80,7 @@ 1 - + 1 1 1 @@ -91,12 +92,12 @@ - + 1 - 2 - 2 - 7 - 0 + 1 + 1 + 0 + 1 1 @@ -109,12 +110,12 @@ 1 - + 1 - 2 - 2 - 7 - 0 + 1 + 1 + 0 + 1 1 1 @@ -196,11 +197,11 @@ 1 - 2 - 2 - 7 - 0 - 1 + 1 + 1 + 0 + 1 + 0 1 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 46f95ffdb2a..23c0b5749b5 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml @@ -51,6 +51,33 @@ 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 @@ -103,32 +130,6 @@ California plugins/UserCountry/images/flags/us.png - - - 1 - 2 - 2 - 7 - 0 - - - 1 - 1 - 5 - - - 1 - 5 - 1 - 51.1 - 5.8 - Maaseik - 05 - be - Belgium - Limburg - plugins/UserCountry/images/flags/be.png - 1 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 26b2965c043..4b973c63814 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml @@ -78,11 +78,11 @@ - 6 + 7 9 3 - 17 - 4 + 10 + 6 6 @@ -92,7 +92,8 @@ 6 30 - 6 + 7 + 0 Europe 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 2b12e5049e2..2febd04aa78 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml @@ -110,27 +110,13 @@ 16 11 - - - 1 - 1 - 1 - 0 - 1 - 0 - 1 - au - plugins/UserCountry/images/flags/au.png - 16 - 11 - - 1 + 2 2 - 2 - 7 - 0 + 1 + 0 + 2 1 @@ -140,12 +126,27 @@ 1 5 - 1 + 0 + 2 be plugins/UserCountry/images/flags/be.png 16 11 + + + 1 + 1 + 1 + 0 + 1 + 0 + 1 + au + plugins/UserCountry/images/flags/au.png + 16 + 11 + 1 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 6c943032032..a47b34141d1 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml @@ -46,6 +46,30 @@ 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 @@ -69,29 +93,6 @@ California plugins/UserCountry/images/flags/us.png - - - 1 - 2 - 2 - 7 - 0 - - - 1 - 1 - 5 - - - 1 - 5 - 1 - 05 - be - Belgium - Limburg - plugins/UserCountry/images/flags/be.png - 1 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 8e0b767a5a5..b222db93489 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 @@ - 17 + 18 19 2 - 41 - 15 + 34 + 17 17 - 17 + 18 Webkit 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 76d895059fd..f1ee8f770b3 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml @@ -1,5 +1,17 @@ + + + 5 + 5 + 1 + 0 + 5 + 4 + 5 + plugins/UserSettings/images/browsers/CH.gif + Chrome 33.0 + 5 @@ -36,18 +48,6 @@ plugins/UserSettings/images/browsers/UNK.gif RockMelt 0.9 - - - 4 - 5 - 2 - 7 - 3 - 4 - 4 - plugins/UserSettings/images/browsers/CH.gif - Chrome 33.0 - 3 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 1d3ee472614..807d9c3032f 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml @@ -1,5 +1,16 @@ + + + 11 + 11 + 1 + 0 + 11 + 10 + 11 + plugins/UserSettings/images/browsers/CH.gif + 5 @@ -33,17 +44,6 @@ 5 plugins/UserSettings/images/browsers/UNK.gif - - - 10 - 11 - 2 - 7 - 9 - 10 - 10 - plugins/UserSettings/images/browsers/CH.gif - 5 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 20aac30060b..590b4874719 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml @@ -50,6 +50,16 @@ 2 2 + + + 2 + 2 + 1 + 0 + 2 + 1 + 2 + 2 @@ -150,16 +160,6 @@ 1 1 - - - 1 - 2 - 2 - 7 - 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 d284896ef78..4c8ddc785d7 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 @@ - 38 + 39 46 3 - 437 - 32 + 430 + 34 36 - 38 + 39 \ 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 5a2c56517d6..a93a160b3d9 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml @@ -2,13 +2,13 @@ - 33 + 34 41 3 - 437 - 27 + 430 + 29 32 - 33 + 34 plugins/UserSettings/images/screens/normal.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 ee2a07f8bce..a6f40cf25c5 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml @@ -2,13 +2,13 @@ - 16 + 17 20 3 - 98 - 13 + 91 + 15 16 - 16 + 17 plugins/UserSettings/images/os/WI8.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 dc257357786..07514ed96da 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml @@ -2,13 +2,13 @@ - 12 + 13 14 2 - 88 - 10 + 81 + 12 12 - 12 + 13 plugins/UserSettings/images/os/WI7.gif Win 7 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 fa541b93954..9f891956397 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getPlugin_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getPlugin_month.xml @@ -2,56 +2,56 @@ - 12 - 38.7% + 13 + 40.6% plugins/UserSettings/images/plugins/cookie.gif - 11 - 35.5% + 12 + 37.5% plugins/UserSettings/images/plugins/flash.gif - 11 - 35.5% + 12 + 37.5% plugins/UserSettings/images/plugins/java.gif - 9 - 29% + 10 + 31.3% plugins/UserSettings/images/plugins/pdf.gif - - 5 - 16.1% - plugins/UserSettings/images/plugins/quicktime.gif + + 6 + 18.8% + plugins/UserSettings/images/plugins/silverlight.gif - + 5 - 16.1% - plugins/UserSettings/images/plugins/silverlight.gif + 15.6% + plugins/UserSettings/images/plugins/quicktime.gif 3 - 9.7% + 9.4% plugins/UserSettings/images/plugins/windowsmedia.gif 1 - 3.2% + 3.1% plugins/UserSettings/images/plugins/director.gif 1 - 3.2% + 3.1% plugins/UserSettings/images/plugins/gears.gif 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 31ce7068bbb..6074f6e1cce 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml @@ -10,6 +10,16 @@ 23 25 + + + 3 + 5 + 3 + 10 + 2 + 2 + 3 + 2 @@ -20,16 +30,6 @@ 2 2 - - - 2 - 5 - 3 - 17 - 0 - 2 - 2 - 2 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 bdb3caca907..bc90fedd6c1 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml @@ -13,13 +13,13 @@ - 11 + 12 16 3 - 132 - 7 + 125 + 9 11 - 11 + 12 plugins/UserSettings/images/screens/wide.gif 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 d74050dd49d..83b8cf01ebe 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 @@ - 5 - 5 - 6 - 5 + 6 + 6 + 8 + 6 4 - 81 + 115 2 - 80% - 1.2 - 16 + 67% + 1.3 + 19 \ 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 eb3184645b0..a2500cddf02 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 @@ - 6 - 6 - 6 + 7 + 7 + 7 0 - 6 - 6 + 7 + 7 5 21 21 - 29 - 437 - 15 - 19 + 28 + 430 + 16 + 18 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 9070b638bcd..47b4378814d 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml @@ -12,13 +12,13 @@ - 4 + 5 5 - 2 - 7 - 3 + 1 + 0 + 5 4 - 4 + 5 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 82db9aa0599..776dffd8efd 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml @@ -2,11 +2,11 @@ - 11 + 12 16 3 - 132 - 7 + 125 + 9 0 @@ -17,7 +17,7 @@ 11 55 - 11 + 12 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 9ea269a0ca2..13e2d0cb194 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml @@ -34,7 +34,7 @@ - 0 + 1 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 2220417182b..acd84cb1e70 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml @@ -2,8 +2,8 @@ - 34 - 89% + 35 + 90% 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 92f5b1c1df5..174a8d90d06 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml @@ -2,11 +2,11 @@ - 32 + 34 - 4 + 3 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 eec83a57406..9154335b0ca 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 @@ - 34 + 35 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 a946f8e5055..5c61a821373 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 @@ -32 \ No newline at end of file +34 \ 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 579e6027510..c3b0e95397b 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 17s \ No newline at end of file +7 min 10s \ 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 3dc1a7bf03b..041729400fe 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 @@ -437 \ No newline at end of file +430 \ 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 962fbe983a7..f24432d1a4c 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 @@ -38 \ No newline at end of file +39 \ 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 0659ce24738..4b7eff08209 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 - 38 + 39 46 36 - 32 - 437 + 34 + 430 3 - 84% + 87% 1.2 - 12 + 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 e28896e01ad..40b7ad88514 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,7 +3,7 @@ - 38 + 39 46 40 180 diff --git a/tests/resources/access-logs/fake_logs_replay.log b/tests/resources/access-logs/fake_logs_replay.log index 791aba16011..f9ead404edd 100644 --- a/tests/resources/access-logs/fake_logs_replay.log +++ b/tests/resources/access-logs/fake_logs_replay.log @@ -8,6 +8,7 @@ 175.41.192.40 - - [15/Aug/2012:09:01:38 +0200] "GET /piwik.php?idsite=1 HTTP/1.1" 200 43 "http://example-referrer-replay.org/" "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Business Everywhere 7.1.2; GTB6; .NET CLR 1.0.3705; .NET CLR 1.1.4322; Media Center PC 4.0) " #idsite=1 replay logs from demo (IP were changed) +84.194.72.21 - - [17/Aug/2012:01:34:15 +0100] "GET /piwik.php?action_name=Liberate%20Web%20Analytics%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=045456&h=1&m=34&s=18&url=http%3A%2F%2Fpiwik.org%2F&urlref=http%3A%2F%2Fmusicforeveryoneradio.be%3A2222%2FCMD_PLUGINS%2Finstallatron%2Findex.raw&_id=e01d58157d66e023&_idts=1394670858&_idvc=1&_idn=1&_refts=1394670858&_viewts=1394670858&_ref=http%3A%2F%2Fmusicforeveryoneradio.be%3A2222%2FCMD_PLUGINS%2Finstallatron%2Findex.raw&pdf=1&qt=0&realp=0&wma=0&dir=0&fla=1&java=1&gears=0&ag=1&cookie=1&res=1920x1080&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D>_ms=58 HTTP/1.1" 200 43 "http://piwik.org/" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.146 Safari/537.36" 93.80.130.163 - - [18/Aug/2012:01:32:23 +0100] "GET /piwik.php?action_name=Liberate%20Web%20Analytics%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=293471&h=4&m=28&s=18&url=http%3A%2F%2Fpiwik.org%2F&urlref=http%3A%2F%2Fwww.google.ru%2Furl%3Fsa%3Dt%26rct%3Dj%26q%3D%26esrc%3Ds%26source%3Dweb%26cd%3D1%26ved%3D0CCoQFjAA%26url%3Dhttp%253A%252F%252Fpiwik.org%252F%26ei%3DffwgU57VGuf44QT3-oCQCw%26usg%3DAFQjCNF_MGJRqKPvaKuUokHtZ3VvNG9ALw%26bvm%3Dbv.62922401%2Cd.bGE%26cad%3Drjt&_id=f077de87fa56021e&_idts=1394670499&_idvc=1&_idn=1&_refts=1394670499&_viewts=1394670499&_ref=http%3A%2F%2Fwww.google.ru%2Furl%3Fsa%3Dt%26rct%3Dj%26q%3D%26esrc%3Ds%26source%3Dweb%26cd%3D1%26ved%3D0CCoQFjAA%26url%3Dhttp%253A%252F%252Fpiwik.org%252F%26ei%3DffwgU57VGuf44QT3-oCQCw%26usg%3DAFQjCNF_MGJRqKPvaKuUokHtZ3VvNG9ALw%26bvm%3Dbv.62922401%2Cd.bGE%26cad%3Drjt&pdf=0&qt=0&realp=0&wma=0&dir=0&fla=1&java=1&gears=0&ag=0&cookie=1&res=1920x1080&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D>_ms=182 HTTP/1.1" 200 43 "http://piwik.org/" "Mozilla/5.0 (Windows NT 6.2; rv:27.0) Gecko/20100101 Firefox/27.0" 176.41.226.154 - - [18/Aug/2012:01:32:24 +0100] "GET /piwik.php?action_name=Installing%20Piwik%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=144006&h=2&m=32&s=21&url=http%3A%2F%2Fpiwik.org%2Fdocs%2Finstallation%2F&_id=8b11942ef3b17467&_idts=1392074017&_idvc=5&_idn=0&_refts=1394670293&_viewts=1393965698&_ref=https%3A%2F%2Fwww.google.com.tr%2F&pdf=1&qt=0&realp=0&wma=0&dir=0&fla=1&java=1&gears=0&ag=1&cookie=1&res=1366x768&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D>_ms=134 HTTP/1.1" 200 43 "http://piwik.org/docs/installation/" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.146 Safari/537.36" 93.80.130.163 - - [18/Aug/2012:01:32:25 +0100] "GET /piwik.php?action_name=Download%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=147473&h=4&m=28&s=20&url=http%3A%2F%2Fpiwik.org%2Fdownload%2F&urlref=http%3A%2F%2Fpiwik.org%2F&_id=f077de87fa56021e&_idts=1394670499&_idvc=1&_idn=0&_refts=1394670499&_viewts=1394670499&_ref=http%3A%2F%2Fwww.google.ru%2Furl%3Fsa%3Dt%26rct%3Dj%26q%3D%26esrc%3Ds%26source%3Dweb%26cd%3D1%26ved%3D0CCoQFjAA%26url%3Dhttp%253A%252F%252Fpiwik.org%252F%26ei%3DffwgU57VGuf44QT3-oCQCw%26usg%3DAFQjCNF_MGJRqKPvaKuUokHtZ3VvNG9ALw%26bvm%3Dbv.62922401%2Cd.bGE%26cad%3Drjt&pdf=0&qt=0&realp=0&wma=0&dir=0&fla=1&java=1&gears=0&ag=0&cookie=1&res=1920x1080&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D>_ms=113 HTTP/1.1" 200 43 "http://piwik.org/download/" "Mozilla/5.0 (Windows NT 6.2; rv:27.0) Gecko/20100101 Firefox/27.0" @@ -17,8 +18,7 @@ 80.136.160.65 - - [18/Aug/2012:01:33:33 +0100] "GET /piwik.php?action_name=Piwik%202.1%20%E2%80%94%20Massive%20Performance%20and%20Reliability%20Improvements%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=542198&h=1&m=33&s=31&url=http%3A%2F%2Fpiwik.org%2Fblog%2F2014%2F03%2Fpiwik-2-1-massive-performance-reliability-improvements%2F&urlref=http%3A%2F%2Fberndjung.com%2Fpiwik%2Findex.php%3Fmodule%3DCoreHome%26action%3Dindex%26idSite%3D1%26period%3Dday%26date%3Dtoday&_id=fc96e596bd4c5d54&_idts=1394670812&_idvc=2&_idn=1&_refts=1394670812&_viewts=1394670812&_ref=http%3A%2F%2Fberndjung.com%2Fpiwik%2Findex.php%3Fmodule%3DCoreHome%26action%3Dindex%26idSite%3D1%26period%3Dday%26date%3Dtoday&pdf=0&qt=0&realp=0&wma=0&dir=0&fla=1&java=0&gears=0&ag=0&cookie=1&res=360x640&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D>_ms=119 HTTP/1.1" 200 43 "http://piwik.org/blog/2014/03/piwik-2-1-massive-performance-reliability-improvements/" "Mozilla/5.0 (Android; Mobile; rv:27.0) Gecko/27.0 Firefox/27.0" 219.101.46.222 - - [18/Aug/2012:01:33:50 +0100] "GET /piwik.php?action_name=Log%20Analytics%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=263291&h=9&m=33&s=50&url=https%3A%2F%2Fpiwik.org%2Flog-analytics%2F&urlref=https%3A%2F%2Fwww.google.co.jp%2Furl%3Fsa%3Dt%26rct%3Dj%26q%3D%26esrc%3Ds%26source%3Dweb%26cd%3D2%26ved%3D0CDAQFjAB%26url%3Dhttps%253A%252F%252Fpiwik.org%252Flog-analytics%252F%26ei%3DrogdU5OuK43pkgXZmYGICA%26usg%3DAFQjCNH4nR8bKYaliCj2egiJ0H_CX4sFJg%26bvm%3Dbv.62578216%2Cd.dGI&_id=15164ceeb5ddb76f&_idts=1394444478&_idvc=4&_idn=0&_refts=1394670831&_viewts=1394584228&_ref=https%3A%2F%2Fwww.google.co.jp%2Furl%3Fsa%3Dt%26rct%3Dj%26q%3D%26esrc%3Ds%26source%3Dweb%26cd%3D2%26ved%3D0CDAQFjAB%26url%3Dhttps%253A%252F%252Fpiwik.org%252Flog-analytics%252F%26ei%3DrogdU5OuK43pkgXZmYGICA%26usg%3DAFQjCNH4nR8bKYaliCj2egiJ0H_CX4sFJg%26bvm%3Dbv.62578216%2Cd.dGI&pdf=1&qt=1&realp=0&wma=0&dir=0&fla=0&java=1&gears=0&ag=0&cookie=1&res=2560x1440&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D HTTP/1.1" 200 43 "https://piwik.org/log-analytics/" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_2) AppleWebKit/537.74.9 (KHTML, like Gecko) Version/7.0.2 Safari/537.74.9" 108.211.181.12 - - [18/Aug/2012:01:33:55 +0100] "GET /piwik.php?action_name=Integrate%20Piwik%20into%20your%20Rails%20Application%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=006719&h=17&m=33&s=58&url=http%3A%2F%2Fpiwik.org%2Fblog%2F2012%2F10%2Fintegrate-piwik-into-your-rails-application%2F&urlref=https%3A%2F%2Fwww.google.com%2F&_id=3d9cad3fc284c272&_idts=1394670839&_idvc=1&_idn=1&_refts=1394670839&_viewts=1394670839&_ref=https%3A%2F%2Fwww.google.com%2F&pdf=1&qt=1&realp=0&wma=1&dir=0&fla=1&java=1&gears=0&ag=1&cookie=1&res=1360x768&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D>_ms=391 HTTP/1.1" 200 43 "http://piwik.org/blog/2012/10/integrate-piwik-into-your-rails-application/" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.149 Safari/537.36" -50.244.17.130 - - [18/Aug/2012:01:33:59 +0100] "GET /piwik.php?action_name=Liberate%20Web%20Analytics%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=658858&h=19&m=34&s=1&url=http%3A%2F%2Fpiwik.org%2F&urlref=http%3A%2F%2Fwww.google.com%2Furl%3Fsa%3Dt%26rct%3Dj%26q%3D%26esrc%3Ds%26source%3Dweb%26cd%3D1%26ved%3D0CCcQFjAA%26url%3Dhttp%253A%252F%252Fpiwik.org%252F%26ei%3D8vwgU8TYDZTI2wWTi4CQCA%26usg%3DAFQjCNF_MGJRqKPvaKuUokHtZ3VvNG9ALw%26bvm%3Dbv.62922401%2Cd.b2I&_id=90d89274a8c26d90&_idts=1394670841&_idvc=1&_idn=1&_refts=1394670841&_viewts=1394670841&_ref=http%3A%2F%2Fwww.google.com%2Furl%3Fsa%3Dt%26rct%3Dj%26q%3D%26esrc%3Ds%26source%3Dweb%26cd%3D1%26ved%3D0CCcQFjAA%26url%3Dhttp%253A%252F%252Fpiwik.org%252F%26ei%3D8vwgU8TYDZTI2wWTi4CQCA%26usg%3DAFQjCNF_MGJRqKPvaKuUokHtZ3VvNG9ALw%26bvm%3Dbv.62922401%2Cd.b2I&pdf=1&qt=1&realp=0&wma=0&dir=0&fla=1&java=1&gears=0&ag=0&cookie=1&res=2880x1800&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D HTTP/1.1" 200 43 "http://piwik.org/" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_2) AppleWebKit/537.74.9 (KHTML, like Gecko) Version/7.0.2 Safari/537.74.9" -84.194.72.21 - - [18/Aug/2012:01:34:15 +0100] "GET /piwik.php?action_name=Liberate%20Web%20Analytics%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=045456&h=1&m=34&s=18&url=http%3A%2F%2Fpiwik.org%2F&urlref=http%3A%2F%2Fmusicforeveryoneradio.be%3A2222%2FCMD_PLUGINS%2Finstallatron%2Findex.raw&_id=e01d58157d66e023&_idts=1394670858&_idvc=1&_idn=1&_refts=1394670858&_viewts=1394670858&_ref=http%3A%2F%2Fmusicforeveryoneradio.be%3A2222%2FCMD_PLUGINS%2Finstallatron%2Findex.raw&pdf=1&qt=0&realp=0&wma=0&dir=0&fla=1&java=1&gears=0&ag=1&cookie=1&res=1920x1080&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D>_ms=58 HTTP/1.1" 200 43 "http://piwik.org/" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.146 Safari/537.36" +50.244.17.130 - - [18/Aug/2012:01:33:59 +0100] "GET /piwik.php?action_name=Liberate%20Web%20Analytics%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=658858&h=19&m=34&s=1&url=http%3A%2F%2Fpiwik.org%2F&urlref=http%3A%2F%2Fwww.google.com%2Furl%3Fsa%3Dt%26rct%3Dj%26q%3D%26esrc%3Ds%26source%3Dweb%26cd%3D1%26ved%3D0CCcQFjAA%26url%3Dhttp%253A%252F%252Fpiwik.org%252F%26ei%3D8vwgU8TYDZTI2wWTi4CQCA%26usg%3DAFQjCNF_MGJRqKPvaKuUokHtZ3VvNG9ALw%26bvm%3Dbv.62922401%2Cd.b2I&_id=90d89274a8c26d90&_idts=1394670841&_idvc=1&_idn=1&_refts=1394670841&_viewts=1344646861&_ref=http%3A%2F%2Fwww.google.com%2Furl%3Fsa%3Dt%26rct%3Dj%26q%3D%26esrc%3Ds%26source%3Dweb%26cd%3D1%26ved%3D0CCcQFjAA%26url%3Dhttp%253A%252F%252Fpiwik.org%252F%26ei%3D8vwgU8TYDZTI2wWTi4CQCA%26usg%3DAFQjCNF_MGJRqKPvaKuUokHtZ3VvNG9ALw%26bvm%3Dbv.62922401%2Cd.b2I&pdf=1&qt=1&realp=0&wma=0&dir=0&fla=1&java=1&gears=0&ag=0&cookie=1&res=2880x1800&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D HTTP/1.1" 200 43 "http://piwik.org/" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_2) AppleWebKit/537.74.9 (KHTML, like Gecko) Version/7.0.2 Safari/537.74.9" 84.194.72.21 - - [18/Aug/2012:01:34:21 +0100] "GET /piwik.php?link=http%3A%2F%2Fdemo.piwik.org%2F&idsite=1&rec=1&r=578077&h=1&m=34&s=24&url=http%3A%2F%2Fpiwik.org%2F&urlref=http%3A%2F%2Fmusicforeveryoneradio.be%3A2222%2FCMD_PLUGINS%2Finstallatron%2Findex.raw&_id=e01d58157d66e023&_idts=1394670858&_idvc=1&_idn=0&_refts=1394670858&_viewts=1394670858&_ref=http%3A%2F%2Fmusicforeveryoneradio.be%3A2222%2FCMD_PLUGINS%2Finstallatron%2Findex.raw&pdf=1&qt=0&realp=0&wma=0&dir=0&fla=1&java=1&gears=0&ag=1&cookie=1&res=1920x1080&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D>_ms=58 HTTP/1.1" 200 43 "http://piwik.org/" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.146 Safari/537.36" 50.244.17.130 - - [18/Aug/2012:01:34:31 +0100] "GET /piwik.php?action_name=What%20is%20Piwik%3F%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=388822&h=19&m=34&s=33&url=http%3A%2F%2Fpiwik.org%2Fwhat-is-piwik%2F&urlref=http%3A%2F%2Fpiwik.org%2F&_id=90d89274a8c26d90&_idts=1394670841&_idvc=1&_idn=0&_refts=1394670841&_viewts=1394670841&_ref=http%3A%2F%2Fwww.google.com%2Furl%3Fsa%3Dt%26rct%3Dj%26q%3D%26esrc%3Ds%26source%3Dweb%26cd%3D1%26ved%3D0CCcQFjAA%26url%3Dhttp%253A%252F%252Fpiwik.org%252F%26ei%3D8vwgU8TYDZTI2wWTi4CQCA%26usg%3DAFQjCNF_MGJRqKPvaKuUokHtZ3VvNG9ALw%26bvm%3Dbv.62922401%2Cd.b2I&pdf=1&qt=1&realp=0&wma=0&dir=0&fla=1&java=1&gears=0&ag=0&cookie=1&res=2880x1800&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D HTTP/1.1" 200 43 "http://piwik.org/what-is-piwik/" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_2) AppleWebKit/537.74.9 (KHTML, like Gecko) Version/7.0.2 Safari/537.74.9" 193.159.20.129 - - [18/Aug/2012:01:34:42 +0100] "GET /piwik.php?action_name=demo.piwik.org%2FPiwik%20Forums%20-%20Piwik%20%E2%80%BA%20Web%20Analytics%20Reports&idsite=1&rec=1&r=546849&h=1&m=34&s=37&url=http%3A%2F%2Fdemo.piwik.org%2Findex.php%3Fmodule%3DCoreHome%26action%3Dindex%26date%3Dyesterday%26period%3Dday%26idSite%3D7%23%2Fmodule%3DLive%26action%3DindexVisitorLog%26date%3Dyesterday%26period%3Dday%26idSite%3D7&urlref=http%3A%2F%2Fdemo.piwik.org%2Findex.php%3Fmodule%3DMultiSites%26action%3Dindex%26date%3Dyesterday%26period%3Dday%26idSite%3D32&_id=d80e3396f1a4c2ac&_idts=1394665308&_idvc=1&_idn=0&_refts=0&_viewts=1394665308&pdf=1&qt=1&realp=0&wma=0&dir=0&fla=1&java=1&gears=0&ag=1&cookie=1&res=1920x1200&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%2C%222%22%3A%5B%22Demo%20language%22%2C%22English%22%5D%7D>_ms=413 HTTP/1.1" 200 43 "http://demo.piwik.org/index.php?module=CoreHome&action=index&date=yesterday&period=day&idSite=7" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.45 Safari/537.36"