From 8ccc9dc05da021325cdbf141a548637fa52f16b2 Mon Sep 17 00:00:00 2001 From: Thomas Steur Date: Tue, 18 Aug 2015 12:14:22 +0000 Subject: fix system tests --- ....getAction_flat__API.getProcessedReport_day.xml | 30 ++++----- ...getAction_lastN__API.getProcessedReport_day.xml | 30 ++++----- ...etCategory_flat__API.getProcessedReport_day.xml | 30 ++++----- ...tCategory_lastN__API.getProcessedReport_day.xml | 30 ++++----- ...ts.getName_flat__API.getProcessedReport_day.xml | 30 ++++----- ...s.getName_lastN__API.getProcessedReport_day.xml | 30 ++++----- ...rts__CustomVariables.getCustomVariables_day.xml | 20 +++--- ...ProcessedMetric__API.getProcessedReport_day.xml | 20 +++--- ...ldKeepEmptyRows__API.getProcessedReport_day.xml | 2 +- ...sits__subtable__API.getProcessedReport_week.xml | 2 +- ...ts_hideColumns___API.getProcessedReport_day.xml | 2 +- ...ocessedMetrics___API.getProcessedReport_day.xml | 2 +- ...ts_showColumns___API.getProcessedReport_day.xml | 2 +- ...Columns_onlyOne__API.getProcessedReport_day.xml | 2 +- ...fThreeDays__Live.getLastVisitsDetails_month.xml | 30 ++++----- ...ithDataTableMaps__Referrers.getKeywords_day.xml | 34 +++++----- ...hColumnLimiting__Referrers.getKeywords_week.xml | 28 ++++---- ...ksWithCsvOutput__Referrers.getKeywords_week.csv | Bin 458 -> 458 bytes ...WithJsonOutput__Referrers.getKeywords_week.json | 2 +- ...oseSubtableIsSelf__Actions.getPageUrls_week.xml | 72 ++++++++++----------- ...nPeriodIsRange__Referrers.getKeywords_range.xml | 34 +++++----- ...ntUsedInRequest__Referrers.getKeywords_week.xml | 4 +- ...rrectPivotTable__Referrers.getKeywords_week.xml | 34 +++++----- ...iodIsDateRange__Referrers.getKeywords_range.xml | 40 ++++++------ ...rrectPivotTable__Referrers.getKeywords_week.xml | 40 ++++++------ ...rchyIsNotLoaded__Referrers.getKeywords_week.xml | 40 ++++++------ ...firstSite_lastN__API.getProcessedReport_day.xml | 30 ++++----- ...rstSite_lastN__API.getProcessedReport_month.xml | 30 ++++----- ...firstSite_lastN__API.getProcessedReport_day.xml | 30 ++++----- ...rstSite_lastN__API.getProcessedReport_month.xml | 30 ++++----- ...firstSite_lastN__API.getProcessedReport_day.xml | 30 ++++----- ...rstSite_lastN__API.getProcessedReport_month.xml | 30 ++++----- ...firstSite_lastN__API.getProcessedReport_day.xml | 30 ++++----- ...rstSite_lastN__API.getProcessedReport_month.xml | 30 ++++----- ...firstSite_lastN__API.getProcessedReport_day.xml | 10 +-- ...rstSite_lastN__API.getProcessedReport_month.xml | 6 +- ...firstSite_lastN__API.getProcessedReport_day.xml | 30 ++++----- ...rstSite_lastN__API.getProcessedReport_month.xml | 30 ++++----- ...firstSite_lastN__API.getProcessedReport_day.xml | 30 ++++----- ...rstSite_lastN__API.getProcessedReport_month.xml | 30 ++++----- ...firstSite_lastN__API.getProcessedReport_day.xml | 30 ++++----- ...rstSite_lastN__API.getProcessedReport_month.xml | 30 ++++----- ...firstSite_lastN__API.getProcessedReport_day.xml | 30 ++++----- ...rstSite_lastN__API.getProcessedReport_month.xml | 30 ++++----- ...s__Transitions.getTransitionsForPageUrl_day.xml | 2 +- ..._Transitions.getTransitionsForPageTitle_day.xml | 2 +- ...t__Transitions.getTransitionsForPageUrl_day.xml | 2 +- ...firstSite_lastN__API.getProcessedReport_day.xml | 30 ++++----- ...firstSite_lastN__API.getProcessedReport_day.xml | 32 ++++----- ...firstSite_lastN__API.getProcessedReport_day.xml | 30 ++++----- ...firstSite_lastN__API.getProcessedReport_day.xml | 30 ++++----- ...firstSite_lastN__API.getProcessedReport_day.xml | 30 ++++----- ...firstSite_lastN__API.getProcessedReport_day.xml | 38 +++++------ ...firstSite_lastN__API.getProcessedReport_day.xml | 30 ++++----- ...firstSite_lastN__API.getProcessedReport_day.xml | 30 ++++----- ...firstSite_lastN__API.getProcessedReport_day.xml | 30 ++++----- ...duledReports.generateReport_month.original.html | 2 +- ...eduledReports.generateReport_month.original.pdf | Bin 512633 -> 512640 bytes ...edReports.generateReport_month.original.sms.txt | 2 +- ...edReports.generateReport_month.original.sms.txt | 2 +- ..._VisitorId__Live.getLastVisitsDetails_month.xml | 28 ++++---- ...tReportMetadata__API.getProcessedReport_day.xml | 2 +- ..._hideMetricsDoc__API.getProcessedReport_day.xml | 2 +- ..._showRawMetrics__API.getProcessedReport_day.xml | 2 +- ...xp0__CustomVariables.getCustomVariables_day.csv | Bin 1986 -> 1280 bytes ...-de__CustomVariables.getCustomVariables_day.csv | Bin 3468 -> 3468 bytes ...t_AbandonedCart__API.getProcessedReport_day.xml | 2 +- ....Get_NormalGoal__API.getProcessedReport_day.xml | 2 +- ...Goals.Get_Order__API.getProcessedReport_day.xml | 2 +- ...a_ItemsCategory__API.getProcessedReport_day.xml | 2 +- ...tadata_ItemsSku__API.getProcessedReport_day.xml | 2 +- ...onPerServerTime__API.getProcessedReport_day.xml | 2 +- ...eOrderWithItems__API.getProcessedReport_day.xml | 2 +- ...merceOrderWithItems__Goals.getItemsName_day.xml | 12 ++-- ...erceOrderWithItems__Goals.getItemsName_week.xml | 12 ++-- ...heduledReports.generateReport_week.original.csv | 2 +- ...eduledReports.generateReport_week.original.html | 10 +-- ...ledReports.generateReport_week.original.sms.txt | 2 +- ...ledReports.generateReport_week.original.sms.txt | 2 +- ...hItemsmultipleDates__Goals.getItemsName_day.xml | 12 ++-- ...I__CustomVariables.getCustomVariables_range.xml | 45 ++++++------- ...t__CustomVariables.getCustomVariables_range.xml | 45 ++++++------- ...ing__CustomVariables.getCustomVariables_day.xml | 12 ++-- ...ned__CustomVariables.getCustomVariables_day.xml | 20 +++--- ...ery__CustomVariables.getCustomVariables_day.xml | 12 ++-- ...ables__subtable__API.getProcessedReport_day.xml | 2 +- ...ata__CustomVariables.getCustomVariables_day.xml | 41 +++++------- ...ta__CustomVariables.getCustomVariables_week.xml | 45 ++++++------- ...ype__CustomVariables.getCustomVariables_day.xml | 40 +++++------- ...pe__CustomVariables.getCustomVariables_week.xml | 44 ++++++------- 90 files changed, 873 insertions(+), 911 deletions(-) diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml index 0914d4b1fe..108dc6b91f 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Piwik test - January 3 – 9, 2010 + 3 Jan 10 - 9 Jan 10 Events Event Actions @@ -41,7 +41,7 @@ The average of all values for this event - + 2 @@ -214,21 +214,21 @@ 0 - - - - - - + + + + + + - - - - - - - + + + + + + + 42 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml index 2686abaab3..dfc90321e5 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Piwik test - January 3 – 9, 2010 + 3 Jan 10 - 9 Jan 10 Events Event Actions @@ -41,7 +41,7 @@ The average of all values for this event - + 6 @@ -151,15 +151,15 @@ 0 - - - - - - + + + + + + - + eventAction==playTrailer @@ -219,12 +219,12 @@ eventAction==Purchase - - - - - - + + + + + + 42 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml index 536c63f5c5..5536cff251 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Piwik test - January 3 – 9, 2010 + 3 Jan 10 - 9 Jan 10 Events Event Categories @@ -41,7 +41,7 @@ The average of all values for this event - + 6 @@ -196,21 +196,21 @@ 9.5 - - - - - - + + + + + + - - - - - - - + + + + + + + 42 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml index c5e0ccb70d..3f683f0611 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Piwik test - January 3 – 9, 2010 + 3 Jan 10 - 9 Jan 10 Events Event Categories @@ -41,7 +41,7 @@ The average of all values for this event - + 28 @@ -70,15 +70,15 @@ 9.66 - - - - - - + + + + + + - + eventCategory==Movie @@ -95,12 +95,12 @@ 747 - - - - - - + + + + + + 42 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml index 04f644e7f6..20d04cc26b 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Piwik test - January 3 – 9, 2010 + 3 Jan 10 - 9 Jan 10 Events Event Names @@ -41,7 +41,7 @@ The average of all values for this event - + 4 @@ -223,21 +223,21 @@ 9.66 - - - - - - + + + + + + - - - - - - - + + + + + + + 42 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml index 6fdc94645b..7a029ed288 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Piwik test - January 3 – 9, 2010 + 3 Jan 10 - 9 Jan 10 Events Event Names @@ -41,7 +41,7 @@ The average of all values for this event - + 16 @@ -106,15 +106,15 @@ 0 - - - - - - + + + + + + - + eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29 @@ -150,12 +150,12 @@ 876 - - - - - - + + + + + + 42 diff --git a/tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml index c2c0a93fff..c8cd332705 100644 --- a/tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml +++ b/tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml @@ -1,6 +1,11 @@ + + + 18 + 1 + 6 @@ -12,11 +17,6 @@ 0 1 - - - 18 - 1 - 3 @@ -82,15 +82,15 @@ 0 - - 1 + 1 - 0 + 1 - + + 1 1 - 1 + 0 diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml index d297c0031d..5de040b945 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Site 1 - Sunday, January 3, 2010 + Sunday 3 January 2010 Actions Page URLs @@ -40,14 +40,6 @@ Exit rate - - - 4 - 4 - 0% - 00:06:00 - 0% - 4 @@ -56,12 +48,22 @@ 00:00:00 100% + + + 4 + 4 + 0% + 00:06:00 + 0% + + 2687 + 2688 diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml index 02d9471f31..99d027df37 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Site 1 - Sunday, January 3, 2010 + Sunday 3 January 2010 Visits Summary Visits by Server Time diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml index 8b04b80db3..fc8e3ded56 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml @@ -1,7 +1,7 @@ new name - Week March 1 – 7, 2010 + Week 1 March - 7 March 2010 Actions Page URLs diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml index f68934ca29..279acfa5ea 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ new name - Saturday, March 6, 2010 + Saturday 6 March 2010 Actions Page titles diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml index 208b546983..209766871b 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumnsWithProcessedMetrics___API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ new name - Saturday, March 6, 2010 + Saturday 6 March 2010 Visits Summary Visits by Server Time diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml index babf29c49a..f8e3c26999 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ new name - Saturday, March 6, 2010 + Saturday 6 March 2010 Actions Page titles diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns_onlyOne__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns_onlyOne__API.getProcessedReport_day.xml index 1d07653623..7484c9c620 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns_onlyOne__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns_onlyOne__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ new name - Saturday, March 6, 2010 + Saturday 6 March 2010 Visits Summary Visits Summary diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml index cc9433a13a..b87c5f9af1 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml @@ -10,7 +10,7 @@ http://piwik.net/ 1 - Apr 7, 2013 10:00:00 AM + Sun 7 Apr 10:00:00 1 @@ -91,10 +91,10 @@ 1365328800 - 10:00:00 AM - Sunday, April 7, 2013 - Sunday, April 7, 2013 - 10:00:00 AM + 10:00:00 + Sunday 7 April 2013 + Sunday 7 April 2013 + 10:00:00 1 @@ -106,7 +106,7 @@ http://piwik.net/ 1 - Apr 6, 2013 11:00:00 AM + Sat 6 Apr 11:00:00 2 @@ -187,10 +187,10 @@ 1365246000 - 11:00:00 AM - Saturday, April 6, 2013 - Saturday, April 6, 2013 - 11:00:00 AM + 11:00:00 + Saturday 6 April 2013 + Saturday 6 April 2013 + 11:00:00 1 @@ -202,7 +202,7 @@ http://piwik.net/ 1 - Apr 5, 2013 12:00:00 PM + Fri 5 Apr 12:00:00 3 @@ -283,9 +283,9 @@ 1365163200 - 12:00:00 PM - Friday, April 5, 2013 - Friday, April 5, 2013 - 12:00:00 PM + 12:00:00 + Friday 5 April 2013 + Friday 5 April 2013 + 12:00:00 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_PlaysNiceWithDataTableMaps__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_PlaysNiceWithDataTableMaps__Referrers.getKeywords_day.xml index 3703da3a45..6cb480f284 100644 --- a/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_PlaysNiceWithDataTableMaps__Referrers.getKeywords_day.xml +++ b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_PlaysNiceWithDataTableMaps__Referrers.getKeywords_day.xml @@ -4,6 +4,18 @@ + + search term 4 + 0 + 2 + 0 + + + that search term + 2 + 0 + 0 + search term 1 0 @@ -11,10 +23,10 @@ 1 - search term 2 - 0 + this search term + 2 0 - 2 + 1 search term 3 @@ -23,22 +35,10 @@ 0 - search term 4 + search term 2 0 - 2 - 0 - - - that search term - 2 0 - 0 - - - this search term - 2 - 0 - 1 + 2 diff --git a/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithColumnLimiting__Referrers.getKeywords_week.xml b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithColumnLimiting__Referrers.getKeywords_week.xml index b03831fa61..b5613d0dbd 100644 --- a/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithColumnLimiting__Referrers.getKeywords_week.xml +++ b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithColumnLimiting__Referrers.getKeywords_week.xml @@ -1,14 +1,24 @@ + + search term 4 + 0 + 2 + + + that search term + 2 + 0 + search term 1 0 1 - search term 2 - 0 - 2 + this search term + 2 + 1 search term 3 @@ -16,18 +26,8 @@ 2 - search term 4 + search term 2 0 2 - - that search term - 2 - 0 - - - this search term - 2 - 1 - \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithCsvOutput__Referrers.getKeywords_week.csv b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithCsvOutput__Referrers.getKeywords_week.csv index ab0c4340e4..83cabc249a 100644 Binary files a/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithCsvOutput__Referrers.getKeywords_week.csv and b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithCsvOutput__Referrers.getKeywords_week.csv differ diff --git a/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithJsonOutput__Referrers.getKeywords_week.json b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithJsonOutput__Referrers.getKeywords_week.json index 0343b12be5..1b48052924 100644 --- a/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithJsonOutput__Referrers.getKeywords_week.json +++ b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithJsonOutput__Referrers.getKeywords_week.json @@ -1 +1 @@ -[{"label":"search term 1","1.\u00a0Melbourne, Victoria, Australia":false,"2.\u00a0Toronto, Ontario, Canada":false,"3.\u00a0Yokohama, Kanagawa, Japan":1},{"label":"search term 2","1.\u00a0Melbourne, Victoria, Australia":false,"2.\u00a0Toronto, Ontario, Canada":false,"3.\u00a0Yokohama, Kanagawa, Japan":2},{"label":"search term 3","1.\u00a0Melbourne, Victoria, Australia":false,"2.\u00a0Toronto, Ontario, Canada":2,"3.\u00a0Yokohama, Kanagawa, Japan":false},{"label":"search term 4","1.\u00a0Melbourne, Victoria, Australia":false,"2.\u00a0Toronto, Ontario, Canada":2,"3.\u00a0Yokohama, Kanagawa, Japan":false},{"label":"that search term","1.\u00a0Melbourne, Victoria, Australia":2,"2.\u00a0Toronto, Ontario, Canada":false,"3.\u00a0Yokohama, Kanagawa, Japan":false},{"label":"this search term","1.\u00a0Melbourne, Victoria, Australia":2,"2.\u00a0Toronto, Ontario, Canada":false,"3.\u00a0Yokohama, Kanagawa, Japan":1}] \ No newline at end of file +[{"label":"search term 4","1.\u00a0Melbourne, Victoria, Australia":false,"2.\u00a0Toronto, Ontario, Canada":2,"3.\u00a0Yokohama, Kanagawa, Japan":false},{"label":"that search term","1.\u00a0Melbourne, Victoria, Australia":2,"2.\u00a0Toronto, Ontario, Canada":false,"3.\u00a0Yokohama, Kanagawa, Japan":false},{"label":"search term 1","1.\u00a0Melbourne, Victoria, Australia":false,"2.\u00a0Toronto, Ontario, Canada":false,"3.\u00a0Yokohama, Kanagawa, Japan":1},{"label":"this search term","1.\u00a0Melbourne, Victoria, Australia":2,"2.\u00a0Toronto, Ontario, Canada":false,"3.\u00a0Yokohama, Kanagawa, Japan":1},{"label":"search term 3","1.\u00a0Melbourne, Victoria, Australia":false,"2.\u00a0Toronto, Ontario, Canada":2,"3.\u00a0Yokohama, Kanagawa, Japan":false},{"label":"search term 2","1.\u00a0Melbourne, Victoria, Australia":false,"2.\u00a0Toronto, Ontario, Canada":false,"3.\u00a0Yokohama, Kanagawa, Japan":2}] \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithReportWhoseSubtableIsSelf__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithReportWhoseSubtableIsSelf__Actions.getPageUrls_week.xml index 99f7f60110..f1c47c508d 100644 --- a/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithReportWhoseSubtableIsSelf__Actions.getPageUrls_week.xml +++ b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotByParam_WorksWithReportWhoseSubtableIsSelf__Actions.getPageUrls_week.xml @@ -1,23 +1,23 @@ - 0 + 4 1 0 0 0 0 0 - 0 - 0 - 0 - 0 + 1 + 1 + 1 + 1 0 0 - 1 - 1 - 1 - 1 + 0 + 0 + 0 + 0 0 0 0 @@ -25,13 +25,13 @@ 0 - 1 + 3 1 - 0 - 0 + 1 + 1 0 - 0 - 0 + 1 + 1 0 0 0 @@ -42,10 +42,10 @@ 0 0 0 - 1 - 1 - 1 - 1 + 0 + 0 + 0 + 0 0 @@ -73,13 +73,13 @@ 1 - 3 + 1 1 - 1 - 1 + 0 + 0 0 - 1 - 1 + 0 + 0 0 0 0 @@ -90,30 +90,30 @@ 0 0 0 - 0 - 0 - 0 - 0 + 1 + 1 + 1 + 1 0 - 4 + 0 1 0 0 0 0 0 - 1 - 1 - 1 - 1 + 0 + 0 + 0 + 0 0 0 - 0 - 0 - 0 - 0 + 1 + 1 + 1 + 1 0 0 0 diff --git a/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySegment_CreatesCorrectPivotTable_WhenPeriodIsRange__Referrers.getKeywords_range.xml b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySegment_CreatesCorrectPivotTable_WhenPeriodIsRange__Referrers.getKeywords_range.xml index 29c2baa5d6..0ce7cf1276 100644 --- a/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySegment_CreatesCorrectPivotTable_WhenPeriodIsRange__Referrers.getKeywords_range.xml +++ b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySegment_CreatesCorrectPivotTable_WhenPeriodIsRange__Referrers.getKeywords_range.xml @@ -1,5 +1,17 @@ + + search term 4 + 0 + 2 + 0 + + + that search term + 2 + 0 + 0 + search term 1 0 @@ -7,10 +19,10 @@ 1 - search term 2 - 0 + this search term + 2 0 - 2 + 1 search term 3 @@ -19,21 +31,9 @@ 0 - search term 4 + search term 2 0 - 2 - 0 - - - that search term - 2 0 - 0 - - - this search term - 2 - 0 - 1 + 2 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySegment_CreatesCorrectPivotTable_WhenSegmentUsedInRequest__Referrers.getKeywords_week.xml b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySegment_CreatesCorrectPivotTable_WhenSegmentUsedInRequest__Referrers.getKeywords_week.xml index 52686d6610..04769de105 100644 --- a/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySegment_CreatesCorrectPivotTable_WhenSegmentUsedInRequest__Referrers.getKeywords_week.xml +++ b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySegment_CreatesCorrectPivotTable_WhenSegmentUsedInRequest__Referrers.getKeywords_week.xml @@ -1,11 +1,11 @@ - that search term + this search term 2 - this search term + that search term 2 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySegment_CreatesCorrectPivotTable__Referrers.getKeywords_week.xml b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySegment_CreatesCorrectPivotTable__Referrers.getKeywords_week.xml index 29c2baa5d6..0ce7cf1276 100644 --- a/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySegment_CreatesCorrectPivotTable__Referrers.getKeywords_week.xml +++ b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySegment_CreatesCorrectPivotTable__Referrers.getKeywords_week.xml @@ -1,5 +1,17 @@ + + search term 4 + 0 + 2 + 0 + + + that search term + 2 + 0 + 0 + search term 1 0 @@ -7,10 +19,10 @@ 1 - search term 2 - 0 + this search term + 2 0 - 2 + 1 search term 3 @@ -19,21 +31,9 @@ 0 - search term 4 + search term 2 0 - 2 - 0 - - - that search term - 2 0 - 0 - - - this search term - 2 - 0 - 1 + 2 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySubtableDimension_CreatesCorrectPivotTable_WhenPeriodIsDateRange__Referrers.getKeywords_range.xml b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySubtableDimension_CreatesCorrectPivotTable_WhenPeriodIsDateRange__Referrers.getKeywords_range.xml index 59e74a92f1..3da9704733 100644 --- a/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySubtableDimension_CreatesCorrectPivotTable_WhenPeriodIsDateRange__Referrers.getKeywords_range.xml +++ b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySubtableDimension_CreatesCorrectPivotTable_WhenPeriodIsDateRange__Referrers.getKeywords_range.xml @@ -1,57 +1,57 @@ - search term 1 + search term 4 0 - 0 + 1 1 0 0 0 - search term 2 - 0 - 0 - 0 - 0 - 1 - 1 - - - search term 3 + that search term 1 - 0 + 1 0 - 1 + 0 0 0 - search term 4 + search term 1 0 - 1 + 0 1 0 0 0 - that search term + this search term 1 1 0 - 0 + 1 0 0 - this search term + search term 3 1 - 1 + 0 0 1 0 0 + + search term 2 + 0 + 0 + 0 + 0 + 1 + 1 + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySubtableDimension_CreatesCorrectPivotTable__Referrers.getKeywords_week.xml b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySubtableDimension_CreatesCorrectPivotTable__Referrers.getKeywords_week.xml index 86ae6c16be..7b18166f59 100644 --- a/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySubtableDimension_CreatesCorrectPivotTable__Referrers.getKeywords_week.xml +++ b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySubtableDimension_CreatesCorrectPivotTable__Referrers.getKeywords_week.xml @@ -1,57 +1,57 @@ - search term 1 + search term 4 0 - 0 + 1 1 0 0 0 - search term 2 - 0 - 0 - 0 - 0 - 1 - 1 - - - search term 3 + that search term 1 - 0 + 1 0 - 1 + 0 0 0 - search term 4 + search term 1 0 - 1 + 0 1 0 0 0 - that search term + this search term 1 1 0 - 0 + 1 0 0 - this search term + search term 3 1 - 1 + 0 0 1 0 0 + + search term 2 + 0 + 0 + 0 + 0 + 1 + 1 + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySubtableDimension_WhenEntireHirearchyIsNotLoaded__Referrers.getKeywords_week.xml b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySubtableDimension_WhenEntireHirearchyIsNotLoaded__Referrers.getKeywords_week.xml index 59e74a92f1..3da9704733 100644 --- a/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySubtableDimension_WhenEntireHirearchyIsNotLoaded__Referrers.getKeywords_week.xml +++ b/tests/PHPUnit/System/expected/test_PivotByQueryParamTest_test_PivotBySubtableDimension_WhenEntireHirearchyIsNotLoaded__Referrers.getKeywords_week.xml @@ -1,57 +1,57 @@ - search term 1 + search term 4 0 - 0 + 1 1 0 0 0 - search term 2 - 0 - 0 - 0 - 0 - 1 - 1 - - - search term 3 + that search term 1 - 0 + 1 0 - 1 + 0 0 0 - search term 4 + search term 1 0 - 1 + 0 1 0 0 0 - that search term + this search term 1 1 0 - 0 + 1 0 0 - this search term + search term 3 1 - 1 + 0 0 1 0 0 + + search term 2 + 0 + 0 + 0 + 0 + 1 + 1 + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitlesFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitlesFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_day.xml index 1b2cdaa4b1..e1254c611b 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitlesFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitlesFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Site 1 - Site search - January 3 – 9, 2010 + 3 Jan 10 - 9 Jan 10 Site Search Page Titles Following a Site Search @@ -27,7 +27,7 @@ Total Pageviews - + 1 @@ -39,21 +39,21 @@ 1 - - - - - - + + + + + + - - - - - - - + + + + + + + 2 diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitlesFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitlesFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_month.xml index 34b9d68415..358b09c180 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitlesFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageTitlesFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_month.xml @@ -1,7 +1,7 @@ Site 1 - Site search - January 1 – July 31, 2010 + 1 Jan 10 - 31 Jul 10 Site Search Page Titles Following a Site Search @@ -27,7 +27,7 @@ Total Pageviews - + 1 @@ -39,21 +39,21 @@ 1 - - - - - - + + + + + + - - - - - - - + + + + + + + 2 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 55c454a436..6a327dba4b 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 @@ -1,7 +1,7 @@ Site 1 - Site search - January 3 – 9, 2010 + 3 Jan 10 - 9 Jan 10 Actions Page titles @@ -40,7 +40,7 @@ Exit rate - + 1 @@ -66,21 +66,21 @@ 0% - - - - - - + + + + + + - - - - - - - + + + + + + + 3 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 5bdb5d7b0a..e1f70f727c 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 @@ -1,7 +1,7 @@ Site 1 - Site search - January 1 – July 31, 2010 + 1 Jan 10 - 31 Jul 10 Actions Page titles @@ -40,7 +40,7 @@ Exit rate - + 1 @@ -66,21 +66,21 @@ 0% - - - - - - + + + + + + - - - - - - - + + + + + + + 3 diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrlsFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrlsFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_day.xml index f8732be73a..a139b8c186 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrlsFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrlsFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Site 1 - Site search - January 3 – 9, 2010 + 3 Jan 10 - 9 Jan 10 Site Search Pages Following a Site Search @@ -27,7 +27,7 @@ Total Pageviews - + 1 @@ -39,15 +39,15 @@ 1 - - - - - - + + + + + + - + http://example.org/index.htm @@ -55,12 +55,12 @@ http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE - - - - - - + + + + + + 2 diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrlsFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrlsFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_month.xml index 6439b7eb6a..ddbfc27323 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrlsFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getPageUrlsFollowingSiteSearch_firstSite_lastN__API.getProcessedReport_month.xml @@ -1,7 +1,7 @@ Site 1 - Site search - January 1 – July 31, 2010 + 1 Jan 10 - 31 Jul 10 Site Search Pages Following a Site Search @@ -27,7 +27,7 @@ Total Pageviews - + 1 @@ -39,15 +39,15 @@ 1 - - - - - - + + + + + + - + http://example.org/index.htm @@ -55,12 +55,12 @@ http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE - - - - - - + + + + + + 2 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 2f206116d1..540d585878 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 @@ -1,7 +1,7 @@ Site 1 - Site search - January 3 – 9, 2010 + 3 Jan 10 - 9 Jan 10 Actions Page URLs @@ -40,7 +40,7 @@ Exit rate - + 1 @@ -66,15 +66,15 @@ 0% - - - - - - + + + + + + - + http://example.org/index.htm pageUrl==http%3A%2F%2Fexample.org%2Findex.htm @@ -88,12 +88,12 @@ pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26mykwd%3D%26IS_FOLLOWING_SEARCH+ONCE - - - - - - + + + + + + 3 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 76bf52fe62..d1babd5956 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 @@ -1,7 +1,7 @@ Site 1 - Site search - January 1 – July 31, 2010 + 1 Jan 10 - 31 Jul 10 Actions Page URLs @@ -40,7 +40,7 @@ Exit rate - + 1 @@ -66,15 +66,15 @@ 0% - - - - - - + + + + + + - + http://example.org/index.htm pageUrl==http%3A%2F%2Fexample.org%2Findex.htm @@ -88,12 +88,12 @@ pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26mykwd%3D%26IS_FOLLOWING_SEARCH+ONCE - - - - - - + + + + + + 3 diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchCategories_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchCategories_firstSite_lastN__API.getProcessedReport_day.xml index 286a9043ba..48dec5534c 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchCategories_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchCategories_firstSite_lastN__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Site 1 - Site search - January 3 – 9, 2010 + 3 Jan 10 - 9 Jan 10 Site Search Search Categories @@ -30,7 +30,7 @@ % Search Exits - + 2 @@ -38,7 +38,7 @@ 0% - + 1 @@ -54,8 +54,8 @@ - - + + 4 diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchCategories_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchCategories_firstSite_lastN__API.getProcessedReport_month.xml index 3a532fac04..cb33390062 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchCategories_firstSite_lastN__API.getProcessedReport_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchCategories_firstSite_lastN__API.getProcessedReport_month.xml @@ -1,7 +1,7 @@ Site 1 - Site search - January 1 – July 31, 2010 + 1 Jan 10 - 31 Jul 10 Site Search Search Categories @@ -30,7 +30,7 @@ % Search Exits - + 2 @@ -52,7 +52,7 @@ - + 4 diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_day.xml index 4e9e2a50a4..12f71c1e5f 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Site 1 - Site search - January 3 – 9, 2010 + 3 Jan 10 - 9 Jan 10 Site Search Site Search Keywords @@ -32,7 +32,7 @@ % Search Exits - + 2 @@ -52,7 +52,7 @@ 0% - + 1 @@ -72,20 +72,20 @@ 0% - - - - - + + + + + - - - - - - - + + + + + + + 8 diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_month.xml index b9f052a1eb..547fb4f58e 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchKeywords_firstSite_lastN__API.getProcessedReport_month.xml @@ -1,7 +1,7 @@ Site 1 - Site search - January 1 – July 31, 2010 + 1 Jan 10 - 31 Jul 10 Site Search Site Search Keywords @@ -32,7 +32,7 @@ % Search Exits - + 2 @@ -64,21 +64,21 @@ 0% - - - - - - + + + + + + - - - - - - - + + + + + + + 8 diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchNoResultKeywords_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchNoResultKeywords_firstSite_lastN__API.getProcessedReport_day.xml index f5a25a2e1c..1f90a947fa 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchNoResultKeywords_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchNoResultKeywords_firstSite_lastN__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Site 1 - Site search - January 3 – 9, 2010 + 3 Jan 10 - 9 Jan 10 Site Search Search Keywords with No Results @@ -29,34 +29,34 @@ % Search Exits - + 1 0% - + 1 0% - - - - - + + + + + - - - - - - - + + + + + + + 2 diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchNoResultKeywords_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchNoResultKeywords_firstSite_lastN__API.getProcessedReport_month.xml index f82dde07dc..8619ee693c 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchNoResultKeywords_firstSite_lastN__API.getProcessedReport_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.getSiteSearchNoResultKeywords_firstSite_lastN__API.getProcessedReport_month.xml @@ -1,7 +1,7 @@ Site 1 - Site search - January 1 – July 31, 2010 + 1 Jan 10 - 31 Jul 10 Site Search Search Keywords with No Results @@ -29,28 +29,28 @@ % Search Exits - + 2 0% - - - - - - + + + + + + - - - - - - - + + + + + + + 2 diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_day.xml index a5a008b823..f0c9afbbfc 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Site 1 - Site search - January 3 – 9, 2010 + 3 Jan 10 - 9 Jan 10 Actions Actions - Main metrics @@ -44,7 +44,7 @@ Unique Keywords - + 4 3 0 @@ -54,7 +54,7 @@ 9 3 - + 0 0 0 @@ -64,20 +64,20 @@ 4 3 - - - - - + + + + + - - - - - - - + + + + + + + diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_month.xml index 4dbb7749c0..b4ee70644f 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_Actions.get_firstSite_lastN__API.getProcessedReport_month.xml @@ -1,7 +1,7 @@ Site 1 - Site search - January 1 – July 31, 2010 + 1 Jan 10 - 31 Jul 10 Actions Actions - Main metrics @@ -44,7 +44,7 @@ Unique Keywords - + 4 3 0 @@ -54,21 +54,21 @@ 13 5 - - - - - - + + + + + + - - - - - - - + + + + + + + diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml index 96a5e2ca93..7b71c193d5 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Site 1 - Site search - January 3 – 9, 2010 + 3 Jan 10 - 9 Jan 10 Visitors Custom Variables @@ -54,7 +54,7 @@ Revenue - + 4 @@ -78,7 +78,7 @@ $ 0 - + 3 @@ -102,14 +102,14 @@ $ 0 - - - - - + + + + + - + customVariableName==_pk_scount @@ -121,7 +121,7 @@ 3172 - + customVariableName==_pk_scount @@ -133,11 +133,11 @@ 3175 - - - - - + + + + + 11 diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml index 84acfed862..b43322948f 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml @@ -1,7 +1,7 @@ Site 1 - Site search - January 1 – July 31, 2010 + 1 Jan 10 - 31 Jul 10 Visitors Custom Variables @@ -50,7 +50,7 @@ Revenue - + 7 @@ -70,15 +70,15 @@ $ 0 - - - - - - + + + + + + - + customVariableName==_pk_scount @@ -90,12 +90,12 @@ 3197 - - - - - - + + + + + + 11 diff --git a/tests/PHPUnit/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml b/tests/PHPUnit/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml index 362ecce292..ef977bac01 100644 --- a/tests/PHPUnit/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml +++ b/tests/PHPUnit/System/expected/test_Transitions__Transitions.getTransitionsForPageUrl_day.xml @@ -1,6 +1,6 @@ - Sat, Mar 6 + Sat 6 Mar diff --git a/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_day.xml b/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_day.xml index 26c278c975..8e483fb253 100644 --- a/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_day.xml +++ b/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageTitle_day.xml @@ -1,6 +1,6 @@ - Sat, Mar 6 + Sat 6 Mar diff --git a/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml b/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml index c6b559a21c..66ea7e03d5 100644 --- a/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml +++ b/tests/PHPUnit/System/expected/test_Transitions_noLimit__Transitions.getTransitionsForPageUrl_day.xml @@ -1,6 +1,6 @@ - Sat, Mar 6 + Sat 6 Mar diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getOutlinks_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getOutlinks_firstSite_lastN__API.getProcessedReport_day.xml index 66783fa4df..85885d4462 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getOutlinks_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getOutlinks_firstSite_lastN__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Site 1 - January 3 – 9, 2010 + 3 Jan 10 - 9 Jan 10 Actions Outlinks @@ -28,22 +28,22 @@ Clicks - - - - - - - + + + + + + + - - - - - - - + + + + + + + diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml index 1dcf5c1e94..8051442f3d 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Site 1 - January 3 – 9, 2010 + 3 Jan 10 - 9 Jan 10 Actions Page titles @@ -42,7 +42,7 @@ Avg. generation time - + 2 @@ -53,7 +53,7 @@ 0.14s - + 1 @@ -64,7 +64,7 @@ 0.22s - + 2 @@ -84,7 +84,7 @@ 0.45s - + 2 @@ -104,7 +104,7 @@ 0.45s - + 2 @@ -124,7 +124,7 @@ 0.45s - + 2 @@ -144,7 +144,7 @@ 0.45s - + 2 @@ -166,9 +166,9 @@ - - - + + + 1956 @@ -178,7 +178,7 @@ 1955 - + 1960 @@ -188,7 +188,7 @@ 1959 - + 1964 @@ -198,7 +198,7 @@ 1963 - + 1968 @@ -208,7 +208,7 @@ 1967 - + 1972 @@ -229,4 +229,4 @@ 7 2 - \ No newline at end of file + 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 4c45587a5a..e7b22c9604 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 @@ -1,7 +1,7 @@ Site 1 - January 3 – 9, 2010 + 3 Jan 10 - 9 Jan 10 Actions Page URLs @@ -42,7 +42,7 @@ Avg. generation time - + 1 @@ -62,7 +62,7 @@ 0.15s - + 1 @@ -73,7 +73,7 @@ 0.22s - + 1 @@ -102,7 +102,7 @@ 0s - + 1 @@ -131,7 +131,7 @@ 0s - + 1 @@ -160,7 +160,7 @@ 0s - + 1 @@ -189,7 +189,7 @@ 0s - + 1 @@ -220,7 +220,7 @@ - + http://example.org/index.htm pageUrl==http%3A%2F%2Fexample.org%2Findex.htm @@ -230,12 +230,12 @@ pageUrl==http%3A%2F%2Fexample.org%2Fproducts - + - + http://example.org/index.htm pageUrl==http%3A%2F%2Fexample.org%2Findex.htm @@ -248,7 +248,7 @@ - + http://example.org/index.htm pageUrl==http%3A%2F%2Fexample.org%2Findex.htm @@ -261,7 +261,7 @@ - + http://example.org/index.htm pageUrl==http%3A%2F%2Fexample.org%2Findex.htm @@ -274,7 +274,7 @@ - + http://example.org/index.htm pageUrl==http%3A%2F%2Fexample.org%2Findex.htm @@ -287,7 +287,7 @@ - + http://example.org/index.htm pageUrl==http%3A%2F%2Fexample.org%2Findex.htm diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_Goals.getDaysToConversion_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_Goals.getDaysToConversion_firstSite_lastN__API.getProcessedReport_day.xml index 97ab84ae2f..9c1be3f18a 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_Goals.getDaysToConversion_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_Goals.getDaysToConversion_firstSite_lastN__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Site 1 - January 3 – 9, 2010 + 3 Jan 10 - 9 Jan 10 Goals Days to Conversion @@ -28,7 +28,7 @@ Revenue - + 2 @@ -100,8 +100,8 @@ $ 0 - - + + 0 @@ -173,7 +173,7 @@ $ 0 - + 0 @@ -245,7 +245,7 @@ $ 0 - + 0 @@ -317,7 +317,7 @@ $ 0 - + 0 @@ -389,7 +389,7 @@ $ 0 - + 0 @@ -463,13 +463,13 @@ - - - - - - - + + + + + + + 10 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml index fc66b8a687..bf674444b7 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Site 1 - January 3 – 9, 2010 + 3 Jan 10 - 9 Jan 10 All Websites All Websites dashboard @@ -53,7 +53,7 @@ Product Revenue Evolution - + 2 @@ -72,7 +72,7 @@ 0 - + 1 @@ -108,7 +108,7 @@ 0 - + 1 @@ -127,7 +127,7 @@ 0 - + 1 @@ -146,7 +146,7 @@ 0 - + 1 @@ -165,7 +165,7 @@ 0 - + 1 @@ -184,7 +184,7 @@ 0 - + 1 @@ -205,14 +205,14 @@ - + 1 http://piwik.net - + 1 @@ -224,35 +224,35 @@ http://piwik.net - + 1 http://piwik.net - + 1 http://piwik.net - + 1 http://piwik.net - + 1 http://piwik.net - + 1 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml index 21f4942fd1..f77187ebe6 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Site 1 - January 3 – 9, 2010 + 3 Jan 10 - 9 Jan 10 Referrers Websites @@ -54,7 +54,7 @@ Revenue - + 1 @@ -67,7 +67,7 @@ $ 0 - + 1 @@ -80,10 +80,10 @@ $ 0 - - - - + + + + 1 @@ -96,7 +96,7 @@ $ 0 - + 1 @@ -111,35 +111,35 @@ - + referrerName==referrer.com - 1907 + 17099 - + referrerName==referrer.com - 1909 + 17101 - - - - + + + + referrerName==referrer.com - 1914 + 17106 - + referrerName==referrer.com - 1916 + 17108 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitFrequency.get_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitFrequency.get_firstSite_lastN__API.getProcessedReport_day.xml index 77da393895..5d889eb52f 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitFrequency.get_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitFrequency.get_firstSite_lastN__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Site 1 - January 3 – 9, 2010 + 3 Jan 10 - 9 Jan 10 Visitors Returning Visits @@ -34,8 +34,8 @@ Bounce Rate for Returning Visits - - + + 1 0 1 @@ -45,7 +45,7 @@ 1 00:00:00 - + 1 0 1 @@ -55,7 +55,7 @@ 5 00:15:01 - + 1 0 1 @@ -65,7 +65,7 @@ 5 00:15:01 - + 1 0 1 @@ -75,7 +75,7 @@ 5 00:15:01 - + 1 0 1 @@ -85,7 +85,7 @@ 5 00:15:01 - + 1 0 1 @@ -97,13 +97,13 @@ - - - - - - - + + + + + + + diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitorInterest.getNumberOfVisitsByDaysSinceLast_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitorInterest.getNumberOfVisitsByDaysSinceLast_firstSite_lastN__API.getProcessedReport_day.xml index 94b167ab2b..b7072a3a35 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitorInterest.getNumberOfVisitsByDaysSinceLast_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitorInterest.getNumberOfVisitsByDaysSinceLast_firstSite_lastN__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Site 1 - January 3 – 9, 2010 + 3 Jan 10 - 9 Jan 10 Visitors Visits by days since last visit @@ -24,7 +24,7 @@ Visits - + 2 @@ -86,7 +86,7 @@ 0 - + 0 @@ -148,7 +148,7 @@ 0 - + 0 @@ -210,7 +210,7 @@ 0 - + 0 @@ -272,7 +272,7 @@ 0 - + 0 @@ -334,7 +334,7 @@ 0 - + 0 @@ -396,7 +396,7 @@ 0 - + 0 @@ -460,13 +460,13 @@ - - - - - - - + + + + + + + 8 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml index a611557fea..63b6741a62 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Site 1 - January 3 – 9, 2010 + 3 Jan 10 - 9 Jan 10 Visits Summary Visits Summary @@ -40,7 +40,7 @@ Avg. Visit Duration (in seconds) - + 2 2 2 @@ -49,7 +49,7 @@ 00:00:00 100% - + 1 1 1 @@ -58,7 +58,7 @@ 00:00:00 100% - + 1 1 5 @@ -67,7 +67,7 @@ 00:15:01 0% - + 1 1 5 @@ -76,7 +76,7 @@ 00:15:01 0% - + 1 1 5 @@ -85,7 +85,7 @@ 00:15:01 0% - + 1 1 5 @@ -94,7 +94,7 @@ 00:15:01 0% - + 1 1 5 @@ -105,13 +105,13 @@ - - - - - - - + + + + + + + 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 28de41dd9c..5f6c7d172c 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 @@ -12,7 +12,7 @@

