[sensor] Set permissions in WPT tests

Thanks to the new set_permission method on test_runner, this CL makes sure the sensor WPT tests with first granted permission and adds tests for sensor permission status. Change-Id: Id72e60f92043986c3fe3517faf0c79716a1f03c8 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2104654 Reviewed-by: Raphael Kubo da Costa <[email protected]> Reviewed-by: Reilly Grant <[email protected]> Commit-Queue: Wanming Lin <[email protected]> Cr-Commit-Position: refs/heads/master@{#751207}
ASISBusiness-Group · Mar 18, 2020 · d18df87 · d18df87
1 parent 175d843
commit d18df87
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 9 deletions.
diff --git a/generic-sensor/generic-sensor-permission.https.html b/generic-sensor/generic-sensor-permission.https.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>sensor: permission</title>
+<link rel="help" href="https://w3c.github.io/sensors/"/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script>
+
+"use strict";
+
+for (const entry of ['accelerometer', 'gyroscope',
+    'magnetometer', 'ambient-light-sensor']) {
+  promise_test(async t => {
+    await test_driver.set_permission({ name: entry }, 'denied', false);
+
+    const status = await navigator.permissions.query({ name: entry });
+    assert_class_string(status, "PermissionStatus");
+    assert_equals(status.state, "denied");
+  }, `Deny ${entry} permission should work.`);
+
+  promise_test(async t => {
+    await test_driver.set_permission({ name: entry }, 'granted', false);
+
+    const status = await navigator.permissions.query({ name: entry });
+    assert_class_string(status, "PermissionStatus");
+    assert_equals(status.state, "granted");
+  }, `Grant ${entry} permission should work.`);
+};
+
+</script>
diff --git a/generic-sensor/resources/generic-sensor-helpers.js b/generic-sensor/resources/generic-sensor-helpers.js
@@ -20,6 +20,8 @@ const loadChromiumResources = async () => {
     '/gen/mojo/public/mojom/base/string16.mojom.js',
     '/gen/services/device/public/mojom/sensor.mojom.js',
     '/gen/services/device/public/mojom/sensor_provider.mojom.js',
+    '/resources/testdriver.js',
+    '/resources/testdriver-vendor.js',
     '/resources/chromium/generic_sensor_mocks.js',
   ];
 

diff --git a/resources/chromium/generic_sensor_mocks.js b/resources/chromium/generic_sensor_mocks.js
@@ -309,18 +309,15 @@ var GenericSensorTest = (() => {
       Object.freeze(this); // Make it immutable.
     }
 
-    initialize() {
+    async initialize() {
       if (testInternal.initialized)
         throw new Error('Call reset() before initialize().');
 
-      if (window.testRunner) {
-        // Grant sensor permissions for Chromium testrunner.
-        ['accelerometer', 'gyroscope',
-         'magnetometer', 'ambient-light-sensor'].forEach((entry) => {
-          window.testRunner.setPermission(entry, 'granted',
-                                          location.origin, location.origin);
-        });
-      }
+      // Grant sensor permissions for Chromium testdriver.
+      for (const entry of ['accelerometer', 'gyroscope',
+          'magnetometer', 'ambient-light-sensor']) {
+        await test_driver.set_permission({ name: entry }, 'granted', false);
+      };
 
       testInternal.sensorProvider = new MockSensorProvider;
       testInternal.initialized = true;