Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <thomas.steur@gmail.com>2016-02-14 23:10:26 +0300
committerThomas Steur <thomas.steur@gmail.com>2016-02-14 23:10:26 +0300
commit2bae9d90f860f3ccc5598420eb978cafd598451e (patch)
treeb742afddcfc882de15b9c075522cee4eae680db6 /tests/PHPUnit/System/expected
parent41b579a9d94a05f7c0cb2e42bf7c03c2d374ed95 (diff)
merge master => 3.0
Diffstat (limited to 'tests/PHPUnit/System/expected')
-rw-r--r--tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_week.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_week.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml5
-rw-r--r--tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml16
-rw-r--r--tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml18
-rw-r--r--tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml7
-rw-r--r--tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml16
-rw-r--r--tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__API.getSuggestedValuesForSegment.xml9
-rw-r--r--tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__VisitsSummary.get_range.xml12
-rw-r--r--tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml3
-rw-r--r--tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml3
-rw-r--r--tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml16
-rw-r--r--tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml8
-rw-r--r--tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml16
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml42
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml58
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml42
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml58
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml10
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml10
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_day.xml16
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml42
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml58
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml6
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml6
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml8
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml4
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml18
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml12
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml12
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml15
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml12
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml13
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml14
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml15
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml28
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__Goals.getMetrics_month.xml8
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml16
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml127
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml8
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml8
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml22
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml13
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml12
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml30
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml20
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml50
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml27
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml12
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml12
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml12
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml12
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml20
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml4
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml14
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml14
-rw-r--r--tests/PHPUnit/System/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml1
-rw-r--r--tests/PHPUnit/System/expected/test_LabelFilter_titles__Actions.getPageTitles_day.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_NonUnicode__Actions.getPageTitles_day.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml1
-rw-r--r--tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml1
-rw-r--r--tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml4
-rw-r--r--tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_RowEvolution_multipleDates_lastNoData__API.getRowEvolution_month.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_month.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_day.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_month.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitles_day.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitles_month.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_day.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_month.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_day.xml4
-rw-r--r--tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_month.xml4
-rw-r--r--tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_day.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_month.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_day.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_month.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_day.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_month.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_day.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_month.xml4
-rw-r--r--tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml10
-rw-r--r--tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml10
-rw-r--r--tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml4
-rw-r--r--tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml10
-rw-r--r--tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml4
-rw-r--r--tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv2
-rw-r--r--tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html2
-rw-r--r--tests/PHPUnit/System/expected/test_UrlNormalization_pagesSegmentedRef__Actions.getPageUrls_day.xml6
-rw-r--r--tests/PHPUnit/System/expected/test_UrlNormalization_pagesSegmented__Actions.getPageUrls_day.xml4
-rw-r--r--tests/PHPUnit/System/expected/test_UrlNormalization_titles__Actions.getPageTitles_day.xml2
-rw-r--r--tests/PHPUnit/System/expected/test_UrlNormalization_urls__Actions.getPageUrls_day.xml6
-rw-r--r--tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml4
-rw-r--r--tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__Actions.getPageUrls_month.xml4
-rw-r--r--tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml4
-rw-r--r--tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml23
-rwxr-xr-xtests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml4
-rwxr-xr-xtests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml8
-rw-r--r--tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv4
-rw-r--r--tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html4
-rw-r--r--tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml3
-rw-r--r--tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml13
-rw-r--r--tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml8
-rw-r--r--tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml8
-rw-r--r--tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml3
-rw-r--r--tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml1
-rw-r--r--tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml3
140 files changed, 966 insertions, 382 deletions
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml
index 51252ac498..e36e5d53df 100644
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml
@@ -2,7 +2,7 @@
<results>
<result idSite="1">
<nb_uniq_visitors>28</nb_uniq_visitors>
- <nb_users>0</nb_users>
+ <nb_users>1</nb_users>
<nb_visits>28</nb_visits>
<nb_actions>31</nb_actions>
<nb_visits_converted>26</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml
index 22528b0939..f1ce3d1ac1 100644
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_week.xml
@@ -2,7 +2,7 @@
<results>
<result idSite="1">
<nb_uniq_visitors>26</nb_uniq_visitors>
- <nb_users>0</nb_users>
+ <nb_users>1</nb_users>
<nb_visits>26</nb_visits>
<nb_actions>29</nb_actions>
<nb_visits_converted>24</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml
index 744ab64e8e..d7fbf8c040 100644
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml
@@ -2,7 +2,7 @@
<results>
<result idSite="1">
<nb_uniq_visitors>27</nb_uniq_visitors>
- <nb_users>0</nb_users>
+ <nb_users>1</nb_users>
<nb_visits>27</nb_visits>
<nb_actions>30</nb_actions>
<nb_visits_converted>25</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_week.xml
index 22528b0939..f1ce3d1ac1 100644
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_week.xml
@@ -2,7 +2,7 @@
<results>
<result idSite="1">
<nb_uniq_visitors>26</nb_uniq_visitors>
- <nb_users>0</nb_users>
+ <nb_users>1</nb_users>
<nb_visits>26</nb_visits>
<nb_actions>29</nb_actions>
<nb_visits_converted>24</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml
index 744ab64e8e..d7fbf8c040 100644
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml
@@ -2,7 +2,7 @@
<results>
<result idSite="1">
<nb_uniq_visitors>27</nb_uniq_visitors>
- <nb_users>0</nb_users>
+ <nb_users>1</nb_users>
<nb_visits>27</nb_visits>
<nb_actions>30</nb_actions>
<nb_visits_converted>25</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_week.xml
index 22528b0939..f1ce3d1ac1 100644
--- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_week.xml
@@ -2,7 +2,7 @@
<results>
<result idSite="1">
<nb_uniq_visitors>26</nb_uniq_visitors>
- <nb_users>0</nb_users>
+ <nb_users>1</nb_users>
<nb_visits>26</nb_visits>
<nb_actions>29</nb_actions>
<nb_visits_converted>24</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml
index 5ffae0691e..2479501ff3 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml
@@ -2,5 +2,10 @@
<result>
<row>FF</row>
<row>UNK</row>
+ <row>CM</row>
+ <row>QQ</row>
+ <row>AN</row>
+ <row>CH</row>
+ <row>IE</row>
<row>SF</row>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml
index 602805c283..e7e79a4222 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_visits>27</nb_visits>
- <nb_actions>73</nb_actions>
- <nb_visits_converted>27</nb_visits_converted>
- <bounce_count>14</bounce_count>
- <sum_visit_length>21073</sum_visit_length>
+ <nb_visits>20</nb_visits>
+ <nb_actions>55</nb_actions>
+ <nb_visits_converted>20</nb_visits_converted>
+ <bounce_count>10</bounce_count>
+ <sum_visit_length>16210</sum_visit_length>
<max_actions>5</max_actions>
- <bounce_rate>52%</bounce_rate>
- <nb_actions_per_visit>2.7</nb_actions_per_visit>
- <avg_time_on_site>780</avg_time_on_site>
+ <bounce_rate>50%</bounce_rate>
+ <nb_actions_per_visit>2.8</nb_actions_per_visit>
+ <avg_time_on_site>811</avg_time_on_site>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml
index dfa3a20623..c0631c362b 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <nb_visits_converted>1</nb_visits_converted>
- <bounce_count>1</bounce_count>
- <sum_visit_length>0</sum_visit_length>
- <max_actions>1</max_actions>
- <bounce_rate>100%</bounce_rate>
- <nb_actions_per_visit>1</nb_actions_per_visit>
- <avg_time_on_site>0</avg_time_on_site>
+ <nb_visits>5</nb_visits>
+ <nb_actions>12</nb_actions>
+ <nb_visits_converted>5</nb_visits_converted>
+ <bounce_count>3</bounce_count>
+ <sum_visit_length>3242</sum_visit_length>
+ <max_actions>5</max_actions>
+ <bounce_rate>60%</bounce_rate>
+ <nb_actions_per_visit>2.4</nb_actions_per_visit>
+ <avg_time_on_site>648</avg_time_on_site>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml
index abcc43c819..c3c7ec0152 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__API.getSuggestedValuesForSegment.xml
@@ -1,4 +1,11 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<row>3.6</row>
+ <row>33</row>
+ <row>5</row>
+ <row>3</row>
+ <row>32</row>
+ <row>34</row>
+ <row>11</row>
+ <row>8</row>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml
index 602805c283..780ddda63a 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_visits>27</nb_visits>
- <nb_actions>73</nb_actions>
- <nb_visits_converted>27</nb_visits_converted>
- <bounce_count>14</bounce_count>
- <sum_visit_length>21073</sum_visit_length>
+ <nb_visits>18</nb_visits>
+ <nb_actions>50</nb_actions>
+ <nb_visits_converted>18</nb_visits_converted>
+ <bounce_count>9</bounce_count>
+ <sum_visit_length>14589</sum_visit_length>
<max_actions>5</max_actions>
- <bounce_rate>52%</bounce_rate>
- <nb_actions_per_visit>2.7</nb_actions_per_visit>
- <avg_time_on_site>780</avg_time_on_site>
+ <bounce_rate>50%</bounce_rate>
+ <nb_actions_per_visit>2.8</nb_actions_per_visit>
+ <avg_time_on_site>811</avg_time_on_site>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__API.getSuggestedValuesForSegment.xml
new file mode 100644
index 0000000000..e421ad0903
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__API.getSuggestedValuesForSegment.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>Unknown</row>
+ <row>HTC</row>
+ <row>Samsung</row>
+ <row>Google</row>
+ <row>Dell</row>
+ <row>Sony</row>
+</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__VisitsSummary.get_range.xml
new file mode 100644
index 0000000000..828ec1e21b
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceBrand__VisitsSummary.get_range.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <nb_visits>27</nb_visits>
+ <nb_actions>76</nb_actions>
+ <nb_visits_converted>27</nb_visits_converted>
+ <bounce_count>13</bounce_count>
+ <sum_visit_length>22694</sum_visit_length>
+ <max_actions>5</max_actions>
+ <bounce_rate>48%</bounce_rate>
+ <nb_actions_per_visit>2.8</nb_actions_per_visit>
+ <avg_time_on_site>841</avg_time_on_site>
+</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml
index 4f5796903a..7b9c37df18 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<row>Desktop</row>
+ <row>Smartphone</row>
+ <row>Phablet</row>
+ <row>Tablet</row>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml
index f32d4c4dc1..90e7df368b 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__API.getSuggestedValuesForSegment.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<row>WIN</row>
+ <row>AND</row>
<row>UNK</row>
+ <row>UBT</row>
+ <row>MLD</row>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml
index 3ce6d98183..fc9d2e2c5a 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_visits>28</nb_visits>
- <nb_actions>74</nb_actions>
- <nb_visits_converted>28</nb_visits_converted>
- <bounce_count>15</bounce_count>
- <sum_visit_length>21073</sum_visit_length>
+ <nb_visits>22</nb_visits>
+ <nb_actions>54</nb_actions>
+ <nb_visits_converted>22</nb_visits_converted>
+ <bounce_count>13</bounce_count>
+ <sum_visit_length>14589</sum_visit_length>
<max_actions>5</max_actions>
- <bounce_rate>54%</bounce_rate>
- <nb_actions_per_visit>2.6</nb_actions_per_visit>
- <avg_time_on_site>753</avg_time_on_site>
+ <bounce_rate>59%</bounce_rate>
+ <nb_actions_per_visit>2.5</nb_actions_per_visit>
+ <avg_time_on_site>663</avg_time_on_site>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml
index 0abf9e4246..efcc22ca70 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__API.getSuggestedValuesForSegment.xml
@@ -2,4 +2,12 @@
<result>
<row>XP</row>
<row>UNK</row>
+ <row>4.4</row>
+ <row>4.3</row>
+ <row>9.04</row>
+ <row>8</row>
+ <row>8.1</row>
+ <row>4.1</row>
+ <row>7</row>
+ <row>Vista</row>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml
index 3ce6d98183..abb563f023 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_visits>28</nb_visits>
- <nb_actions>74</nb_actions>
- <nb_visits_converted>28</nb_visits_converted>
- <bounce_count>15</bounce_count>
- <sum_visit_length>21073</sum_visit_length>
+ <nb_visits>19</nb_visits>
+ <nb_actions>51</nb_actions>
+ <nb_visits_converted>19</nb_visits_converted>
+ <bounce_count>10</bounce_count>
+ <sum_visit_length>14589</sum_visit_length>
<max_actions>5</max_actions>
- <bounce_rate>54%</bounce_rate>
- <nb_actions_per_visit>2.6</nb_actions_per_visit>
- <avg_time_on_site>753</avg_time_on_site>
+ <bounce_rate>53%</bounce_rate>
+ <nb_actions_per_visit>2.7</nb_actions_per_visit>
+ <avg_time_on_site>768</avg_time_on_site>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
index 2bb1a15667..798759bcea 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml
@@ -762,6 +762,48 @@
<segment>entryPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment>
</row>
<row>
+ <label>api</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.009</min_time_generation>
+ <max_time_generation>0.009</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.009</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/fútbol-user-agent</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.009</min_time_generation>
+ <max_time_generation>0.009</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.009</avg_time_generation>
+ <url>http://piwik.net/api/fútbol-user-agent</url>
+ </row>
+ </subtable>
+ </row>
+ <row>
<label>download</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml
index d1c53283d0..ed79501504 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml
@@ -13,7 +13,7 @@
<entry_sum_visit_length>54</entry_sum_visit_length>
<entry_bounce_count>8</entry_bounce_count>
<exit_nb_visits>8</exit_nb_visits>
- <avg_time_on_page>17</avg_time_on_page>
+ <avg_time_on_page>13</avg_time_on_page>
<bounce_rate>89%</bounce_rate>
<exit_rate>80%</exit_rate>
<avg_time_generation>0.389</avg_time_generation>
@@ -31,7 +31,7 @@
<entry_sum_visit_length>54</entry_sum_visit_length>
<entry_bounce_count>5</entry_bounce_count>
<exit_nb_visits>5</exit_nb_visits>
- <avg_time_on_page>24</avg_time_on_page>
+ <avg_time_on_page>17</avg_time_on_page>
<bounce_rate>83%</bounce_rate>
<exit_rate>71%</exit_rate>
<avg_time_generation>0.443</avg_time_generation>
@@ -49,7 +49,7 @@
<entry_sum_visit_length>54</entry_sum_visit_length>
<entry_bounce_count>4</entry_bounce_count>
<exit_nb_visits>4</exit_nb_visits>
- <avg_time_on_page>30</avg_time_on_page>
+ <avg_time_on_page>22</avg_time_on_page>
<bounce_rate>80%</bounce_rate>
<exit_rate>80%</exit_rate>
<avg_time_generation>0.089</avg_time_generation>
@@ -70,7 +70,7 @@
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_entry_nb_uniq_visitors>5</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>4</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>30</avg_time_on_page>
+ <avg_time_on_page>22</avg_time_on_page>
<bounce_rate>80%</bounce_rate>
<exit_rate>80%</exit_rate>
<avg_time_generation>0.089</avg_time_generation>
@@ -91,7 +91,7 @@
<entry_sum_visit_length>0</entry_sum_visit_length>
<entry_bounce_count>1</entry_bounce_count>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>8</avg_time_on_page>
+ <avg_time_on_page>5</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>50%</exit_rate>
<avg_time_generation>0.974</avg_time_generation>
@@ -112,7 +112,7 @@
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>8</avg_time_on_page>
+ <avg_time_on_page>5</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>50%</exit_rate>
<avg_time_generation>0.974</avg_time_generation>
@@ -542,7 +542,7 @@
<entry_sum_visit_length>0</entry_sum_visit_length>
<entry_bounce_count>4</entry_bounce_count>
<exit_nb_visits>5</exit_nb_visits>
- <avg_time_on_page>10</avg_time_on_page>
+ <avg_time_on_page>7</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.255</avg_time_generation>
@@ -563,7 +563,7 @@
<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>3</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>17</avg_time_on_page>
+ <avg_time_on_page>10</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.255</avg_time_generation>
@@ -1123,6 +1123,48 @@
<segment>entryPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment>
</row>
<row>
+ <label>api</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.009</min_time_generation>
+ <max_time_generation>0.009</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.009</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/fútbol-user-agent</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.009</min_time_generation>
+ <max_time_generation>0.009</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.009</avg_time_generation>
+ <url>http://piwik.net/api/fútbol-user-agent</url>
+ </row>
+ </subtable>
+ </row>
+ <row>
<label>changelog</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
index 05350333b8..edf1ae59e6 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml
@@ -756,6 +756,48 @@
<segment>exitPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment>
</row>
<row>
+ <label>api</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.009</min_time_generation>
+ <max_time_generation>0.009</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.009</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/fútbol-user-agent</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.009</min_time_generation>
+ <max_time_generation>0.009</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.009</avg_time_generation>
+ <url>http://piwik.net/api/fútbol-user-agent</url>
+ </row>
+ </subtable>
+ </row>
+ <row>
<label>download</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml
index e5240da081..7973b3e001 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml
@@ -13,7 +13,7 @@
<entry_sum_visit_length>54</entry_sum_visit_length>
<entry_bounce_count>8</entry_bounce_count>
<exit_nb_visits>8</exit_nb_visits>
- <avg_time_on_page>17</avg_time_on_page>
+ <avg_time_on_page>13</avg_time_on_page>
<bounce_rate>89%</bounce_rate>
<exit_rate>80%</exit_rate>
<avg_time_generation>0.389</avg_time_generation>
@@ -31,7 +31,7 @@
<entry_sum_visit_length>54</entry_sum_visit_length>
<entry_bounce_count>5</entry_bounce_count>
<exit_nb_visits>5</exit_nb_visits>
- <avg_time_on_page>24</avg_time_on_page>
+ <avg_time_on_page>17</avg_time_on_page>
<bounce_rate>83%</bounce_rate>
<exit_rate>71%</exit_rate>
<avg_time_generation>0.443</avg_time_generation>
@@ -49,7 +49,7 @@
<entry_sum_visit_length>54</entry_sum_visit_length>
<entry_bounce_count>4</entry_bounce_count>
<exit_nb_visits>4</exit_nb_visits>
- <avg_time_on_page>30</avg_time_on_page>
+ <avg_time_on_page>22</avg_time_on_page>
<bounce_rate>80%</bounce_rate>
<exit_rate>80%</exit_rate>
<avg_time_generation>0.089</avg_time_generation>
@@ -70,7 +70,7 @@
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_entry_nb_uniq_visitors>5</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>4</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>30</avg_time_on_page>
+ <avg_time_on_page>22</avg_time_on_page>
<bounce_rate>80%</bounce_rate>
<exit_rate>80%</exit_rate>
<avg_time_generation>0.089</avg_time_generation>
@@ -91,7 +91,7 @@
<entry_sum_visit_length>0</entry_sum_visit_length>
<entry_bounce_count>1</entry_bounce_count>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>8</avg_time_on_page>
+ <avg_time_on_page>5</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>50%</exit_rate>
<avg_time_generation>0.974</avg_time_generation>
@@ -112,7 +112,7 @@
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>8</avg_time_on_page>
+ <avg_time_on_page>5</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>50%</exit_rate>
<avg_time_generation>0.974</avg_time_generation>
@@ -542,7 +542,7 @@
<entry_sum_visit_length>0</entry_sum_visit_length>
<entry_bounce_count>4</entry_bounce_count>
<exit_nb_visits>5</exit_nb_visits>
- <avg_time_on_page>10</avg_time_on_page>
+ <avg_time_on_page>7</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.255</avg_time_generation>
@@ -563,7 +563,7 @@
<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>3</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>17</avg_time_on_page>
+ <avg_time_on_page>10</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.255</avg_time_generation>
@@ -1117,6 +1117,48 @@
<segment>exitPageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment>
</row>
<row>
+ <label>api</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.009</min_time_generation>
+ <max_time_generation>0.009</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.009</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/fútbol-user-agent</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.009</min_time_generation>
+ <max_time_generation>0.009</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.009</avg_time_generation>
+ <url>http://piwik.net/api/fútbol-user-agent</url>
+ </row>
+ </subtable>
+ </row>
+ <row>
<label>contact</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml
index a56dd22637..4265021a1b 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_month.xml
@@ -2,17 +2,17 @@
<result>
<row>
<label>Page Name not defined</label>
- <nb_visits>27</nb_visits>
- <nb_hits>28</nb_hits>
+ <nb_visits>28</nb_visits>
+ <nb_hits>29</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <nb_hits_with_time_generation>6</nb_hits_with_time_generation>
+ <nb_hits_with_time_generation>7</nb_hits_with_time_generation>
<min_time_generation>0.001</min_time_generation>
<max_time_generation>0.359</max_time_generation>
- <sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
- <avg_time_generation>0.156</avg_time_generation>
+ <avg_time_generation>0.135</avg_time_generation>
</row>
<row>
<label>301</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml
index 9ac6ea68c2..24291fc91a 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageTitles_range.xml
@@ -2,17 +2,17 @@
<result>
<row>
<label>Page Name not defined</label>
- <nb_visits>28</nb_visits>
- <nb_hits>38</nb_hits>
+ <nb_visits>29</nb_visits>
+ <nb_hits>39</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <nb_hits_with_time_generation>16</nb_hits_with_time_generation>
+ <nb_hits_with_time_generation>17</nb_hits_with_time_generation>
<min_time_generation>0.001</min_time_generation>
<max_time_generation>1.324</max_time_generation>
- <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>28</sum_daily_nb_uniq_visitors>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
- <avg_time_generation>0.3</avg_time_generation>
+ <avg_time_generation>0.283</avg_time_generation>
</row>
<row>
<label> Liberate Web Analytics - Analytics - Piwik</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_day.xml
index ce5ec3dc77..27aff1019b 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_day.xml
@@ -12,7 +12,7 @@
<entry_nb_actions>10</entry_nb_actions>
<entry_sum_visit_length>54</entry_sum_visit_length>
<entry_bounce_count>0</entry_bounce_count>
- <avg_time_on_page>83</avg_time_on_page>
+ <avg_time_on_page>33</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<avg_time_generation>0.443</avg_time_generation>
@@ -29,7 +29,7 @@
<entry_nb_actions>10</entry_nb_actions>
<entry_sum_visit_length>54</entry_sum_visit_length>
<entry_bounce_count>0</entry_bounce_count>
- <avg_time_on_page>83</avg_time_on_page>
+ <avg_time_on_page>33</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<avg_time_generation>0.443</avg_time_generation>
@@ -42,7 +42,7 @@
<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
<min_time_generation>0.624</min_time_generation>
<max_time_generation>1.324</max_time_generation>
- <avg_time_on_page>15</avg_time_on_page>
+ <avg_time_on_page>8</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<avg_time_generation>0.974</avg_time_generation>
@@ -56,7 +56,7 @@
<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
<min_time_generation>0.624</min_time_generation>
<max_time_generation>1.324</max_time_generation>
- <avg_time_on_page>15</avg_time_on_page>
+ <avg_time_on_page>8</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<avg_time_generation>0.974</avg_time_generation>
@@ -76,7 +76,7 @@
<entry_nb_actions>10</entry_nb_actions>
<entry_sum_visit_length>54</entry_sum_visit_length>
<entry_bounce_count>0</entry_bounce_count>
- <avg_time_on_page>151</avg_time_on_page>
+ <avg_time_on_page>50</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<avg_time_generation>0.089</avg_time_generation>
@@ -95,7 +95,7 @@
<entry_nb_actions>10</entry_nb_actions>
<entry_sum_visit_length>54</entry_sum_visit_length>
<entry_bounce_count>0</entry_bounce_count>
- <avg_time_on_page>151</avg_time_on_page>
+ <avg_time_on_page>50</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<avg_time_generation>0.089</avg_time_generation>
@@ -161,7 +161,7 @@
<min_time_generation>0.234</min_time_generation>
<max_time_generation>0.294</max_time_generation>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>52</avg_time_on_page>
+ <avg_time_on_page>17</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.255</avg_time_generation>
@@ -177,7 +177,7 @@
<max_time_generation>0.294</max_time_generation>
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>52</avg_time_on_page>
+ <avg_time_on_page>17</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.255</avg_time_generation>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml
index cf6cb6491a..5a2fb28be8 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml
@@ -793,6 +793,48 @@
<segment>pageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment>
</row>
<row>
+ <label>api</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.009</min_time_generation>
+ <max_time_generation>0.009</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.009</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/fútbol-user-agent</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.009</min_time_generation>
+ <max_time_generation>0.009</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.009</avg_time_generation>
+ <url>http://piwik.net/api/fútbol-user-agent</url>
+ </row>
+ </subtable>
+ </row>
+ <row>
<label>download</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
index 6cad9e0d80..6ed96aef32 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml
@@ -13,7 +13,7 @@
<entry_sum_visit_length>54</entry_sum_visit_length>
<entry_bounce_count>8</entry_bounce_count>
<exit_nb_visits>8</exit_nb_visits>
- <avg_time_on_page>17</avg_time_on_page>
+ <avg_time_on_page>13</avg_time_on_page>
<bounce_rate>89%</bounce_rate>
<exit_rate>80%</exit_rate>
<avg_time_generation>0.389</avg_time_generation>
@@ -31,7 +31,7 @@
<entry_sum_visit_length>54</entry_sum_visit_length>
<entry_bounce_count>5</entry_bounce_count>
<exit_nb_visits>5</exit_nb_visits>
- <avg_time_on_page>24</avg_time_on_page>
+ <avg_time_on_page>17</avg_time_on_page>
<bounce_rate>83%</bounce_rate>
<exit_rate>71%</exit_rate>
<avg_time_generation>0.443</avg_time_generation>
@@ -49,7 +49,7 @@
<entry_sum_visit_length>54</entry_sum_visit_length>
<entry_bounce_count>4</entry_bounce_count>
<exit_nb_visits>4</exit_nb_visits>
- <avg_time_on_page>30</avg_time_on_page>
+ <avg_time_on_page>22</avg_time_on_page>
<bounce_rate>80%</bounce_rate>
<exit_rate>80%</exit_rate>
<avg_time_generation>0.089</avg_time_generation>
@@ -70,7 +70,7 @@
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_entry_nb_uniq_visitors>5</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>4</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>30</avg_time_on_page>
+ <avg_time_on_page>22</avg_time_on_page>
<bounce_rate>80%</bounce_rate>
<exit_rate>80%</exit_rate>
<avg_time_generation>0.089</avg_time_generation>
@@ -91,7 +91,7 @@
<entry_sum_visit_length>0</entry_sum_visit_length>
<entry_bounce_count>1</entry_bounce_count>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>8</avg_time_on_page>
+ <avg_time_on_page>5</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>50%</exit_rate>
<avg_time_generation>0.974</avg_time_generation>
@@ -112,7 +112,7 @@
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>8</avg_time_on_page>
+ <avg_time_on_page>5</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>50%</exit_rate>
<avg_time_generation>0.974</avg_time_generation>
@@ -542,7 +542,7 @@
<entry_sum_visit_length>0</entry_sum_visit_length>
<entry_bounce_count>4</entry_bounce_count>
<exit_nb_visits>5</exit_nb_visits>
- <avg_time_on_page>10</avg_time_on_page>
+ <avg_time_on_page>7</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.255</avg_time_generation>
@@ -563,7 +563,7 @@
<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>3</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>17</avg_time_on_page>
+ <avg_time_on_page>10</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.255</avg_time_generation>
@@ -1173,6 +1173,48 @@
<segment>pageUrl==http%3A%2F%2Fpiwik.net%2Fto-an-error</segment>
</row>
<row>
+ <label>api</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.009</min_time_generation>
+ <max_time_generation>0.009</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.009</avg_time_generation>
+ <subtable>
+ <row>
+ <label>/fútbol-user-agent</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>1</nb_hits_with_time_generation>
+ <min_time_generation>0.009</min_time_generation>
+ <max_time_generation>0.009</max_time_generation>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0.009</avg_time_generation>
+ <url>http://piwik.net/api/fútbol-user-agent</url>
+ </row>
+ </subtable>
+ </row>
+ <row>
<label>changelog</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml
index a9f37fee84..23f5051f83 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_month.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_pageviews>39</nb_pageviews>
- <nb_uniq_pageviews>38</nb_uniq_pageviews>
+ <nb_pageviews>40</nb_pageviews>
+ <nb_uniq_pageviews>39</nb_uniq_pageviews>
<nb_downloads>4</nb_downloads>
<nb_uniq_downloads>4</nb_uniq_downloads>
<nb_outlinks>0</nb_outlinks>
<nb_uniq_outlinks>0</nb_uniq_outlinks>
<nb_searches>0</nb_searches>
<nb_keywords>0</nb_keywords>
- <avg_time_generation>0.206</avg_time_generation>
+ <avg_time_generation>0.184</avg_time_generation>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml
index f06074a2b3..bf02fbd84b 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_pageviews>63</nb_pageviews>
- <nb_uniq_pageviews>56</nb_uniq_pageviews>
+ <nb_pageviews>64</nb_pageviews>
+ <nb_uniq_pageviews>57</nb_uniq_pageviews>
<nb_downloads>5</nb_downloads>
<nb_uniq_downloads>5</nb_uniq_downloads>
<nb_outlinks>1</nb_outlinks>
<nb_uniq_outlinks>1</nb_uniq_outlinks>
<nb_searches>0</nb_searches>
<nb_keywords>0</nb_keywords>
- <avg_time_generation>0.273</avg_time_generation>
+ <avg_time_generation>0.264</avg_time_generation>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
index 3746937e85..5996574d1f 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>HTTP-code</label>
- <nb_actions>44</nb_actions>
+ <nb_actions>45</nb_actions>
<slots>
<row>
<scope>page</scope>
@@ -17,9 +17,9 @@
<subtable>
<row>
<label>200</label>
- <nb_visits>33</nb_visits>
- <nb_actions>35</nb_actions>
- <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors>
+ <nb_visits>34</nb_visits>
+ <nb_actions>36</nb_actions>
+ <sum_daily_nb_uniq_visitors>34</sum_daily_nb_uniq_visitors>
</row>
<row>
<label>301</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml
index 55ef69079d..190fff01c2 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__CustomVariables.getUsagesOfSlots.xml
@@ -72,7 +72,7 @@
<row>
<name>HTTP-code</name>
<nb_visits>0</nb_visits>
- <nb_actions>70</nb_actions>
+ <nb_actions>71</nb_actions>
</row>
<row>
<name>Generation Time</name>
@@ -99,7 +99,7 @@
<row>
<name>HTTP-code</name>
<nb_visits>0</nb_visits>
- <nb_actions>70</nb_actions>
+ <nb_actions>71</nb_actions>
</row>
</usages>
</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml
index 08840cc821..0adfc71aee 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml
@@ -9,8 +9,9 @@
<bounce_count>31</bounce_count>
<nb_visits_converted>31</nb_visits_converted>
<sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>1</sum_daily_nb_users>
+ <sum_daily_nb_users>2</sum_daily_nb_users>
<logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo>
+ <segment>deviceBrand==Unknown</segment>
</row>
<row>
<label>HTC</label>
@@ -23,6 +24,20 @@
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<logo>plugins/DevicesDetection/images/brand/HTC.ico</logo>
+ <segment>deviceBrand==HTC</segment>
+ </row>
+ <row>
+ <label>Apple</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <logo>plugins/DevicesDetection/images/brand/Apple.ico</logo>
+ <segment>deviceBrand==Apple</segment>
</row>
<row>
<label>Samsung</label>
@@ -35,5 +50,6 @@
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>1</sum_daily_nb_users>
<logo>plugins/DevicesDetection/images/brand/Samsung.ico</logo>
+ <segment>deviceBrand==Samsung</segment>
</row>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml
index 4c4cb49892..26b425d530 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml
@@ -9,7 +9,7 @@
<bounce_count>16</bounce_count>
<nb_visits_converted>17</nb_visits_converted>
<sum_daily_nb_uniq_visitors>18</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
<segment>browserEngine==WebKit</segment>
</row>
<row>
@@ -38,13 +38,13 @@
</row>
<row>
<label>Unknown</label>
- <nb_visits>4</nb_visits>
- <nb_actions>4</nb_actions>
+ <nb_visits>5</nb_visits>
+ <nb_actions>5</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>4</bounce_count>
- <nb_visits_converted>1</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <bounce_count>5</bounce_count>
+ <nb_visits_converted>2</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<segment>browserEngine==</segment>
</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
index d1231b5bb1..9ec764ffe6 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
@@ -9,7 +9,7 @@
<bounce_count>9</bounce_count>
<nb_visits_converted>10</nb_visits_converted>
<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>1</sum_daily_nb_users>
+ <sum_daily_nb_users>2</sum_daily_nb_users>
<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
</row>
<row>
@@ -50,13 +50,13 @@
</row>
<row>
<label>Unknown</label>
- <nb_visits>4</nb_visits>
- <nb_actions>4</nb_actions>
+ <nb_visits>5</nb_visits>
+ <nb_actions>5</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>4</bounce_count>
- <nb_visits_converted>1</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <bounce_count>5</bounce_count>
+ <nb_visits_converted>2</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo>
</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
index 8d82c019fc..fb459cbb95 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
@@ -100,7 +100,7 @@
<bounce_count>2</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
<segment>browserCode==CH;browserVersion==20.0</segment>
<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
</row>
@@ -208,4 +208,17 @@
<segment>browserCode==IE;browserVersion==8.0</segment>
<logo>plugins/DevicesDetection/images/browsers/IE.gif</logo>
</row>
+ <row>
+ <label>Unknown</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>browserCode==UNK;browserVersion==1.0</segment>
+ <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo>
+ </row>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml
index 34e9fb7630..cce03cafcc 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml
@@ -9,7 +9,7 @@
<bounce_count>9</bounce_count>
<nb_visits_converted>10</nb_visits_converted>
<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>1</sum_daily_nb_users>
+ <sum_daily_nb_users>2</sum_daily_nb_users>
<logo>plugins/DevicesDetection/images/browsers/CH.gif</logo>
<segment>browserCode==CH</segment>
</row>
@@ -54,13 +54,13 @@
</row>
<row>
<label>Unknown</label>
- <nb_visits>4</nb_visits>
- <nb_actions>4</nb_actions>
+ <nb_visits>5</nb_visits>
+ <nb_actions>5</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>4</bounce_count>
- <nb_visits_converted>1</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <bounce_count>5</bounce_count>
+ <nb_visits_converted>2</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo>
<segment>browserCode==UNK</segment>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
index f330ccb30f..6a19338c7d 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
@@ -9,7 +9,7 @@
<bounce_count>31</bounce_count>
<nb_visits_converted>31</nb_visits_converted>
<sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>1</sum_daily_nb_users>
+ <sum_daily_nb_users>2</sum_daily_nb_users>
</row>
<row>
<label>HTC - Vision</label>
@@ -23,6 +23,17 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
</row>
<row>
+ <label>Apple - iPhone</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ </row>
+ <row>
<label>Samsung - GALAXY S5</label>
<nb_visits>1</nb_visits>
<nb_actions>3</nb_actions>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
index c7234f8606..9eee07e117 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml
@@ -21,7 +21,7 @@
<bounce_count>10</bounce_count>
<nb_visits_converted>11</nb_visits_converted>
<sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
<logo>plugins/DevicesDetection/images/os/WIN.gif</logo>
</row>
<row>
@@ -72,4 +72,16 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<logo>plugins/DevicesDetection/images/os/UNK.gif</logo>
</row>
+ <row>
+ <label>iOS</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <logo>plugins/DevicesDetection/images/os/IOS.gif</logo>
+ </row>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml
index 8ff1d6faee..f20b32cd47 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml
@@ -22,7 +22,7 @@
<bounce_count>7</bounce_count>
<nb_visits_converted>7</nb_visits_converted>
<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
<segment>operatingSystemCode==WIN;operatingSystemVersion==7</segment>
<logo>plugins/DevicesDetection/images/os/WIN.gif</logo>
</row>
@@ -118,6 +118,19 @@
<logo>plugins/DevicesDetection/images/os/UNK.gif</logo>
</row>
<row>
+ <label>iOS 7.1</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>operatingSystemCode==IOS;operatingSystemVersion==7.1</segment>
+ <logo>plugins/DevicesDetection/images/os/IOS.gif</logo>
+ </row>
+ <row>
<label>Mac</label>
<nb_visits>1</nb_visits>
<nb_actions>1</nb_actions>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml
index 875400f578..9215886300 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getType_month.xml
@@ -9,11 +9,24 @@
<bounce_count>27</bounce_count>
<nb_visits_converted>30</nb_visits_converted>
<sum_daily_nb_uniq_visitors>29</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>1</sum_daily_nb_users>
+ <sum_daily_nb_users>2</sum_daily_nb_users>
<segment>deviceType==desktop</segment>
<logo>plugins/DevicesDetection/images/screens/normal.gif</logo>
</row>
<row>
+ <label>Smartphone</label>
+ <nb_visits>4</nb_visits>
+ <nb_actions>6</nb_actions>
+ <max_actions>3</max_actions>
+ <sum_visit_length>2</sum_visit_length>
+ <bounce_count>3</bounce_count>
+ <nb_visits_converted>4</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
+ <segment>deviceType==smartphone</segment>
+ <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo>
+ </row>
+ <row>
<label>Unknown</label>
<nb_visits>4</nb_visits>
<nb_actions>4</nb_actions>
@@ -26,19 +39,6 @@
<logo>plugins/DevicesDetection/images/screens/unknown.gif</logo>
</row>
<row>
- <label>Smartphone</label>
- <nb_visits>3</nb_visits>
- <nb_actions>5</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>2</sum_visit_length>
- <bounce_count>2</bounce_count>
- <nb_visits_converted>3</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>1</sum_daily_nb_users>
- <segment>deviceType==smartphone</segment>
- <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo>
- </row>
- <row>
<label>Camera</label>
<nb_visits>0</nb_visits>
<segment>deviceType==camera</segment>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
index d6f76b939e..b4efda3138 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>0 days</label>
- <nb_conversions>33</nb_conversions>
+ <nb_conversions>34</nb_conversions>
</row>
<row>
<label>1 day</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getMetrics_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getMetrics_month.xml
index d97c3eb0d0..603f674615 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getMetrics_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getMetrics_month.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_conversions>34</nb_conversions>
- <nb_visits_converted>34</nb_visits_converted>
- <revenue>170</revenue>
- <conversion_rate>89.47%</conversion_rate>
+ <nb_conversions>35</nb_conversions>
+ <nb_visits_converted>35</nb_visits_converted>
+ <revenue>175</revenue>
+ <conversion_rate>89.74%</conversion_rate>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
index fcd1e7c56b..c25b8275f0 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getVisitsUntilConversion_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>1 visit</label>
- <nb_conversions>34</nb_conversions>
+ <nb_conversions>35</nb_conversions>
</row>
<row>
<label>2 visits</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml
index 73154bb53f..9c8f8990b0 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.get_month.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_conversions>34</nb_conversions>
- <nb_visits_converted>34</nb_visits_converted>
- <revenue>170</revenue>
- <conversion_rate>89.47%</conversion_rate>
- <nb_conversions_new_visit>31</nb_conversions_new_visit>
- <nb_visits_converted_new_visit>31</nb_visits_converted_new_visit>
- <revenue_new_visit>155</revenue_new_visit>
- <conversion_rate_new_visit>88.57%</conversion_rate_new_visit>
+ <nb_conversions>35</nb_conversions>
+ <nb_visits_converted>35</nb_visits_converted>
+ <revenue>175</revenue>
+ <conversion_rate>89.74%</conversion_rate>
+ <nb_conversions_new_visit>32</nb_conversions_new_visit>
+ <nb_visits_converted_new_visit>32</nb_visits_converted_new_visit>
+ <revenue_new_visit>160</revenue_new_visit>
+ <conversion_rate_new_visit>88.89%</conversion_rate_new_visit>
<nb_conversions_returning_visit>3</nb_conversions_returning_visit>
<nb_visits_converted_returning_visit>3</nb_visits_converted_returning_visit>
<revenue_returning_visit>15</revenue_returning_visit>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
index 84ba4e506d..2087b56cee 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
@@ -2114,7 +2114,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>67</idVisit>
+ <idVisit>68</idVisit>
<visitIp>173.5.0.0</visitIp>
<actionDetails>
@@ -2123,7 +2123,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>93</goalPageId>
+ <goalPageId>94</goalPageId>
<url>http://hello.example.com/hello/from/another/world/6,681965</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -2135,7 +2135,7 @@
<pageTitle />
<pageIdAction>61</pageIdAction>
- <pageId>93</pageId>
+ <pageId>94</pageId>
<customVariables>
<row>
<customVariablePageName1>Generation Time</customVariablePageName1>
@@ -2293,7 +2293,7 @@
<pageTitle />
<pageIdAction>56</pageIdAction>
- <pageId>90</pageId>
+ <pageId>91</pageId>
<customVariables>
<row>
<customVariablePageName1>Generation Time</customVariablePageName1>
@@ -2512,7 +2512,7 @@
<pageTitle>404/URL = http%3A%2F%2Fhello.example.com%2Fhello%2Fworld%2F6%2C681965</pageTitle>
<pageIdAction>60</pageIdAction>
- <pageId>92</pageId>
+ <pageId>93</pageId>
<customVariables>
<row>
<customVariablePageName1>Generation Time</customVariablePageName1>
@@ -2638,7 +2638,7 @@
</row>
<row>
<idSite>1</idSite>
- <idVisit>66</idVisit>
+ <idVisit>67</idVisit>
<visitIp>70.95.32.0</visitIp>
<actionDetails>
@@ -2647,7 +2647,7 @@
<goalName>all</goalName>
<goalId>1</goalId>
<revenue>5</revenue>
- <goalPageId>91</goalPageId>
+ <goalPageId>92</goalPageId>
<url>http://example.hello.com/Topic/hw43061</url>
<icon>plugins/Morpheus/images/goal.png</icon>
@@ -2659,7 +2659,7 @@
<pageTitle>301/URL = http%3A%2F%2Fexample.hello.com%2FTopic%2Fhw43061</pageTitle>
<pageIdAction>58</pageIdAction>
- <pageId>91</pageId>
+ <pageId>92</pageId>
<customVariables>
<row>
<customVariablePageName1>Generation Time</customVariablePageName1>
@@ -3133,6 +3133,115 @@
</row>
<row>
<idSite>1</idSite>
+ <idVisit>66</idVisit>
+ <visitIp>73.77.55.45</visitIp>
+
+ <actionDetails>
+ <row>
+ <type>goal</type>
+ <goalName>all</goalName>
+ <goalId>1</goalId>
+ <revenue>5</revenue>
+ <goalPageId>90</goalPageId>
+
+ <url>http://piwik.net/api/fútbol-user-agent</url>
+ <icon>plugins/Morpheus/images/goal.png</icon>
+
+ </row>
+ <row>
+ <type>action</type>
+ <url>http://piwik.net/api/fútbol-user-agent</url>
+ <pageTitle />
+ <pageIdAction>71</pageIdAction>
+
+ <pageId>90</pageId>
+ <customVariables>
+ <row>
+ <customVariablePageName1>HTTP-code</customVariablePageName1>
+ <customVariablePageValue1>200</customVariablePageValue1>
+ </row>
+ </customVariables>
+ <generationTime>0.009s</generationTime>
+ <icon />
+
+ </row>
+ </actionDetails>
+ <goalConversions>1</goalConversions>
+ <siteCurrency>USD</siteCurrency>
+ <siteCurrencySymbol>$</siteCurrencySymbol>
+
+
+
+
+ <userId />
+ <visitorType>new</visitorType>
+ <visitorTypeIcon />
+ <visitConverted>1</visitConverted>
+ <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+ <visitCount>1</visitCount>
+
+ <visitEcommerceStatus>none</visitEcommerceStatus>
+ <visitEcommerceStatusIcon />
+ <daysSinceFirstVisit>0</daysSinceFirstVisit>
+ <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
+ <visitDuration>0</visitDuration>
+ <visitDurationPretty>0s</visitDurationPretty>
+ <searches>0</searches>
+ <actions>1</actions>
+ <referrerType>direct</referrerType>
+ <referrerTypeName>Direct Entry</referrerTypeName>
+ <referrerName />
+ <referrerKeyword />
+ <referrerKeywordPosition />
+ <referrerUrl />
+ <referrerSearchEngineUrl />
+ <referrerSearchEngineIcon />
+ <languageCode />
+ <language>Unknown</language>
+ <deviceType>Smartphone</deviceType>
+ <deviceTypeIcon>plugins/DevicesDetection/images/screens/smartphone.png</deviceTypeIcon>
+ <deviceBrand>Apple</deviceBrand>
+ <deviceModel>iPhone</deviceModel>
+ <operatingSystem>iOS 7.1</operatingSystem>
+ <operatingSystemName>iOS</operatingSystemName>
+ <operatingSystemIcon>plugins/DevicesDetection/images/os/IOS.gif</operatingSystemIcon>
+ <operatingSystemCode>IOS</operatingSystemCode>
+ <operatingSystemVersion>7.1</operatingSystemVersion>
+ <browserFamily />
+ <browserFamilyDescription>Unknown</browserFamilyDescription>
+ <browser>Unknown</browser>
+ <browserName>Unknown</browserName>
+ <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
+ <browserCode>UNK</browserCode>
+ <browserVersion>1.0</browserVersion>
+ <events>0</events>
+ <continent>North America</continent>
+ <continentCode>amn</continentCode>
+ <country>United States</country>
+ <countryCode>us</countryCode>
+ <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag>
+ <region>New Jersey</region>
+ <regionCode>NJ</regionCode>
+ <city>Mount Laurel</city>
+ <location>Mount Laurel, New Jersey, United States</location>
+ <latitude>39.957001</latitude>
+ <longitude>-74.916000</longitude>
+ <visitLocalTime>12:20:31</visitLocalTime>
+ <visitLocalHour>12</visitLocalHour>
+ <daysSinceLastVisit>0</daysSinceLastVisit>
+ <customVariables>
+ </customVariables>
+ <resolution>unknown</resolution>
+ <plugins />
+ <pluginsIcons />
+
+
+
+
+
+ </row>
+ <row>
+ <idSite>1</idSite>
<idVisit>64</idVisit>
<visitIp>192.0.2.222</visitIp>
@@ -4409,7 +4518,7 @@
- <userId />
+ <userId>commonuser</userId>
<visitorType>new</visitorType>
<visitorTypeIcon />
<visitConverted>1</visitConverted>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml
index 8485ac465c..fd2d4e58ad 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml
@@ -2,10 +2,10 @@
<result>
<row>
<label>Piwik test</label>
- <nb_visits>38</nb_visits>
- <nb_actions>45</nb_actions>
- <nb_pageviews>39</nb_pageviews>
- <revenue>170</revenue>
+ <nb_visits>39</nb_visits>
+ <nb_actions>46</nb_actions>
+ <nb_pageviews>40</nb_pageviews>
+ <revenue>175</revenue>
<visits_evolution>100%</visits_evolution>
<actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml
index 9b9cc1efd7..5adcb351b8 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_visits>38</nb_visits>
- <nb_actions>45</nb_actions>
+ <nb_visits>39</nb_visits>
+ <nb_actions>46</nb_actions>
<visits_evolution>100%</visits_evolution>
<actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution>
<revenue_evolution>100%</revenue_evolution>
- <nb_pageviews>39</nb_pageviews>
- <revenue>170</revenue>
+ <nb_pageviews>40</nb_pageviews>
+ <revenue>175</revenue>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
index a1e8fd0e9d..8131944987 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Referrers.getReferrerType_month.xml
@@ -2,23 +2,24 @@
<result>
<row>
<label>Direct Entry</label>
- <nb_visits>34</nb_visits>
- <nb_actions>39</nb_actions>
+ <nb_visits>35</nb_visits>
+ <nb_actions>40</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>549</sum_visit_length>
- <bounce_count>30</bounce_count>
+ <bounce_count>31</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>30</nb_conversions>
- <nb_visits_converted>30</nb_visits_converted>
- <revenue>150</revenue>
+ <nb_conversions>31</nb_conversions>
+ <nb_visits_converted>31</nb_visits_converted>
+ <revenue>155</revenue>
</row>
</goals>
- <nb_conversions>30</nb_conversions>
- <revenue>150</revenue>
- <sum_daily_nb_uniq_visitors>32</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>1</sum_daily_nb_users>
+ <nb_conversions>31</nb_conversions>
+ <revenue>155</revenue>
+ <sum_daily_nb_uniq_visitors>33</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>2</sum_daily_nb_users>
<nb_visits_converted>0</nb_visits_converted>
+ <segment>referrerType==direct</segment>
</row>
<row>
<label>Websites</label>
@@ -38,6 +39,7 @@
<revenue>20</revenue>
<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>1</sum_daily_nb_users>
+ <segment>referrerType==website</segment>
<subtable>
<row>
<label>example.com</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml
index 55471df8f7..06ad7df1f9 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml
@@ -64,7 +64,7 @@
<bounce_count>3</bounce_count>
<nb_visits_converted>3</nb_visits_converted>
<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
</row>
<row>
<label>Android / Android Browser / unknown</label>
@@ -111,6 +111,17 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
</row>
<row>
+ <label>iOS / Unknown / unknown</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ </row>
+ <row>
<label>GNU/Linux / Chrome / unknown</label>
<nb_visits>1</nb_visits>
<nb_actions>1</nb_actions>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml
index 2dd3a3f0ff..d8f74a118c 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml
@@ -2,14 +2,14 @@
<result>
<row>
<label>unknown</label>
- <nb_visits>36</nb_visits>
- <nb_actions>43</nb_actions>
+ <nb_visits>37</nb_visits>
+ <nb_actions>44</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>551</sum_visit_length>
- <bounce_count>31</bounce_count>
- <nb_visits_converted>32</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>34</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>2</sum_daily_nb_users>
+ <bounce_count>32</bounce_count>
+ <nb_visits_converted>33</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>35</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>3</sum_daily_nb_users>
<segment>resolution==unknown</segment>
</row>
<row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml
index fa5433509b..4c6a424157 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCity_month.xml
@@ -17,7 +17,7 @@
<nb_conversions>27</nb_conversions>
<revenue>135</revenue>
<sum_daily_nb_uniq_visitors>29</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>2</sum_daily_nb_users>
+ <sum_daily_nb_users>3</sum_daily_nb_users>
<nb_visits_converted>0</nb_visits_converted>
<city_name>Unknown</city_name>
<city>xx</city>
@@ -84,6 +84,34 @@
<logo>plugins/UserCountry/images/flags/ca.png</logo>
</row>
<row>
+ <label>Mount Laurel, New Jersey, United States</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>5</revenue>
+ </row>
+ </goals>
+ <nb_conversions>1</nb_conversions>
+ <revenue>5</revenue>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <lat>39.957</lat>
+ <long>-74.916</long>
+ <segment>city==Mount+Laurel;regionCode==NJ;countryCode==us</segment>
+ <city_name>Mount Laurel</city_name>
+ <region>NJ</region>
+ <country>us</country>
+ <country_name>United States</country_name>
+ <region_name>New Jersey</region_name>
+ <logo>plugins/UserCountry/images/flags/us.png</logo>
+ </row>
+ <row>
<label>Seoul, Seoul-t&amp;#039;ukpyolsi, South Korea</label>
<nb_visits>1</nb_visits>
<nb_actions>1</nb_actions>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml
index 054cf2e1d3..4d15ccdb89 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getContinent_month.xml
@@ -22,21 +22,21 @@
</row>
<row>
<label>North America</label>
- <nb_visits>11</nb_visits>
- <nb_actions>14</nb_actions>
+ <nb_visits>12</nb_visits>
+ <nb_actions>15</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>4</sum_visit_length>
- <bounce_count>9</bounce_count>
+ <bounce_count>10</bounce_count>
<goals>
<row idgoal='1'>
- <nb_conversions>11</nb_conversions>
- <nb_visits_converted>11</nb_visits_converted>
- <revenue>55</revenue>
+ <nb_conversions>12</nb_conversions>
+ <nb_visits_converted>12</nb_visits_converted>
+ <revenue>60</revenue>
</row>
</goals>
- <nb_conversions>11</nb_conversions>
- <revenue>55</revenue>
- <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
+ <nb_conversions>12</nb_conversions>
+ <revenue>60</revenue>
+ <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>2</sum_daily_nb_users>
<code>North America</code>
</row>
@@ -57,7 +57,7 @@
<nb_conversions>9</nb_conversions>
<revenue>45</revenue>
<sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
<nb_visits_converted>0</nb_visits_converted>
<code>Unknown</code>
</row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml
index 98deda9945..70da83f4e9 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getCountry_month.xml
@@ -25,6 +25,30 @@
<logoHeight>11</logoHeight>
</row>
<row>
+ <label>United States</label>
+ <nb_visits>11</nb_visits>
+ <nb_actions>14</nb_actions>
+ <max_actions>3</max_actions>
+ <sum_visit_length>4</sum_visit_length>
+ <bounce_count>9</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>11</nb_conversions>
+ <nb_visits_converted>11</nb_visits_converted>
+ <revenue>55</revenue>
+ </row>
+ </goals>
+ <nb_conversions>11</nb_conversions>
+ <revenue>55</revenue>
+ <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>2</sum_daily_nb_users>
+ <code>us</code>
+ <logo>plugins/UserCountry/images/flags/us.png</logo>
+ <segment>countryCode==us</segment>
+ <logoWidth>16</logoWidth>
+ <logoHeight>11</logoHeight>
+ </row>
+ <row>
<label>Unknown</label>
<nb_visits>11</nb_visits>
<nb_actions>12</nb_actions>
@@ -41,7 +65,7 @@
<nb_conversions>9</nb_conversions>
<revenue>45</revenue>
<sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
<nb_visits_converted>0</nb_visits_converted>
<code>xx</code>
<logo>plugins/UserCountry/images/flags/xx.png</logo>
@@ -50,30 +74,6 @@
<logoHeight>11</logoHeight>
</row>
<row>
- <label>United States</label>
- <nb_visits>10</nb_visits>
- <nb_actions>13</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>4</sum_visit_length>
- <bounce_count>8</bounce_count>
- <goals>
- <row idgoal='1'>
- <nb_conversions>10</nb_conversions>
- <nb_visits_converted>10</nb_visits_converted>
- <revenue>50</revenue>
- </row>
- </goals>
- <nb_conversions>10</nb_conversions>
- <revenue>50</revenue>
- <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>2</sum_daily_nb_users>
- <code>us</code>
- <logo>plugins/UserCountry/images/flags/us.png</logo>
- <segment>countryCode==us</segment>
- <logoWidth>16</logoWidth>
- <logoHeight>11</logoHeight>
- </row>
- <row>
<label>Brazil</label>
<nb_visits>3</nb_visits>
<nb_actions>3</nb_actions>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml
index bdcfaeca3c..b9f8ff9295 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserCountry.getRegion_month.xml
@@ -17,7 +17,7 @@
<nb_conversions>27</nb_conversions>
<revenue>135</revenue>
<sum_daily_nb_uniq_visitors>29</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>2</sum_daily_nb_users>
+ <sum_daily_nb_users>3</sum_daily_nb_users>
<nb_visits_converted>0</nb_visits_converted>
<region>xx</region>
<country>xx</country>
@@ -51,6 +51,31 @@
<logo>plugins/UserCountry/images/flags/us.png</logo>
</row>
<row>
+ <label>New Jersey, United States</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>1</bounce_count>
+ <goals>
+ <row idgoal='1'>
+ <nb_conversions>1</nb_conversions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <revenue>5</revenue>
+ </row>
+ </goals>
+ <nb_conversions>1</nb_conversions>
+ <revenue>5</revenue>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>regionCode==NJ;countryCode==us</segment>
+ <region>NJ</region>
+ <country>us</country>
+ <country_name>United States</country_name>
+ <region_name>New Jersey</region_name>
+ <logo>plugins/UserCountry/images/flags/us.png</logo>
+ </row>
+ <row>
<label>Nunavut, Canada</label>
<nb_visits>1</nb_visits>
<nb_actions>1</nb_actions>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml
index da22c13a83..029f2ea4a7 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguageCode_month.xml
@@ -2,14 +2,14 @@
<result>
<row>
<label>Unknown (xx)</label>
- <nb_visits>38</nb_visits>
- <nb_actions>45</nb_actions>
+ <nb_visits>39</nb_visits>
+ <nb_actions>46</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>551</sum_visit_length>
- <bounce_count>33</bounce_count>
- <nb_visits_converted>34</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>36</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>2</sum_daily_nb_users>
+ <bounce_count>34</bounce_count>
+ <nb_visits_converted>35</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>37</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>3</sum_daily_nb_users>
<segment>languageCode==xx</segment>
</row>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml
index d2c34aab1a..5a86d88387 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserLanguage.getLanguage_month.xml
@@ -2,14 +2,14 @@
<result>
<row>
<label>Unknown</label>
- <nb_visits>38</nb_visits>
- <nb_actions>45</nb_actions>
+ <nb_visits>39</nb_visits>
+ <nb_actions>46</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>551</sum_visit_length>
- <bounce_count>33</bounce_count>
- <nb_visits_converted>34</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>36</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>2</sum_daily_nb_users>
+ <bounce_count>34</bounce_count>
+ <nb_visits_converted>35</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>37</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>3</sum_daily_nb_users>
<segment>languageCode==xx</segment>
</row>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
index b381de56d6..cc47ebdc6e 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getByDayOfWeek_month.xml
@@ -2,13 +2,13 @@
<result>
<row>
<label>Monday</label>
- <nb_visits>1</nb_visits>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_actions>1</nb_actions>
+ <nb_visits>2</nb_visits>
+ <nb_uniq_visitors>2</nb_uniq_visitors>
+ <nb_actions>2</nb_actions>
<nb_users>0</nb_users>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>1</nb_visits_converted>
+ <bounce_count>2</bounce_count>
+ <nb_visits_converted>2</nb_visits_converted>
<day_of_week>1</day_of_week>
</row>
<row>
@@ -54,7 +54,7 @@
<nb_visits>11</nb_visits>
<nb_uniq_visitors>11</nb_uniq_visitors>
<nb_actions>14</nb_actions>
- <nb_users>0</nb_users>
+ <nb_users>1</nb_users>
<sum_visit_length>305</sum_visit_length>
<bounce_count>9</bounce_count>
<nb_visits_converted>9</nb_visits_converted>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
index e4f045cd9f..46f45bc7b3 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml
@@ -146,13 +146,13 @@
</row>
<row>
<label>12h</label>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
+ <nb_visits>3</nb_visits>
+ <nb_actions>3</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>2</bounce_count>
- <nb_visits_converted>2</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <bounce_count>3</bounce_count>
+ <nb_visits_converted>3</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<segment>visitLocalHour==12</segment>
</row>
@@ -189,7 +189,7 @@
<bounce_count>1</bounce_count>
<nb_visits_converted>1</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
<segment>visitLocalHour==15</segment>
</row>
<row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
index fcc08ecee4..09be75ee74 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml
@@ -191,23 +191,23 @@
</row>
<row>
<label>12h</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>1</bounce_count>
+ <bounce_count>2</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<goals>
<row idgoal='1'>
- <nb_conversions>1</nb_conversions>
- <nb_visits_converted>1</nb_visits_converted>
- <revenue>5</revenue>
+ <nb_conversions>2</nb_conversions>
+ <nb_visits_converted>2</nb_visits_converted>
+ <revenue>10</revenue>
</row>
</goals>
- <nb_conversions>1</nb_conversions>
- <revenue>5</revenue>
+ <nb_conversions>2</nb_conversions>
+ <revenue>10</revenue>
<segment>visitServerHour==12</segment>
</row>
<row>
@@ -252,7 +252,7 @@
<bounce_count>1</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
+ <sum_daily_nb_users>1</sum_daily_nb_users>
<goals>
<row idgoal='1'>
<nb_conversions>1</nb_conversions>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
index 43027f77b0..c39484f83d 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>New visits</label>
- <nb_visits>35</nb_visits>
+ <nb_visits>36</nb_visits>
</row>
<row>
<label>0 days</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml
index a879d261b3..adb58e2a56 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>New visits</label>
- <nb_visits>39</nb_visits>
+ <nb_visits>40</nb_visits>
</row>
<row>
<label>0 days</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
index 221a29c2b5..4eb8fddf65 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>1 visit</label>
- <nb_visits>38</nb_visits>
+ <nb_visits>39</nb_visits>
<nb_visits_percentage>100%</nb_visits_percentage>
</row>
<row>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml
index 11fd85a144..f02d54dcf5 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByVisitCount_range.xml
@@ -2,8 +2,8 @@
<result>
<row>
<label>1 visit</label>
- <nb_visits>44</nb_visits>
- <nb_visits_percentage>86%</nb_visits_percentage>
+ <nb_visits>45</nb_visits>
+ <nb_visits_percentage>87%</nb_visits_percentage>
</row>
<row>
<label>2 visits</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
index 0ca3284b5b..174a8d90d0 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>1 page</label>
- <nb_visits>33</nb_visits>
+ <nb_visits>34</nb_visits>
</row>
<row>
<label>2 pages</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml
index 51ed7da2eb..d771a07bc9 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerPage_range.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>1 page</label>
- <nb_visits>42</nb_visits>
+ <nb_visits>43</nb_visits>
</row>
<row>
<label>2 pages</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
index f3e2effb18..5809c92de9 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_month.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>0-10s</label>
- <nb_visits>35</nb_visits>
+ <nb_visits>36</nb_visits>
</row>
<row>
<label>11-30s</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml
index b62b79979b..6f5a23aa2a 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsPerVisitDuration_range.xml
@@ -2,7 +2,7 @@
<result>
<row>
<label>0-10s</label>
- <nb_visits>45</nb_visits>
+ <nb_visits>46</nb_visits>
</row>
<row>
<label>11-30s</label>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
index 05473b60f6..0e7e4e3d09 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getActions_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>45</result> \ No newline at end of file
+<result>46</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
index 95aa700980..5c61a82137 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getBounceCount_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>33</result> \ No newline at end of file
+<result>34</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
index 8af80c337f..51a0bb8472 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUniqueVisitors_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>36</result> \ No newline at end of file
+<result>37</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml
index 13002b2017..15ef03fb49 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getUsers_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>2</result> \ No newline at end of file
+<result>3</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
index 5c61a82137..8e4b837a62 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisitsConverted_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>34</result> \ No newline at end of file
+<result>35</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
index 962fbe983a..f24432d1a4 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.getVisits_month.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8" ?>
-<result>38</result> \ No newline at end of file
+<result>39</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml
index a71746a977..94dde51493 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__VisitsSummary.get_month.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_uniq_visitors>36</nb_uniq_visitors>
- <nb_users>2</nb_users>
- <nb_visits>38</nb_visits>
- <nb_actions>45</nb_actions>
- <nb_visits_converted>34</nb_visits_converted>
- <bounce_count>33</bounce_count>
+ <nb_uniq_visitors>37</nb_uniq_visitors>
+ <nb_users>3</nb_users>
+ <nb_visits>39</nb_visits>
+ <nb_actions>46</nb_actions>
+ <nb_visits_converted>35</nb_visits_converted>
+ <bounce_count>34</bounce_count>
<sum_visit_length>551</sum_visit_length>
<max_actions>3</max_actions>
<bounce_rate>87%</bounce_rate>
<nb_actions_per_visit>1.2</nb_actions_per_visit>
- <avg_time_on_site>15</avg_time_on_site>
+ <avg_time_on_site>14</avg_time_on_site>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml
index 4e4c5a220b..94b54bf27a 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml
@@ -3,11 +3,11 @@
<result date="2012-08">
<row>
<label>Piwik test</label>
- <nb_visits>38</nb_visits>
- <nb_actions>45</nb_actions>
- <nb_pageviews>39</nb_pageviews>
- <revenue>170</revenue>
- <nb_conversions>34</nb_conversions>
+ <nb_visits>39</nb_visits>
+ <nb_actions>46</nb_actions>
+ <nb_pageviews>40</nb_pageviews>
+ <revenue>175</revenue>
+ <nb_conversions>35</nb_conversions>
<visits_evolution>100%</visits_evolution>
<actions_evolution>100%</actions_evolution>
<pageviews_evolution>100%</pageviews_evolution>
@@ -59,8 +59,8 @@
<revenue>5</revenue>
<nb_conversions>1</nb_conversions>
<visits_evolution>-97.4%</visits_evolution>
- <actions_evolution>-77.8%</actions_evolution>
- <pageviews_evolution>-74.4%</pageviews_evolution>
+ <actions_evolution>-78.3%</actions_evolution>
+ <pageviews_evolution>-75%</pageviews_evolution>
<revenue_evolution>-97.1%</revenue_evolution>
<nb_conversions_evolution>-97.1%</nb_conversions_evolution>
<idsite>1</idsite>
diff --git a/tests/PHPUnit/System/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml
index 411d2a2eb9..086e95965f 100644
--- a/tests/PHPUnit/System/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml
+++ b/tests/PHPUnit/System/expected/test_LabelFilter_keywords_html__Referrers.getSearchEngines_day.xml
@@ -10,6 +10,7 @@
<sum_visit_length>1441</sum_visit_length>
<bounce_count>0</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
+ <segment>referrerName==Google;referrerType==search;referrerKeyword==%3C%3E%26%5C%22the+pdo+extension+is+required+for+this+adapter+but+the+extension+is+not+loaded</segment>
<url>http://google.com/search?q=%3C%3E%26%5C%22the+pdo+extension+is+required+for+this+adapter+but+the+extension+is+not+loaded</url>
</row>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_LabelFilter_titles__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_titles__Actions.getPageTitles_day.xml
index afffc60a48..79f1fd371f 100644
--- a/tests/PHPUnit/System/expected/test_LabelFilter_titles__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_LabelFilter_titles__Actions.getPageTitles_day.xml
@@ -14,7 +14,7 @@
<entry_nb_actions>9</entry_nb_actions>
<entry_sum_visit_length>1441</entry_sum_visit_length>
<entry_bounce_count>0</entry_bounce_count>
- <avg_time_on_page>1116</avg_time_on_page>
+ <avg_time_on_page>279</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<avg_time_generation>0.626</avg_time_generation>
diff --git a/tests/PHPUnit/System/expected/test_NonUnicode__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_NonUnicode__Actions.getPageTitles_day.xml
index 008d9e87fb..8b29b241d3 100644
--- a/tests/PHPUnit/System/expected/test_NonUnicode__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_NonUnicode__Actions.getPageTitles_day.xml
@@ -9,7 +9,7 @@
<nb_hits_following_search>2</nb_hits_following_search>
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
</row>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml
index 8b154c9334..4cf37854e3 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml
@@ -10,5 +10,6 @@
<bounce_count>1</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
<logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo>
+ <segment>deviceBrand==Unknown</segment>
</row>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml
index deb88da799..fd2de07373 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml
@@ -17,6 +17,7 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>1</revenue>
+ <segment>referrerType==search</segment>
<subtable>
<row>
<label>purchase</label>
@@ -55,6 +56,7 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>42</revenue>
+ <segment>referrerType==website</segment>
<subtable>
<row>
<label>referrer.com</label>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml
index 8ff05bc8ff..a6ccba6e74 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml
@@ -11,5 +11,6 @@
<bounce_count>1</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
<logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo>
+ <segment>deviceBrand==Unknown</segment>
</row>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml
index 2225e62fa0..e4b6ce2e00 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml
@@ -18,6 +18,7 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>1</revenue>
+ <segment>referrerType==search</segment>
<subtable>
<row>
<label>purchase</label>
@@ -58,6 +59,7 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>42</revenue>
+ <segment>referrerType==website</segment>
<subtable>
<row>
<label>referrer.com</label>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
index e00992d683..8d118edb9a 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
@@ -113,8 +113,8 @@
<pageIdAction>2</pageIdAction>
<pageId>1</pageId>
- <timeSpent>1080</timeSpent>
- <timeSpentPretty>18 min 0s</timeSpentPretty>
+ <timeSpent>1084</timeSpent>
+ <timeSpentPretty>18 min 4s</timeSpentPretty>
<icon />
</row>
diff --git a/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml
index 3b8bde9065..34447b169a 100644
--- a/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml
@@ -249,7 +249,7 @@
<change>-100%</change>
</nb_visits_1>
<nb_visits_2>
- <name>Google - justice )(&amp;^#%$ not &amp;#039;" corruption! (Visits)</name>
+ <name>Google - justice )(&amp;^#%$ not &amp;#039;&quot; corruption! (Visits)</name>
<min>0</min>
<max>1</max>
</nb_visits_2>
diff --git a/tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml b/tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml
index d97e75695c..a0555e1b4a 100644
--- a/tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml
@@ -14,7 +14,7 @@
<logo>plugins/Referrers/images/searchEngines/google.com.png</logo>
</row>
<row>
- <label>Google - justice )(&amp;^#%$ not &amp;#039;" corruption!</label>
+ <label>Google - justice )(&amp;^#%$ not &amp;#039;&quot; corruption!</label>
<nb_visits>8</nb_visits>
<nb_actions>8</nb_actions>
<max_actions>1</max_actions>
diff --git a/tests/PHPUnit/System/expected/test_RowEvolution_multipleDates_lastNoData__API.getRowEvolution_month.xml b/tests/PHPUnit/System/expected/test_RowEvolution_multipleDates_lastNoData__API.getRowEvolution_month.xml
index 5730859763..10f622edda 100644
--- a/tests/PHPUnit/System/expected/test_RowEvolution_multipleDates_lastNoData__API.getRowEvolution_month.xml
+++ b/tests/PHPUnit/System/expected/test_RowEvolution_multipleDates_lastNoData__API.getRowEvolution_month.xml
@@ -33,7 +33,7 @@
<change>-100%</change>
</nb_visits_0>
<nb_visits_1>
- <name>justice )(&amp;^#%$ not &amp;#039;" corruption! (Visits)</name>
+ <name>justice )(&amp;^#%$ not &amp;#039;&quot; corruption! (Visits)</name>
<min>0</min>
<max>8</max>
<change>-100%</change>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
index 4d574d9da9..3808a4f5b5 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
@@ -75,7 +75,7 @@
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
<bounce_rate>0%</bounce_rate>
- <avg_time_on_page>00:03:36</avg_time_on_page>
+ <avg_time_on_page>00:01:48</avg_time_on_page>
<exit_rate>0%</exit_rate>
</row>
</result>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_month.xml
index 2c17c63452..f88c7b0657 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_month.xml
@@ -75,7 +75,7 @@
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
<bounce_rate>0%</bounce_rate>
- <avg_time_on_page>00:03:36</avg_time_on_page>
+ <avg_time_on_page>00:01:48</avg_time_on_page>
<exit_rate>0%</exit_rate>
</row>
</result>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
index e500a0aeef..9987853e36 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
@@ -63,7 +63,7 @@
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
<bounce_rate>0%</bounce_rate>
- <avg_time_on_page>00:03:36</avg_time_on_page>
+ <avg_time_on_page>00:01:48</avg_time_on_page>
<exit_rate>0%</exit_rate>
</row>
</result>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml
index 0db09dbb26..062f55e0fd 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_month.xml
@@ -63,7 +63,7 @@
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
<bounce_rate>0%</bounce_rate>
- <avg_time_on_page>00:03:36</avg_time_on_page>
+ <avg_time_on_page>00:01:48</avg_time_on_page>
<exit_rate>0%</exit_rate>
</row>
</result>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_day.xml
index 7ea5167dfd..fe61ab5004 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_day.xml
@@ -20,7 +20,7 @@
<nb_hits>2</nb_hits>
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_month.xml
index 86ae401b60..e49e07c8a2 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitlesFollowingSiteSearch_month.xml
@@ -20,7 +20,7 @@
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitles_day.xml
index 9dc49472a7..5bc8b63f86 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitles_day.xml
@@ -32,7 +32,7 @@
<nb_hits>2</nb_hits>
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitles_month.xml
index d9462f0f36..c4d37d733e 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitles_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageTitles_month.xml
@@ -32,7 +32,7 @@
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_day.xml
index 74ece58337..8cdba28f3b 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_day.xml
@@ -21,7 +21,7 @@
<nb_hits>2</nb_hits>
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_month.xml
index 1c66040802..2dda15648d 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrlsFollowingSiteSearch_month.xml
@@ -21,7 +21,7 @@
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml
index b001f1be29..2939c4da2b 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_day.xml
@@ -36,7 +36,7 @@
<nb_hits>2</nb_hits>
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml
index ddae944352..5c9107743f 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getPageUrls_month.xml
@@ -36,7 +36,7 @@
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_day.xml
index 4798b08e6e..4567e228f7 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_day.xml
@@ -8,7 +8,7 @@
<nb_hits>6</nb_hits>
<sum_time_spent>468</sum_time_spent>
<nb_pages_per_search>3</nb_pages_per_search>
- <avg_time_on_page>234</avg_time_on_page>
+ <avg_time_on_page>78</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
@@ -52,7 +52,7 @@
<nb_hits>2</nb_hits>
<sum_time_spent>54</sum_time_spent>
<nb_pages_per_search>2</nb_pages_per_search>
- <avg_time_on_page>54</avg_time_on_page>
+ <avg_time_on_page>27</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_month.xml
index 5b6e7c4828..26e6e57fdf 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_AllSites__Actions.getSiteSearchKeywords_month.xml
@@ -18,7 +18,7 @@
<nb_hits>6</nb_hits>
<sum_time_spent>468</sum_time_spent>
<nb_pages_per_search>3</nb_pages_per_search>
- <avg_time_on_page>234</avg_time_on_page>
+ <avg_time_on_page>78</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
@@ -50,7 +50,7 @@
<nb_hits>2</nb_hits>
<sum_time_spent>54</sum_time_spent>
<nb_pages_per_search>2</nb_pages_per_search>
- <avg_time_on_page>54</avg_time_on_page>
+ <avg_time_on_page>27</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_day.xml
index 66f8e8a41d..b28a8b9c15 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_day.xml
@@ -18,7 +18,7 @@
<nb_hits>2</nb_hits>
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_month.xml
index 450ab9b87a..6bcdb7bac8 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitlesFollowingSiteSearch_month.xml
@@ -18,7 +18,7 @@
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_day.xml
index 200b1c3565..68d4794fb7 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_day.xml
@@ -30,7 +30,7 @@
<nb_hits>2</nb_hits>
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_month.xml
index 3adcd2fca8..5b7c76e160 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageTitles_month.xml
@@ -30,7 +30,7 @@
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_day.xml
index 3fbf138c64..be73f3d714 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_day.xml
@@ -19,7 +19,7 @@
<nb_hits>2</nb_hits>
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_month.xml
index 77a97cfa0b..336ef8382f 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrlsFollowingSiteSearch_month.xml
@@ -19,7 +19,7 @@
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml
index 5617717b0d..0c49416b27 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_day.xml
@@ -34,7 +34,7 @@
<nb_hits>2</nb_hits>
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml
index 12b4aea3ad..cd21527e10 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getPageUrls_month.xml
@@ -34,7 +34,7 @@
<sum_time_spent>216</sum_time_spent>
<nb_hits_following_search>1</nb_hits_following_search>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <avg_time_on_page>216</avg_time_on_page>
+ <avg_time_on_page>108</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&amp;mykwd=&amp;IS_FOLLOWING_SEARCH ONCE</url>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_day.xml
index 588feafeea..7059d2638a 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_day.xml
@@ -6,7 +6,7 @@
<nb_hits>6</nb_hits>
<sum_time_spent>468</sum_time_spent>
<nb_pages_per_search>3</nb_pages_per_search>
- <avg_time_on_page>234</avg_time_on_page>
+ <avg_time_on_page>78</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_month.xml
index 3e1015bd31..6cd43051cb 100644
--- a/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_month.xml
+++ b/tests/PHPUnit/System/expected/test_SiteSearch_NotLastNPeriods__Actions.getSiteSearchKeywords_month.xml
@@ -16,7 +16,7 @@
<nb_hits>6</nb_hits>
<sum_time_spent>468</sum_time_spent>
<nb_pages_per_search>3</nb_pages_per_search>
- <avg_time_on_page>234</avg_time_on_page>
+ <avg_time_on_page>78</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
@@ -48,7 +48,7 @@
<nb_hits>2</nb_hits>
<sum_time_spent>54</sum_time_spent>
<nb_pages_per_search>2</nb_pages_per_search>
- <avg_time_on_page>54</avg_time_on_page>
+ <avg_time_on_page>27</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
</row>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
index a5ea296b53..207e2159fc 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
@@ -89,7 +89,7 @@
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
<bounce_rate>0%</bounce_rate>
- <avg_time_on_page>00:06:00</avg_time_on_page>
+ <avg_time_on_page>00:03:00</avg_time_on_page>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.31s</avg_time_generation>
</row>
@@ -118,7 +118,7 @@
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
<bounce_rate>0%</bounce_rate>
- <avg_time_on_page>00:06:00</avg_time_on_page>
+ <avg_time_on_page>00:03:00</avg_time_on_page>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.31s</avg_time_generation>
</row>
@@ -147,7 +147,7 @@
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
<bounce_rate>0%</bounce_rate>
- <avg_time_on_page>00:06:00</avg_time_on_page>
+ <avg_time_on_page>00:03:00</avg_time_on_page>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.31s</avg_time_generation>
</row>
@@ -176,7 +176,7 @@
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
<bounce_rate>0%</bounce_rate>
- <avg_time_on_page>00:06:00</avg_time_on_page>
+ <avg_time_on_page>00:03:00</avg_time_on_page>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.31s</avg_time_generation>
</row>
@@ -205,7 +205,7 @@
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
<bounce_rate>0%</bounce_rate>
- <avg_time_on_page>00:06:00</avg_time_on_page>
+ <avg_time_on_page>00:03:00</avg_time_on_page>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.31s</avg_time_generation>
</row>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml
index c67d91399b..57f0b1452f 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml
@@ -99,7 +99,7 @@
<max_time_generation>0.452</max_time_generation>
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
@@ -155,7 +155,7 @@
<max_time_generation>0.452</max_time_generation>
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
@@ -211,7 +211,7 @@
<max_time_generation>0.452</max_time_generation>
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
@@ -267,7 +267,7 @@
<max_time_generation>0.452</max_time_generation>
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
@@ -323,7 +323,7 @@
<max_time_generation>0.452</max_time_generation>
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml
index 08d1c90f9a..de92713eae 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml
@@ -51,7 +51,7 @@
<exit_nb_visits>8</exit_nb_visits>
<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>8</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml
index fc85313690..e7008c40ff 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml
@@ -97,7 +97,7 @@
<exit_nb_visits>6</exit_nb_visits>
<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>6</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
@@ -138,7 +138,7 @@
<exit_nb_visits>2</exit_nb_visits>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml
index 0d0f6aaca8..9cb3a82c02 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml
@@ -51,7 +51,7 @@
<exit_nb_visits>8</exit_nb_visits>
<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>8</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml
index 4087b624e2..f7e7161700 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml
@@ -98,7 +98,7 @@
<max_time_generation>0.452</max_time_generation>
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
@@ -154,7 +154,7 @@
<max_time_generation>0.452</max_time_generation>
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
@@ -210,7 +210,7 @@
<max_time_generation>0.452</max_time_generation>
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
@@ -266,7 +266,7 @@
<max_time_generation>0.452</max_time_generation>
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
@@ -322,7 +322,7 @@
<max_time_generation>0.452</max_time_generation>
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml
index 6e13a1e872..e68d67ec34 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml
@@ -50,7 +50,7 @@
<exit_nb_visits>8</exit_nb_visits>
<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>8</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml
index 8366107a19..6f28680dc3 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml
@@ -96,7 +96,7 @@
<exit_nb_visits>6</exit_nb_visits>
<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>6</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
@@ -137,7 +137,7 @@
<exit_nb_visits>2</exit_nb_visits>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>2</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml
index fb02cf8629..266832e590 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml
@@ -50,7 +50,7 @@
<exit_nb_visits>8</exit_nb_visits>
<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>8</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<avg_time_generation>0.313</avg_time_generation>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
index f0e58ae957..94a3e0f6fb 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
@@ -236,7 +236,7 @@ Page URLs
label,nb_visits,nb_hits,bounce_rate,avg_time_on_page,exit_rate,avg_time_generation
/index.htm,9,9,11%,00:05:20,11%,0.3s
Page URL not defined,9,17,0%,00:00:00,0%,0.22s
-/thankyou,8,16,0%,00:06:00,100%,0.31s
+/thankyou,8,16,0%,00:03:00,100%,0.31s
/products,1,1,100%,00:00:00,100%,0.15s
Entry pages
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
index fe254e0793..95c67bf1c7 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
@@ -4099,7 +4099,7 @@
8
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 00:06:00
+ 00:03:00
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
0%
diff --git a/tests/PHPUnit/System/expected/test_UrlNormalization_pagesSegmentedRef__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_UrlNormalization_pagesSegmentedRef__Actions.getPageUrls_day.xml
index 667ec31507..275f1a4987 100644
--- a/tests/PHPUnit/System/expected/test_UrlNormalization_pagesSegmentedRef__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_UrlNormalization_pagesSegmentedRef__Actions.getPageUrls_day.xml
@@ -10,7 +10,7 @@
<entry_sum_visit_length>2161</entry_sum_visit_length>
<entry_bounce_count>0</entry_bounce_count>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>630</avg_time_on_page>
+ <avg_time_on_page>420</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>25%</exit_rate>
<subtable>
@@ -25,7 +25,7 @@
<entry_nb_actions>8</entry_nb_actions>
<entry_sum_visit_length>2161</entry_sum_visit_length>
<entry_bounce_count>0</entry_bounce_count>
- <avg_time_on_page>1080</avg_time_on_page>
+ <avg_time_on_page>540</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>http://example.org/foo/bar.html</url>
@@ -36,7 +36,7 @@
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_hits>2</nb_hits>
<sum_time_spent>720</sum_time_spent>
- <avg_time_on_page>720</avg_time_on_page>
+ <avg_time_on_page>360</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>https://www.example.org/foo/bar2.html</url>
diff --git a/tests/PHPUnit/System/expected/test_UrlNormalization_pagesSegmented__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_UrlNormalization_pagesSegmented__Actions.getPageUrls_day.xml
index 2d5f40e9cb..1dd8c3190c 100644
--- a/tests/PHPUnit/System/expected/test_UrlNormalization_pagesSegmented__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_UrlNormalization_pagesSegmented__Actions.getPageUrls_day.xml
@@ -5,7 +5,7 @@
<nb_visits>1</nb_visits>
<nb_hits>2</nb_hits>
<sum_time_spent>360</sum_time_spent>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<subtable>
@@ -15,7 +15,7 @@
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_hits>2</nb_hits>
<sum_time_spent>360</sum_time_spent>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>https://www.example.org/foo/bar2.html</url>
diff --git a/tests/PHPUnit/System/expected/test_UrlNormalization_titles__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_UrlNormalization_titles__Actions.getPageTitles_day.xml
index 0549176cb6..504018b6cd 100644
--- a/tests/PHPUnit/System/expected/test_UrlNormalization_titles__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_UrlNormalization_titles__Actions.getPageTitles_day.xml
@@ -89,7 +89,7 @@
<sum_time_spent>720</sum_time_spent>
<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>720</avg_time_on_page>
+ <avg_time_on_page>360</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
</row>
diff --git a/tests/PHPUnit/System/expected/test_UrlNormalization_urls__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_UrlNormalization_urls__Actions.getPageUrls_day.xml
index 667ec31507..275f1a4987 100644
--- a/tests/PHPUnit/System/expected/test_UrlNormalization_urls__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_UrlNormalization_urls__Actions.getPageUrls_day.xml
@@ -10,7 +10,7 @@
<entry_sum_visit_length>2161</entry_sum_visit_length>
<entry_bounce_count>0</entry_bounce_count>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>630</avg_time_on_page>
+ <avg_time_on_page>420</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>25%</exit_rate>
<subtable>
@@ -25,7 +25,7 @@
<entry_nb_actions>8</entry_nb_actions>
<entry_sum_visit_length>2161</entry_sum_visit_length>
<entry_bounce_count>0</entry_bounce_count>
- <avg_time_on_page>1080</avg_time_on_page>
+ <avg_time_on_page>540</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>http://example.org/foo/bar.html</url>
@@ -36,7 +36,7 @@
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_hits>2</nb_hits>
<sum_time_spent>720</sum_time_spent>
- <avg_time_on_page>720</avg_time_on_page>
+ <avg_time_on_page>360</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>0%</exit_rate>
<url>https://www.example.org/foo/bar2.html</url>
diff --git a/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml
index b83a3d071d..ed2500e125 100644
--- a/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml
@@ -154,8 +154,8 @@
<pageIdAction>10</pageIdAction>
<serverTimePretty>Mar 6, 2010 16:28:33</serverTimePretty>
<pageId>9</pageId>
- <timeSpent>720</timeSpent>
- <timeSpentPretty>12 min 0s</timeSpentPretty>
+ <timeSpent>721</timeSpent>
+ <timeSpentPretty>12 min 1s</timeSpentPretty>
<icon />
<timestamp>1267892913</timestamp>
</row>
diff --git a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__Actions.getPageUrls_month.xml
index cd12df23f8..4201ab7dd3 100644
--- a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__Actions.getPageUrls_month.xml
@@ -11,7 +11,7 @@
<entry_sum_visit_length>361</entry_sum_visit_length>
<entry_bounce_count>0</entry_bounce_count>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>120</avg_time_on_page>
+ <avg_time_on_page>72</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>33%</exit_rate>
<subtable>
@@ -50,7 +50,7 @@
<exit_nb_visits>1</exit_nb_visits>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<url>http://example.org/category/Pageyy</url>
diff --git a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml
index cd12df23f8..4201ab7dd3 100644
--- a/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldNotAppear__Actions.getPageUrls_month.xml
@@ -11,7 +11,7 @@
<entry_sum_visit_length>361</entry_sum_visit_length>
<entry_bounce_count>0</entry_bounce_count>
<exit_nb_visits>1</exit_nb_visits>
- <avg_time_on_page>120</avg_time_on_page>
+ <avg_time_on_page>72</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>33%</exit_rate>
<subtable>
@@ -50,7 +50,7 @@
<exit_nb_visits>1</exit_nb_visits>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
- <avg_time_on_page>360</avg_time_on_page>
+ <avg_time_on_page>180</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>100%</exit_rate>
<url>http://example.org/category/Pageyy</url>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
index 1a9ff120e6..9ba6330564 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
@@ -67,13 +67,6 @@
<permission>1</permission>
</row>
<row>
- <type>metric</type>
- <category>Actions</category>
- <name>Action Type</name>
- <segment>actionType</segment>
- <acceptedValues>A type of action, such as: pageviews, contents, sitesearches, events, outlinks, downloads</acceptedValues>
- </row>
- <row>
<type>dimension</type>
<category>Visit Location</category>
<name>City</name>
@@ -147,6 +140,13 @@
<row>
<type>dimension</type>
<category>Visit</category>
+ <name>Device brand</name>
+ <segment>deviceBrand</segment>
+ <acceptedValues>3Q, Acer, Ainol, Airness, Alcatel, Allview, Altech UEC, Arnova, Amazon, Amoi, Apple, Archos, ARRIS, Airties, Asus, Avvio, Audiovox, Axxion, BBK, Becker, Bird, Beetel, Bmobile, Barnes &amp; Noble, BangOlufsen, BenQ, BenQ-Siemens, Blu, Boway, bq, Brondi, Bush, CUBOT, Carrefour, Captiva, Casio, Cat, Celkon, ConCorde, Changhong, Cherry Mobile, Cricket, Crosscall, Compal, CnM, Crius Mea, CreNova, Capitel, Compaq, Coolpad, Cowon, Cube, Coby Kyros, Danew, Datang, Denver, Desay, Dbtel, DoCoMo, Dicam, Dell, DMM, Doogee, Doov, Dopod, Dune HD, E-Boda, EBEST, Ericsson, ECS, Ezio, Elephone, Easypix, Energy Sistem, Ericy, Eton, eTouch, Evertek, Ezze, Fly, Foxconn, Fujitsu, Garmin-Asus, Gateway, Gemini, Gionee, Gigabyte, Gigaset, GOCLEVER, Goly, Google, Gradiente, Grundig, Haier, Hasee, Hisense, Hi-Level, Hosin, HP, HTC, Huawei, Humax, Hyrican, Hyundai, Ikea, iBall, i-Joy, iBerry, iKoMo, i-mate, iOcean, Infinix, Innostream, Inkti, Intex, i-mobile, INQ, Intek, Inverto, iTel, Jiayu, Jolla, Karbonn, KDDI, Kingsun, Konka, Komu, Koobee, K-Touch, KT-Tech, KOPO, Koridy, Kumai, Kyocera, Kazam, Lava, Lanix, LCT, Lenovo, Lenco, Le Pan, LG, Lingwin, Loewe, Logicom, Lexibook, Majestic, Manta Multimedia, Mobistel, Mecer, Medion, MEEG, Meizu, Metz, MEU, MicroMax, Mediacom, MediaTek, Mio, Mpman, Mofut, Motorola, Microsoft, MSI, Memup, Mitsubishi, MLLED, M.T.T., MyPhone, NEC, Netgear, NGM, Nintendo, Noain, Nokia, Nomi, Nikon, Newgen, Nexian, NextBook, Onda, OnePlus, OPPO, Orange, O2, Ouki, OUYA, Opsson, Panasonic, PEAQ, Philips, Polaroid, Palm, phoneOne, Pantech, Point of View, PolyPad, Pomp, Positivo, Prestigio, ProScan, PULID, Qilive, Qtek, QMobile, Quechua, Overmax, Oysters, Ramos, RCA Tablets, Readboy, Rikomagic, RIM, Roku, Rover, Samsung, Sega, Sony Ericsson, Sencor, Softbank, SFR, Sagem, Sharp, Siemens, Sendo, Skyworth, Smartfren, Sony, Spice, SuperSonic, Selevision, Sanyo, Symphony, Smart, Star, Storex, Stonex, SunVan, Sumvision, Tesla, TCL, Telit, ThL, TiPhone, Tecno Mobile, Tesco, TIANYU, Telefunken, Telenor, T-Mobile, Thomson, Tolino, Toplux, Toshiba, TechnoTrend, Trevi, Tunisie Telecom, Turbo-X, TVC, TechniSat, teXet, Unowhy, Uniscope, UTStarcom, Vastking, Videocon, Vertu, Vitelcom, VK Mobile, ViewSonic, Vestel, Vivo, Voto, Voxtel, Vodafone, Vizio, Videoweb, Walton, Web TV, WellcoM, Wexler, Wiko, Wolder, Wonu, Woxter, Xiaomi, Xolo, Unknown, Yarvik, Yuandao, Yusun, Ytone, Zeemi, Zonda, Zopo, ZTE</acceptedValues>
+ </row>
+ <row>
+ <type>dimension</type>
+ <category>Visit</category>
<name>Device type</name>
<segment>deviceType</segment>
<acceptedValues>desktop, smartphone, tablet, feature phone, console, tv, car browser, smart display, camera, portable media player, phablet</acceptedValues>
@@ -222,7 +222,7 @@
<category>Visit</category>
<name>Visit ID</name>
<segment>visitId</segment>
- <acceptedValues>Any integer. </acceptedValues>
+ <acceptedValues>Any integer.</acceptedValues>
<permission>1</permission>
</row>
<row>
@@ -483,6 +483,13 @@
<row>
<type>dimension</type>
<category>Actions</category>
+ <name>Action Type</name>
+ <segment>actionType</segment>
+ <acceptedValues>A type of action, such as: pageviews, contents, sitesearches, events, outlinks, downloads</acceptedValues>
+ </row>
+ <row>
+ <type>dimension</type>
+ <category>Actions</category>
<name>Action URL</name>
<segment>actionUrl</segment>
<unionOfSegments>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
index f6d30fd9ba..5b19eea90f 100755
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
@@ -226,8 +226,8 @@
<customVariablePageValue5>Category TWO LEFT in cart</customVariablePageValue5>
</row>
</customVariables>
- <timeSpent>360</timeSpent>
- <timeSpentPretty>6 min 0s</timeSpentPretty>
+ <timeSpent>361</timeSpent>
+ <timeSpentPretty>6 min 1s</timeSpentPretty>
<icon />
</row>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
index 730c0fc1a4..d391947a56 100755
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
@@ -87,8 +87,8 @@
<customVariablePageValue5>Category TWO LEFT in cart</customVariablePageValue5>
</row>
</customVariables>
- <timeSpent>360</timeSpent>
- <timeSpentPretty>6 min 0s</timeSpentPretty>
+ <timeSpent>361</timeSpent>
+ <timeSpentPretty>6 min 1s</timeSpentPretty>
<icon />
</row>
@@ -430,8 +430,8 @@
<customVariablePageValue5>Category TWO LEFT in cart</customVariablePageValue5>
</row>
</customVariables>
- <timeSpent>360</timeSpent>
- <timeSpentPretty>6 min 0s</timeSpentPretty>
+ <timeSpent>361</timeSpent>
+ <timeSpentPretty>6 min 1s</timeSpentPretty>
<icon />
</row>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
index 50eeb9cc0e..c13ba3af27 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
@@ -224,7 +224,7 @@ Sunday,0,0%,0,00:00:00,0%,0
Page URLs
label,nb_visits,nb_hits,bounce_rate,avg_time_on_page,exit_rate
-/index.htm,4,16,0%,00:13:30,100%
+/index.htm,4,16,0%,00:03:23,100%
Entry pages
label,entry_nb_visits,entry_bounce_count,bounce_rate
@@ -236,7 +236,7 @@ label,nb_visits,exit_nb_visits,exit_rate
Page titles
label,nb_visits,nb_hits,bounce_rate,avg_time_on_page,exit_rate
- View product left in cart,3,9,0%,00:06:00,100%
+ View product left in cart,3,9,0%,00:02:00,100%
Another Product page,1,1,0%,00:06:00,0%
Another Product page with multiple categories,1,1,0%,00:00:00,100%
Another Product page with no category,1,1,0%,00:00:00,0%
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
index b2825b88ee..7f70fb99c1 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
@@ -3894,7 +3894,7 @@
4
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 00:13:30
+ 00:03:23
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
0%
@@ -4036,7 +4036,7 @@
3
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 00:06:00
+ 00:02:00
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
0%
diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml
index 2b521b00a4..1ed4db4a84 100644
--- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml
+++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml
@@ -10,6 +10,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Ffacebook.com%2Fwhatever</segment>
<url>http://facebook.com/whatever</url>
</row>
<row>
@@ -22,6 +23,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Ffb.me%2F%3Fq%3Dsdlfjs%26n%3Dslfjsd</segment>
<url>http://fb.me/?q=sdlfjs&amp;n=slfjsd</url>
</row>
<row>
@@ -34,6 +36,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Fwww.facebook.com%2Fanother%2Fpath</segment>
<url>http://www.facebook.com/another/path</url>
</row>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml
index 4649b78a18..d85c6fa7fa 100644
--- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml
+++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml
@@ -11,6 +11,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Ffacebook.com%2Fwhatever</segment>
<url>http://facebook.com/whatever</url>
</row>
<row>
@@ -23,6 +24,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Ffb.me%2F%3Fq%3Dsdlfjs%26n%3Dslfjsd</segment>
<url>http://fb.me/?q=sdlfjs&amp;n=slfjsd</url>
</row>
<row>
@@ -35,6 +37,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Fmixi.jp</segment>
<url>http://mixi.jp</url>
</row>
<row>
@@ -47,6 +50,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Fskyrock.com</segment>
<url>http://skyrock.com</url>
</row>
<row>
@@ -59,6 +63,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Ft.co%2Fid%2F%3Fy%3Ddsfs</segment>
<url>http://t.co/id/?y=dsfs</url>
</row>
<row>
@@ -71,6 +76,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Ftwitter.com%2Fwhatever2</segment>
<url>http://twitter.com/whatever2</url>
</row>
<row>
@@ -83,6 +89,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Fwww.facebook.com%2Fanother%2Fpath</segment>
<url>http://www.facebook.com/another/path</url>
</row>
<row>
@@ -95,6 +102,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Fwww.flickr.com</segment>
<url>http://www.flickr.com</url>
</row>
<row>
@@ -107,6 +115,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Fwww.twitter.com%2Findex%3Fa%3D2334</segment>
<url>http://www.twitter.com/index?a=2334</url>
</row>
<row>
@@ -119,6 +128,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Fxanga.com</segment>
<url>http://xanga.com</url>
</row>
</result>
@@ -133,6 +143,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Ft.co%2Fid%2F%3Fy%3Ddsfs</segment>
<url>http://t.co/id/?y=dsfs</url>
</row>
<row>
@@ -145,6 +156,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Ftwitter.com%2Fwhatever2</segment>
<url>http://twitter.com/whatever2</url>
</row>
<row>
@@ -157,6 +169,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>referrerUrl==http%3A%2F%2Fwww.facebook.com%2Fanother%2Fpath</segment>
<url>http://www.facebook.com/another/path</url>
</row>
</result>
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
index ad8e93fed4..f15526855b 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
@@ -3,7 +3,11 @@
<totalVisits>2</totalVisits>
<totalVisitDuration>361</totalVisitDuration>
<totalActions>2</totalActions>
+ <totalEvents>0</totalEvents>
+ <totalOutlinks>1</totalOutlinks>
+ <totalDownloads>0</totalDownloads>
<totalSearches>0</totalSearches>
+ <totalPageViews>1</totalPageViews>
<totalPageViewsWithTiming>0</totalPageViewsWithTiming>
<totalGoalConversions>1</totalGoalConversions>
<totalConversionsByGoal>
@@ -34,14 +38,14 @@
<firstVisit>
- <daysAgo>0</daysAgo>
+
<referrerType>campaign</referrerType>
<referralSummary>Campaign: campaign name - yeah! - campaign keyword - right...</referralSummary>
</firstVisit>
<lastVisit>
- <daysAgo>0</daysAgo>
+
<referrerType>campaign</referrerType>
<referralSummary>Campaign: campaign name - yeah! - campaign keyword - right...</referralSummary>
</lastVisit>
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml
index ad8e93fed4..f15526855b 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml
@@ -3,7 +3,11 @@
<totalVisits>2</totalVisits>
<totalVisitDuration>361</totalVisitDuration>
<totalActions>2</totalActions>
+ <totalEvents>0</totalEvents>
+ <totalOutlinks>1</totalOutlinks>
+ <totalDownloads>0</totalDownloads>
<totalSearches>0</totalSearches>
+ <totalPageViews>1</totalPageViews>
<totalPageViewsWithTiming>0</totalPageViewsWithTiming>
<totalGoalConversions>1</totalGoalConversions>
<totalConversionsByGoal>
@@ -34,14 +38,14 @@
<firstVisit>
- <daysAgo>0</daysAgo>
+
<referrerType>campaign</referrerType>
<referralSummary>Campaign: campaign name - yeah! - campaign keyword - right...</referralSummary>
</firstVisit>
<lastVisit>
- <daysAgo>0</daysAgo>
+
<referrerType>campaign</referrerType>
<referralSummary>Campaign: campaign name - yeah! - campaign keyword - right...</referralSummary>
</lastVisit>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml
index 1cecf66395..61f5ff50c5 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getReferrerType_day.xml
@@ -10,6 +10,7 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>55</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
+ <segment>referrerType==direct</segment>
</row>
<row>
<label>Search Engines</label>
@@ -21,6 +22,7 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>12</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
+ <segment>referrerType==search</segment>
<subtable>
<row>
<label>search term 2</label>
@@ -67,6 +69,7 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>8</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
+ <segment>referrerType==website</segment>
<subtable>
<row>
<label>whatever0.com</label>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml
index 4f21289bfd..d8646a11f5 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml
@@ -10,6 +10,7 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>55</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
+ <segment>referrerType==direct</segment>
</row>
<row>
<label>Search Engines - Others</label>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml
index 1cecf66395..61f5ff50c5 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getReferrerType_day.xml
@@ -10,6 +10,7 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>55</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
+ <segment>referrerType==direct</segment>
</row>
<row>
<label>Search Engines</label>
@@ -21,6 +22,7 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>12</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
+ <segment>referrerType==search</segment>
<subtable>
<row>
<label>search term 2</label>
@@ -67,6 +69,7 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>8</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
+ <segment>referrerType==website</segment>
<subtable>
<row>
<label>whatever0.com</label>