- Mail Test report - Date range: January 2010 + Mail Test report - Date range: 2010, January

diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf index ffc46593bf..8ab4a1eff9 100644 Binary files a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf and b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf differ diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_month.original.sms.txt b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_month.original.sms.txt index 3255f3784e..9012a16b8e 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_month.original.sms.txt +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_month.original.sms.txt @@ -1 +1 @@ -January 2010. Site 1: 11 Visits (+100%), 43 Actions (+100%). Site 2: 1 Visits (+100%), 3 Actions (+100%) \ No newline at end of file +2010, January. Site 1: 11 Visits (+100%), 43 Actions (+100%). Site 2: 1 Visits (+100%), 3 Actions (+100%) \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_month.original.sms.txt b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_month.original.sms.txt index 99c4547298..5e1a234843 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_month.original.sms.txt +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_month.original.sms.txt @@ -1 +1 @@ -January 2010. 11 Visits (+100%), 43 Actions (+100%) \ No newline at end of file +2010, January. 11 Visits (+100%), 43 Actions (+100%) \ No newline at end of file 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 c728abec68..4d85354ee1 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 @@ -9,7 +9,7 @@ http://example.org/index.htm incredible title! 2 - Mar 6, 2010 11:22:33 AM + Sat 6 Mar 11:22:33 1 1267874553 @@ -28,7 +28,7 @@ http://example.org/index2.htm incredible title! 3 - Mar 6, 2010 11:25:33 AM + Sat 6 Mar 11:25:33 2 180 3 min 0s @@ -40,7 +40,7 @@ http://example.org/index3.htm incredible title! 4 - Mar 6, 2010 11:28:33 AM + Sat 6 Mar 11:28:33 3 1267874913 @@ -59,7 +59,7 @@ http://example.org/no-user-id-set-but-should-appear-in-user-id-visit no User Id set but it should appear in email@example.com! 6 - Mar 6, 2010 1:16:33 PM + Sat 6 Mar 13:16:33 4 360 6 min 0s @@ -71,7 +71,7 @@ http://example.org/index.htm incredible title! 2 - Mar 6, 2010 1:22:33 PM + Sat 6 Mar 13:22:33 5 360 6 min 0s @@ -83,7 +83,7 @@ http://example.org/index.htm second page 2 - Mar 6, 2010 1:28:33 PM + Sat 6 Mar 13:28:33 6 1267882113 @@ -102,7 +102,7 @@ http://example.org/index.htm a new user id was set -> new visit 2 - Mar 6, 2010 1:34:33 PM + Sat 6 Mar 13:34:33 7 1267882473 @@ -121,7 +121,7 @@ http://example.org/home pageview - should not be tracked by our user id but in a new visit 10 - Mar 6, 2010 4:28:33 PM + Sat 6 Mar 16:28:33 10 1267892913 @@ -140,7 +140,7 @@ http://example.org/home same user id was set -> this is the same unique user 10 - Mar 6, 2010 4:22:33 PM + Sat 6 Mar 16:22:33 8 360 6 min 0s @@ -152,7 +152,7 @@ http://example.org/home second pageview - by this user id 10 - Mar 6, 2010 4:28:33 PM + Sat 6 Mar 16:28:33 9 720 12 min 0s @@ -165,7 +165,7 @@ 1 0 - Mar 6, 2010 4:34:33 PM + Sat 6 Mar 16:34:33 http://example.org/home plugins/Morpheus/images/goal.png 1267893273 @@ -174,7 +174,7 @@ ecommerceAbandonedCart 10000000000 1 - Mar 6, 2010 4:40:33 PM + Sat 6 Mar 16:40:33 sku-007-PRISM @@ -201,7 +201,7 @@ http://example.org/index.htm Page view by email@example.com 2 - Mar 14, 2010 11:22:33 AM + Sun 14 Mar 11:22:33 11 1268565753 @@ -220,7 +220,7 @@ http://example.org/index.htm A page view by new-user-id@one-weeklater 2 - Mar 14, 2010 11:46:33 AM + Sun 14 Mar 11:46:33 12 1268567193 diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml index 7173518fff..1b05d735d9 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Piwik test - Sunday, January 4, 2009 + Sunday 4 January 2009 Visitors Country diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_hideMetricsDoc__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_hideMetricsDoc__API.getProcessedReport_day.xml index 33f240bdab..92986c8118 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_hideMetricsDoc__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_hideMetricsDoc__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Piwik test - Sunday, January 4, 2009 + Sunday 4 January 2009 Actions Actions - Main metrics diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml index 454018b7d3..75bcc851e2 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Piwik test - Sunday, January 4, 2009 + Sunday 4 January 2009 Visitors Country diff --git a/tests/PHPUnit/System/expected/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv b/tests/PHPUnit/System/expected/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv index 12f9a8fce3..89e329416e 100644 Binary files a/tests/PHPUnit/System/expected/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv and b/tests/PHPUnit/System/expected/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv differ diff --git a/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv b/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv index 489da99277..8372bb607e 100644 Binary files a/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv and b/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv differ diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_AbandonedCart__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_AbandonedCart__API.getProcessedReport_day.xml index acdd5b2221..3e099b5692 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_AbandonedCart__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_AbandonedCart__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Piwik test - Tuesday, April 5, 2011 + Tuesday 5 April 2011 Ecommerce Abandoned Carts diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_NormalGoal__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_NormalGoal__API.getProcessedReport_day.xml index 5c2ff7a020..d492e19c4b 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_NormalGoal__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_NormalGoal__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Piwik test - Tuesday, April 5, 2011 + Tuesday 5 April 2011 Goals Goal title match, triggered ONCE diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_Order__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_Order__API.getProcessedReport_day.xml index 2c589e00f2..99d9d6ab69 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_Order__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_Goals.Get_Order__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Piwik test - Tuesday, April 5, 2011 + Tuesday 5 April 2011 Ecommerce Ecommerce Orders diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_ItemsCategory__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_ItemsCategory__API.getProcessedReport_day.xml index 96a06e075f..70117fb4d3 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_ItemsCategory__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_ItemsCategory__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Piwik test - Tuesday, April 5, 2011 + Tuesday 5 April 2011 Ecommerce Product Category diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_ItemsSku__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_ItemsSku__API.getProcessedReport_day.xml index 34a12b5b11..20079eb4c4 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_ItemsSku__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_ItemsSku__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Piwik test - Tuesday, April 5, 2011 + Tuesday 5 April 2011 Ecommerce Product SKU diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml index e885f8b006..a0a7bbea54 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Piwik test - Tuesday, April 5, 2011 + Tuesday 5 April 2011 Visits Summary Visits by Server Time diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml index 05e7930247..3d36e8c075 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Piwik test - Tuesday, April 5, 2011 + Tuesday 5 April 2011 Visitors Country diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.getItemsName_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.getItemsName_day.xml index 8beefcdba1..80da495736 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.getItemsName_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.getItemsName_day.xml @@ -31,20 +31,20 @@ 0% - + 1 2 - 2 - 0 + 4 + 666 0 0% - + 1 2 - 4 - 666 + 2 + 0 0 0% diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.getItemsName_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.getItemsName_week.xml index 91beadc53c..854349a01e 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.getItemsName_week.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Goals.getItemsName_week.xml @@ -40,20 +40,20 @@ 0% - + 3 - 3 + 6 2 - 0 + 1332 0 0% - + 3 - 6 + 3 2 - 1332 + 0 0 0% 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 6e390a8437..f874d6dd9a 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 @@ -190,8 +190,8 @@ Canon SLR,$ 1500,1,1,$ 1500,1,0%,0 PRODUCT name,$ 1011.22,3,2,$ 255.61,1.5,100%,2 PRODUCT name BIS,$ 600,6,1,$ 100,6,0%,0 TRIPOD - bought day after,$ 200,2,1,$ 100,2,0%,0 -PRODUCT TWO LEFT in cart,$ 0,0,0,$ 0,0,0%,3 PRODUCT THREE LEFT in cart,$ 0,0,0,$ 1332,0,0%,3 +PRODUCT TWO LEFT in cart,$ 0,0,0,$ 0,0,0%,3 Product Category label,revenue,quantity,orders,nb_visits,avg_price,avg_quantity,conversion_rate 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 c029098279..b34c15199f 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 @@ -12,7 +12,7 @@

