Updates device detector to new major version (#18299)

* Updates device detector to new major version

* updates expected test files

3 files changed, 86 insertions, 27 deletions

diff --git a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getBrand_day.xml b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getBrand_day.xml
index 2bf75e28d9..bd2711f84f 100644
--- a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getBrand_day.xml
+++ b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getBrand_day.xml
@@ -24,27 +24,49 @@
 	</row>
 	<row>
 		<label>Unknown</label>
-		<nb_uniq_visitors>3</nb_uniq_visitors>
+		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>3</nb_visits>
-		<nb_actions>3</nb_actions>
+		<nb_actions>2</nb_actions>
 		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
-		<sum_visit_length>1808</sum_visit_length>
+		<sum_visit_length>1087</sum_visit_length>
 		<bounce_count>3</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>3</nb_conversions>
+				<nb_conversions>2</nb_conversions>
 				<nb_visits_converted>2</nb_visits_converted>
-				<revenue>62.26</revenue>
+				<revenue>52.26</revenue>
 			</row>
 		</goals>
-		<nb_conversions>3</nb_conversions>
-		<revenue>62.26</revenue>
+		<nb_conversions>2</nb_conversions>
+		<revenue>52.26</revenue>
 		<logo>plugins/Morpheus/icons/dist/brand/unk.png</logo>
 		<segment>deviceBrand==Unknown</segment>
 	</row>
 	<row>
+		<label>Fly</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>724</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>1</nb_visits_converted>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>10</revenue>
+			</row>
+		</goals>
+		<nb_conversions>1</nb_conversions>
+		<revenue>10</revenue>
+		<logo>plugins/Morpheus/icons/dist/brand/Fly.png</logo>
+		<segment>deviceBrand==Fly</segment>
+	</row>
+	<row>
 		<label>HTC</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
diff --git a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getModel_day.xml b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getModel_day.xml
index 5b3523672f..6168041e5b 100644
--- a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getModel_day.xml
+++ b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getModel_day.xml
@@ -44,26 +44,47 @@
 	</row>
 	<row>
 		<label>Unknown</label>
-		<nb_uniq_visitors>2</nb_uniq_visitors>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
-		<nb_actions>2</nb_actions>
+		<nb_actions>1</nb_actions>
 		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
-		<sum_visit_length>724</sum_visit_length>
+		<sum_visit_length>3</sum_visit_length>
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>2</nb_conversions>
+				<nb_conversions>1</nb_conversions>
 				<nb_visits_converted>1</nb_visits_converted>
-				<revenue>52.26</revenue>
+				<revenue>42.26</revenue>
 			</row>
 		</goals>
-		<nb_conversions>2</nb_conversions>
-		<revenue>52.26</revenue>
+		<nb_conversions>1</nb_conversions>
+		<revenue>42.26</revenue>
 		<segment>deviceBrand==Unknown;deviceModel==</segment>
 	</row>
 	<row>
+		<label>Fly - DS123</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>724</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>1</nb_visits_converted>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>10</revenue>
+			</row>
+		</goals>
+		<nb_conversions>1</nb_conversions>
+		<revenue>10</revenue>
+		<segment>deviceBrand==Fly;deviceModel==DS123</segment>
+	</row>
+	<row>
 		<label>Generic Desktop</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
diff --git a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml
index 6aa976d8f7..a9313c542e 100644
--- a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml
+++ b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml
@@ -46,23 +46,23 @@
 	</row>
 	<row>
 		<label>Unknown</label>
-		<nb_uniq_visitors>2</nb_uniq_visitors>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
-		<nb_actions>2</nb_actions>
+		<nb_actions>1</nb_actions>
 		<nb_users>0</nb_users>
 		<max_actions>1</max_actions>
-		<sum_visit_length>724</sum_visit_length>
+		<sum_visit_length>3</sum_visit_length>
 		<bounce_count>2</bounce_count>
 		<nb_visits_converted>1</nb_visits_converted>
 		<goals>
 			<row idgoal='1'>
-				<nb_conversions>2</nb_conversions>
+				<nb_conversions>1</nb_conversions>
 				<nb_visits_converted>1</nb_visits_converted>
-				<revenue>52.26</revenue>
+				<revenue>42.26</revenue>
 			</row>
 		</goals>
-		<nb_conversions>2</nb_conversions>
-		<revenue>52.26</revenue>
+		<nb_conversions>1</nb_conversions>
+		<revenue>42.26</revenue>
 		<logo>plugins/Morpheus/icons/dist/devices/unknown.png</logo>
 	</row>
 	<row>
@@ -88,6 +88,28 @@
 		<logo>plugins/Morpheus/icons/dist/devices/desktop.png</logo>
 	</row>
 	<row>
+		<label>Feature phone</label>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<nb_actions>1</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>1</max_actions>
+		<sum_visit_length>724</sum_visit_length>
+		<bounce_count>1</bounce_count>
+		<nb_visits_converted>1</nb_visits_converted>
+		<goals>
+			<row idgoal='1'>
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>10</revenue>
+			</row>
+		</goals>
+		<nb_conversions>1</nb_conversions>
+		<revenue>10</revenue>
+		<segment>deviceType==feature+phone</segment>
+		<logo>plugins/Morpheus/icons/dist/devices/feature_phone.png</logo>
+	</row>
+	<row>
 		<label>Tv</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
@@ -119,12 +141,6 @@
 		<logo>plugins/Morpheus/icons/dist/devices/console.png</logo>
 	</row>
 	<row>
-		<label>Feature phone</label>
-		<nb_visits>0</nb_visits>
-		<segment>deviceType==feature+phone</segment>
-		<logo>plugins/Morpheus/icons/dist/devices/feature_phone.png</logo>
-	</row>
-	<row>
 		<label>Peripheral</label>
 		<nb_visits>0</nb_visits>
 		<segment>deviceType==peripheral</segment>