From dd6c90784ee00a0fa942ec763b88e4a211901611 Mon Sep 17 00:00:00 2001 From: mattab <matthieu.aubry@gmail.com> Date: Fri, 17 Jan 2014 22:50:13 +1300 Subject: [PATCH] Fix tests after changes in detection refs PR #202 https://travis-ci.org/piwik/piwik/jobs/17104153 --- ...icesDetection.getBrowserFamilies_month.xml | 8 +++---- ...icesDetection.getBrowserVersions_month.xml | 14 ++++++------ ...__UserSettings.getBrowserVersion_month.xml | 22 +++++++++---------- ...ortLogs__UserSettings.getBrowser_month.xml | 22 +++++++++---------- ...s__UserSettings.getConfiguration_month.xml | 2 +- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml index b6c1b4e644..f0a0faf700 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml @@ -34,7 +34,7 @@ <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> </row> <row> - <label>Firefox</label> + <label>Android Browser</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> @@ -42,10 +42,10 @@ <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <logo>plugins/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/UserSettings/images/browsers/AN.gif</logo> </row> <row> - <label>Safari</label> + <label>Firefox</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> @@ -53,6 +53,6 @@ <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <logo>plugins/UserSettings/images/browsers/SF.gif</logo> + <logo>plugins/UserSettings/images/browsers/FF.gif</logo> </row> </result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml index 1435ae4e38..80ef44cb99 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml @@ -34,7 +34,7 @@ <logo>plugins/UserSettings/images/browsers/CH.gif</logo> </row> <row> - <label>Chrome 19.0</label> + <label>Android Browser</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> @@ -42,10 +42,10 @@ <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <logo>plugins/UserSettings/images/browsers/CH.gif</logo> + <logo>plugins/UserSettings/images/browsers/AN.gif</logo> </row> <row> - <label>Chrome 20.0</label> + <label>Chrome 19.0</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> @@ -56,7 +56,7 @@ <logo>plugins/UserSettings/images/browsers/CH.gif</logo> </row> <row> - <label>Firefox 6.0</label> + <label>Chrome 20.0</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> @@ -64,10 +64,10 @@ <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <logo>plugins/UserSettings/images/browsers/FF.gif</logo> + <logo>plugins/UserSettings/images/browsers/CH.gif</logo> </row> <row> - <label>Mobile Safari 4.0</label> + <label>Firefox 6.0</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> @@ -75,7 +75,7 @@ <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <logo>plugins/UserSettings/images/browsers/SF.gif</logo> + <logo>plugins/UserSettings/images/browsers/FF.gif</logo> </row> <row> <label>Chrome 11.0</label> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml index 068785de87..e286fe2f4a 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml @@ -37,7 +37,7 @@ <shortLabel>RockMelt 0.9</shortLabel> </row> <row> - <label>Chrome 19.0</label> + <label>Android Browser </label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> @@ -45,11 +45,11 @@ <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <logo>plugins/UserSettings/images/browsers/CH.gif</logo> - <shortLabel>Chrome 19.0</shortLabel> + <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> + <shortLabel>Android Browser </shortLabel> </row> <row> - <label>Chrome 20.0</label> + <label>Chrome 19.0</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> @@ -58,10 +58,10 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <logo>plugins/UserSettings/images/browsers/CH.gif</logo> - <shortLabel>Chrome 20.0</shortLabel> + <shortLabel>Chrome 19.0</shortLabel> </row> <row> - <label>Firefox 6.0</label> + <label>Chrome 20.0</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> @@ -69,11 +69,11 @@ <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <logo>plugins/UserSettings/images/browsers/FF.gif</logo> - <shortLabel>Firefox 6.0</shortLabel> + <logo>plugins/UserSettings/images/browsers/CH.gif</logo> + <shortLabel>Chrome 20.0</shortLabel> </row> <row> - <label>Mobile Safari 4.0</label> + <label>Firefox 6.0</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> @@ -81,8 +81,8 @@ <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> - <shortLabel>Mobile Safari 4.0</shortLabel> + <logo>plugins/UserSettings/images/browsers/FF.gif</logo> + <shortLabel>Firefox 6.0</shortLabel> </row> <row> <label>Chrome 11.0</label> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml index b3ff3fb0a4..eac066a4e4 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml @@ -33,6 +33,17 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> </row> + <row> + <label>Android Browser </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>2</nb_visits_converted> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> + </row> <row> <label>Chrome</label> <nb_visits>5</nb_visits> @@ -55,17 +66,6 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <logo>plugins/UserSettings/images/browsers/FF.gif</logo> </row> - <row> - <label>Mobile Safari</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>2</nb_visits_converted> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> - </row> <row> <label>Unknown</label> <nb_visits>1</nb_visits> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml index c5d306e75c..3aa7e6c0ec 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml @@ -31,7 +31,7 @@ <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> </row> <row> - <label>Android / Mobile Safari / unknown</label> + <label>Android / Android Browser / unknown</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> -- GitLab