Skip to content

Commit 23984ef

Browse files
chengweih001lutien
chengweih001
authored and
lutien
committed
Bug 1966174 [wpt PR 52500] - Move sensor WPT tests to run in headless shell,
Automatic update from web-platform-tests Move sensor WPT tests to run in headless shell This CL migrates sensor WPT tests to use testdriver.bidi.set_permission to override the expected sensor permission. This allows those tests to be run in headless shell. Bug: 358197788 Change-Id: I03c2cc8702ee03a5170b1bc26f2d67dc53b3694e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6536708 Reviewed-by: Weizhong Xia <[email protected]> Commit-Queue: Jack Hsieh <[email protected]> Cr-Commit-Position: refs/heads/main@{#1459521} -- wpt-commits: 03bf407c770c149d9da57ebabf93e6192db452d3 wpt-pr: 52500 Differential Revision: https://phabricator.services.mozilla.com/D250149
1 parent c167edf commit 23984ef

17 files changed

+59
-37
lines changed

‎testing/web-platform/tests/accelerometer/Accelerometer-iframe-access.https.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<link rel="help" href="https://www.w3.org/TR/accelerometer/">
77
<script src="/resources/testharness.js"></script>
88
<script src="/resources/testharnessreport.js"></script>
9-
<script src="/resources/testdriver.js"></script>
9+
<script src="/resources/testdriver.js?feature=bidi"></script>
1010
<script src="/resources/testdriver-vendor.js"></script>
1111
<script src="/generic-sensor/resources/generic-sensor-helpers.js"></script>
1212
<script src="/generic-sensor/generic-sensor-iframe-tests.sub.js"></script>

‎testing/web-platform/tests/accelerometer/Accelerometer.https.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<link rel="help" href="https://www.w3.org/TR/accelerometer/">
77
<script src="/resources/testharness.js"></script>
88
<script src="/resources/testharnessreport.js"></script>
9-
<script src="/resources/testdriver.js"></script>
9+
<script src="/resources/testdriver.js?feature=bidi"></script>
1010
<script src="/resources/testdriver-vendor.js"></script>
1111
<script src="/page-visibility/resources/window_state_context.js"></script>
1212
<script src="/generic-sensor/resources/generic-sensor-helpers.js"></script>

‎testing/web-platform/tests/accelerometer/GravitySensor.https.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<link rel="help" href="https://www.w3.org/TR/accelerometer/">
77
<script src="/resources/testharness.js"></script>
88
<script src="/resources/testharnessreport.js"></script>
9-
<script src="/resources/testdriver.js"></script>
9+
<script src="/resources/testdriver.js?feature=bidi"></script>
1010
<script src="/resources/testdriver-vendor.js"></script>
1111
<script src="/page-visibility/resources/window_state_context.js"></script>
1212
<script src="/generic-sensor/resources/generic-sensor-helpers.js"></script>

‎testing/web-platform/tests/accelerometer/LinearAccelerationSensor.https.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<link rel="help" href="https://www.w3.org/TR/accelerometer/">
77
<script src="/resources/testharness.js"></script>
88
<script src="/resources/testharnessreport.js"></script>
9-
<script src="/resources/testdriver.js"></script>
9+
<script src="/resources/testdriver.js?feature=bidi"></script>
1010
<script src="/resources/testdriver-vendor.js"></script>
1111
<script src="/page-visibility/resources/window_state_context.js"></script>
1212
<script src="/generic-sensor/resources/generic-sensor-helpers.js"></script>

‎testing/web-platform/tests/ambient-light/AmbientLightSensor-iframe-access.https.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<link rel="help" href="https://w3c.github.io/ambient-light/">
66
<script src="/resources/testharness.js"></script>
77
<script src="/resources/testharnessreport.js"></script>
8-
<script src="/resources/testdriver.js"></script>
8+
<script src="/resources/testdriver.js?feature=bidi"></script>
99
<script src="/resources/testdriver-vendor.js"></script>
1010
<script src="/generic-sensor/resources/generic-sensor-helpers.js"></script>
1111
<script src="/generic-sensor/generic-sensor-iframe-tests.sub.js"></script>

‎testing/web-platform/tests/ambient-light/AmbientLightSensor.https.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<link rel="help" href="https://www.w3.org/TR/ambient-light/">
77
<script src="/resources/testharness.js"></script>
88
<script src="/resources/testharnessreport.js"></script>
9-
<script src="/resources/testdriver.js"></script>
9+
<script src="/resources/testdriver.js?feature=bidi"></script>
1010
<script src="/resources/testdriver-vendor.js"></script>
1111
<script src="/page-visibility/resources/window_state_context.js"></script>
1212
<script src="/generic-sensor/resources/generic-sensor-helpers.js"></script>

‎testing/web-platform/tests/generic-sensor/generic-sensor-iframe-tests.sub.js‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ function run_generic_sensor_iframe_tests(sensorData, readingData) {
8989
};
9090

9191
// Create main frame sensor.
92-
await test_driver.set_permission({name: permissionName}, 'granted');
92+
await test_driver.bidi.permissions.set_permission(
93+
{descriptor: {name: permissionName}, state: 'granted'});
9394
await test_driver.create_virtual_sensor(testDriverName);
9495
const sensor = new sensorType();
9596
t.add_cleanup(async () => {
@@ -192,7 +193,8 @@ function run_generic_sensor_iframe_tests(sensorData, readingData) {
192193

193194
sensor_test(async (t, readings) => {
194195
// Create main frame sensor.
195-
await test_driver.set_permission({name: permissionName}, 'granted');
196+
await test_driver.bidi.permissions.set_permission(
197+
{descriptor: {name: permissionName}, state: 'granted'});
196198
await test_driver.create_virtual_sensor(testDriverName);
197199
const sensor = new sensorType();
198200
t.add_cleanup(async () => {
@@ -277,7 +279,8 @@ function run_generic_sensor_iframe_tests(sensorData, readingData) {
277279
await iframeLoadWatcher.wait_for('load');
278280

279281
// Create sensor in the iframe.
280-
await test_driver.set_permission({name: permissionName}, 'granted');
282+
await test_driver.bidi.permissions.set_permission(
283+
{descriptor: {name: permissionName}, state: 'granted'});
281284
await test_driver.create_virtual_sensor(testDriverName);
282285
iframe.contentWindow.focus();
283286
const iframeSensor = new iframe.contentWindow[sensorName]();
@@ -310,7 +313,8 @@ function run_generic_sensor_iframe_tests(sensorData, readingData) {
310313
await iframeLoadWatcher.wait_for('load');
311314

312315
// Create sensor in the iframe.
313-
await test_driver.set_permission({name: permissionName}, 'granted');
316+
await test_driver.bidi.permissions.set_permission(
317+
{descriptor: {name: permissionName}, state: 'granted'});
314318
await test_driver.create_virtual_sensor(testDriverName);
315319
const iframeSensor = new iframe.contentWindow[sensorName]();
316320
t.add_cleanup(async () => {

‎testing/web-platform/tests/generic-sensor/generic-sensor-tests.js‎

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ function runGenericSensorTests(sensorData, readingData) {
4343
});
4444

4545
sensor_test(async t => {
46-
await test_driver.set_permission({name: permissionName}, 'denied');
46+
await test_driver.bidi.permissions.set_permission(
47+
{descriptor: {name: permissionName}, state: 'denied'});
4748

4849
await test_driver.create_virtual_sensor(testDriverName);
4950
const sensor = new sensorType;
@@ -62,7 +63,8 @@ function runGenericSensorTests(sensorData, readingData) {
6263
granted.`);
6364

6465
sensor_test(async t => {
65-
await test_driver.set_permission({name: permissionName}, 'granted');
66+
await test_driver.bidi.permissions.set_permission(
67+
{descriptor: {name: permissionName}, state: 'granted'});
6668

6769
await test_driver.create_virtual_sensor(testDriverName, {connected: false});
6870
const sensor = new sensorType;
@@ -81,7 +83,8 @@ function runGenericSensorTests(sensorData, readingData) {
8183
}, `${sensorName}: Test that onerror is send when start() call has failed.`);
8284

8385
sensor_test(async t => {
84-
await test_driver.set_permission({name: permissionName}, 'granted');
86+
await test_driver.bidi.permissions.set_permission(
87+
{descriptor: {name: permissionName}, state: 'granted'});
8588

8689
await test_driver.create_virtual_sensor(testDriverName);
8790

@@ -101,7 +104,8 @@ function runGenericSensorTests(sensorData, readingData) {
101104
}, `${sensorName}: Test that frequency is capped to allowed maximum.`);
102105

103106
sensor_test(async t => {
104-
await test_driver.set_permission({name: permissionName}, 'granted');
107+
await test_driver.bidi.permissions.set_permission(
108+
{descriptor: {name: permissionName}, state: 'granted'});
105109

106110
const maxSupportedFrequency = 5;
107111
await test_driver.create_virtual_sensor(
@@ -125,7 +129,8 @@ function runGenericSensorTests(sensorData, readingData) {
125129
frequency.`);
126130

127131
sensor_test(async t => {
128-
await test_driver.set_permission({name: permissionName}, 'granted');
132+
await test_driver.bidi.permissions.set_permission(
133+
{descriptor: {name: permissionName}, state: 'granted'});
129134

130135
const minSupportedFrequency = 2;
131136
await test_driver.create_virtual_sensor(
@@ -201,7 +206,8 @@ function runGenericSensorTests(sensorData, readingData) {
201206
allowed to use feature policy.`);
202207

203208
sensor_test(async (t, readings, expectedReadings) => {
204-
await test_driver.set_permission({name: permissionName}, 'granted');
209+
await test_driver.bidi.permissions.set_permission(
210+
{descriptor: {name: permissionName}, state: 'granted'});
205211

206212
await test_driver.create_virtual_sensor(testDriverName);
207213

@@ -234,7 +240,8 @@ function runGenericSensorTests(sensorData, readingData) {
234240
valid.`);
235241

236242
sensor_test(async (t, readings, expectedReadings) => {
237-
await test_driver.set_permission({name: permissionName}, 'granted');
243+
await test_driver.bidi.permissions.set_permission(
244+
{descriptor: {name: permissionName}, state: 'granted'});
238245

239246
await test_driver.create_virtual_sensor(testDriverName);
240247

@@ -279,7 +286,8 @@ function runGenericSensorTests(sensorData, readingData) {
279286
// Tests that readings maps to expectedReadings correctly. Due to threshold
280287
// check and rounding some values might be discarded or changed.
281288
sensor_test(async (t, readings, expectedReadings) => {
282-
await test_driver.set_permission({name: permissionName}, 'granted');
289+
await test_driver.bidi.permissions.set_permission(
290+
{descriptor: {name: permissionName}, state: 'granted'});
283291

284292
await test_driver.create_virtual_sensor(testDriverName);
285293

@@ -309,7 +317,8 @@ function runGenericSensorTests(sensorData, readingData) {
309317
correctly.`);
310318

311319
sensor_test(async (t, readings) => {
312-
await test_driver.set_permission({name: permissionName}, 'granted');
320+
await test_driver.bidi.permissions.set_permission(
321+
{descriptor: {name: permissionName}, state: 'granted'});
313322

314323
await test_driver.create_virtual_sensor(testDriverName);
315324

@@ -343,7 +352,8 @@ function runGenericSensorTests(sensorData, readingData) {
343352
}, `${sensorName}: sensor timestamp is updated when time passes.`);
344353

345354
sensor_test(async t => {
346-
await test_driver.set_permission({name: permissionName}, 'granted');
355+
await test_driver.bidi.permissions.set_permission(
356+
{descriptor: {name: permissionName}, state: 'granted'});
347357

348358
await test_driver.create_virtual_sensor(testDriverName);
349359

@@ -366,7 +376,8 @@ function runGenericSensorTests(sensorData, readingData) {
366376
states are correct.`);
367377

368378
sensor_test(async t => {
369-
await test_driver.set_permission({name: permissionName}, 'granted');
379+
await test_driver.bidi.permissions.set_permission(
380+
{descriptor: {name: permissionName}, state: 'granted'});
370381

371382
await test_driver.create_virtual_sensor(testDriverName);
372383

@@ -385,7 +396,8 @@ function runGenericSensorTests(sensorData, readingData) {
385396
started sensor.`);
386397

387398
sensor_test(async t => {
388-
await test_driver.set_permission({name: permissionName}, 'granted');
399+
await test_driver.bidi.permissions.set_permission(
400+
{descriptor: {name: permissionName}, state: 'granted'});
389401

390402
await test_driver.create_virtual_sensor(testDriverName);
391403

@@ -405,7 +417,8 @@ function runGenericSensorTests(sensorData, readingData) {
405417
stopped sensor.`);
406418

407419
sensor_test(async (t, readings, expectedReadings) => {
408-
await test_driver.set_permission({name: permissionName}, 'granted');
420+
await test_driver.bidi.permissions.set_permission(
421+
{descriptor: {name: permissionName}, state: 'granted'});
409422

410423
await test_driver.create_virtual_sensor(testDriverName);
411424

@@ -454,7 +467,8 @@ function runGenericSensorTests(sensorData, readingData) {
454467
}, `${sensorName}: Test that fresh reading is fetched on start().`);
455468

456469
sensor_test(async (t, readings, expectedReadings) => {
457-
await test_driver.set_permission({name: permissionName}, 'granted');
470+
await test_driver.bidi.permissions.set_permission(
471+
{descriptor: {name: permissionName}, state: 'granted'});
458472

459473
await test_driver.create_virtual_sensor(testDriverName);
460474

@@ -516,7 +530,8 @@ function runGenericSensorTests(sensorData, readingData) {
516530
}, `${sensorName}: Readings are not delivered when the page has no visibility`);
517531

518532
sensor_test(async t => {
519-
await test_driver.set_permission({name: permissionName}, 'granted');
533+
await test_driver.bidi.permissions.set_permission(
534+
{descriptor: {name: permissionName}, state: 'granted'});
520535

521536
await test_driver.create_virtual_sensor(testDriverName);
522537

@@ -567,7 +582,8 @@ function runGenericSensorTests(sensorData, readingData) {
567582
}, `${sensorName}: frequency hint works.`);
568583

569584
sensor_test(async (t, readings, expectedReadings) => {
570-
await test_driver.set_permission({name: permissionName}, 'granted');
585+
await test_driver.bidi.permissions.set_permission(
586+
{descriptor: {name: permissionName}, state: 'granted'});
571587

572588
await test_driver.create_virtual_sensor(testDriverName);
573589

@@ -652,7 +668,8 @@ function runGenericSensorTests(sensorData, readingData) {
652668
// async (t, readings, expectedReadings, expectedRemappedReadings) => {
653669
// assert_implements_optional(screen.orientation.angle == 270,
654670
// 'Remapped values expect a specific screen rotation.');
655-
// await test_driver.set_permission({name: permissionName}, 'granted');
671+
// await test_driver.bidi.permissions.set_permission({descriptor: {name:
672+
// permissionName}, state: 'granted'});
656673

657674
// await test_driver.create_virtual_sensor(testDriverName);
658675

‎testing/web-platform/tests/generic-sensor/resources/iframe_sensor_handler.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<meta charset="utf-8">
33
<title>cross-origin iframe sensor tester</title>
4-
<script src="/resources/testdriver.js"></script>
4+
<script src="/resources/testdriver.js?feature=bidi"></script>
55
<script src="/resources/testdriver-vendor.js"></script>
66
<script src="/generic-sensor/resources/generic-sensor-helpers.js"></script>
77
<script>
@@ -31,7 +31,8 @@
3131
// really work when permissions are granted by default. This can only
3232
// be fixed by testdriver.js allowing set_permission() to specify a
3333
// different origin.
34-
await test_driver.set_permission({ name: permissionName }, 'granted');
34+
await test_driver.bidi.permissions.set_permission(
35+
{descriptor: {name: permissionName}, state: 'granted'});
3536
sensor = new self[sensorName]();
3637
}
3738
return Promise.resolve();

‎testing/web-platform/tests/gyroscope/Gyroscope-iframe-access.https.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<link rel="help" href="https://www.w3.org/TR/gyroscope/">
66
<script src="/resources/testharness.js"></script>
77
<script src="/resources/testharnessreport.js"></script>
8-
<script src="/resources/testdriver.js"></script>
8+
<script src="/resources/testdriver.js?feature=bidi"></script>
99
<script src="/resources/testdriver-vendor.js"></script>
1010
<script src="/generic-sensor/resources/generic-sensor-helpers.js"></script>
1111
<script src="/generic-sensor/generic-sensor-iframe-tests.sub.js"></script>

0 commit comments

Comments
 (0)