From 8ccc9dc05da021325cdbf141a548637fa52f16b2 Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@gmail.com>
Date: Tue, 18 Aug 2015 12:14:22 +0000
Subject: [PATCH] fix system tests
---
...ction_flat__API.getProcessedReport_day.xml | 30 ++++----
...tion_lastN__API.getProcessedReport_day.xml | 30 ++++----
...egory_flat__API.getProcessedReport_day.xml | 30 ++++----
...gory_lastN__API.getProcessedReport_day.xml | 30 ++++----
...tName_flat__API.getProcessedReport_day.xml | 30 ++++----
...Name_lastN__API.getProcessedReport_day.xml | 30 ++++----
...CustomVariables.getCustomVariables_day.xml | 20 ++---
...ssedMetric__API.getProcessedReport_day.xml | 20 ++---
...pEmptyRows__API.getProcessedReport_day.xml | 2 +-
..._subtable__API.getProcessedReport_week.xml | 2 +-
...deColumns___API.getProcessedReport_day.xml | 2 +-
...edMetrics___API.getProcessedReport_day.xml | 2 +-
...owColumns___API.getProcessedReport_day.xml | 2 +-
...ns_onlyOne__API.getProcessedReport_day.xml | 2 +-
...eDays__Live.getLastVisitsDetails_month.xml | 30 ++++----
...taTableMaps__Referrers.getKeywords_day.xml | 34 ++++-----
...mnLimiting__Referrers.getKeywords_week.xml | 28 +++----
...hCsvOutput__Referrers.getKeywords_week.csv | Bin 458 -> 458 bytes
...sonOutput__Referrers.getKeywords_week.json | 2 +-
...btableIsSelf__Actions.getPageUrls_week.xml | 72 +++++++++---------
...odIsRange__Referrers.getKeywords_range.xml | 34 ++++-----
...dInRequest__Referrers.getKeywords_week.xml | 4 +-
...PivotTable__Referrers.getKeywords_week.xml | 34 ++++-----
...DateRange__Referrers.getKeywords_range.xml | 40 +++++-----
...PivotTable__Referrers.getKeywords_week.xml | 40 +++++-----
...sNotLoaded__Referrers.getKeywords_week.xml | 40 +++++-----
...Site_lastN__API.getProcessedReport_day.xml | 30 ++++----
...te_lastN__API.getProcessedReport_month.xml | 30 ++++----
...Site_lastN__API.getProcessedReport_day.xml | 30 ++++----
...te_lastN__API.getProcessedReport_month.xml | 30 ++++----
...Site_lastN__API.getProcessedReport_day.xml | 30 ++++----
...te_lastN__API.getProcessedReport_month.xml | 30 ++++----
...Site_lastN__API.getProcessedReport_day.xml | 30 ++++----
...te_lastN__API.getProcessedReport_month.xml | 30 ++++----
...Site_lastN__API.getProcessedReport_day.xml | 10 +--
...te_lastN__API.getProcessedReport_month.xml | 6 +-
...Site_lastN__API.getProcessedReport_day.xml | 30 ++++----
...te_lastN__API.getProcessedReport_month.xml | 30 ++++----
...Site_lastN__API.getProcessedReport_day.xml | 30 ++++----
...te_lastN__API.getProcessedReport_month.xml | 30 ++++----
...Site_lastN__API.getProcessedReport_day.xml | 30 ++++----
...te_lastN__API.getProcessedReport_month.xml | 30 ++++----
...Site_lastN__API.getProcessedReport_day.xml | 30 ++++----
...te_lastN__API.getProcessedReport_month.xml | 30 ++++----
...ansitions.getTransitionsForPageUrl_day.xml | 2 +-
...sitions.getTransitionsForPageTitle_day.xml | 2 +-
...ansitions.getTransitionsForPageUrl_day.xml | 2 +-
...Site_lastN__API.getProcessedReport_day.xml | 30 ++++----
...Site_lastN__API.getProcessedReport_day.xml | 32 ++++----
...Site_lastN__API.getProcessedReport_day.xml | 30 ++++----
...Site_lastN__API.getProcessedReport_day.xml | 30 ++++----
...Site_lastN__API.getProcessedReport_day.xml | 30 ++++----
...Site_lastN__API.getProcessedReport_day.xml | 38 ++++-----
...Site_lastN__API.getProcessedReport_day.xml | 30 ++++----
...Site_lastN__API.getProcessedReport_day.xml | 30 ++++----
...Site_lastN__API.getProcessedReport_day.xml | 30 ++++----
...Reports.generateReport_month.original.html | 2 +-
...dReports.generateReport_month.original.pdf | Bin 512633 -> 512640 bytes
...orts.generateReport_month.original.sms.txt | 2 +-
...orts.generateReport_month.original.sms.txt | 2 +-
...torId__Live.getLastVisitsDetails_month.xml | 28 +++----
...rtMetadata__API.getProcessedReport_day.xml | 2 +-
...MetricsDoc__API.getProcessedReport_day.xml | 2 +-
...RawMetrics__API.getProcessedReport_day.xml | 2 +-
...CustomVariables.getCustomVariables_day.csv | Bin 1986 -> 1280 bytes
...CustomVariables.getCustomVariables_day.csv | Bin 3468 -> 3468 bytes
...ndonedCart__API.getProcessedReport_day.xml | 2 +-
...NormalGoal__API.getProcessedReport_day.xml | 2 +-
....Get_Order__API.getProcessedReport_day.xml | 2 +-
...msCategory__API.getProcessedReport_day.xml | 2 +-
...a_ItemsSku__API.getProcessedReport_day.xml | 2 +-
...ServerTime__API.getProcessedReport_day.xml | 2 +-
...rWithItems__API.getProcessedReport_day.xml | 2 +-
...OrderWithItems__Goals.getItemsName_day.xml | 12 +--
...rderWithItems__Goals.getItemsName_week.xml | 12 +--
...edReports.generateReport_week.original.csv | 2 +-
...dReports.generateReport_week.original.html | 10 +--
...ports.generateReport_week.original.sms.txt | 2 +-
...ports.generateReport_week.original.sms.txt | 2 +-
...smultipleDates__Goals.getItemsName_day.xml | 12 +--
...stomVariables.getCustomVariables_range.xml | 45 +++++------
...stomVariables.getCustomVariables_range.xml | 45 +++++------
...CustomVariables.getCustomVariables_day.xml | 12 +--
...CustomVariables.getCustomVariables_day.xml | 20 ++---
...CustomVariables.getCustomVariables_day.xml | 12 +--
...__subtable__API.getProcessedReport_day.xml | 2 +-
...CustomVariables.getCustomVariables_day.xml | 41 +++++-----
...ustomVariables.getCustomVariables_week.xml | 45 +++++------
...CustomVariables.getCustomVariables_day.xml | 40 +++++-----
...ustomVariables.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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Piwik test</website>
- <prettyDate>January 3 – 9, 2010</prettyDate>
+ <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
<metadata>
<category>Events</category>
<name>Event Actions</name>
@@ -41,7 +41,7 @@
<avg_event_value>The average of all values for this event</avg_event_value>
</columns>
<reportData>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<row>
<label>clickBuyNow - Spirited Away (åƒã¨åƒå°‹ã®ç¥žéš ã—)</label>
<nb_events>2</nb_events>
@@ -214,21 +214,21 @@
<avg_event_value>0</avg_event_value>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportData>
<reportMetadata>
- <result prettyDate="Sunday, January 3, 2010" />
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Sunday 3 January 2010" />
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportMetadata>
<reportTotal>
<nb_visits>42</nb_visits>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Piwik test</website>
- <prettyDate>January 3 – 9, 2010</prettyDate>
+ <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
<metadata>
<category>Events</category>
<name>Event Actions</name>
@@ -41,7 +41,7 @@
<avg_event_value>The average of all values for this event</avg_event_value>
</columns>
<reportData>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<row>
<label>playTrailer</label>
<nb_events>6</nb_events>
@@ -151,15 +151,15 @@
<avg_event_value>0</avg_event_value>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportData>
<reportMetadata>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<row>
<segment>eventAction==playTrailer</segment>
@@ -219,12 +219,12 @@
<segment>eventAction==Purchase</segment>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportMetadata>
<reportTotal>
<nb_visits>42</nb_visits>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Piwik test</website>
- <prettyDate>January 3 – 9, 2010</prettyDate>
+ <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
<metadata>
<category>Events</category>
<name>Event Categories</name>
@@ -41,7 +41,7 @@
<avg_event_value>The average of all values for this event</avg_event_value>
</columns>
<reportData>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<row>
<label>Movie - playTrailer</label>
<nb_events>6</nb_events>
@@ -196,21 +196,21 @@
<avg_event_value>9.5</avg_event_value>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportData>
<reportMetadata>
- <result prettyDate="Sunday, January 3, 2010" />
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Sunday 3 January 2010" />
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportMetadata>
<reportTotal>
<nb_visits>42</nb_visits>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Piwik test</website>
- <prettyDate>January 3 – 9, 2010</prettyDate>
+ <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
<metadata>
<category>Events</category>
<name>Event Categories</name>
@@ -41,7 +41,7 @@
<avg_event_value>The average of all values for this event</avg_event_value>
</columns>
<reportData>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<row>
<label>Movie</label>
<nb_events>28</nb_events>
@@ -70,15 +70,15 @@
<avg_event_value>9.66</avg_event_value>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportData>
<reportMetadata>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<row>
<segment>eventCategory==Movie</segment>
@@ -95,12 +95,12 @@
<idsubdatatable>747</idsubdatatable>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportMetadata>
<reportTotal>
<nb_visits>42</nb_visits>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Piwik test</website>
- <prettyDate>January 3 – 9, 2010</prettyDate>
+ <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
<metadata>
<category>Events</category>
<name>Event Names</name>
@@ -41,7 +41,7 @@
<avg_event_value>The average of all values for this event</avg_event_value>
</columns>
<reportData>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<row>
<label>Event Name not defined - Search</label>
<nb_events>4</nb_events>
@@ -223,21 +223,21 @@
<avg_event_value>9.66</avg_event_value>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportData>
<reportMetadata>
- <result prettyDate="Sunday, January 3, 2010" />
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Sunday 3 January 2010" />
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportMetadata>
<reportTotal>
<nb_visits>42</nb_visits>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Piwik test</website>
- <prettyDate>January 3 – 9, 2010</prettyDate>
+ <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
<metadata>
<category>Events</category>
<name>Event Names</name>
@@ -41,7 +41,7 @@
<avg_event_value>The average of all values for this event</avg_event_value>
</columns>
<reportData>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<row>
<label>Spirited Away (åƒã¨åƒå°‹ã®ç¥žéš ã—)</label>
<nb_events>16</nb_events>
@@ -106,15 +106,15 @@
<avg_event_value>0</avg_event_value>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportData>
<reportMetadata>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<row>
<segment>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</segment>
@@ -150,12 +150,12 @@
<idsubdatatable>876</idsubdatatable>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportMetadata>
<reportTotal>
<nb_visits>42</nb_visits>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<results>
<result date="2010-03-05">
+ <row>
+ <label>CustomVarPage</label>
+ <nb_actions>18</nb_actions>
+ <is_aggregate>1</is_aggregate>
+ </row>
<row>
<label>CustomVarVisit</label>
<nb_visits>6</nb_visits>
@@ -12,11 +17,6 @@
<nb_visits_converted>0</nb_visits_converted>
<is_aggregate>1</is_aggregate>
</row>
- <row>
- <label>CustomVarPage</label>
- <nb_actions>18</nb_actions>
- <is_aggregate>1</is_aggregate>
- </row>
<row>
<label>CustomVarVisit - CustomVarValue1</label>
<nb_visits>3</nb_visits>
@@ -82,15 +82,15 @@
<is_aggregate>0</is_aggregate>
</row>
<row>
- <label>CustomVarPage - CustomVarValue1</label>
- <nb_visits>1</nb_visits>
+ <label>CustomVarPage</label>
<nb_actions>1</nb_actions>
- <is_aggregate>0</is_aggregate>
+ <is_aggregate>1</is_aggregate>
</row>
<row>
- <label>CustomVarPage</label>
+ <label>CustomVarPage - CustomVarValue1</label>
+ <nb_visits>1</nb_visits>
<nb_actions>1</nb_actions>
- <is_aggregate>1</is_aggregate>
+ <is_aggregate>0</is_aggregate>
</row>
</result>
<result date="2010-03-07" />
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Site 1</website>
- <prettyDate>Sunday, January 3, 2010</prettyDate>
+ <prettyDate>Sunday 3 January 2010</prettyDate>
<metadata>
<category>Actions</category>
<name>Page URLs</name>
@@ -40,14 +40,6 @@
<exit_rate>Exit rate</exit_rate>
</columns>
<reportData>
- <row>
- <label>space</label>
- <nb_visits>4</nb_visits>
- <nb_hits>4</nb_hits>
- <bounce_rate>0%</bounce_rate>
- <avg_time_on_page>00:06:00</avg_time_on_page>
- <exit_rate>0%</exit_rate>
- </row>
<row>
<label>grue</label>
<nb_visits>4</nb_visits>
@@ -56,12 +48,22 @@
<avg_time_on_page>00:00:00</avg_time_on_page>
<exit_rate>100%</exit_rate>
</row>
+ <row>
+ <label>space</label>
+ <nb_visits>4</nb_visits>
+ <nb_hits>4</nb_hits>
+ <bounce_rate>0%</bounce_rate>
+ <avg_time_on_page>00:06:00</avg_time_on_page>
+ <exit_rate>0%</exit_rate>
+ </row>
</reportData>
<reportMetadata>
<row>
+
<idsubdatatable>2687</idsubdatatable>
</row>
<row>
+
<idsubdatatable>2688</idsubdatatable>
</row>
</reportMetadata>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Site 1</website>
- <prettyDate>Sunday, January 3, 2010</prettyDate>
+ <prettyDate>Sunday 3 January 2010</prettyDate>
<metadata>
<category>Visits Summary</category>
<name>Visits by Server Time</name>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>new name</website>
- <prettyDate>Week March 1 – 7, 2010</prettyDate>
+ <prettyDate>Week 1 March - 7 March 2010</prettyDate>
<metadata>
<category>Actions</category>
<name>Page URLs</name>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>new name</website>
- <prettyDate>Saturday, March 6, 2010</prettyDate>
+ <prettyDate>Saturday 6 March 2010</prettyDate>
<metadata>
<category>Actions</category>
<name>Page titles</name>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>new name</website>
- <prettyDate>Saturday, March 6, 2010</prettyDate>
+ <prettyDate>Saturday 6 March 2010</prettyDate>
<metadata>
<category>Visits Summary</category>
<name>Visits by Server Time</name>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>new name</website>
- <prettyDate>Saturday, March 6, 2010</prettyDate>
+ <prettyDate>Saturday 6 March 2010</prettyDate>
<metadata>
<category>Actions</category>
<name>Page titles</name>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>new name</website>
- <prettyDate>Saturday, March 6, 2010</prettyDate>
+ <prettyDate>Saturday 6 March 2010</prettyDate>
<metadata>
<category>Visits Summary</category>
<name>Visits Summary</name>
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 @@
<url>http://piwik.net/</url>
<pageTitle />
<pageIdAction>1</pageIdAction>
- <serverTimePretty>Apr 7, 2013 10:00:00 AM</serverTimePretty>
+ <serverTimePretty>Sun 7 Apr 10:00:00</serverTimePretty>
<pageId>1</pageId>
<customVariables>
<row>
@@ -91,10 +91,10 @@
<plugins />
<pluginsIcons />
<serverTimestamp>1365328800</serverTimestamp>
- <serverTimePretty>10:00:00 AM</serverTimePretty>
- <serverDatePretty>Sunday, April 7, 2013</serverDatePretty>
- <serverDatePrettyFirstAction>Sunday, April 7, 2013</serverDatePrettyFirstAction>
- <serverTimePrettyFirstAction>10:00:00 AM</serverTimePrettyFirstAction>
+ <serverTimePretty>10:00:00</serverTimePretty>
+ <serverDatePretty>Sunday 7 April 2013</serverDatePretty>
+ <serverDatePrettyFirstAction>Sunday 7 April 2013</serverDatePrettyFirstAction>
+ <serverTimePrettyFirstAction>10:00:00</serverTimePrettyFirstAction>
</row>
<row>
<idSite>1</idSite>
@@ -106,7 +106,7 @@
<url>http://piwik.net/</url>
<pageTitle />
<pageIdAction>1</pageIdAction>
- <serverTimePretty>Apr 6, 2013 11:00:00 AM</serverTimePretty>
+ <serverTimePretty>Sat 6 Apr 11:00:00</serverTimePretty>
<pageId>2</pageId>
<customVariables>
<row>
@@ -187,10 +187,10 @@
<plugins />
<pluginsIcons />
<serverTimestamp>1365246000</serverTimestamp>
- <serverTimePretty>11:00:00 AM</serverTimePretty>
- <serverDatePretty>Saturday, April 6, 2013</serverDatePretty>
- <serverDatePrettyFirstAction>Saturday, April 6, 2013</serverDatePrettyFirstAction>
- <serverTimePrettyFirstAction>11:00:00 AM</serverTimePrettyFirstAction>
+ <serverTimePretty>11:00:00</serverTimePretty>
+ <serverDatePretty>Saturday 6 April 2013</serverDatePretty>
+ <serverDatePrettyFirstAction>Saturday 6 April 2013</serverDatePrettyFirstAction>
+ <serverTimePrettyFirstAction>11:00:00</serverTimePrettyFirstAction>
</row>
<row>
<idSite>1</idSite>
@@ -202,7 +202,7 @@
<url>http://piwik.net/</url>
<pageTitle />
<pageIdAction>1</pageIdAction>
- <serverTimePretty>Apr 5, 2013 12:00:00 PM</serverTimePretty>
+ <serverTimePretty>Fri 5 Apr 12:00:00</serverTimePretty>
<pageId>3</pageId>
<customVariables>
<row>
@@ -283,9 +283,9 @@
<plugins />
<pluginsIcons />
<serverTimestamp>1365163200</serverTimestamp>
- <serverTimePretty>12:00:00 PM</serverTimePretty>
- <serverDatePretty>Friday, April 5, 2013</serverDatePretty>
- <serverDatePrettyFirstAction>Friday, April 5, 2013</serverDatePrettyFirstAction>
- <serverTimePrettyFirstAction>12:00:00 PM</serverTimePrettyFirstAction>
+ <serverTimePretty>12:00:00</serverTimePretty>
+ <serverDatePretty>Friday 5 April 2013</serverDatePretty>
+ <serverDatePrettyFirstAction>Friday 5 April 2013</serverDatePrettyFirstAction>
+ <serverTimePrettyFirstAction>12:00:00</serverTimePrettyFirstAction>
</row>
</result>
\ 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 @@
<result date="2010-01-01" />
<result date="2010-01-02" />
<result date="2010-01-03">
+ <row>
+ <col name="label">search term 4</col>
+ <col name="1. Melbourne, Victoria, Australia">0</col>
+ <col name="2. Toronto, Ontario, Canada">2</col>
+ <col name="3. Yokohama, Kanagawa, Japan">0</col>
+ </row>
+ <row>
+ <col name="label">that search term</col>
+ <col name="1. Melbourne, Victoria, Australia">2</col>
+ <col name="2. Toronto, Ontario, Canada">0</col>
+ <col name="3. Yokohama, Kanagawa, Japan">0</col>
+ </row>
<row>
<col name="label">search term 1</col>
<col name="1. Melbourne, Victoria, Australia">0</col>
@@ -11,10 +23,10 @@
<col name="3. Yokohama, Kanagawa, Japan">1</col>
</row>
<row>
- <col name="label">search term 2</col>
- <col name="1. Melbourne, Victoria, Australia">0</col>
+ <col name="label">this search term</col>
+ <col name="1. Melbourne, Victoria, Australia">2</col>
<col name="2. Toronto, Ontario, Canada">0</col>
- <col name="3. Yokohama, Kanagawa, Japan">2</col>
+ <col name="3. Yokohama, Kanagawa, Japan">1</col>
</row>
<row>
<col name="label">search term 3</col>
@@ -23,22 +35,10 @@
<col name="3. Yokohama, Kanagawa, Japan">0</col>
</row>
<row>
- <col name="label">search term 4</col>
+ <col name="label">search term 2</col>
<col name="1. Melbourne, Victoria, Australia">0</col>
- <col name="2. Toronto, Ontario, Canada">2</col>
- <col name="3. Yokohama, Kanagawa, Japan">0</col>
- </row>
- <row>
- <col name="label">that search term</col>
- <col name="1. Melbourne, Victoria, Australia">2</col>
<col name="2. Toronto, Ontario, Canada">0</col>
- <col name="3. Yokohama, Kanagawa, Japan">0</col>
- </row>
- <row>
- <col name="label">this search term</col>
- <col name="1. Melbourne, Victoria, Australia">2</col>
- <col name="2. Toronto, Ontario, Canada">0</col>
- <col name="3. Yokohama, Kanagawa, Japan">1</col>
+ <col name="3. Yokohama, Kanagawa, Japan">2</col>
</row>
</result>
<result date="2010-01-04" />
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
+ <row>
+ <col name="label">search term 4</col>
+ <col name="1. Melbourne, Victoria, Australia">0</col>
+ <col name="Others">2</col>
+ </row>
+ <row>
+ <col name="label">that search term</col>
+ <col name="1. Melbourne, Victoria, Australia">2</col>
+ <col name="Others">0</col>
+ </row>
<row>
<col name="label">search term 1</col>
<col name="1. Melbourne, Victoria, Australia">0</col>
<col name="Others">1</col>
</row>
<row>
- <col name="label">search term 2</col>
- <col name="1. Melbourne, Victoria, Australia">0</col>
- <col name="Others">2</col>
+ <col name="label">this search term</col>
+ <col name="1. Melbourne, Victoria, Australia">2</col>
+ <col name="Others">1</col>
</row>
<row>
<col name="label">search term 3</col>
@@ -16,18 +26,8 @@
<col name="Others">2</col>
</row>
<row>
- <col name="label">search term 4</col>
+ <col name="label">search term 2</col>
<col name="1. Melbourne, Victoria, Australia">0</col>
<col name="Others">2</col>
</row>
- <row>
- <col name="label">that search term</col>
- <col name="1. Melbourne, Victoria, Australia">2</col>
- <col name="Others">0</col>
- </row>
- <row>
- <col name="label">this search term</col>
- <col name="1. Melbourne, Victoria, Australia">2</col>
- <col name="Others">1</col>
- </row>
</result>
\ 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 ab0c4340e4d2f04b383d8116e9e35d7660e4dece..83cabc249a1ac725e5852bfa3754768a9faff51d 100644
GIT binary patch
delta 32
ocmX@be2RI(i^&O$c9T6AB__TQm^_bBXW}=h$rg+nlLZ+00Mv;KX8-^I
delta 33
rcmV++0N($~1Ih!C=#xGH5R-fX7?ZpK4wIq*8k3X(D3RzslTHCF)piTu
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<row>
- <col name="label">0</col>
+ <col name="label">4</col>
<col name="1. /index">1</col>
<col name="2. /13">0</col>
<col name="3. /12">0</col>
<col name="4. /9">0</col>
<col name="5. /14">0</col>
<col name="6. /15">0</col>
- <col name="7. /19">0</col>
- <col name="8. /18">0</col>
- <col name="9. /17">0</col>
- <col name="10. /16">0</col>
+ <col name="7. /19">1</col>
+ <col name="8. /18">1</col>
+ <col name="9. /17">1</col>
+ <col name="10. /16">1</col>
<col name="11. /8">0</col>
<col name="12. /11">0</col>
- <col name="13. /2">1</col>
- <col name="14. /1">1</col>
- <col name="15. /0">1</col>
- <col name="16. /3">1</col>
+ <col name="13. /2">0</col>
+ <col name="14. /1">0</col>
+ <col name="15. /0">0</col>
+ <col name="16. /3">0</col>
<col name="17. /4">0</col>
<col name="18. /7">0</col>
<col name="19. /6">0</col>
@@ -25,13 +25,13 @@
<col name="21. /10">0</col>
</row>
<row>
- <col name="label">1</col>
+ <col name="label">3</col>
<col name="1. /index">1</col>
- <col name="2. /13">0</col>
- <col name="3. /12">0</col>
+ <col name="2. /13">1</col>
+ <col name="3. /12">1</col>
<col name="4. /9">0</col>
- <col name="5. /14">0</col>
- <col name="6. /15">0</col>
+ <col name="5. /14">1</col>
+ <col name="6. /15">1</col>
<col name="7. /19">0</col>
<col name="8. /18">0</col>
<col name="9. /17">0</col>
@@ -42,10 +42,10 @@
<col name="14. /1">0</col>
<col name="15. /0">0</col>
<col name="16. /3">0</col>
- <col name="17. /4">1</col>
- <col name="18. /7">1</col>
- <col name="19. /6">1</col>
- <col name="20. /5">1</col>
+ <col name="17. /4">0</col>
+ <col name="18. /7">0</col>
+ <col name="19. /6">0</col>
+ <col name="20. /5">0</col>
<col name="21. /10">0</col>
</row>
<row>
@@ -73,13 +73,13 @@
<col name="21. /10">1</col>
</row>
<row>
- <col name="label">3</col>
+ <col name="label">1</col>
<col name="1. /index">1</col>
- <col name="2. /13">1</col>
- <col name="3. /12">1</col>
+ <col name="2. /13">0</col>
+ <col name="3. /12">0</col>
<col name="4. /9">0</col>
- <col name="5. /14">1</col>
- <col name="6. /15">1</col>
+ <col name="5. /14">0</col>
+ <col name="6. /15">0</col>
<col name="7. /19">0</col>
<col name="8. /18">0</col>
<col name="9. /17">0</col>
@@ -90,30 +90,30 @@
<col name="14. /1">0</col>
<col name="15. /0">0</col>
<col name="16. /3">0</col>
- <col name="17. /4">0</col>
- <col name="18. /7">0</col>
- <col name="19. /6">0</col>
- <col name="20. /5">0</col>
+ <col name="17. /4">1</col>
+ <col name="18. /7">1</col>
+ <col name="19. /6">1</col>
+ <col name="20. /5">1</col>
<col name="21. /10">0</col>
</row>
<row>
- <col name="label">4</col>
+ <col name="label">0</col>
<col name="1. /index">1</col>
<col name="2. /13">0</col>
<col name="3. /12">0</col>
<col name="4. /9">0</col>
<col name="5. /14">0</col>
<col name="6. /15">0</col>
- <col name="7. /19">1</col>
- <col name="8. /18">1</col>
- <col name="9. /17">1</col>
- <col name="10. /16">1</col>
+ <col name="7. /19">0</col>
+ <col name="8. /18">0</col>
+ <col name="9. /17">0</col>
+ <col name="10. /16">0</col>
<col name="11. /8">0</col>
<col name="12. /11">0</col>
- <col name="13. /2">0</col>
- <col name="14. /1">0</col>
- <col name="15. /0">0</col>
- <col name="16. /3">0</col>
+ <col name="13. /2">1</col>
+ <col name="14. /1">1</col>
+ <col name="15. /0">1</col>
+ <col name="16. /3">1</col>
<col name="17. /4">0</col>
<col name="18. /7">0</col>
<col name="19. /6">0</col>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
+ <row>
+ <col name="label">search term 4</col>
+ <col name="1. Melbourne, Victoria, Australia">0</col>
+ <col name="2. Toronto, Ontario, Canada">2</col>
+ <col name="3. Yokohama, Kanagawa, Japan">0</col>
+ </row>
+ <row>
+ <col name="label">that search term</col>
+ <col name="1. Melbourne, Victoria, Australia">2</col>
+ <col name="2. Toronto, Ontario, Canada">0</col>
+ <col name="3. Yokohama, Kanagawa, Japan">0</col>
+ </row>
<row>
<col name="label">search term 1</col>
<col name="1. Melbourne, Victoria, Australia">0</col>
@@ -7,10 +19,10 @@
<col name="3. Yokohama, Kanagawa, Japan">1</col>
</row>
<row>
- <col name="label">search term 2</col>
- <col name="1. Melbourne, Victoria, Australia">0</col>
+ <col name="label">this search term</col>
+ <col name="1. Melbourne, Victoria, Australia">2</col>
<col name="2. Toronto, Ontario, Canada">0</col>
- <col name="3. Yokohama, Kanagawa, Japan">2</col>
+ <col name="3. Yokohama, Kanagawa, Japan">1</col>
</row>
<row>
<col name="label">search term 3</col>
@@ -19,21 +31,9 @@
<col name="3. Yokohama, Kanagawa, Japan">0</col>
</row>
<row>
- <col name="label">search term 4</col>
+ <col name="label">search term 2</col>
<col name="1. Melbourne, Victoria, Australia">0</col>
- <col name="2. Toronto, Ontario, Canada">2</col>
- <col name="3. Yokohama, Kanagawa, Japan">0</col>
- </row>
- <row>
- <col name="label">that search term</col>
- <col name="1. Melbourne, Victoria, Australia">2</col>
<col name="2. Toronto, Ontario, Canada">0</col>
- <col name="3. Yokohama, Kanagawa, Japan">0</col>
- </row>
- <row>
- <col name="label">this search term</col>
- <col name="1. Melbourne, Victoria, Australia">2</col>
- <col name="2. Toronto, Ontario, Canada">0</col>
- <col name="3. Yokohama, Kanagawa, Japan">1</col>
+ <col name="3. Yokohama, Kanagawa, Japan">2</col>
</row>
</result>
\ 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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<row>
- <col name="label">that search term</col>
+ <col name="label">this search term</col>
<col name="1. Melbourne, Victoria, Australia">2</col>
</row>
<row>
- <col name="label">this search term</col>
+ <col name="label">that search term</col>
<col name="1. Melbourne, Victoria, Australia">2</col>
</row>
</result>
\ 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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
+ <row>
+ <col name="label">search term 4</col>
+ <col name="1. Melbourne, Victoria, Australia">0</col>
+ <col name="2. Toronto, Ontario, Canada">2</col>
+ <col name="3. Yokohama, Kanagawa, Japan">0</col>
+ </row>
+ <row>
+ <col name="label">that search term</col>
+ <col name="1. Melbourne, Victoria, Australia">2</col>
+ <col name="2. Toronto, Ontario, Canada">0</col>
+ <col name="3. Yokohama, Kanagawa, Japan">0</col>
+ </row>
<row>
<col name="label">search term 1</col>
<col name="1. Melbourne, Victoria, Australia">0</col>
@@ -7,10 +19,10 @@
<col name="3. Yokohama, Kanagawa, Japan">1</col>
</row>
<row>
- <col name="label">search term 2</col>
- <col name="1. Melbourne, Victoria, Australia">0</col>
+ <col name="label">this search term</col>
+ <col name="1. Melbourne, Victoria, Australia">2</col>
<col name="2. Toronto, Ontario, Canada">0</col>
- <col name="3. Yokohama, Kanagawa, Japan">2</col>
+ <col name="3. Yokohama, Kanagawa, Japan">1</col>
</row>
<row>
<col name="label">search term 3</col>
@@ -19,21 +31,9 @@
<col name="3. Yokohama, Kanagawa, Japan">0</col>
</row>
<row>
- <col name="label">search term 4</col>
+ <col name="label">search term 2</col>
<col name="1. Melbourne, Victoria, Australia">0</col>
- <col name="2. Toronto, Ontario, Canada">2</col>
- <col name="3. Yokohama, Kanagawa, Japan">0</col>
- </row>
- <row>
- <col name="label">that search term</col>
- <col name="1. Melbourne, Victoria, Australia">2</col>
<col name="2. Toronto, Ontario, Canada">0</col>
- <col name="3. Yokohama, Kanagawa, Japan">0</col>
- </row>
- <row>
- <col name="label">this search term</col>
- <col name="1. Melbourne, Victoria, Australia">2</col>
- <col name="2. Toronto, Ontario, Canada">0</col>
- <col name="3. Yokohama, Kanagawa, Japan">1</col>
+ <col name="3. Yokohama, Kanagawa, Japan">2</col>
</row>
</result>
\ 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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<row>
- <col name="label">search term 1</col>
+ <col name="label">search term 4</col>
<col name="1. Google">0</col>
- <col name="2. Yahoo!">0</col>
+ <col name="2. Yahoo!">1</col>
<col name="3. Bing">1</col>
<col name="4. Ask">0</col>
<col name="5. Babylon">0</col>
<col name="6. Alexa">0</col>
</row>
<row>
- <col name="label">search term 2</col>
- <col name="1. Google">0</col>
- <col name="2. Yahoo!">0</col>
- <col name="3. Bing">0</col>
- <col name="4. Ask">0</col>
- <col name="5. Babylon">1</col>
- <col name="6. Alexa">1</col>
- </row>
- <row>
- <col name="label">search term 3</col>
+ <col name="label">that search term</col>
<col name="1. Google">1</col>
- <col name="2. Yahoo!">0</col>
+ <col name="2. Yahoo!">1</col>
<col name="3. Bing">0</col>
- <col name="4. Ask">1</col>
+ <col name="4. Ask">0</col>
<col name="5. Babylon">0</col>
<col name="6. Alexa">0</col>
</row>
<row>
- <col name="label">search term 4</col>
+ <col name="label">search term 1</col>
<col name="1. Google">0</col>
- <col name="2. Yahoo!">1</col>
+ <col name="2. Yahoo!">0</col>
<col name="3. Bing">1</col>
<col name="4. Ask">0</col>
<col name="5. Babylon">0</col>
<col name="6. Alexa">0</col>
</row>
<row>
- <col name="label">that search term</col>
+ <col name="label">this search term</col>
<col name="1. Google">1</col>
<col name="2. Yahoo!">1</col>
<col name="3. Bing">0</col>
- <col name="4. Ask">0</col>
+ <col name="4. Ask">1</col>
<col name="5. Babylon">0</col>
<col name="6. Alexa">0</col>
</row>
<row>
- <col name="label">this search term</col>
+ <col name="label">search term 3</col>
<col name="1. Google">1</col>
- <col name="2. Yahoo!">1</col>
+ <col name="2. Yahoo!">0</col>
<col name="3. Bing">0</col>
<col name="4. Ask">1</col>
<col name="5. Babylon">0</col>
<col name="6. Alexa">0</col>
</row>
+ <row>
+ <col name="label">search term 2</col>
+ <col name="1. Google">0</col>
+ <col name="2. Yahoo!">0</col>
+ <col name="3. Bing">0</col>
+ <col name="4. Ask">0</col>
+ <col name="5. Babylon">1</col>
+ <col name="6. Alexa">1</col>
+ </row>
</result>
\ 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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<row>
- <col name="label">search term 1</col>
+ <col name="label">search term 4</col>
<col name="Google">0</col>
- <col name="Yahoo!">0</col>
+ <col name="Yahoo!">1</col>
<col name="Bing">1</col>
<col name="Ask">0</col>
<col name="Babylon">0</col>
<col name="Alexa">0</col>
</row>
<row>
- <col name="label">search term 2</col>
- <col name="Google">0</col>
- <col name="Yahoo!">0</col>
- <col name="Bing">0</col>
- <col name="Ask">0</col>
- <col name="Babylon">1</col>
- <col name="Alexa">1</col>
- </row>
- <row>
- <col name="label">search term 3</col>
+ <col name="label">that search term</col>
<col name="Google">1</col>
- <col name="Yahoo!">0</col>
+ <col name="Yahoo!">1</col>
<col name="Bing">0</col>
- <col name="Ask">1</col>
+ <col name="Ask">0</col>
<col name="Babylon">0</col>
<col name="Alexa">0</col>
</row>
<row>
- <col name="label">search term 4</col>
+ <col name="label">search term 1</col>
<col name="Google">0</col>
- <col name="Yahoo!">1</col>
+ <col name="Yahoo!">0</col>
<col name="Bing">1</col>
<col name="Ask">0</col>
<col name="Babylon">0</col>
<col name="Alexa">0</col>
</row>
<row>
- <col name="label">that search term</col>
+ <col name="label">this search term</col>
<col name="Google">1</col>
<col name="Yahoo!">1</col>
<col name="Bing">0</col>
- <col name="Ask">0</col>
+ <col name="Ask">1</col>
<col name="Babylon">0</col>
<col name="Alexa">0</col>
</row>
<row>
- <col name="label">this search term</col>
+ <col name="label">search term 3</col>
<col name="Google">1</col>
- <col name="Yahoo!">1</col>
+ <col name="Yahoo!">0</col>
<col name="Bing">0</col>
<col name="Ask">1</col>
<col name="Babylon">0</col>
<col name="Alexa">0</col>
</row>
+ <row>
+ <col name="label">search term 2</col>
+ <col name="Google">0</col>
+ <col name="Yahoo!">0</col>
+ <col name="Bing">0</col>
+ <col name="Ask">0</col>
+ <col name="Babylon">1</col>
+ <col name="Alexa">1</col>
+ </row>
</result>
\ 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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<row>
- <col name="label">search term 1</col>
+ <col name="label">search term 4</col>
<col name="1. Google">0</col>
- <col name="2. Yahoo!">0</col>
+ <col name="2. Yahoo!">1</col>
<col name="3. Bing">1</col>
<col name="4. Ask">0</col>
<col name="5. Babylon">0</col>
<col name="6. Alexa">0</col>
</row>
<row>
- <col name="label">search term 2</col>
- <col name="1. Google">0</col>
- <col name="2. Yahoo!">0</col>
- <col name="3. Bing">0</col>
- <col name="4. Ask">0</col>
- <col name="5. Babylon">1</col>
- <col name="6. Alexa">1</col>
- </row>
- <row>
- <col name="label">search term 3</col>
+ <col name="label">that search term</col>
<col name="1. Google">1</col>
- <col name="2. Yahoo!">0</col>
+ <col name="2. Yahoo!">1</col>
<col name="3. Bing">0</col>
- <col name="4. Ask">1</col>
+ <col name="4. Ask">0</col>
<col name="5. Babylon">0</col>
<col name="6. Alexa">0</col>
</row>
<row>
- <col name="label">search term 4</col>
+ <col name="label">search term 1</col>
<col name="1. Google">0</col>
- <col name="2. Yahoo!">1</col>
+ <col name="2. Yahoo!">0</col>
<col name="3. Bing">1</col>
<col name="4. Ask">0</col>
<col name="5. Babylon">0</col>
<col name="6. Alexa">0</col>
</row>
<row>
- <col name="label">that search term</col>
+ <col name="label">this search term</col>
<col name="1. Google">1</col>
<col name="2. Yahoo!">1</col>
<col name="3. Bing">0</col>
- <col name="4. Ask">0</col>
+ <col name="4. Ask">1</col>
<col name="5. Babylon">0</col>
<col name="6. Alexa">0</col>
</row>
<row>
- <col name="label">this search term</col>
+ <col name="label">search term 3</col>
<col name="1. Google">1</col>
- <col name="2. Yahoo!">1</col>
+ <col name="2. Yahoo!">0</col>
<col name="3. Bing">0</col>
<col name="4. Ask">1</col>
<col name="5. Babylon">0</col>
<col name="6. Alexa">0</col>
</row>
+ <row>
+ <col name="label">search term 2</col>
+ <col name="1. Google">0</col>
+ <col name="2. Yahoo!">0</col>
+ <col name="3. Bing">0</col>
+ <col name="4. Ask">0</col>
+ <col name="5. Babylon">1</col>
+ <col name="6. Alexa">1</col>
+ </row>
</result>
\ 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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Site 1 - Site search</website>
- <prettyDate>January 3 – 9, 2010</prettyDate>
+ <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
<metadata>
<category>Site Search</category>
<name>Page Titles Following a Site Search</name>
@@ -27,7 +27,7 @@
<nb_hits>Total Pageviews</nb_hits>
</columns>
<reportData>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<row>
<label> Im just a page</label>
<nb_hits>1</nb_hits>
@@ -39,21 +39,21 @@
<nb_hits_following_search>1</nb_hits_following_search>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportData>
<reportMetadata>
- <result prettyDate="Sunday, January 3, 2010" />
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Sunday 3 January 2010" />
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportMetadata>
<reportTotal>
<nb_visits>2</nb_visits>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Site 1 - Site search</website>
- <prettyDate>January 1 – July 31, 2010</prettyDate>
+ <prettyDate>1 Jan 10 - 31 Jul 10</prettyDate>
<metadata>
<category>Site Search</category>
<name>Page Titles Following a Site Search</name>
@@ -27,7 +27,7 @@
<nb_hits>Total Pageviews</nb_hits>
</columns>
<reportData>
- <result prettyDate="January 2010">
+ <result prettyDate="2010, January">
<row>
<label> Im just a page</label>
<nb_hits>1</nb_hits>
@@ -39,21 +39,21 @@
<nb_hits_following_search>1</nb_hits_following_search>
</row>
</result>
- <result prettyDate="February 2010" />
- <result prettyDate="March 2010" />
- <result prettyDate="April 2010" />
- <result prettyDate="May 2010" />
- <result prettyDate="June 2010" />
- <result prettyDate="July 2010" />
+ <result prettyDate="2010, February" />
+ <result prettyDate="2010, March" />
+ <result prettyDate="2010, April" />
+ <result prettyDate="2010, May" />
+ <result prettyDate="2010, June" />
+ <result prettyDate="2010, July" />
</reportData>
<reportMetadata>
- <result prettyDate="January 2010" />
- <result prettyDate="February 2010" />
- <result prettyDate="March 2010" />
- <result prettyDate="April 2010" />
- <result prettyDate="May 2010" />
- <result prettyDate="June 2010" />
- <result prettyDate="July 2010" />
+ <result prettyDate="2010, January" />
+ <result prettyDate="2010, February" />
+ <result prettyDate="2010, March" />
+ <result prettyDate="2010, April" />
+ <result prettyDate="2010, May" />
+ <result prettyDate="2010, June" />
+ <result prettyDate="2010, July" />
</reportMetadata>
<reportTotal>
<nb_visits>2</nb_visits>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Site 1 - Site search</website>
- <prettyDate>January 3 – 9, 2010</prettyDate>
+ <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
<metadata>
<category>Actions</category>
<name>Page titles</name>
@@ -40,7 +40,7 @@
<exit_rate>Exit rate</exit_rate>
</columns>
<reportData>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<row>
<label> Im just a page</label>
<nb_visits>1</nb_visits>
@@ -66,21 +66,21 @@
<exit_rate>0%</exit_rate>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportData>
<reportMetadata>
- <result prettyDate="Sunday, January 3, 2010" />
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Sunday 3 January 2010" />
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportMetadata>
<reportTotal>
<nb_visits>3</nb_visits>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Site 1 - Site search</website>
- <prettyDate>January 1 – July 31, 2010</prettyDate>
+ <prettyDate>1 Jan 10 - 31 Jul 10</prettyDate>
<metadata>
<category>Actions</category>
<name>Page titles</name>
@@ -40,7 +40,7 @@
<exit_rate>Exit rate</exit_rate>
</columns>
<reportData>
- <result prettyDate="January 2010">
+ <result prettyDate="2010, January">
<row>
<label> Im just a page</label>
<nb_visits>1</nb_visits>
@@ -66,21 +66,21 @@
<exit_rate>0%</exit_rate>
</row>
</result>
- <result prettyDate="February 2010" />
- <result prettyDate="March 2010" />
- <result prettyDate="April 2010" />
- <result prettyDate="May 2010" />
- <result prettyDate="June 2010" />
- <result prettyDate="July 2010" />
+ <result prettyDate="2010, February" />
+ <result prettyDate="2010, March" />
+ <result prettyDate="2010, April" />
+ <result prettyDate="2010, May" />
+ <result prettyDate="2010, June" />
+ <result prettyDate="2010, July" />
</reportData>
<reportMetadata>
- <result prettyDate="January 2010" />
- <result prettyDate="February 2010" />
- <result prettyDate="March 2010" />
- <result prettyDate="April 2010" />
- <result prettyDate="May 2010" />
- <result prettyDate="June 2010" />
- <result prettyDate="July 2010" />
+ <result prettyDate="2010, January" />
+ <result prettyDate="2010, February" />
+ <result prettyDate="2010, March" />
+ <result prettyDate="2010, April" />
+ <result prettyDate="2010, May" />
+ <result prettyDate="2010, June" />
+ <result prettyDate="2010, July" />
</reportMetadata>
<reportTotal>
<nb_visits>3</nb_visits>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Site 1 - Site search</website>
- <prettyDate>January 3 – 9, 2010</prettyDate>
+ <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
<metadata>
<category>Site Search</category>
<name>Pages Following a Site Search</name>
@@ -27,7 +27,7 @@
<nb_hits>Total Pageviews</nb_hits>
</columns>
<reportData>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<row>
<label>/index.htm</label>
<nb_hits>1</nb_hits>
@@ -39,15 +39,15 @@
<nb_hits_following_search>1</nb_hits_following_search>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportData>
<reportMetadata>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<row>
<url>http://example.org/index.htm</url>
</row>
@@ -55,12 +55,12 @@
<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportMetadata>
<reportTotal>
<nb_visits>2</nb_visits>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Site 1 - Site search</website>
- <prettyDate>January 1 – July 31, 2010</prettyDate>
+ <prettyDate>1 Jan 10 - 31 Jul 10</prettyDate>
<metadata>
<category>Site Search</category>
<name>Pages Following a Site Search</name>
@@ -27,7 +27,7 @@
<nb_hits>Total Pageviews</nb_hits>
</columns>
<reportData>
- <result prettyDate="January 2010">
+ <result prettyDate="2010, January">
<row>
<label>/index.htm</label>
<nb_hits>1</nb_hits>
@@ -39,15 +39,15 @@
<nb_hits_following_search>1</nb_hits_following_search>
</row>
</result>
- <result prettyDate="February 2010" />
- <result prettyDate="March 2010" />
- <result prettyDate="April 2010" />
- <result prettyDate="May 2010" />
- <result prettyDate="June 2010" />
- <result prettyDate="July 2010" />
+ <result prettyDate="2010, February" />
+ <result prettyDate="2010, March" />
+ <result prettyDate="2010, April" />
+ <result prettyDate="2010, May" />
+ <result prettyDate="2010, June" />
+ <result prettyDate="2010, July" />
</reportData>
<reportMetadata>
- <result prettyDate="January 2010">
+ <result prettyDate="2010, January">
<row>
<url>http://example.org/index.htm</url>
</row>
@@ -55,12 +55,12 @@
<url>http://example.org/index.htm?random=PAGEVIEW, NOT SEARCH&mykwd=&IS_FOLLOWING_SEARCH ONCE</url>
</row>
</result>
- <result prettyDate="February 2010" />
- <result prettyDate="March 2010" />
- <result prettyDate="April 2010" />
- <result prettyDate="May 2010" />
- <result prettyDate="June 2010" />
- <result prettyDate="July 2010" />
+ <result prettyDate="2010, February" />
+ <result prettyDate="2010, March" />
+ <result prettyDate="2010, April" />
+ <result prettyDate="2010, May" />
+ <result prettyDate="2010, June" />
+ <result prettyDate="2010, July" />
</reportMetadata>
<reportTotal>
<nb_visits>2</nb_visits>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Site 1 - Site search</website>
- <prettyDate>January 3 – 9, 2010</prettyDate>
+ <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
<metadata>
<category>Actions</category>
<name>Page URLs</name>
@@ -40,7 +40,7 @@
<exit_rate>Exit rate</exit_rate>
</columns>
<reportData>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<row>
<label>/index.htm</label>
<nb_visits>1</nb_visits>
@@ -66,15 +66,15 @@
<exit_rate>0%</exit_rate>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportData>
<reportMetadata>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<row>
<url>http://example.org/index.htm</url>
<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
@@ -88,12 +88,12 @@
<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26mykwd%3D%26IS_FOLLOWING_SEARCH+ONCE</segment>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportMetadata>
<reportTotal>
<nb_visits>3</nb_visits>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Site 1 - Site search</website>
- <prettyDate>January 1 – July 31, 2010</prettyDate>
+ <prettyDate>1 Jan 10 - 31 Jul 10</prettyDate>
<metadata>
<category>Actions</category>
<name>Page URLs</name>
@@ -40,7 +40,7 @@
<exit_rate>Exit rate</exit_rate>
</columns>
<reportData>
- <result prettyDate="January 2010">
+ <result prettyDate="2010, January">
<row>
<label>/index.htm</label>
<nb_visits>1</nb_visits>
@@ -66,15 +66,15 @@
<exit_rate>0%</exit_rate>
</row>
</result>
- <result prettyDate="February 2010" />
- <result prettyDate="March 2010" />
- <result prettyDate="April 2010" />
- <result prettyDate="May 2010" />
- <result prettyDate="June 2010" />
- <result prettyDate="July 2010" />
+ <result prettyDate="2010, February" />
+ <result prettyDate="2010, March" />
+ <result prettyDate="2010, April" />
+ <result prettyDate="2010, May" />
+ <result prettyDate="2010, June" />
+ <result prettyDate="2010, July" />
</reportData>
<reportMetadata>
- <result prettyDate="January 2010">
+ <result prettyDate="2010, January">
<row>
<url>http://example.org/index.htm</url>
<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
@@ -88,12 +88,12 @@
<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm%3Frandom%3DPAGEVIEW%2C+NOT+SEARCH%26mykwd%3D%26IS_FOLLOWING_SEARCH+ONCE</segment>
</row>
</result>
- <result prettyDate="February 2010" />
- <result prettyDate="March 2010" />
- <result prettyDate="April 2010" />
- <result prettyDate="May 2010" />
- <result prettyDate="June 2010" />
- <result prettyDate="July 2010" />
+ <result prettyDate="2010, February" />
+ <result prettyDate="2010, March" />
+ <result prettyDate="2010, April" />
+ <result prettyDate="2010, May" />
+ <result prettyDate="2010, June" />
+ <result prettyDate="2010, July" />
</reportMetadata>
<reportTotal>
<nb_visits>3</nb_visits>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Site 1 - Site search</website>
- <prettyDate>January 3 – 9, 2010</prettyDate>
+ <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
<metadata>
<category>Site Search</category>
<name>Search Categories</name>
@@ -30,7 +30,7 @@
<exit_rate>% Search Exits</exit_rate>
</columns>
<reportData>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<row>
<label>Search Category</label>
<nb_visits>2</nb_visits>
@@ -38,7 +38,7 @@
<exit_rate>0%</exit_rate>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010">
+ <result prettyDate="Monday 4 January 2010">
<row>
<label>Bad No Result Category :(</label>
<nb_visits>1</nb_visits>
@@ -54,8 +54,8 @@
</result>
</reportData>
<reportMetadata>
- <result prettyDate="Sunday, January 3, 2010" />
- <result prettyDate="Monday, January 4, 2010" />
+ <result prettyDate="Sunday 3 January 2010" />
+ <result prettyDate="Monday 4 January 2010" />
</reportMetadata>
<reportTotal>
<nb_visits>4</nb_visits>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Site 1 - Site search</website>
- <prettyDate>January 1 – July 31, 2010</prettyDate>
+ <prettyDate>1 Jan 10 - 31 Jul 10</prettyDate>
<metadata>
<category>Site Search</category>
<name>Search Categories</name>
@@ -30,7 +30,7 @@
<exit_rate>% Search Exits</exit_rate>
</columns>
<reportData>
- <result prettyDate="January 2010">
+ <result prettyDate="2010, January">
<row>
<label>Search Category</label>
<nb_visits>2</nb_visits>
@@ -52,7 +52,7 @@
</result>
</reportData>
<reportMetadata>
- <result prettyDate="January 2010" />
+ <result prettyDate="2010, January" />
</reportMetadata>
<reportTotal>
<nb_visits>4</nb_visits>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Site 1 - Site search</website>
- <prettyDate>January 3 – 9, 2010</prettyDate>
+ <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
<metadata>
<category>Site Search</category>
<name>Site Search Keywords</name>
@@ -32,7 +32,7 @@
<exit_rate>% Search Exits</exit_rate>
</columns>
<reportData>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<row>
<label>Search 1</label>
<nb_visits>2</nb_visits>
@@ -52,7 +52,7 @@
<exit_rate>0%</exit_rate>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010">
+ <result prettyDate="Monday 4 January 2010">
<row>
<label>Final tüte Keyword Searched for now</label>
<nb_visits>1</nb_visits>
@@ -72,20 +72,20 @@
<exit_rate>0%</exit_rate>
</row>
</result>
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportData>
<reportMetadata>
- <result prettyDate="Sunday, January 3, 2010" />
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Sunday 3 January 2010" />
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportMetadata>
<reportTotal>
<nb_visits>8</nb_visits>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Site 1 - Site search</website>
- <prettyDate>January 1 – July 31, 2010</prettyDate>
+ <prettyDate>1 Jan 10 - 31 Jul 10</prettyDate>
<metadata>
<category>Site Search</category>
<name>Site Search Keywords</name>
@@ -32,7 +32,7 @@
<exit_rate>% Search Exits</exit_rate>
</columns>
<reportData>
- <result prettyDate="January 2010">
+ <result prettyDate="2010, January">
<row>
<label>No Result Keyword!</label>
<nb_visits>2</nb_visits>
@@ -64,21 +64,21 @@
<exit_rate>0%</exit_rate>
</row>
</result>
- <result prettyDate="February 2010" />
- <result prettyDate="March 2010" />
- <result prettyDate="April 2010" />
- <result prettyDate="May 2010" />
- <result prettyDate="June 2010" />
- <result prettyDate="July 2010" />
+ <result prettyDate="2010, February" />
+ <result prettyDate="2010, March" />
+ <result prettyDate="2010, April" />
+ <result prettyDate="2010, May" />
+ <result prettyDate="2010, June" />
+ <result prettyDate="2010, July" />
</reportData>
<reportMetadata>
- <result prettyDate="January 2010" />
- <result prettyDate="February 2010" />
- <result prettyDate="March 2010" />
- <result prettyDate="April 2010" />
- <result prettyDate="May 2010" />
- <result prettyDate="June 2010" />
- <result prettyDate="July 2010" />
+ <result prettyDate="2010, January" />
+ <result prettyDate="2010, February" />
+ <result prettyDate="2010, March" />
+ <result prettyDate="2010, April" />
+ <result prettyDate="2010, May" />
+ <result prettyDate="2010, June" />
+ <result prettyDate="2010, July" />
</reportMetadata>
<reportTotal>
<nb_visits>8</nb_visits>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Site 1 - Site search</website>
- <prettyDate>January 3 – 9, 2010</prettyDate>
+ <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
<metadata>
<category>Site Search</category>
<name>Search Keywords with No Results</name>
@@ -29,34 +29,34 @@
<exit_rate>% Search Exits</exit_rate>
</columns>
<reportData>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<row>
<label>No Result Keyword!</label>
<nb_visits>1</nb_visits>
<exit_rate>0%</exit_rate>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010">
+ <result prettyDate="Monday 4 January 2010">
<row>
<label>No Result Keyword!</label>
<nb_visits>1</nb_visits>
<exit_rate>0%</exit_rate>
</row>
</result>
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportData>
<reportMetadata>
- <result prettyDate="Sunday, January 3, 2010" />
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Sunday 3 January 2010" />
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportMetadata>
<reportTotal>
<nb_visits>2</nb_visits>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Site 1 - Site search</website>
- <prettyDate>January 1 – July 31, 2010</prettyDate>
+ <prettyDate>1 Jan 10 - 31 Jul 10</prettyDate>
<metadata>
<category>Site Search</category>
<name>Search Keywords with No Results</name>
@@ -29,28 +29,28 @@
<exit_rate>% Search Exits</exit_rate>
</columns>
<reportData>
- <result prettyDate="January 2010">
+ <result prettyDate="2010, January">
<row>
<label>No Result Keyword!</label>
<nb_visits>2</nb_visits>
<exit_rate>0%</exit_rate>
</row>
</result>
- <result prettyDate="February 2010" />
- <result prettyDate="March 2010" />
- <result prettyDate="April 2010" />
- <result prettyDate="May 2010" />
- <result prettyDate="June 2010" />
- <result prettyDate="July 2010" />
+ <result prettyDate="2010, February" />
+ <result prettyDate="2010, March" />
+ <result prettyDate="2010, April" />
+ <result prettyDate="2010, May" />
+ <result prettyDate="2010, June" />
+ <result prettyDate="2010, July" />
</reportData>
<reportMetadata>
- <result prettyDate="January 2010" />
- <result prettyDate="February 2010" />
- <result prettyDate="March 2010" />
- <result prettyDate="April 2010" />
- <result prettyDate="May 2010" />
- <result prettyDate="June 2010" />
- <result prettyDate="July 2010" />
+ <result prettyDate="2010, January" />
+ <result prettyDate="2010, February" />
+ <result prettyDate="2010, March" />
+ <result prettyDate="2010, April" />
+ <result prettyDate="2010, May" />
+ <result prettyDate="2010, June" />
+ <result prettyDate="2010, July" />
</reportMetadata>
<reportTotal>
<nb_visits>2</nb_visits>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Site 1 - Site search</website>
- <prettyDate>January 3 – 9, 2010</prettyDate>
+ <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
<metadata>
<category>Actions</category>
<name>Actions - Main metrics</name>
@@ -44,7 +44,7 @@
<nb_keywords>Unique Keywords</nb_keywords>
</columns>
<reportData>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<nb_pageviews>4</nb_pageviews>
<nb_uniq_pageviews>3</nb_uniq_pageviews>
<nb_downloads>0</nb_downloads>
@@ -54,7 +54,7 @@
<nb_searches>9</nb_searches>
<nb_keywords>3</nb_keywords>
</result>
- <result prettyDate="Monday, January 4, 2010">
+ <result prettyDate="Monday 4 January 2010">
<nb_pageviews>0</nb_pageviews>
<nb_uniq_pageviews>0</nb_uniq_pageviews>
<nb_downloads>0</nb_downloads>
@@ -64,20 +64,20 @@
<nb_searches>4</nb_searches>
<nb_keywords>3</nb_keywords>
</result>
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportData>
<reportMetadata>
- <result prettyDate="Sunday, January 3, 2010" />
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Sunday 3 January 2010" />
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportMetadata>
<reportTotal>
</reportTotal>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Site 1 - Site search</website>
- <prettyDate>January 1 – July 31, 2010</prettyDate>
+ <prettyDate>1 Jan 10 - 31 Jul 10</prettyDate>
<metadata>
<category>Actions</category>
<name>Actions - Main metrics</name>
@@ -44,7 +44,7 @@
<nb_keywords>Unique Keywords</nb_keywords>
</columns>
<reportData>
- <result prettyDate="January 2010">
+ <result prettyDate="2010, January">
<nb_pageviews>4</nb_pageviews>
<nb_uniq_pageviews>3</nb_uniq_pageviews>
<nb_downloads>0</nb_downloads>
@@ -54,21 +54,21 @@
<nb_searches>13</nb_searches>
<nb_keywords>5</nb_keywords>
</result>
- <result prettyDate="February 2010" />
- <result prettyDate="March 2010" />
- <result prettyDate="April 2010" />
- <result prettyDate="May 2010" />
- <result prettyDate="June 2010" />
- <result prettyDate="July 2010" />
+ <result prettyDate="2010, February" />
+ <result prettyDate="2010, March" />
+ <result prettyDate="2010, April" />
+ <result prettyDate="2010, May" />
+ <result prettyDate="2010, June" />
+ <result prettyDate="2010, July" />
</reportData>
<reportMetadata>
- <result prettyDate="January 2010" />
- <result prettyDate="February 2010" />
- <result prettyDate="March 2010" />
- <result prettyDate="April 2010" />
- <result prettyDate="May 2010" />
- <result prettyDate="June 2010" />
- <result prettyDate="July 2010" />
+ <result prettyDate="2010, January" />
+ <result prettyDate="2010, February" />
+ <result prettyDate="2010, March" />
+ <result prettyDate="2010, April" />
+ <result prettyDate="2010, May" />
+ <result prettyDate="2010, June" />
+ <result prettyDate="2010, July" />
</reportMetadata>
<reportTotal>
</reportTotal>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Site 1 - Site search</website>
- <prettyDate>January 3 – 9, 2010</prettyDate>
+ <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
<metadata>
<category>Visitors</category>
<name>Custom Variables</name>
@@ -54,7 +54,7 @@
<revenue>Revenue</revenue>
</columns>
<reportData>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<row>
<label>_pk_scount</label>
<nb_visits>4</nb_visits>
@@ -78,7 +78,7 @@
<revenue>$ 0</revenue>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010">
+ <result prettyDate="Monday 4 January 2010">
<row>
<label>_pk_scount</label>
<nb_visits>3</nb_visits>
@@ -102,14 +102,14 @@
<revenue>$ 0</revenue>
</row>
</result>
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportData>
<reportMetadata>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<row>
<segment>customVariableName==_pk_scount</segment>
@@ -121,7 +121,7 @@
<idsubdatatable>3172</idsubdatatable>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010">
+ <result prettyDate="Monday 4 January 2010">
<row>
<segment>customVariableName==_pk_scount</segment>
@@ -133,11 +133,11 @@
<idsubdatatable>3175</idsubdatatable>
</row>
</result>
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportMetadata>
<reportTotal>
<nb_visits>11</nb_visits>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Site 1 - Site search</website>
- <prettyDate>January 1 – July 31, 2010</prettyDate>
+ <prettyDate>1 Jan 10 - 31 Jul 10</prettyDate>
<metadata>
<category>Visitors</category>
<name>Custom Variables</name>
@@ -50,7 +50,7 @@
<revenue>Revenue</revenue>
</columns>
<reportData>
- <result prettyDate="January 2010">
+ <result prettyDate="2010, January">
<row>
<label>_pk_scount</label>
<nb_visits>7</nb_visits>
@@ -70,15 +70,15 @@
<revenue>$ 0</revenue>
</row>
</result>
- <result prettyDate="February 2010" />
- <result prettyDate="March 2010" />
- <result prettyDate="April 2010" />
- <result prettyDate="May 2010" />
- <result prettyDate="June 2010" />
- <result prettyDate="July 2010" />
+ <result prettyDate="2010, February" />
+ <result prettyDate="2010, March" />
+ <result prettyDate="2010, April" />
+ <result prettyDate="2010, May" />
+ <result prettyDate="2010, June" />
+ <result prettyDate="2010, July" />
</reportData>
<reportMetadata>
- <result prettyDate="January 2010">
+ <result prettyDate="2010, January">
<row>
<segment>customVariableName==_pk_scount</segment>
@@ -90,12 +90,12 @@
<idsubdatatable>3197</idsubdatatable>
</row>
</result>
- <result prettyDate="February 2010" />
- <result prettyDate="March 2010" />
- <result prettyDate="April 2010" />
- <result prettyDate="May 2010" />
- <result prettyDate="June 2010" />
- <result prettyDate="July 2010" />
+ <result prettyDate="2010, February" />
+ <result prettyDate="2010, March" />
+ <result prettyDate="2010, April" />
+ <result prettyDate="2010, May" />
+ <result prettyDate="2010, June" />
+ <result prettyDate="2010, July" />
</reportMetadata>
<reportTotal>
<nb_visits>11</nb_visits>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <date>Sat, Mar 6</date>
+ <date>Sat 6 Mar</date>
<previousPages>
<row>
<label>example.org/the/third_page.html?foo=bar</label>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <date>Sat, Mar 6</date>
+ <date>Sat 6 Mar</date>
<previousPages>
<row>
<label>page title - the/third_page.html?foo=bar</label>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <date>Sat, Mar 6</date>
+ <date>Sat 6 Mar</date>
<previousPages>
<row>
<label>example.org/the/third_page.html?foo=bar</label>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Site 1</website>
- <prettyDate>January 3 – 9, 2010</prettyDate>
+ <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
<metadata>
<category>Actions</category>
<name>Outlinks</name>
@@ -28,22 +28,22 @@
<nb_hits>Clicks</nb_hits>
</columns>
<reportData>
- <result prettyDate="Sunday, January 3, 2010" />
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Sunday 3 January 2010" />
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportData>
<reportMetadata>
- <result prettyDate="Sunday, January 3, 2010" />
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Sunday 3 January 2010" />
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportMetadata>
<reportTotal>
</reportTotal>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Site 1</website>
- <prettyDate>January 3 – 9, 2010</prettyDate>
+ <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
<metadata>
<category>Actions</category>
<name>Page titles</name>
@@ -42,7 +42,7 @@
<avg_time_generation>Avg. generation time</avg_time_generation>
</columns>
<reportData>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<row>
<label> first page view</label>
<nb_visits>2</nb_visits>
@@ -53,7 +53,7 @@
<avg_time_generation>0.14s</avg_time_generation>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010">
+ <result prettyDate="Monday 4 January 2010">
<row>
<label>Page Name not defined</label>
<nb_visits>1</nb_visits>
@@ -64,7 +64,7 @@
<avg_time_generation>0.22s</avg_time_generation>
</row>
</result>
- <result prettyDate="Tuesday, January 5, 2010">
+ <result prettyDate="Tuesday 5 January 2010">
<row>
<label>second visitor</label>
<nb_visits>2</nb_visits>
@@ -84,7 +84,7 @@
<avg_time_generation>0.45s</avg_time_generation>
</row>
</result>
- <result prettyDate="Wednesday, January 6, 2010">
+ <result prettyDate="Wednesday 6 January 2010">
<row>
<label>second visitor</label>
<nb_visits>2</nb_visits>
@@ -104,7 +104,7 @@
<avg_time_generation>0.45s</avg_time_generation>
</row>
</result>
- <result prettyDate="Thursday, January 7, 2010">
+ <result prettyDate="Thursday 7 January 2010">
<row>
<label>second visitor</label>
<nb_visits>2</nb_visits>
@@ -124,7 +124,7 @@
<avg_time_generation>0.45s</avg_time_generation>
</row>
</result>
- <result prettyDate="Friday, January 8, 2010">
+ <result prettyDate="Friday 8 January 2010">
<row>
<label>second visitor</label>
<nb_visits>2</nb_visits>
@@ -144,7 +144,7 @@
<avg_time_generation>0.45s</avg_time_generation>
</row>
</result>
- <result prettyDate="Saturday, January 9, 2010">
+ <result prettyDate="Saturday 9 January 2010">
<row>
<label>second visitor</label>
<nb_visits>2</nb_visits>
@@ -166,9 +166,9 @@
</result>
</reportData>
<reportMetadata>
- <result prettyDate="Sunday, January 3, 2010" />
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010">
+ <result prettyDate="Sunday 3 January 2010" />
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010">
<row>
<idsubdatatable>1956</idsubdatatable>
@@ -178,7 +178,7 @@
<idsubdatatable>1955</idsubdatatable>
</row>
</result>
- <result prettyDate="Wednesday, January 6, 2010">
+ <result prettyDate="Wednesday 6 January 2010">
<row>
<idsubdatatable>1960</idsubdatatable>
@@ -188,7 +188,7 @@
<idsubdatatable>1959</idsubdatatable>
</row>
</result>
- <result prettyDate="Thursday, January 7, 2010">
+ <result prettyDate="Thursday 7 January 2010">
<row>
<idsubdatatable>1964</idsubdatatable>
@@ -198,7 +198,7 @@
<idsubdatatable>1963</idsubdatatable>
</row>
</result>
- <result prettyDate="Friday, January 8, 2010">
+ <result prettyDate="Friday 8 January 2010">
<row>
<idsubdatatable>1968</idsubdatatable>
@@ -208,7 +208,7 @@
<idsubdatatable>1967</idsubdatatable>
</row>
</result>
- <result prettyDate="Saturday, January 9, 2010">
+ <result prettyDate="Saturday 9 January 2010">
<row>
<idsubdatatable>1972</idsubdatatable>
@@ -229,4 +229,4 @@
<exit_nb_visits>7</exit_nb_visits>
<exit_nb_uniq_visitors>2</exit_nb_uniq_visitors>
</reportTotal>
-</result>
\ No newline at end of file
+</result>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Site 1</website>
- <prettyDate>January 3 – 9, 2010</prettyDate>
+ <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
<metadata>
<category>Actions</category>
<name>Page URLs</name>
@@ -42,7 +42,7 @@
<avg_time_generation>Avg. generation time</avg_time_generation>
</columns>
<reportData>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<row>
<label>/index.htm</label>
<nb_visits>1</nb_visits>
@@ -62,7 +62,7 @@
<avg_time_generation>0.15s</avg_time_generation>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010">
+ <result prettyDate="Monday 4 January 2010">
<row>
<label>Page URL not defined</label>
<nb_visits>1</nb_visits>
@@ -73,7 +73,7 @@
<avg_time_generation>0.22s</avg_time_generation>
</row>
</result>
- <result prettyDate="Tuesday, January 5, 2010">
+ <result prettyDate="Tuesday 5 January 2010">
<row>
<label>/index.htm</label>
<nb_visits>1</nb_visits>
@@ -102,7 +102,7 @@
<avg_time_generation>0s</avg_time_generation>
</row>
</result>
- <result prettyDate="Wednesday, January 6, 2010">
+ <result prettyDate="Wednesday 6 January 2010">
<row>
<label>/index.htm</label>
<nb_visits>1</nb_visits>
@@ -131,7 +131,7 @@
<avg_time_generation>0s</avg_time_generation>
</row>
</result>
- <result prettyDate="Thursday, January 7, 2010">
+ <result prettyDate="Thursday 7 January 2010">
<row>
<label>/index.htm</label>
<nb_visits>1</nb_visits>
@@ -160,7 +160,7 @@
<avg_time_generation>0s</avg_time_generation>
</row>
</result>
- <result prettyDate="Friday, January 8, 2010">
+ <result prettyDate="Friday 8 January 2010">
<row>
<label>/index.htm</label>
<nb_visits>1</nb_visits>
@@ -189,7 +189,7 @@
<avg_time_generation>0s</avg_time_generation>
</row>
</result>
- <result prettyDate="Saturday, January 9, 2010">
+ <result prettyDate="Saturday 9 January 2010">
<row>
<label>/index.htm</label>
<nb_visits>1</nb_visits>
@@ -220,7 +220,7 @@
</result>
</reportData>
<reportMetadata>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<row>
<url>http://example.org/index.htm</url>
<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
@@ -230,12 +230,12 @@
<segment>pageUrl==http%3A%2F%2Fexample.org%2Fproducts</segment>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010">
+ <result prettyDate="Monday 4 January 2010">
<row>
<url />
</row>
</result>
- <result prettyDate="Tuesday, January 5, 2010">
+ <result prettyDate="Tuesday 5 January 2010">
<row>
<url>http://example.org/index.htm</url>
<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
@@ -248,7 +248,7 @@
<url />
</row>
</result>
- <result prettyDate="Wednesday, January 6, 2010">
+ <result prettyDate="Wednesday 6 January 2010">
<row>
<url>http://example.org/index.htm</url>
<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
@@ -261,7 +261,7 @@
<url />
</row>
</result>
- <result prettyDate="Thursday, January 7, 2010">
+ <result prettyDate="Thursday 7 January 2010">
<row>
<url>http://example.org/index.htm</url>
<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
@@ -274,7 +274,7 @@
<url />
</row>
</result>
- <result prettyDate="Friday, January 8, 2010">
+ <result prettyDate="Friday 8 January 2010">
<row>
<url>http://example.org/index.htm</url>
<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
@@ -287,7 +287,7 @@
<url />
</row>
</result>
- <result prettyDate="Saturday, January 9, 2010">
+ <result prettyDate="Saturday 9 January 2010">
<row>
<url>http://example.org/index.htm</url>
<segment>pageUrl==http%3A%2F%2Fexample.org%2Findex.htm</segment>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Site 1</website>
- <prettyDate>January 3 – 9, 2010</prettyDate>
+ <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
<metadata>
<category>Goals</category>
<name>Days to Conversion</name>
@@ -28,7 +28,7 @@
<revenue>Revenue</revenue>
</columns>
<reportData>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<row>
<label>0 days</label>
<nb_conversions>2</nb_conversions>
@@ -100,8 +100,8 @@
<revenue>$ 0</revenue>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010">
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010">
<row>
<label>0 days</label>
<nb_conversions>0</nb_conversions>
@@ -173,7 +173,7 @@
<revenue>$ 0</revenue>
</row>
</result>
- <result prettyDate="Wednesday, January 6, 2010">
+ <result prettyDate="Wednesday 6 January 2010">
<row>
<label>0 days</label>
<nb_conversions>0</nb_conversions>
@@ -245,7 +245,7 @@
<revenue>$ 0</revenue>
</row>
</result>
- <result prettyDate="Thursday, January 7, 2010">
+ <result prettyDate="Thursday 7 January 2010">
<row>
<label>0 days</label>
<nb_conversions>0</nb_conversions>
@@ -317,7 +317,7 @@
<revenue>$ 0</revenue>
</row>
</result>
- <result prettyDate="Friday, January 8, 2010">
+ <result prettyDate="Friday 8 January 2010">
<row>
<label>0 days</label>
<nb_conversions>0</nb_conversions>
@@ -389,7 +389,7 @@
<revenue>$ 0</revenue>
</row>
</result>
- <result prettyDate="Saturday, January 9, 2010">
+ <result prettyDate="Saturday 9 January 2010">
<row>
<label>0 days</label>
<nb_conversions>0</nb_conversions>
@@ -463,13 +463,13 @@
</result>
</reportData>
<reportMetadata>
- <result prettyDate="Sunday, January 3, 2010" />
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Sunday 3 January 2010" />
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportMetadata>
<reportTotal>
<nb_conversions>10</nb_conversions>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Site 1</website>
- <prettyDate>January 3 – 9, 2010</prettyDate>
+ <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
<metadata>
<category>All Websites</category>
<name>All Websites dashboard</name>
@@ -53,7 +53,7 @@
<ecommerce_revenue_evolution>Product Revenue Evolution</ecommerce_revenue_evolution>
</columns>
<reportData>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<row>
<label>Site 1</label>
<nb_visits>2</nb_visits>
@@ -72,7 +72,7 @@
<ecommerce_revenue_evolution>0</ecommerce_revenue_evolution>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010">
+ <result prettyDate="Monday 4 January 2010">
<row>
<label>Site 1</label>
<nb_visits>1</nb_visits>
@@ -108,7 +108,7 @@
<ecommerce_revenue_evolution>0</ecommerce_revenue_evolution>
</row>
</result>
- <result prettyDate="Tuesday, January 5, 2010">
+ <result prettyDate="Tuesday 5 January 2010">
<row>
<label>Site 1</label>
<nb_visits>1</nb_visits>
@@ -127,7 +127,7 @@
<ecommerce_revenue_evolution>0</ecommerce_revenue_evolution>
</row>
</result>
- <result prettyDate="Wednesday, January 6, 2010">
+ <result prettyDate="Wednesday 6 January 2010">
<row>
<label>Site 1</label>
<nb_visits>1</nb_visits>
@@ -146,7 +146,7 @@
<ecommerce_revenue_evolution>0</ecommerce_revenue_evolution>
</row>
</result>
- <result prettyDate="Thursday, January 7, 2010">
+ <result prettyDate="Thursday 7 January 2010">
<row>
<label>Site 1</label>
<nb_visits>1</nb_visits>
@@ -165,7 +165,7 @@
<ecommerce_revenue_evolution>0</ecommerce_revenue_evolution>
</row>
</result>
- <result prettyDate="Friday, January 8, 2010">
+ <result prettyDate="Friday 8 January 2010">
<row>
<label>Site 1</label>
<nb_visits>1</nb_visits>
@@ -184,7 +184,7 @@
<ecommerce_revenue_evolution>0</ecommerce_revenue_evolution>
</row>
</result>
- <result prettyDate="Saturday, January 9, 2010">
+ <result prettyDate="Saturday 9 January 2010">
<row>
<label>Site 1</label>
<nb_visits>1</nb_visits>
@@ -205,14 +205,14 @@
</result>
</reportData>
<reportMetadata>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<row>
<idsite>1</idsite>
<group />
<main_url>http://piwik.net</main_url>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010">
+ <result prettyDate="Monday 4 January 2010">
<row>
<idsite>1</idsite>
<group />
@@ -224,35 +224,35 @@
<main_url>http://piwik.net</main_url>
</row>
</result>
- <result prettyDate="Tuesday, January 5, 2010">
+ <result prettyDate="Tuesday 5 January 2010">
<row>
<idsite>1</idsite>
<group />
<main_url>http://piwik.net</main_url>
</row>
</result>
- <result prettyDate="Wednesday, January 6, 2010">
+ <result prettyDate="Wednesday 6 January 2010">
<row>
<idsite>1</idsite>
<group />
<main_url>http://piwik.net</main_url>
</row>
</result>
- <result prettyDate="Thursday, January 7, 2010">
+ <result prettyDate="Thursday 7 January 2010">
<row>
<idsite>1</idsite>
<group />
<main_url>http://piwik.net</main_url>
</row>
</result>
- <result prettyDate="Friday, January 8, 2010">
+ <result prettyDate="Friday 8 January 2010">
<row>
<idsite>1</idsite>
<group />
<main_url>http://piwik.net</main_url>
</row>
</result>
- <result prettyDate="Saturday, January 9, 2010">
+ <result prettyDate="Saturday 9 January 2010">
<row>
<idsite>1</idsite>
<group />
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Site 1</website>
- <prettyDate>January 3 – 9, 2010</prettyDate>
+ <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
<metadata>
<category>Referrers</category>
<name>Websites</name>
@@ -54,7 +54,7 @@
<revenue>Revenue</revenue>
</columns>
<reportData>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<row>
<label>referrer.com</label>
<nb_uniq_visitors>1</nb_uniq_visitors>
@@ -67,7 +67,7 @@
<revenue>$ 0</revenue>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010">
+ <result prettyDate="Monday 4 January 2010">
<row>
<label>referrer.com</label>
<nb_uniq_visitors>1</nb_uniq_visitors>
@@ -80,10 +80,10 @@
<revenue>$ 0</revenue>
</row>
</result>
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010">
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010">
<row>
<label>referrer.com</label>
<nb_uniq_visitors>1</nb_uniq_visitors>
@@ -96,7 +96,7 @@
<revenue>$ 0</revenue>
</row>
</result>
- <result prettyDate="Saturday, January 9, 2010">
+ <result prettyDate="Saturday 9 January 2010">
<row>
<label>referrer.com</label>
<nb_uniq_visitors>1</nb_uniq_visitors>
@@ -111,35 +111,35 @@
</result>
</reportData>
<reportMetadata>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<row>
<segment>referrerName==referrer.com</segment>
- <idsubdatatable>1907</idsubdatatable>
+ <idsubdatatable>17099</idsubdatatable>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010">
+ <result prettyDate="Monday 4 January 2010">
<row>
<segment>referrerName==referrer.com</segment>
- <idsubdatatable>1909</idsubdatatable>
+ <idsubdatatable>17101</idsubdatatable>
</row>
</result>
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010">
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010">
<row>
<segment>referrerName==referrer.com</segment>
- <idsubdatatable>1914</idsubdatatable>
+ <idsubdatatable>17106</idsubdatatable>
</row>
</result>
- <result prettyDate="Saturday, January 9, 2010">
+ <result prettyDate="Saturday 9 January 2010">
<row>
<segment>referrerName==referrer.com</segment>
- <idsubdatatable>1916</idsubdatatable>
+ <idsubdatatable>17108</idsubdatatable>
</row>
</result>
</reportMetadata>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Site 1</website>
- <prettyDate>January 3 – 9, 2010</prettyDate>
+ <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
<metadata>
<category>Visitors</category>
<name>Returning Visits</name>
@@ -34,8 +34,8 @@
<bounce_rate_returning>Bounce Rate for Returning Visits</bounce_rate_returning>
</columns>
<reportData>
- <result prettyDate="Sunday, January 3, 2010" />
- <result prettyDate="Monday, January 4, 2010">
+ <result prettyDate="Sunday 3 January 2010" />
+ <result prettyDate="Monday 4 January 2010">
<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>1</nb_visits_returning>
@@ -45,7 +45,7 @@
<nb_actions_per_visit_returning>1</nb_actions_per_visit_returning>
<avg_time_on_site_returning>00:00:00</avg_time_on_site_returning>
</result>
- <result prettyDate="Tuesday, January 5, 2010">
+ <result prettyDate="Tuesday 5 January 2010">
<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>1</nb_visits_returning>
@@ -55,7 +55,7 @@
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
<avg_time_on_site_returning>00:15:01</avg_time_on_site_returning>
</result>
- <result prettyDate="Wednesday, January 6, 2010">
+ <result prettyDate="Wednesday 6 January 2010">
<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>1</nb_visits_returning>
@@ -65,7 +65,7 @@
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
<avg_time_on_site_returning>00:15:01</avg_time_on_site_returning>
</result>
- <result prettyDate="Thursday, January 7, 2010">
+ <result prettyDate="Thursday 7 January 2010">
<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>1</nb_visits_returning>
@@ -75,7 +75,7 @@
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
<avg_time_on_site_returning>00:15:01</avg_time_on_site_returning>
</result>
- <result prettyDate="Friday, January 8, 2010">
+ <result prettyDate="Friday 8 January 2010">
<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>1</nb_visits_returning>
@@ -85,7 +85,7 @@
<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
<avg_time_on_site_returning>00:15:01</avg_time_on_site_returning>
</result>
- <result prettyDate="Saturday, January 9, 2010">
+ <result prettyDate="Saturday 9 January 2010">
<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
<nb_users_returning>0</nb_users_returning>
<nb_visits_returning>1</nb_visits_returning>
@@ -97,13 +97,13 @@
</result>
</reportData>
<reportMetadata>
- <result prettyDate="Sunday, January 3, 2010" />
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Sunday 3 January 2010" />
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportMetadata>
<reportTotal>
</reportTotal>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Site 1</website>
- <prettyDate>January 3 – 9, 2010</prettyDate>
+ <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
<metadata>
<category>Visitors</category>
<name>Visits by days since last visit</name>
@@ -24,7 +24,7 @@
<nb_visits>Visits</nb_visits>
</columns>
<reportData>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<row>
<label>New visits</label>
<nb_visits>2</nb_visits>
@@ -86,7 +86,7 @@
<nb_visits>0</nb_visits>
</row>
</result>
- <result prettyDate="Monday, January 4, 2010">
+ <result prettyDate="Monday 4 January 2010">
<row>
<label>New visits</label>
<nb_visits>0</nb_visits>
@@ -148,7 +148,7 @@
<nb_visits>0</nb_visits>
</row>
</result>
- <result prettyDate="Tuesday, January 5, 2010">
+ <result prettyDate="Tuesday 5 January 2010">
<row>
<label>New visits</label>
<nb_visits>0</nb_visits>
@@ -210,7 +210,7 @@
<nb_visits>0</nb_visits>
</row>
</result>
- <result prettyDate="Wednesday, January 6, 2010">
+ <result prettyDate="Wednesday 6 January 2010">
<row>
<label>New visits</label>
<nb_visits>0</nb_visits>
@@ -272,7 +272,7 @@
<nb_visits>0</nb_visits>
</row>
</result>
- <result prettyDate="Thursday, January 7, 2010">
+ <result prettyDate="Thursday 7 January 2010">
<row>
<label>New visits</label>
<nb_visits>0</nb_visits>
@@ -334,7 +334,7 @@
<nb_visits>0</nb_visits>
</row>
</result>
- <result prettyDate="Friday, January 8, 2010">
+ <result prettyDate="Friday 8 January 2010">
<row>
<label>New visits</label>
<nb_visits>0</nb_visits>
@@ -396,7 +396,7 @@
<nb_visits>0</nb_visits>
</row>
</result>
- <result prettyDate="Saturday, January 9, 2010">
+ <result prettyDate="Saturday 9 January 2010">
<row>
<label>New visits</label>
<nb_visits>0</nb_visits>
@@ -460,13 +460,13 @@
</result>
</reportData>
<reportMetadata>
- <result prettyDate="Sunday, January 3, 2010" />
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Sunday 3 January 2010" />
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportMetadata>
<reportTotal>
<nb_visits>8</nb_visits>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Site 1</website>
- <prettyDate>January 3 – 9, 2010</prettyDate>
+ <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
<metadata>
<category>Visits Summary</category>
<name>Visits Summary</name>
@@ -40,7 +40,7 @@
<avg_time_on_site>Avg. Visit Duration (in seconds)</avg_time_on_site>
</columns>
<reportData>
- <result prettyDate="Sunday, January 3, 2010">
+ <result prettyDate="Sunday 3 January 2010">
<nb_uniq_visitors>2</nb_uniq_visitors>
<nb_visits>2</nb_visits>
<nb_actions>2</nb_actions>
@@ -49,7 +49,7 @@
<avg_time_on_site>00:00:00</avg_time_on_site>
<bounce_rate>100%</bounce_rate>
</result>
- <result prettyDate="Monday, January 4, 2010">
+ <result prettyDate="Monday 4 January 2010">
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_visits>1</nb_visits>
<nb_actions>1</nb_actions>
@@ -58,7 +58,7 @@
<avg_time_on_site>00:00:00</avg_time_on_site>
<bounce_rate>100%</bounce_rate>
</result>
- <result prettyDate="Tuesday, January 5, 2010">
+ <result prettyDate="Tuesday 5 January 2010">
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_visits>1</nb_visits>
<nb_actions>5</nb_actions>
@@ -67,7 +67,7 @@
<avg_time_on_site>00:15:01</avg_time_on_site>
<bounce_rate>0%</bounce_rate>
</result>
- <result prettyDate="Wednesday, January 6, 2010">
+ <result prettyDate="Wednesday 6 January 2010">
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_visits>1</nb_visits>
<nb_actions>5</nb_actions>
@@ -76,7 +76,7 @@
<avg_time_on_site>00:15:01</avg_time_on_site>
<bounce_rate>0%</bounce_rate>
</result>
- <result prettyDate="Thursday, January 7, 2010">
+ <result prettyDate="Thursday 7 January 2010">
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_visits>1</nb_visits>
<nb_actions>5</nb_actions>
@@ -85,7 +85,7 @@
<avg_time_on_site>00:15:01</avg_time_on_site>
<bounce_rate>0%</bounce_rate>
</result>
- <result prettyDate="Friday, January 8, 2010">
+ <result prettyDate="Friday 8 January 2010">
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_visits>1</nb_visits>
<nb_actions>5</nb_actions>
@@ -94,7 +94,7 @@
<avg_time_on_site>00:15:01</avg_time_on_site>
<bounce_rate>0%</bounce_rate>
</result>
- <result prettyDate="Saturday, January 9, 2010">
+ <result prettyDate="Saturday 9 January 2010">
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_visits>1</nb_visits>
<nb_actions>5</nb_actions>
@@ -105,13 +105,13 @@
</result>
</reportData>
<reportMetadata>
- <result prettyDate="Sunday, January 3, 2010" />
- <result prettyDate="Monday, January 4, 2010" />
- <result prettyDate="Tuesday, January 5, 2010" />
- <result prettyDate="Wednesday, January 6, 2010" />
- <result prettyDate="Thursday, January 7, 2010" />
- <result prettyDate="Friday, January 8, 2010" />
- <result prettyDate="Saturday, January 9, 2010" />
+ <result prettyDate="Sunday 3 January 2010" />
+ <result prettyDate="Monday 4 January 2010" />
+ <result prettyDate="Tuesday 5 January 2010" />
+ <result prettyDate="Wednesday 6 January 2010" />
+ <result prettyDate="Thursday 7 January 2010" />
+ <result prettyDate="Friday 8 January 2010" />
+ <result prettyDate="Saturday 9 January 2010" />
</reportMetadata>
<reportTotal>
</reportTotal>
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 @@
</h1>
<p>
- Mail Test report - Date range: January 2010
+ Mail Test report - Date range: 2010, January
</p>
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 ffc46593bf01cbcf88c60f9fe80d5335b7a10a06..8ab4a1eff9aa7193939406d23708d255c9bf28b5 100644
GIT binary patch
delta 84
zcmeylM809Ed_xOk3)2>6{xgic+xgEhcf|ndnHnrEEI|6M4$DPpAid6m#Yh22KgeL2
im&?f8UU!WJh*`JSU1MWxW#pZHF^gSz`=n_0=VbuYY#qt~
delta 65
zcmZozD*tndd_xOk3)2>6{xjPJ&M<eyY@e;c;=;21fey<>>Ft|5Sd0|5Kh0p7m)qWQ
VjRlBVx3^qlV{F~t7R~;v3;=kA8>9dL
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 @@
<url>http://example.org/index.htm</url>
<pageTitle>incredible title!</pageTitle>
<pageIdAction>2</pageIdAction>
- <serverTimePretty>Mar 6, 2010 11:22:33 AM</serverTimePretty>
+ <serverTimePretty>Sat 6 Mar 11:22:33</serverTimePretty>
<pageId>1</pageId>
<icon />
<timestamp>1267874553</timestamp>
@@ -28,7 +28,7 @@
<url>http://example.org/index2.htm</url>
<pageTitle>incredible title!</pageTitle>
<pageIdAction>3</pageIdAction>
- <serverTimePretty>Mar 6, 2010 11:25:33 AM</serverTimePretty>
+ <serverTimePretty>Sat 6 Mar 11:25:33</serverTimePretty>
<pageId>2</pageId>
<timeSpent>180</timeSpent>
<timeSpentPretty>3 min 0s</timeSpentPretty>
@@ -40,7 +40,7 @@
<url>http://example.org/index3.htm</url>
<pageTitle>incredible title!</pageTitle>
<pageIdAction>4</pageIdAction>
- <serverTimePretty>Mar 6, 2010 11:28:33 AM</serverTimePretty>
+ <serverTimePretty>Sat 6 Mar 11:28:33</serverTimePretty>
<pageId>3</pageId>
<icon />
<timestamp>1267874913</timestamp>
@@ -59,7 +59,7 @@
<url>http://example.org/no-user-id-set-but-should-appear-in-user-id-visit</url>
<pageTitle>no User Id set but it should appear in email@example.com!</pageTitle>
<pageIdAction>6</pageIdAction>
- <serverTimePretty>Mar 6, 2010 1:16:33 PM</serverTimePretty>
+ <serverTimePretty>Sat 6 Mar 13:16:33</serverTimePretty>
<pageId>4</pageId>
<timeSpent>360</timeSpent>
<timeSpentPretty>6 min 0s</timeSpentPretty>
@@ -71,7 +71,7 @@
<url>http://example.org/index.htm</url>
<pageTitle>incredible title!</pageTitle>
<pageIdAction>2</pageIdAction>
- <serverTimePretty>Mar 6, 2010 1:22:33 PM</serverTimePretty>
+ <serverTimePretty>Sat 6 Mar 13:22:33</serverTimePretty>
<pageId>5</pageId>
<timeSpent>360</timeSpent>
<timeSpentPretty>6 min 0s</timeSpentPretty>
@@ -83,7 +83,7 @@
<url>http://example.org/index.htm</url>
<pageTitle>second page</pageTitle>
<pageIdAction>2</pageIdAction>
- <serverTimePretty>Mar 6, 2010 1:28:33 PM</serverTimePretty>
+ <serverTimePretty>Sat 6 Mar 13:28:33</serverTimePretty>
<pageId>6</pageId>
<icon />
<timestamp>1267882113</timestamp>
@@ -102,7 +102,7 @@
<url>http://example.org/index.htm</url>
<pageTitle>a new user id was set -> new visit</pageTitle>
<pageIdAction>2</pageIdAction>
- <serverTimePretty>Mar 6, 2010 1:34:33 PM</serverTimePretty>
+ <serverTimePretty>Sat 6 Mar 13:34:33</serverTimePretty>
<pageId>7</pageId>
<icon />
<timestamp>1267882473</timestamp>
@@ -121,7 +121,7 @@
<url>http://example.org/home</url>
<pageTitle>pageview - should not be tracked by our user id but in a new visit</pageTitle>
<pageIdAction>10</pageIdAction>
- <serverTimePretty>Mar 6, 2010 4:28:33 PM</serverTimePretty>
+ <serverTimePretty>Sat 6 Mar 16:28:33</serverTimePretty>
<pageId>10</pageId>
<icon />
<timestamp>1267892913</timestamp>
@@ -140,7 +140,7 @@
<url>http://example.org/home</url>
<pageTitle>same user id was set -> this is the same unique user</pageTitle>
<pageIdAction>10</pageIdAction>
- <serverTimePretty>Mar 6, 2010 4:22:33 PM</serverTimePretty>
+ <serverTimePretty>Sat 6 Mar 16:22:33</serverTimePretty>
<pageId>8</pageId>
<timeSpent>360</timeSpent>
<timeSpentPretty>6 min 0s</timeSpentPretty>
@@ -152,7 +152,7 @@
<url>http://example.org/home</url>
<pageTitle>second pageview - by this user id</pageTitle>
<pageIdAction>10</pageIdAction>
- <serverTimePretty>Mar 6, 2010 4:28:33 PM</serverTimePretty>
+ <serverTimePretty>Sat 6 Mar 16:28:33</serverTimePretty>
<pageId>9</pageId>
<timeSpent>720</timeSpent>
<timeSpentPretty>12 min 0s</timeSpentPretty>
@@ -165,7 +165,7 @@
<goalId>1</goalId>
<revenue>0</revenue>
<goalPageId />
- <serverTimePretty>Mar 6, 2010 4:34:33 PM</serverTimePretty>
+ <serverTimePretty>Sat 6 Mar 16:34:33</serverTimePretty>
<url>http://example.org/home</url>
<icon>plugins/Morpheus/images/goal.png</icon>
<timestamp>1267893273</timestamp>
@@ -174,7 +174,7 @@
<type>ecommerceAbandonedCart</type>
<revenue>10000000000</revenue>
<items>1</items>
- <serverTimePretty>Mar 6, 2010 4:40:33 PM</serverTimePretty>
+ <serverTimePretty>Sat 6 Mar 16:40:33</serverTimePretty>
<itemDetails>
<row>
<itemSKU>sku-007-PRISM</itemSKU>
@@ -201,7 +201,7 @@
<url>http://example.org/index.htm</url>
<pageTitle>Page view by email@example.com</pageTitle>
<pageIdAction>2</pageIdAction>
- <serverTimePretty>Mar 14, 2010 11:22:33 AM</serverTimePretty>
+ <serverTimePretty>Sun 14 Mar 11:22:33</serverTimePretty>
<pageId>11</pageId>
<icon />
<timestamp>1268565753</timestamp>
@@ -220,7 +220,7 @@
<url>http://example.org/index.htm</url>
<pageTitle>A page view by new-user-id@one-weeklater</pageTitle>
<pageIdAction>2</pageIdAction>
- <serverTimePretty>Mar 14, 2010 11:46:33 AM</serverTimePretty>
+ <serverTimePretty>Sun 14 Mar 11:46:33</serverTimePretty>
<pageId>12</pageId>
<icon />
<timestamp>1268567193</timestamp>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Piwik test</website>
- <prettyDate>Sunday, January 4, 2009</prettyDate>
+ <prettyDate>Sunday 4 January 2009</prettyDate>
<metadata>
<category>Visitors</category>
<name>Country</name>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Piwik test</website>
- <prettyDate>Sunday, January 4, 2009</prettyDate>
+ <prettyDate>Sunday 4 January 2009</prettyDate>
<metadata>
<category>Actions</category>
<name>Actions - Main metrics</name>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Piwik test</website>
- <prettyDate>Sunday, January 4, 2009</prettyDate>
+ <prettyDate>Sunday 4 January 2009</prettyDate>
<metadata>
<category>Visitors</category>
<name>Country</name>
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 12f9a8fce3832fdd29791dae16a36afd4564c623..89e329416e9157f6b133d816fdcbcdcd1aa6dee4 100644
GIT binary patch
delta 39
tcmX@a-@vs&i)peCQ^MpoKs<%TZ1Ozjrpa8a7bZ_&GXRQdO;%wy0RSCv4cPzy
literal 1986
zcmcJPTXWMe5QWdPe}&(b2bywu>O+Ug05e=VT*B~_apK?va)HFAlpha#D^<1|($q{~
zG_qGKY4_~zS^fICP^Ph_TBxTL(n#Ml*OpoGjk-(|)^n{n(`YN?sWx7-#Ljna@1ESM
z((;DY5x%C_DX=)h!x*a->j~Ns->@p#DUdTxZ_&?{*XuK#pb2R0{0htgM}x4--FBqG
zbF@@qFTWGPhEwKw1^(&5)BPjxHg}J~YgTsg9?szI=_N6i)FWrwf8?uQP+iMFsYJt?
zIct2q)s?>ZyquDo2h4j+lOL(?*L~zTPuR85qqbqj)6LF=Ja6%|#^(?O8~ho2jZZI;
z49OW|KaNCiGyqkq_j<<vDbheMbb<T<d8l(e*E@8<zafnnPW4dtuh(sSJ#-D)uJ{5D
zSL1Lk9Il1KGHU!ccBQ%`+65!^{c3mzdhL-fd=C`tWK<&OUy_^9Q&y|MWyAgdVrr1O
z8maS0Euw(bf!?~ckh@0e_8_%78NW(j?bLs*yDig(|F+RR`;B#1TTk=~k27+$;SFkd
zmeS$v8qBD|gmWoOoDoe$OqOwbL-*y~YBJ_V&i+RtxBH*;nOjRTv8F@5;?Y=L;pvh$
z^h!U7G4@652xFjC(DadkO=pCh1bytIb`*!YWq;hR6}MG1#_evz9V`4N->kxaA9q3r
x8ixzAk@2-xHN<;t)pzZ7e+^Pzh;u!G!zs*s3{NhQ{}ryTZ-J{(xE6{;zX4m_Qpo@S
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 489da992770fc30e127f8c6866696de2498d0a53..8372bb607e8aa91a4f5333dc4378a803ab3d739d 100644
GIT binary patch
delta 54
zcmV-60LlN18;l#UXatjp3>K4!2PBj31WL2A1i%85fC!AUI0$|MlL!qYlcoxOlWGkj
MlPV2Bvm^`B0Tg=@dH?_b
delta 46
zcmV+}0MY-98;l#UXauvO1PTL_XaqWwfC!AUI0$|Mlj;g?v$_k?0h6Q(Hj{h{K9g7r
EB7zMNO8@`>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Piwik test</website>
- <prettyDate>Tuesday, April 5, 2011</prettyDate>
+ <prettyDate>Tuesday 5 April 2011</prettyDate>
<metadata>
<category>Ecommerce</category>
<name>Abandoned Carts</name>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Piwik test</website>
- <prettyDate>Tuesday, April 5, 2011</prettyDate>
+ <prettyDate>Tuesday 5 April 2011</prettyDate>
<metadata>
<category>Goals</category>
<name>Goal title match, triggered ONCE</name>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Piwik test</website>
- <prettyDate>Tuesday, April 5, 2011</prettyDate>
+ <prettyDate>Tuesday 5 April 2011</prettyDate>
<metadata>
<category>Ecommerce</category>
<name>Ecommerce Orders</name>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Piwik test</website>
- <prettyDate>Tuesday, April 5, 2011</prettyDate>
+ <prettyDate>Tuesday 5 April 2011</prettyDate>
<metadata>
<category>Ecommerce</category>
<name>Product Category</name>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Piwik test</website>
- <prettyDate>Tuesday, April 5, 2011</prettyDate>
+ <prettyDate>Tuesday 5 April 2011</prettyDate>
<metadata>
<category>Ecommerce</category>
<name>Product SKU</name>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Piwik test</website>
- <prettyDate>Tuesday, April 5, 2011</prettyDate>
+ <prettyDate>Tuesday 5 April 2011</prettyDate>
<metadata>
<category>Visits Summary</category>
<name>Visits by Server Time</name>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Piwik test</website>
- <prettyDate>Tuesday, April 5, 2011</prettyDate>
+ <prettyDate>Tuesday 5 April 2011</prettyDate>
<metadata>
<category>Visitors</category>
<name>Country</name>
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 @@
<conversion_rate>0%</conversion_rate>
</row>
<row>
- <label>PRODUCT TWO LEFT in cart</label>
+ <label>PRODUCT THREE LEFT in cart</label>
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
- <avg_price>0</avg_price>
+ <nb_actions>4</nb_actions>
+ <avg_price>666</avg_price>
<avg_quantity>0</avg_quantity>
<conversion_rate>0%</conversion_rate>
</row>
<row>
- <label>PRODUCT THREE LEFT in cart</label>
+ <label>PRODUCT TWO LEFT in cart</label>
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_visits>2</nb_visits>
- <nb_actions>4</nb_actions>
- <avg_price>666</avg_price>
+ <nb_actions>2</nb_actions>
+ <avg_price>0</avg_price>
<avg_quantity>0</avg_quantity>
<conversion_rate>0%</conversion_rate>
</row>
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 @@
<conversion_rate>0%</conversion_rate>
</row>
<row>
- <label>PRODUCT TWO LEFT in cart</label>
+ <label>PRODUCT THREE LEFT in cart</label>
<nb_visits>3</nb_visits>
- <nb_actions>3</nb_actions>
+ <nb_actions>6</nb_actions>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <avg_price>0</avg_price>
+ <avg_price>1332</avg_price>
<avg_quantity>0</avg_quantity>
<conversion_rate>0%</conversion_rate>
</row>
<row>
- <label>PRODUCT THREE LEFT in cart</label>
+ <label>PRODUCT TWO LEFT in cart</label>
<nb_visits>3</nb_visits>
- <nb_actions>6</nb_actions>
+ <nb_actions>3</nb_actions>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <avg_price>1332</avg_price>
+ <avg_price>0</avg_price>
<avg_quantity>0</avg_quantity>
<conversion_rate>0%</conversion_rate>
</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 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 @@
</h1>
<p>
- Mail Test report - Date range: Week April 4 – 10, 2011
+ Mail Test report - Date range: Week 4 April - 10 April 2011
</p>
@@ -3348,7 +3348,7 @@
<tr style="background-color: rgb(242,242,242);line-height: 22px;">
<td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- PRODUCT TWO LEFT in cart </td>
+ PRODUCT THREE LEFT in cart </td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
$ 0
</td>
@@ -3362,7 +3362,7 @@
3
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- $ 0
+ $ 1332
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
0
@@ -3374,7 +3374,7 @@
<tr style=";line-height: 22px;">
<td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- PRODUCT THREE LEFT in cart </td>
+ PRODUCT TWO LEFT in cart </td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
$ 0
</td>
@@ -3388,7 +3388,7 @@
3
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- $ 1332
+ $ 0
</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_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 @@
<conversion_rate>0%</conversion_rate>
</row>
<row>
- <label>PRODUCT TWO LEFT in cart</label>
+ <label>PRODUCT THREE LEFT in cart</label>
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
- <avg_price>0</avg_price>
+ <nb_actions>4</nb_actions>
+ <avg_price>666</avg_price>
<avg_quantity>0</avg_quantity>
<conversion_rate>0%</conversion_rate>
</row>
<row>
- <label>PRODUCT THREE LEFT in cart</label>
+ <label>PRODUCT TWO LEFT in cart</label>
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_visits>2</nb_visits>
- <nb_actions>4</nb_actions>
- <avg_price>666</avg_price>
+ <nb_actions>2</nb_actions>
+ <avg_price>0</avg_price>
<avg_quantity>0</avg_quantity>
<conversion_rate>0%</conversion_rate>
</row>
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 @@
<revenue>1000</revenue>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <segment>customVariableName==VisitorType</segment>
<subtable>
<row>
<label>LoggedIn</label>
@@ -88,7 +87,6 @@
<revenue>0</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <segment>customVariableName==SET+WITH+EMPTY+VALUE</segment>
<subtable>
<row>
<label>Value not defined</label>
@@ -111,6 +109,24 @@
</row>
</subtable>
</row>
+ <row>
+ <label>Status user</label>
+ <nb_actions>3</nb_actions>
+ <subtable>
+ <row>
+ <label>looking at "profile page"</label>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ </row>
+ <row>
+ <label>Loggedin</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ </row>
+ </subtable>
+ </row>
<row>
<label>Value will be VERY long and truncated</label>
<nb_visits>1</nb_visits>
@@ -129,7 +145,6 @@
<revenue>0</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <segment>customVariableName==Value+will+be+VERY+long+and+truncated</segment>
<subtable>
<row>
<label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label>
@@ -152,25 +167,6 @@
</row>
</subtable>
</row>
- <row>
- <label>Status user</label>
- <nb_actions>3</nb_actions>
- <segment>customVariableName==Status+user</segment>
- <subtable>
- <row>
- <label>looking at "profile page"</label>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- </row>
- <row>
- <label>Loggedin</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- </row>
- </subtable>
- </row>
<row>
<label>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</label>
<nb_visits>2</nb_visits>
@@ -189,7 +185,6 @@
<revenue>1000</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <segment>customVariableName==Othercustom+value+which+should+be+truncated+abcdefghijklmnopqrstuvwxyz</segment>
<subtable>
<row>
<label>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</label>
@@ -215,7 +210,6 @@
<row>
<label>Language</label>
<nb_actions>1</nb_actions>
- <segment>customVariableName==Language</segment>
<subtable>
<row>
<label>FR</label>
@@ -228,7 +222,6 @@
<row>
<label>SET WITH EMPTY VALUE PAGE SCOPE</label>
<nb_actions>1</nb_actions>
- <segment>customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE</segment>
<subtable>
<row>
<label>Value not defined</label>
@@ -238,4 +231,4 @@
</row>
</subtable>
</row>
-</result>
+</result>
\ 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 @@
<revenue>1000</revenue>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <segment>customVariableName==VisitorType</segment>
<subtable>
<row>
<label>LoggedIn</label>
@@ -88,7 +87,6 @@
<revenue>0</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <segment>customVariableName==SET+WITH+EMPTY+VALUE</segment>
<subtable>
<row>
<label>Value not defined</label>
@@ -111,6 +109,24 @@
</row>
</subtable>
</row>
+ <row>
+ <label>Status user</label>
+ <nb_actions>3</nb_actions>
+ <subtable>
+ <row>
+ <label>looking at "profile page"</label>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ </row>
+ <row>
+ <label>Loggedin</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ </row>
+ </subtable>
+ </row>
<row>
<label>Value will be VERY long and truncated</label>
<nb_visits>1</nb_visits>
@@ -129,7 +145,6 @@
<revenue>0</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <segment>customVariableName==Value+will+be+VERY+long+and+truncated</segment>
<subtable>
<row>
<label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label>
@@ -152,25 +167,6 @@
</row>
</subtable>
</row>
- <row>
- <label>Status user</label>
- <nb_actions>3</nb_actions>
- <segment>customVariableName==Status+user</segment>
- <subtable>
- <row>
- <label>looking at "profile page"</label>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- </row>
- <row>
- <label>Loggedin</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- </row>
- </subtable>
- </row>
<row>
<label>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</label>
<nb_visits>2</nb_visits>
@@ -189,7 +185,6 @@
<revenue>1000</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <segment>customVariableName==Othercustom+value+which+should+be+truncated+abcdefghijklmnopqrstuvwxyz</segment>
<subtable>
<row>
<label>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</label>
@@ -215,7 +210,6 @@
<row>
<label>Language</label>
<nb_actions>1</nb_actions>
- <segment>customVariableName==Language</segment>
<subtable>
<row>
<label>FR</label>
@@ -228,7 +222,6 @@
<row>
<label>SET WITH EMPTY VALUE PAGE SCOPE</label>
<nb_actions>1</nb_actions>
- <segment>customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE</segment>
<subtable>
<row>
<label>Value not defined</label>
@@ -238,4 +231,4 @@
</row>
</subtable>
</row>
-</result>
+</result>
\ 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 @@
</subtable>
</row>
<row>
- <label>name</label>
+ <label>tweeted</label>
<nb_actions>20</nb_actions>
<segment>customVariableName==tweeted</segment>
<subtable>
<row>
- <label>thing0</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
+ <label>n</label>
+ <nb_visits>10</nb_visits>
+ <nb_actions>10</nb_actions>
</row>
<row>
<label>Others</label>
- <nb_visits>19</nb_visits>
- <nb_actions>19</nb_actions>
+ <nb_visits>10</nb_visits>
+ <nb_actions>10</nb_actions>
</row>
</subtable>
</row>
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 @@
<label>Others</label>
<nb_actions>60</nb_actions>
</row>
- <row>
- <label>name - Others</label>
- <nb_visits>19</nb_visits>
- <nb_actions>19</nb_actions>
- </row>
<row>
<label>liked - y</label>
<nb_visits>16</nb_visits>
<nb_actions>16</nb_actions>
</row>
+ <row>
+ <label>tweeted - n</label>
+ <nb_visits>10</nb_visits>
+ <nb_actions>10</nb_actions>
+ </row>
+ <row>
+ <label>tweeted - Others</label>
+ <nb_visits>10</nb_visits>
+ <nb_actions>10</nb_actions>
+ </row>
<row>
<label>liked - Others</label>
<nb_visits>4</nb_visits>
<nb_actions>4</nb_actions>
</row>
- <row>
- <label>name - thing0</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- </row>
</result>
\ 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 @@
</subtable>
</row>
<row>
- <label>name</label>
+ <label>tweeted</label>
<nb_actions>20</nb_actions>
<segment>customVariableName==tweeted</segment>
<subtable>
<row>
- <label>thing0</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
+ <label>n</label>
+ <nb_visits>10</nb_visits>
+ <nb_actions>10</nb_actions>
</row>
<row>
<label>Others</label>
- <nb_visits>19</nb_visits>
- <nb_actions>19</nb_actions>
+ <nb_visits>10</nb_visits>
+ <nb_actions>10</nb_actions>
</row>
</subtable>
</row>
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 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Piwik test</website>
- <prettyDate>Sunday, January 3, 2010</prettyDate>
+ <prettyDate>Sunday 3 January 2010</prettyDate>
<metadata>
<category>Visitors</category>
<name>Custom Variables</name>
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 @@
</goals>
<nb_conversions>3</nb_conversions>
<revenue>1000</revenue>
- <segment>customVariableName==VisitorType</segment>
<subtable>
<row>
<label>LoggedIn</label>
@@ -86,7 +85,6 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
- <segment>customVariableName==SET+WITH+EMPTY+VALUE</segment>
<subtable>
<row>
<label>Value not defined</label>
@@ -108,6 +106,22 @@
</row>
</subtable>
</row>
+ <row>
+ <label>Status user</label>
+ <nb_actions>3</nb_actions>
+ <subtable>
+ <row>
+ <label>looking at "profile page"</label>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
+ </row>
+ <row>
+ <label>Loggedin</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ </row>
+ </subtable>
+ </row>
<row>
<label>Value will be VERY long and truncated</label>
<nb_visits>1</nb_visits>
@@ -125,7 +139,6 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
- <segment>customVariableName==Value+will+be+VERY+long+and+truncated</segment>
<subtable>
<row>
<label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label>
@@ -147,23 +160,6 @@
</row>
</subtable>
</row>
- <row>
- <label>Status user</label>
- <nb_actions>3</nb_actions>
- <segment>customVariableName==Status+user</segment>
- <subtable>
- <row>
- <label>looking at "profile page"</label>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
- </row>
- <row>
- <label>Loggedin</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- </row>
- </subtable>
- </row>
<row>
<label>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</label>
<nb_visits>2</nb_visits>
@@ -181,7 +177,6 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>1000</revenue>
- <segment>customVariableName==Othercustom+value+which+should+be+truncated+abcdefghijklmnopqrstuvwxyz</segment>
<subtable>
<row>
<label>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</label>
@@ -206,7 +201,6 @@
<row>
<label>Language</label>
<nb_actions>1</nb_actions>
- <segment>customVariableName==Language</segment>
<subtable>
<row>
<label>FR</label>
@@ -218,7 +212,6 @@
<row>
<label>SET WITH EMPTY VALUE PAGE SCOPE</label>
<nb_actions>1</nb_actions>
- <segment>customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE</segment>
<subtable>
<row>
<label>Value not defined</label>
@@ -235,4 +228,4 @@
<result date="2010-01-08" />
<result date="2010-01-09" />
</result>
-</results>
+</results>
\ 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 @@
<revenue>1000</revenue>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <segment>customVariableName==VisitorType</segment>
<subtable>
<row>
<label>LoggedIn</label>
@@ -90,7 +89,6 @@
<revenue>0</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <segment>customVariableName==SET+WITH+EMPTY+VALUE</segment>
<subtable>
<row>
<label>Value not defined</label>
@@ -113,6 +111,24 @@
</row>
</subtable>
</row>
+ <row>
+ <label>Status user</label>
+ <nb_actions>3</nb_actions>
+ <subtable>
+ <row>
+ <label>looking at "profile page"</label>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ </row>
+ <row>
+ <label>Loggedin</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ </row>
+ </subtable>
+ </row>
<row>
<label>Value will be VERY long and truncated</label>
<nb_visits>1</nb_visits>
@@ -131,7 +147,6 @@
<revenue>0</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <segment>customVariableName==Value+will+be+VERY+long+and+truncated</segment>
<subtable>
<row>
<label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label>
@@ -154,25 +169,6 @@
</row>
</subtable>
</row>
- <row>
- <label>Status user</label>
- <nb_actions>3</nb_actions>
- <segment>customVariableName==Status+user</segment>
- <subtable>
- <row>
- <label>looking at "profile page"</label>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- </row>
- <row>
- <label>Loggedin</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- </row>
- </subtable>
- </row>
<row>
<label>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</label>
<nb_visits>2</nb_visits>
@@ -191,7 +187,6 @@
<revenue>1000</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <segment>customVariableName==Othercustom+value+which+should+be+truncated+abcdefghijklmnopqrstuvwxyz</segment>
<subtable>
<row>
<label>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</label>
@@ -217,7 +212,6 @@
<row>
<label>Language</label>
<nb_actions>1</nb_actions>
- <segment>customVariableName==Language</segment>
<subtable>
<row>
<label>FR</label>
@@ -230,7 +224,6 @@
<row>
<label>SET WITH EMPTY VALUE PAGE SCOPE</label>
<nb_actions>1</nb_actions>
- <segment>customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE</segment>
<subtable>
<row>
<label>Value not defined</label>
@@ -248,4 +241,4 @@
<result date="From 2010-02-01 to 2010-02-07" />
<result date="From 2010-02-08 to 2010-02-14" />
</result>
-</results>
+</results>
\ 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 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
- <segment>customVariableName==SET+WITH+EMPTY+VALUE</segment>
<subtable>
<row>
<label>Value not defined</label>
@@ -41,6 +40,22 @@
</row>
</subtable>
</row>
+ <row>
+ <label>Status user</label>
+ <nb_actions>3</nb_actions>
+ <subtable>
+ <row>
+ <label>looking at "profile page"</label>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
+ </row>
+ <row>
+ <label>Loggedin</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ </row>
+ </subtable>
+ </row>
<row>
<label>Value will be VERY long and truncated</label>
<nb_visits>1</nb_visits>
@@ -58,7 +73,6 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
- <segment>customVariableName==Value+will+be+VERY+long+and+truncated</segment>
<subtable>
<row>
<label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label>
@@ -102,7 +116,6 @@
</goals>
<nb_conversions>2</nb_conversions>
<revenue>0</revenue>
- <segment>customVariableName==VisitorType</segment>
<subtable>
<row>
<label>LoggedIn</label>
@@ -137,27 +150,9 @@
</row>
</subtable>
</row>
- <row>
- <label>Status user</label>
- <nb_actions>3</nb_actions>
- <segment>customVariableName==Status+user</segment>
- <subtable>
- <row>
- <label>looking at "profile page"</label>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
- </row>
- <row>
- <label>Loggedin</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- </row>
- </subtable>
- </row>
<row>
<label>Language</label>
<nb_actions>1</nb_actions>
- <segment>customVariableName==Language</segment>
<subtable>
<row>
<label>FR</label>
@@ -169,7 +164,6 @@
<row>
<label>SET WITH EMPTY VALUE PAGE SCOPE</label>
<nb_actions>1</nb_actions>
- <segment>customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE</segment>
<subtable>
<row>
<label>Value not defined</label>
@@ -186,4 +180,4 @@
<result date="2010-01-08" />
<result date="2010-01-09" />
</result>
-</results>
+</results>
\ 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 @@
<revenue>0</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <segment>customVariableName==SET+WITH+EMPTY+VALUE</segment>
<subtable>
<row>
<label>Value not defined</label>
@@ -43,6 +42,24 @@
</row>
</subtable>
</row>
+ <row>
+ <label>Status user</label>
+ <nb_actions>3</nb_actions>
+ <subtable>
+ <row>
+ <label>looking at "profile page"</label>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ </row>
+ <row>
+ <label>Loggedin</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ </row>
+ </subtable>
+ </row>
<row>
<label>Value will be VERY long and truncated</label>
<nb_visits>1</nb_visits>
@@ -61,7 +78,6 @@
<revenue>0</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <segment>customVariableName==Value+will+be+VERY+long+and+truncated</segment>
<subtable>
<row>
<label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label>
@@ -107,7 +123,6 @@
<revenue>0</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <segment>customVariableName==VisitorType</segment>
<subtable>
<row>
<label>LoggedIn</label>
@@ -143,29 +158,9 @@
</row>
</subtable>
</row>
- <row>
- <label>Status user</label>
- <nb_actions>3</nb_actions>
- <segment>customVariableName==Status+user</segment>
- <subtable>
- <row>
- <label>looking at "profile page"</label>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
- <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- </row>
- <row>
- <label>Loggedin</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- </row>
- </subtable>
- </row>
<row>
<label>Language</label>
<nb_actions>1</nb_actions>
- <segment>customVariableName==Language</segment>
<subtable>
<row>
<label>FR</label>
@@ -178,7 +173,6 @@
<row>
<label>SET WITH EMPTY VALUE PAGE SCOPE</label>
<nb_actions>1</nb_actions>
- <segment>customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE</segment>
<subtable>
<row>
<label>Value not defined</label>
@@ -196,4 +190,4 @@
<result date="From 2010-02-01 to 2010-02-07" />
<result date="From 2010-02-08 to 2010-02-14" />
</result>
-</results>
+</results>
\ No newline at end of file
--
GitLab