- Mail Test report - Date range: Week April 4 – 10, 2011 + Mail Test report - Date range: Week 4 April - 10 April 2011

@@ -3348,7 +3348,7 @@ - PRODUCT TWO LEFT in cart + PRODUCT THREE LEFT in cart $ 0 @@ -3362,7 +3362,7 @@ 3 - $ 0 + $ 1332 0 @@ -3374,7 +3374,7 @@ - PRODUCT THREE LEFT in cart + PRODUCT TWO LEFT in cart $ 0 @@ -3388,7 +3388,7 @@ 3 - $ 1332 + $ 0 0 diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt index d93abaaa99..e0d2df5b77 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt @@ -1 +1 @@ -Week April 4 – 10, 2011. Piwik test: 5 Visits (+100%), 16 Actions (+100%), Revenue: $ 13361 (+100%), 5 Goal conversions (+100%), Product Revenue: $ 13351 (+100%), 4 Ecommerce Orders (+100%). Piwik test: 2 Visits (+100%), 1 Actions (+100%), Revenue: $ 250 (+100%), 1 Goal conversions (+100%) \ No newline at end of file +Week 4 April - 10 April 2011. Piwik test: 5 Visits (+100%), 16 Actions (+100%), Revenue: $ 13361 (+100%), 5 Goal conversions (+100%), Product Revenue: $ 13351 (+100%), 4 Ecommerce Orders (+100%). Piwik test: 2 Visits (+100%), 1 Actions (+100%), Revenue: $ 250 (+100%), 1 Goal conversions (+100%) \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt index 3632f5fb81..fa6a9d691e 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt @@ -1 +1 @@ -Week April 4 – 10, 2011. 5 Visits (+100%), 16 Actions (+100%), Revenue: $ 13361 (+100%), 5 Goal conversions (+100%), Product Revenue: $ 13351 (+100%), 4 Ecommerce Orders (+100%) \ No newline at end of file +Week 4 April - 10 April 2011. 5 Visits (+100%), 16 Actions (+100%), Revenue: $ 13361 (+100%), 5 Goal conversions (+100%), Product Revenue: $ 13351 (+100%), 4 Ecommerce Orders (+100%) \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItemsmultipleDates__Goals.getItemsName_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItemsmultipleDates__Goals.getItemsName_day.xml index f48390dcdb..bdc280c4c9 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItemsmultipleDates__Goals.getItemsName_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItemsmultipleDates__Goals.getItemsName_day.xml @@ -32,20 +32,20 @@ 0% - + 1 2 - 2 - 0 + 4 + 666 0 0% - + 1 2 - 4 - 666 + 2 + 0 0 0% diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml index 03553f91e1..1639c238a3 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml @@ -23,7 +23,6 @@ 1000 2 0 - customVariableName==VisitorType @@ -88,7 +87,6 @@ 0 1 0 - customVariableName==SET+WITH+EMPTY+VALUE @@ -111,6 +109,24 @@ + + + 3 + + + + 2 + 2 + 2 + + + + 1 + 1 + 1 + + + 1 @@ -129,7 +145,6 @@ 0 1 0 - customVariableName==Value+will+be+VERY+long+and+truncated @@ -152,25 +167,6 @@ - - - 3 - customVariableName==Status+user - - - - 2 - 2 - 2 - - - - 1 - 1 - 1 - - - 2 @@ -189,7 +185,6 @@ 1000 1 0 - customVariableName==Othercustom+value+which+should+be+truncated+abcdefghijklmnopqrstuvwxyz @@ -215,7 +210,6 @@ 1 - customVariableName==Language @@ -228,7 +222,6 @@ 1 - customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE @@ -238,4 +231,4 @@ - + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__CustomVariables.getCustomVariables_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__CustomVariables.getCustomVariables_range.xml index 03553f91e1..1639c238a3 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__CustomVariables.getCustomVariables_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__CustomVariables.getCustomVariables_range.xml @@ -23,7 +23,6 @@ 1000 2 0 - customVariableName==VisitorType @@ -88,7 +87,6 @@ 0 1 0 - customVariableName==SET+WITH+EMPTY+VALUE @@ -111,6 +109,24 @@ + + + 3 + + + + 2 + 2 + 2 + + + + 1 + 1 + 1 + + + 1 @@ -129,7 +145,6 @@ 0 1 0 - customVariableName==Value+will+be+VERY+long+and+truncated @@ -152,25 +167,6 @@ - - - 3 - customVariableName==Status+user - - - - 2 - 2 - 2 - - - - 1 - 1 - 1 - - - 2 @@ -189,7 +185,6 @@ 1000 1 0 - customVariableName==Othercustom+value+which+should+be+truncated+abcdefghijklmnopqrstuvwxyz @@ -215,7 +210,6 @@ 1 - customVariableName==Language @@ -228,7 +222,6 @@ 1 - customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE @@ -238,4 +231,4 @@ - + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__CustomVariables.getCustomVariables_day.xml index a354856dec..6b7a4a8b1c 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__CustomVariables.getCustomVariables_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__CustomVariables.getCustomVariables_day.xml @@ -18,19 +18,19 @@ - + 20 customVariableName==tweeted - - 1 - 1 + + 10 + 10 - 19 - 19 + 10 + 10 diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__CustomVariables.getCustomVariables_day.xml index a496ea54f0..c90e3c1d29 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__CustomVariables.getCustomVariables_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__CustomVariables.getCustomVariables_day.xml @@ -4,24 +4,24 @@ 60 - - - 19 - 19 - 16 16 + + + 10 + 10 + + + + 10 + 10 + 4 4 - - - 1 - 1 - \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__CustomVariables.getCustomVariables_day.xml index a354856dec..6b7a4a8b1c 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__CustomVariables.getCustomVariables_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__CustomVariables.getCustomVariables_day.xml @@ -18,19 +18,19 @@ - + 20 customVariableName==tweeted - - 1 - 1 + + 10 + 10 - 19 - 19 + 10 + 10 diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml index 01be2a53b2..87b6e82799 100644 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ Piwik test - Sunday, January 3, 2010 + Sunday 3 January 2010 Visitors Custom Variables diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml index bed7b91cd6..5b779b60c6 100644 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml +++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml @@ -24,7 +24,6 @@ 3 1000 - customVariableName==VisitorType @@ -86,7 +85,6 @@ 1 0 - customVariableName==SET+WITH+EMPTY+VALUE @@ -108,6 +106,22 @@ + + + 3 + + + + 2 + 2 + + + + 1 + 1 + + + 1 @@ -125,7 +139,6 @@ 1 0 - customVariableName==Value+will+be+VERY+long+and+truncated @@ -147,23 +160,6 @@ - - - 3 - customVariableName==Status+user - - - - 2 - 2 - - - - 1 - 1 - - - 2 @@ -181,7 +177,6 @@ 1 1000 - customVariableName==Othercustom+value+which+should+be+truncated+abcdefghijklmnopqrstuvwxyz @@ -206,7 +201,6 @@ 1 - customVariableName==Language @@ -218,7 +212,6 @@ 1 - customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE @@ -235,4 +228,4 @@ - + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml index e1b99901fa..6b156a1379 100644 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml +++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml @@ -25,7 +25,6 @@ 1000 2 0 - customVariableName==VisitorType @@ -90,7 +89,6 @@ 0 1 0 - customVariableName==SET+WITH+EMPTY+VALUE @@ -113,6 +111,24 @@ + + + 3 + + + + 2 + 2 + 2 + + + + 1 + 1 + 1 + + + 1 @@ -131,7 +147,6 @@ 0 1 0 - customVariableName==Value+will+be+VERY+long+and+truncated @@ -154,25 +169,6 @@ - - - 3 - customVariableName==Status+user - - - - 2 - 2 - 2 - - - - 1 - 1 - 1 - - - 2 @@ -191,7 +187,6 @@ 1000 1 0 - customVariableName==Othercustom+value+which+should+be+truncated+abcdefghijklmnopqrstuvwxyz @@ -217,7 +212,6 @@ 1 - customVariableName==Language @@ -230,7 +224,6 @@ 1 - customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE @@ -248,4 +241,4 @@ - + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml index 6b70992801..4a549e2004 100644 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml +++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml @@ -19,7 +19,6 @@ 1 0 - customVariableName==SET+WITH+EMPTY+VALUE @@ -41,6 +40,22 @@ + + + 3 + + + + 2 + 2 + + + + 1 + 1 + + + 1 @@ -58,7 +73,6 @@ 1 0 - customVariableName==Value+will+be+VERY+long+and+truncated @@ -102,7 +116,6 @@ 2 0 - customVariableName==VisitorType @@ -137,27 +150,9 @@ - - - 3 - customVariableName==Status+user - - - - 2 - 2 - - - - 1 - 1 - - - 1 - customVariableName==Language @@ -169,7 +164,6 @@ 1 - customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE @@ -186,4 +180,4 @@ - + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml index 81da5843b0..28956c8523 100644 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml +++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml @@ -20,7 +20,6 @@ 0 1 0 - customVariableName==SET+WITH+EMPTY+VALUE @@ -43,6 +42,24 @@ + + + 3 + + + + 2 + 2 + 2 + + + + 1 + 1 + 1 + + + 1 @@ -61,7 +78,6 @@ 0 1 0 - customVariableName==Value+will+be+VERY+long+and+truncated @@ -107,7 +123,6 @@ 0 1 0 - customVariableName==VisitorType @@ -143,29 +158,9 @@ - - - 3 - customVariableName==Status+user - - - - 2 - 2 - 2 - - - - 1 - 1 - 1 - - - 1 - customVariableName==Language @@ -178,7 +173,6 @@ 1 - customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE @@ -196,4 +190,4 @@ - + \ No newline at end of file -- cgit v1.2.3