another attempt on fixing unit test expected values

3 files changed, 34 insertions, 46 deletions

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 176f0fae0d..1435ae4e38 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml
@@ -12,17 +12,6 @@
 		<logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
 	</row>
 	<row>
-		<label>RockMelt 0.9</label>
-		<nb_visits>5</nb_visits>
-		<nb_actions>8</nb_actions>
-		<max_actions>3</max_actions>
-		<sum_visit_length>305</sum_visit_length>
-		<bounce_count>3</bounce_count>
-		<nb_visits_converted>4</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
-		<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
-	</row>
-	<row>
 		<label>Internet Explorer 9.0</label>
 		<nb_visits>5</nb_visits>
 		<nb_actions>5</nb_actions>
@@ -34,6 +23,17 @@
 		<logo>plugins/UserSettings/images/browsers/IE.gif</logo>
 	</row>
 	<row>
+		<label>RockMelt 0.9</label>
+		<nb_visits>5</nb_visits>
+		<nb_actions>8</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>305</sum_visit_length>
+		<bounce_count>3</bounce_count>
+		<nb_visits_converted>4</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+		<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
+	</row>
+	<row>
 		<label>Chrome 19.0</label>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
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 80c151f57a..068785de87 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml
@@ -13,6 +13,18 @@
 		<shortLabel>Epiphany 2.30</shortLabel>
 	</row>
 	<row>
+		<label>Internet Explorer 9.0</label>
+		<nb_visits>5</nb_visits>
+		<nb_actions>5</nb_actions>
+		<max_actions>1</max_actions>
+		<sum_visit_length>0</sum_visit_length>
+		<bounce_count>5</bounce_count>
+		<nb_visits_converted>5</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+		<logo>plugins/UserSettings/images/browsers/IE.gif</logo>
+		<shortLabel>Internet Explorer 9.0</shortLabel>
+	</row>
+	<row>
 		<label>RockMelt 0.9</label>
 		<nb_visits>5</nb_visits>
 		<nb_actions>8</nb_actions>
@@ -25,18 +37,6 @@
 		<shortLabel>RockMelt 0.9</shortLabel>
 	</row>
 	<row>
-		<label>Internet Explorer 10.6</label>
-		<nb_visits>3</nb_visits>
-		<nb_actions>3</nb_actions>
-		<max_actions>1</max_actions>
-		<sum_visit_length>0</sum_visit_length>
-		<bounce_count>3</bounce_count>
-		<nb_visits_converted>3</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
-		<logo>plugins/UserSettings/images/browsers/IE.gif</logo>
-		<shortLabel>Internet Explorer 10.6</shortLabel>
-	</row>
-	<row>
 		<label>Chrome 19.0</label>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
@@ -73,18 +73,6 @@
 		<shortLabel>Firefox 6.0</shortLabel>
 	</row>
 	<row>
-		<label>Internet Explorer 10.0</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/IE.gif</logo>
-		<shortLabel>Internet Explorer 10.0</shortLabel>
-	</row>
-	<row>
 		<label>Mobile Safari 4.0</label>
 		<nb_visits>2</nb_visits>
 		<nb_actions>2</nb_actions>
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 6997bcb7db..b3ff3fb0a4 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
@@ -12,17 +12,6 @@
 		<logo>plugins/UserSettings/images/browsers/EP.gif</logo>
 	</row>
 	<row>
-		<label>RockMelt</label>
-		<nb_visits>5</nb_visits>
-		<nb_actions>8</nb_actions>
-		<max_actions>3</max_actions>
-		<sum_visit_length>305</sum_visit_length>
-		<bounce_count>3</bounce_count>
-		<nb_visits_converted>4</nb_visits_converted>
-		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
-		<logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
-	</row>
-	<row>
 		<label>Internet Explorer</label>
 		<nb_visits>6</nb_visits>
 		<nb_actions>6</nb_actions>
@@ -34,6 +23,17 @@
 		<logo>plugins/UserSettings/images/browsers/IE.gif</logo>
 	</row>
 	<row>
+		<label>RockMelt</label>
+		<nb_visits>5</nb_visits>
+		<nb_actions>8</nb_actions>
+		<max_actions>3</max_actions>
+		<sum_visit_length>305</sum_visit_length>
+		<bounce_count>3</bounce_count>
+		<nb_visits_converted>4</nb_visits_converted>
+		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+		<logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
+	</row>
+	<row>
 		<label>Chrome</label>
 		<nb_visits>5</nb_visits>
 		<nb_actions>5</nb_actions>