Merge f68a7c2 into 4673d9f

nielsbasjes · May 2, 2019 · 886225e · 886225e
2 parents 4673d9f + f68a7c2
commit 886225e
Showing 1 changed file with 67 additions and 2 deletions.
diff --git a/analyzer/src/main/resources/UserAgents/Robots.yaml b/analyzer/src/main/resources/UserAgents/Robots.yaml
@@ -2418,6 +2418,48 @@ config:
     - 'AgentName                           :   5001 : "SpeedCurve WebpageTest"'
     - 'AgentVersion                        :   5001 : @PTSTVersion'
 
+- matcher:
+    require:
+    - 'agent.product.(1)version="SpeedCurve"'
+    - 'agent.product.name[1-1]="Mobile"'
+    variable:
+    - 'PTSTVersion:agent.product.name="PTST"^.(2)version'
+    extract:
+    - '__Set_ALL_Fields__                  :   5999 : "<<<null>>>"' # Must be 1 lower than the rest (or you will wipe yourself too)
+    - 'DeviceClass                         :   6001 : "Robot Mobile"'
+    - 'DeviceName                          :   6001 : "SpeedCurve WebpageTest"'
+    - 'DeviceBrand                         :   6001 : "SpeedCurve"'
+    - 'OperatingSystemClass                :   6001 : "Cloud"'
+    - 'OperatingSystemName                 :   6001 : "Cloud"'
+    - 'OperatingSystemVersion              :   6001 : "??"'
+    - 'LayoutEngineClass                   :   6001 : "Robot"'
+    - 'LayoutEngineName                    :   6001 : "SpeedCurve WebpageTest"'
+    - 'LayoutEngineVersion                 :   6001 : @PTSTVersion'
+    - 'AgentClass                          :   6001 : "Robot"'
+    - 'AgentName                           :   6001 : "SpeedCurve WebpageTest"'
+    - 'AgentVersion                        :   6001 : @PTSTVersion'
+
+- matcher:
+    require:
+    - 'agent.product.(1)version="SpeedCurve"'
+    - 'agent.(1)product.(1)comments.(2)entry[1-1]="Android"'
+    variable:
+    - 'PTSTVersion:agent.product.name="PTST"^.(2)version'
+    extract:
+    - '__Set_ALL_Fields__                  :   6999 : "<<<null>>>"' # Must be 1 lower than the rest (or you will wipe yourself too)
+    - 'DeviceClass                         :   7001 : "Robot Mobile"'
+    - 'DeviceName                          :   7001 : "SpeedCurve WebpageTest"'
+    - 'DeviceBrand                         :   7001 : "SpeedCurve"'
+    - 'OperatingSystemClass                :   7001 : "Cloud"'
+    - 'OperatingSystemName                 :   7001 : "Cloud"'
+    - 'OperatingSystemVersion              :   7001 : "??"'
+    - 'LayoutEngineClass                   :   7001 : "Robot"'
+    - 'LayoutEngineName                    :   7001 : "SpeedCurve WebpageTest"'
+    - 'LayoutEngineVersion                 :   7001 : @PTSTVersion'
+    - 'AgentClass                          :   7001 : "Robot"'
+    - 'AgentName                           :   7001 : "SpeedCurve WebpageTest"'
+    - 'AgentVersion                        :   7001 : @PTSTVersion'
+
 - test:
     input:
       user_agent_string: 'Mozilla/5.0 (Linux; Android 6.0.1; Moto G (4) Build/MPJ24.139-64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.146 Mobile Safari/537.36 PTST/180521.140508'
@@ -2519,7 +2561,7 @@ config:
     input:
       user_agent_string: 'Mozilla/5.0 (iPad; CPU OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B137 Safari/601.1 PTST/SpeedCurve/180620.180643'
     expected:
-      DeviceClass                          : 'Robot'
+      DeviceClass                          : 'Robot Mobile'
       DeviceName                           : 'SpeedCurve WebpageTest'
       DeviceBrand                          : 'SpeedCurve'
       OperatingSystemClass                 : 'Cloud'
@@ -2543,7 +2585,7 @@ config:
     input:
       user_agent_string: 'Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1 PTST/SpeedCurve/180620.180643'
     expected:
-      DeviceClass                          : 'Robot'
+      DeviceClass                          : 'Robot Mobile'
       DeviceName                           : 'SpeedCurve WebpageTest'
       DeviceBrand                          : 'SpeedCurve'
       OperatingSystemClass                 : 'Cloud'
@@ -2563,6 +2605,29 @@ config:
       AgentNameVersion                     : 'SpeedCurve WebpageTest 180620.180643'
       AgentNameVersionMajor                : 'SpeedCurve WebpageTest 180620'
 
+- test:
+    input:
+      user_agent_string: 'Mozilla/5.0 (Linux; Android 4.3; Nexus 10 Build/JSS15Q) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.76 Safari/537.36 PTST/SpeedCurve/190429.170455'
+    expected:
+      DeviceClass                          : 'Robot Mobile'
+      DeviceName                           : 'SpeedCurve WebpageTest'
+      DeviceBrand                          : 'SpeedCurve'
+      OperatingSystemClass                 : 'Cloud'
+      OperatingSystemName                  : 'Cloud'
+      OperatingSystemVersion               : '??'
+      OperatingSystemNameVersion           : 'Cloud ??'
+      LayoutEngineClass                    : 'Robot'
+      LayoutEngineName                     : 'SpeedCurve WebpageTest'
+      LayoutEngineVersion                  : '190429.170455'
+      LayoutEngineVersionMajor             : '190429'
+      LayoutEngineNameVersion              : 'SpeedCurve WebpageTest 190429.170455'
+      LayoutEngineNameVersionMajor         : 'SpeedCurve WebpageTest 190429'
+      AgentClass                           : 'Robot'
+      AgentName                            : 'SpeedCurve WebpageTest'
+      AgentVersion                         : '190429.170455'
+      AgentVersionMajor                    : '190429'
+      AgentNameVersion                     : 'SpeedCurve WebpageTest 190429.170455'
+      AgentNameVersionMajor                : 'SpeedCurve WebpageTest 190429'
 
 - test:
     input: