third_party/WebKit/LayoutTests/external/wpt/webusb/usbDevice-iframe.https.html - Issue 2789723003: Migrate WebUSB LayoutTests into external/wpt

Unified Diff: third_party/WebKit/LayoutTests/external/wpt/webusb/usbDevice-iframe.https.html

Issue 2789723003: Migrate WebUSB LayoutTests into external/wpt (Closed)

Patch Set: Rebased Created 3 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « third_party/WebKit/LayoutTests/external/wpt/webusb/usbConnectionEvent.https.html ('k') | third_party/WebKit/LayoutTests/external/wpt/webusb/usbDevice.https.html » ('j') | third_party/WebKit/LayoutTests/usb/OWNERS » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/external/wpt/webusb/usbDevice-iframe.https.html

diff --git a/third_party/WebKit/LayoutTests/usb/usbDevice-iframe.html b/third_party/WebKit/LayoutTests/external/wpt/webusb/usbDevice-iframe.https.html

similarity index 51%

copy from third_party/WebKit/LayoutTests/usb/usbDevice-iframe.html

copy to third_party/WebKit/LayoutTests/external/wpt/webusb/usbDevice-iframe.https.html

index b6514072106d3b1b10da023a877cb1fe70a3c2ac..faf967e68cf0d1b638c29b9a3c81091cd4cec955 100644

--- a/third_party/WebKit/LayoutTests/usb/usbDevice-iframe.html

+++ b/third_party/WebKit/LayoutTests/external/wpt/webusb/usbDevice-iframe.https.html

@@ -1,9 +1,8 @@

<!DOCTYPE html>

-<script src="../resources/testharness.js"></script>

-<script src="../resources/testharnessreport.js"></script>

+<script src="/resources/testharness.js"></script>

+<script src="/resources/testharnessreport.js"></script>

-<script src="resources/webusb-test.js"></script>

'use strict';

@@ -11,7 +10,7 @@ function runIframeDisconnectTest(onDeviceConnected) {

return navigator.usb.test.initialize().then(() => {

return new Promise((resolve, reject) => {

let opened = false;

- let fakeDevice = null;

+ let fakeDeviceGuid = null;

let iframe = document.createElement('iframe');

iframe.src = 'resources/open-in-iframe.html';

@@ -23,7 +22,7 @@ function runIframeDisconnectTest(onDeviceConnected) {

window.onmessage = messageEvent => {

if (messageEvent.data == 'Ready') {

- fakeDevice = navigator.usb.test.addFakeDevice(fakeDeviceInit);

+ fakeDeviceGuid = navigator.usb.test.addFakeDevice(fakeDeviceInit);

} else if (messageEvent.data == 'Success') {

opened = true;

onDeviceConnected(iframe);

@@ -32,8 +31,8 @@ function runIframeDisconnectTest(onDeviceConnected) {

}

};

- navigator.usb.test.ondeviceclose = closedFakeDevice => {

- assert_equals(closedFakeDevice, fakeDevice);

+ navigator.usb.test.ondeviceclose = guid => {

+ assert_equals(guid, fakeDeviceGuid);

assert_true(opened);

resolve();

};

@@ -54,35 +53,4 @@ promise_test(() => {

iframe.src = 'about:blank';

});

}, 'navigating iframe disconnects device.');

-promise_test(() => {

- return navigator.usb.test.initialize().then(() => {

- return new Promise((resolve, reject) => {

- let opened = false;

- let fakeDeviceGuid = null;

- let iframe = document.createElement('iframe');

- iframe.src = 'resources/open-in-iframe.html';

- iframe.onload = () => {

- navigator.usb.test.attachToWindow(iframe.contentWindow).then(() => {

- iframe.contentWindow.postMessage('Ready', '*');

- });

- };

- window.onmessage = messageEvent => {

- if (messageEvent.data == 'Ready') {

- document.body.removeChild(iframe);

- runGarbageCollection().then(() => {

- navigator.usb.test.addFakeDevice(fakeDeviceInit);

- resolve();

- });

- } else {

- reject(messageEvent.data);

- }

- };

- document.body.appendChild(iframe);

- });

-}, 'events are not delivered to detached frames');

</script>