From 2464b709d3de294e301bb086684e94c328573e2e Mon Sep 17 00:00:00 2001
From: sgiehl <stefan@piwik.org>
Date: Sun, 28 Sep 2014 19:41:59 +0200
Subject: [PATCH] fixed more tests
---
...ionTest__Live.getLastVisitsDetails_day.xml | 4 +-
...browserEngine__VisitsSummary.get_range.xml | 12 ++++++
...mEvents__Live.getLastVisitsDetails_day.xml | 40 +++++++++----------
...vents__Live.getLastVisitsDetails_month.xml | 40 +++++++++----------
...icesDetection.getBrowserEngines_month.xml} | 36 ++++++++---------
...tLogs__Live.getLastVisitsDetails_range.xml | 20 +++++-----
...evicesDetection.getBrowserEngines_day.xml} | 1 -
...pport__UserSettings.getBrowserType_day.xml | 15 -------
...Ordered__Live.getLastVisitsDetails_day.xml | 8 ++--
...thItems__Live.getLastVisitsDetails_day.xml | 12 +++---
...evicesDetection.getBrowserEngines_day.xml} | 0
...vicesDetection.getBrowserEngines_week.xml} | 0
...evicesDetection.getBrowserEngines_day.xml} | 0
13 files changed, 90 insertions(+), 98 deletions(-)
create mode 100644 tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml
rename tests/PHPUnit/Integration/expected/{test_ImportLogs__UserSettings.getBrowserType_month.xml => test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml} (67%)
rename tests/PHPUnit/Integration/expected/{test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml => test_OneVisitorTwoVisits__DevicesDetection.getBrowserEngines_day.xml} (91%)
delete mode 100644 tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml
rename tests/PHPUnit/Integration/expected/{test_noVisit_PeriodIsLast__UserSettings.getBrowserType_day.xml => test_noVisit_PeriodIsLast__DevicesDetection.getBrowserEngines_day.xml} (100%)
rename tests/PHPUnit/Integration/expected/{test_noVisit_PeriodIsLast__UserSettings.getBrowserType_week.xml => test_noVisit_PeriodIsLast__DevicesDetection.getBrowserEngines_week.xml} (100%)
rename tests/PHPUnit/Integration/expected/{test_noVisit__UserSettings.getBrowserType_day.xml => test_noVisit__DevicesDetection.getBrowserEngines_day.xml} (100%)
diff --git a/plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml b/plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml
index 76e4a27324..6626b1a24d 100644
--- a/plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml
+++ b/plugins/CustomVariables/tests/processed/test_CustomVariablesIntegrationTest__Live.getLastVisitsDetails_day.xml
@@ -117,6 +117,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -144,8 +146,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml
new file mode 100644
index 0000000000..d8bcdace18
--- /dev/null
+++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <nb_visits>0</nb_visits>
+ <nb_actions>0</nb_actions>
+ <nb_visits_converted>0</nb_visits_converted>
+ <bounce_count>0</bounce_count>
+ <sum_visit_length>0</sum_visit_length>
+ <max_actions>0</max_actions>
+ <bounce_rate>0%</bounce_rate>
+ <nb_actions_per_visit>0</nb_actions_per_visit>
+ <avg_time_on_site>0</avg_time_on_site>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
index 1a81da7025..2c741a31b0 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
@@ -46,6 +46,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>1</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -73,8 +75,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -148,6 +148,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>1</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -175,8 +177,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -318,6 +318,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>6</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -345,8 +347,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -420,6 +420,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>1</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -447,8 +449,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -757,6 +757,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>13</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -784,8 +786,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -859,6 +859,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>1</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -886,8 +888,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -957,6 +957,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>1</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -984,8 +986,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -1123,6 +1123,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>6</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -1150,8 +1152,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -1221,6 +1221,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>1</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -1248,8 +1250,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -1554,6 +1554,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>13</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -1581,8 +1583,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
index 1a81da7025..bd1da27205 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
@@ -45,6 +45,8 @@
<customVariableValue1>should not appear in events report Bis</customVariableValue1>
</row>
</customVariables>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<deviceType>Desktop</deviceType>
<events>1</events>
<provider>Unknown</provider>
@@ -73,8 +75,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -148,6 +148,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>1</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -175,8 +177,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -318,6 +318,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>6</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -345,8 +347,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -420,6 +420,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>1</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -447,8 +449,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -757,6 +757,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>13</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -784,8 +786,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -859,6 +859,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>1</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -886,8 +888,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -957,6 +957,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>1</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -984,8 +986,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -1123,6 +1123,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>6</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -1150,8 +1152,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -1221,6 +1221,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>1</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -1248,8 +1250,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -1554,6 +1554,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>13</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -1581,8 +1583,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml
similarity index 67%
rename from tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
rename to tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml
index 0a914aaf35..bb6679c971 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml
@@ -2,27 +2,14 @@
<result>
<row>
<label>WebKit (Safari, Chrome)</label>
- <nb_visits>10</nb_visits>
- <nb_actions>10</nb_actions>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>10</bounce_count>
- <nb_visits_converted>10</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
- <sum_daily_nb_users>0</sum_daily_nb_users>
- <shortLabel>Webkit</shortLabel>
- </row>
- <row>
- <label>Unknown</label>
- <nb_visits>9</nb_visits>
- <nb_actions>12</nb_actions>
+ <nb_visits>17</nb_visits>
+ <nb_actions>20</nb_actions>
<max_actions>3</max_actions>
<sum_visit_length>305</sum_visit_length>
- <bounce_count>7</bounce_count>
- <nb_visits_converted>7</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
+ <bounce_count>15</bounce_count>
+ <nb_visits_converted>16</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>17</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <shortLabel>Unknown</shortLabel>
</row>
<row>
<label>Trident (IE)</label>
@@ -34,7 +21,17 @@
<nb_visits_converted>6</nb_visits_converted>
<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <shortLabel>Ie</shortLabel>
+ </row>
+ <row>
+ <label>Unknown</label>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>2</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
</row>
<row>
<label>Gecko (Firefox)</label>
@@ -46,6 +43,5 @@
<nb_visits_converted>2</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <shortLabel>Gecko</shortLabel>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
index 85a49ba35c..020dbfef10 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
@@ -955,6 +955,8 @@
</row>
</customVariables>
<deviceType>Unknown</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -982,8 +984,6 @@
<operatingSystemCode>AND</operatingSystemCode>
<operatingSystemShortName>Android</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 27.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -1069,6 +1069,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -1096,8 +1098,6 @@
<operatingSystemCode>WI7</operatingSystemCode>
<operatingSystemShortName>Win 7</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 27.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -1238,6 +1238,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -1265,8 +1267,6 @@
<operatingSystemCode>WI8</operatingSystemCode>
<operatingSystemShortName>Win 8</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WI8.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 27.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -3959,6 +3959,8 @@
<customVariables>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -3986,8 +3988,6 @@
<operatingSystemCode>LIN</operatingSystemCode>
<operatingSystemShortName>Linux</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 6.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -4375,6 +4375,8 @@
<customVariables>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -4402,8 +4404,6 @@
<operatingSystemCode>LIN</operatingSystemCode>
<operatingSystemShortName>Linux</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 6.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserEngines_day.xml
similarity index 91%
rename from tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml
rename to tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserEngines_day.xml
index 6d13aaf736..935548a360 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserEngines_day.xml
@@ -9,6 +9,5 @@
<sum_visit_length>1621</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
- <shortLabel>Gecko</shortLabel>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml
deleted file mode 100644
index e84a021ee9..0000000000
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<result>
- <row>
- <label>Gecko (Firefox)</label>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_visits>2</nb_visits>
- <nb_actions>9</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>8</max_actions>
- <sum_visit_length>1621</sum_visit_length>
- <bounce_count>1</bounce_count>
- <nb_visits_converted>2</nb_visits_converted>
- <shortLabel>Gecko</shortLabel>
- </row>
-</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
index 75ea1242f2..df83d3ad4d 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
@@ -79,6 +79,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -106,8 +108,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -290,6 +290,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -317,8 +319,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
index 41d80fb8fc..67f66e5d18 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
@@ -155,6 +155,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -182,8 +184,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -485,6 +485,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -512,8 +514,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -701,6 +701,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -728,8 +730,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserType_day.xml b/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserEngines_day.xml
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserType_day.xml
rename to tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserEngines_day.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserType_week.xml b/tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserEngines_week.xml
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__UserSettings.getBrowserType_week.xml
rename to tests/PHPUnit/Integration/expected/test_noVisit_PeriodIsLast__DevicesDetection.getBrowserEngines_week.xml
diff --git a/tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getBrowserType_day.xml b/tests/PHPUnit/Integration/expected/test_noVisit__DevicesDetection.getBrowserEngines_day.xml
similarity index 100%
rename from tests/PHPUnit/Integration/expected/test_noVisit__UserSettings.getBrowserType_day.xml
rename to tests/PHPUnit/Integration/expected/test_noVisit__DevicesDetection.getBrowserEngines_day.xml
--
GitLab