Modify ProximitySensor tests (#19214)

* Modify ProximitySensor tests

- Support mock sensor
- Add verifyProSensorReading function

generic-sensor/resources/generic-sensor-helpers.js

@@ -61,8 +61,11 @@ function sensor_test(func, name, properties) {
 }
 
 function verifySensorReading(pattern, values, timestamp, isNull) {
+  // If |val| cannot be converted to a float, we return the original value.
+  // This can happen when a value in |pattern| is not a number.
   function round(val) {
-    return Number.parseFloat(val).toPrecision(6);
+    const res = Number.parseFloat(val).toPrecision(6);
+    return res === "NaN" ? val : res;
   }
 
   if (isNull) {
@@ -92,6 +95,10 @@ function verifyGeoSensorReading(pattern, {latitude, longitude, altitude,
     accuracy, altitudeAccuracy, heading, speed], timestamp, isNull);
 }
 
+function verifyProximitySensorReading(pattern, {distance, max, near, timestamp}, isNull) {
+  return verifySensorReading(pattern, [distance, max, near], timestamp, isNull);
+}
+
 // A "sliding window" that iterates over |data| and returns one item at a
 // time, advancing and wrapping around as needed. |data| must be an array of
 // arrays.

proximity/ProximitySensor-iframe-access.https.html

@@ -5,7 +5,7 @@
 <link rel="help" href="https://w3c.github.io/proximity/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/generic-sensor/generic-sensor-tests.js"></script>
+<script src="/generic-sensor/resources/generic-sensor-helpers.js"></script>
 <script src="/generic-sensor/generic-sensor-iframe-tests.sub.js"></script>
 <script src="/generic-sensor/generic-sensor-feature-policy-test.sub.js"></script>
 <div id="log"></div>

proximity/ProximitySensor.https.html

@@ -5,10 +5,28 @@
 <link rel="help" href="https://w3c.github.io/proximity/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/generic-sensor/resources/generic-sensor-helpers.js"></script>
 <script src="/generic-sensor/generic-sensor-tests.js"></script>
-<div id="log"></div>
+
 <script>
 
-runGenericSensorTests('ProximitySensor');
+'use strict';
+
+// near: 0 stands for false, 1 stands for true, which will be convert to boolean
+// in mock sensor
+const kReadings = {
+    readings: [
+        [1.12345, 2.12345, 1]
+    ],
+    expectedReadings: [
+        [1.12345, 2.12345, true]
+    ]
+};
+
+runGenericSensorTests(
+    'ProximitySensor',
+    kReadings,
+    verifyProximitySensorReading,
+    ['proximity']);
 
 </script>

resources/chromium/generic_sensor_mocks.js

@@ -150,7 +150,8 @@ var GenericSensorTest = (() => {
         ['RelativeOrientationSensor',
             device.mojom.SensorType.RELATIVE_ORIENTATION_QUATERNION],
         ['RelativeOrientationEulerAngles',
-            device.mojom.SensorType.RELATIVE_ORIENTATION_EULER_ANGLES]
+            device.mojom.SensorType.RELATIVE_ORIENTATION_EULER_ANGLES],
+        ['ProximitySensor', device.mojom.SensorType.PROXIMITY]
       ]);
       this.binding_ = new mojo.Binding(device.mojom.SensorProvider, this);