Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(433)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/LayoutTests/usb/usbDevice.html

Issue 2791573002: Revert of Refactor WebUSB LayoutTests to separate out the Mojo service mocks (Closed)
Patch Set: Created 3 years, 9 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
Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/usb/usb-connection-event.html ('k') | third_party/WebKit/LayoutTests/usb/usbDevice-iframe.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/LayoutTests/usb/usbDevice.html
diff --git a/third_party/WebKit/LayoutTests/usb/usbDevice.html b/third_party/WebKit/LayoutTests/usb/usbDevice.html
index 5746c7e6781f90710c7eb2105d9cb8dbd0204b60..3d17247ce33cf6c2d3b02632dfc28493a2c27f76 100644
--- a/third_party/WebKit/LayoutTests/usb/usbDevice.html
+++ b/third_party/WebKit/LayoutTests/usb/usbDevice.html
@@ -1,9 +1,9 @@
<!DOCTYPE html>
<script src="../resources/testharness.js"></script>
<script src="../resources/testharnessreport.js"></script>
+<script src="../resources/mojo-helpers.js"></script>
<script src="resources/fake-devices.js"></script>
<script src="resources/usb-helpers.js"></script>
-<script src="resources/webusb-test.js"></script>
<script>
'use strict';
@@ -22,31 +22,28 @@
'The device must have a configuration selected.');
}
-usb_test(() => {
- let guid = navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
- return navigator.usb.getDevices().then(devices => {
- assert_equals(1, devices.length);
- navigator.usb.test.removeFakeDevice(guid);
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
+ return navigator.usb.getDevices().then(devices => {
+ assert_equals(1, devices.length);
+ usb.mockDeviceManager.removeMockDevice(usb.fakeDevices[0]);
return assertRejectsWithNotFoundError(devices[0].open());
});
}, 'open rejects when called on a disconnected device');
-usb_test(() => {
- let guid = navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(1, devices.length);
let promise = devices[0].open();
- navigator.usb.test.removeFakeDevice(guid);
+ usb.mockDeviceManager.removeMockDevice(usb.fakeDevices[0]);
return assertRejectsWithNotFoundError(promise)
.then(() => runGarbageCollection());
});
}, 'open rejects when device disconnected during call');
-usb_test(() => {
- navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(1, devices.length);
let device = devices[0];
@@ -60,9 +57,8 @@
}).then(() => runGarbageCollection());
}, 'a device can be opened and closed');
-usb_test(() => {
- navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(1, devices.length);
let device = devices[0];
@@ -77,9 +73,8 @@
});
}, 'open and close can be called multiple times');
-usb_test(() => {
- navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(1, devices.length);
let device = devices[0];
@@ -97,39 +92,36 @@
});
}, 'open and close cannot be called again while open or close are in progress');
-usb_test(() => {
- let guid = navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(1, devices.length);
let device = devices[0];
return device.open().then(() => {
- navigator.usb.test.removeFakeDevice(guid);
+ usb.mockDeviceManager.removeMockDevice(usb.fakeDevices[0]);
return assertRejectsWithNotFoundError(device.close());
});
});
}, 'close rejects when called on a disconnected device');
-usb_test(() => {
- let guid = navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
- return navigator.usb.getDevices().then(devices => {
- assert_equals(1, devices.length);
- let device = devices[0];
- return device.open()
- .then(() => {
- navigator.usb.test.removeFakeDevice(guid);
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
+ return navigator.usb.getDevices().then(devices => {
+ assert_equals(1, devices.length);
+ var device = devices[0];
+ return device.open()
+ .then(() => {
+ usb.mockDeviceManager.removeMockDevice(usb.fakeDevices[0]);
return assertRejectsWithNotFoundError(device.selectConfiguration(1));
});
});
}, 'selectConfiguration rejects when called on a disconnected device');
-usb_test(() => {
- navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
- return navigator.usb.getDevices().then(devices => {
- assert_equals(1, devices.length);
- let device = devices[0];
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
+ return navigator.usb.getDevices().then(devices => {
+ assert_equals(1, devices.length);
+ var device = devices[0];
return Promise.all([
assertRejectsWithNotOpenError(device.selectConfiguration(1)),
assertRejectsWithNotOpenError(device.claimInterface(0)),
@@ -161,9 +153,8 @@
});
}, 'methods requiring it reject when the device is not open');
-usb_test(() => {
- navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(1, devices.length);
let device = devices[0];
@@ -174,16 +165,15 @@
return device.selectConfiguration(1);
})
.then(() => {
- assertDeviceInfoEquals(
- device.configuration, fakeDeviceInit.configurations[0]);
+ usb.assertConfigurationInfoEquals(
+ device.configuration, usb.fakeDevices[0].configurations[0]);
})
.then(() => device.close());
});
}, 'device configuration can be set and queried');
-usb_test(() => {
- navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(1, devices.length);
let device = devices[0];
@@ -196,9 +186,9 @@
});
}, 'selectConfiguration rejects on invalid configurations');
-usb_test(() => {
- navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(1, devices.length);
let device = devices[0];
@@ -233,9 +223,8 @@
});
}, 'methods requiring it reject when the device is unconfigured');
-usb_test(() => {
- navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(1, devices.length);
let device = devices[0];
@@ -253,9 +242,8 @@
});
}, 'an interface can be claimed and released');
-usb_test(() => {
- navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(1, devices.length);
let device = devices[0];
@@ -272,9 +260,8 @@
});
}, 'interfaces are released on close');
-usb_test(() => {
- navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(1, devices.length);
let device = devices[0];
@@ -292,24 +279,22 @@
});
}, 'a non-existent interface cannot be claimed or released');
-usb_test(() => {
- let guid = navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(1, devices.length);
var device = devices[0];
return device.open()
.then(() => device.selectConfiguration(1))
.then(() => {
- navigator.usb.test.removeFakeDevice(guid);
+ usb.mockDeviceManager.removeMockDevice(usb.fakeDevices[0]);
return assertRejectsWithNotFoundError(device.claimInterface(0));
});
});
}, 'claimInterface rejects when called on a disconnected device');
-usb_test(() => {
- let guid = navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(1, devices.length);
var device = devices[0];
@@ -317,15 +302,14 @@
.then(() => device.selectConfiguration(1))
.then(() => device.claimInterface(0))
.then(() => {
- navigator.usb.test.removeFakeDevice(guid);
+ usb.mockDeviceManager.removeMockDevice(usb.fakeDevices[0]);
return assertRejectsWithNotFoundError(device.releaseInterface(0));
});
});
}, 'releaseInterface rejects when called on a disconnected device');
-usb_test(() => {
- navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(1, devices.length);
let device = devices[0];
@@ -337,9 +321,8 @@
});
}, 'can select an alternate interface');
-usb_test(() => {
- navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(1, devices.length);
let device = devices[0];
@@ -354,9 +337,8 @@
});
}, 'cannot select a non-existent alternate interface');
-usb_test(() => {
- let guid = navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(1, devices.length);
var device = devices[0];
@@ -364,15 +346,14 @@
.then(() => device.selectConfiguration(2))
.then(() => device.claimInterface(0))
.then(() => {
- navigator.usb.test.removeFakeDevice(guid);
+ usb.mockDeviceManager.removeMockDevice(usb.fakeDevices[0]);
return assertRejectsWithNotFoundError(device.selectAlternateInterface(0, 1));
});
});
}, 'selectAlternateInterface rejects when called on a disconnected device');
-usb_test(() => {
- navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(1, devices.length);
let device = devices[0];
@@ -398,16 +379,15 @@
});
}, 'can issue IN control transfer');
-usb_test(() => {
- let guid = navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
- return navigator.usb.getDevices().then(devices => {
- assert_equals(1, devices.length);
- let device = devices[0];
- return device.open()
- .then(() => device.selectConfiguration(1))
- .then(() => {
- navigator.usb.test.removeFakeDevice(guid);
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
+ return navigator.usb.getDevices().then(devices => {
+ assert_equals(1, devices.length);
+ let device = devices[0];
+ return device.open()
+ .then(() => device.selectConfiguration(1))
+ .then(() => {
+ usb.mockDeviceManager.removeMockDevice(usb.fakeDevices[0]);
return assertRejectsWithNotFoundError(device.controlTransferIn({
requestType: 'vendor',
recipient: 'device',
@@ -419,9 +399,8 @@
});
}, 'controlTransferIn rejects when called on a disconnected device');
-usb_test(() => {
- navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(1, devices.length);
let device = devices[0];
@@ -443,16 +422,15 @@
});
}, 'can issue OUT control transfer');
-usb_test(() => {
- let guid = navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
- return navigator.usb.getDevices().then(devices => {
- assert_equals(1, devices.length);
- let device = devices[0];
- return device.open()
- .then(() => device.selectConfiguration(1))
- .then(() => {
- navigator.usb.test.removeFakeDevice(guid);
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
+ return navigator.usb.getDevices().then(devices => {
+ assert_equals(1, devices.length);
+ let device = devices[0];
+ return device.open()
+ .then(() => device.selectConfiguration(1))
+ .then(() => {
+ usb.mockDeviceManager.removeMockDevice(usb.fakeDevices[0]);
return assertRejectsWithNotFoundError(device.controlTransferOut({
requestType: 'vendor',
recipient: 'device',
@@ -464,9 +442,8 @@
});
}, 'controlTransferOut rejects when called on a disconnected device');
-usb_test(() => {
- navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(1, devices.length);
let device = devices[0];
@@ -528,9 +505,8 @@
});
}, 'requests to interfaces and endpoint require an interface claim');
-usb_test(() => {
- navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(devices.length, 1);
let device = devices[0];
@@ -542,25 +518,23 @@
});
}, 'can clear a halt condition');
-usb_test(() => {
- let guid = navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
- return navigator.usb.getDevices().then(devices => {
- assert_equals(devices.length, 1);
- let device = devices[0];
- return device.open()
- .then(() => device.selectConfiguration(1))
- .then(() => device.claimInterface(0))
- .then(() => {
- navigator.usb.test.removeFakeDevice(guid);
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
+ return navigator.usb.getDevices().then(devices => {
+ assert_equals(devices.length, 1);
+ let device = devices[0];
+ return device.open()
+ .then(() => device.selectConfiguration(1))
+ .then(() => device.claimInterface(0))
+ .then(() => {
+ usb.mockDeviceManager.removeMockDevice(usb.fakeDevices[0]);
return assertRejectsWithNotFoundError(device.clearHalt('in', 1));
});
});
}, 'clearHalt rejects when called on a disconnected device');
-usb_test(() => {
- navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(devices.length, 1);
let device = devices[0];
@@ -590,9 +564,8 @@
});
}, 'transfers to unavailable endpoints are rejected');
-usb_test(() => {
- navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(devices.length, 1);
let device = devices[0];
@@ -611,9 +584,8 @@
});
}, 'can issue IN interrupt transfer');
-usb_test(() => {
- navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(devices.length, 1);
let device = devices[0];
@@ -633,9 +605,8 @@
});
}, 'can issue IN bulk transfer');
-usb_test(() => {
- let guid = navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(devices.length, 1);
let device = devices[0];
@@ -643,15 +614,14 @@
.then(() => device.selectConfiguration(1))
.then(() => device.claimInterface(1))
.then(() => {
- navigator.usb.test.removeFakeDevice(guid);
+ usb.mockDeviceManager.removeMockDevice(usb.fakeDevices[0]);
return assertRejectsWithNotFoundError(device.transferIn(2, 1024));
});
});
}, 'transferIn rejects if called on a disconnected device');
-usb_test(() => {
- navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(devices.length, 1);
let device = devices[0];
@@ -673,9 +643,8 @@
});
}, 'can issue OUT bulk transfer');
-usb_test(() => {
- let guid = navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(devices.length, 1);
let device = devices[0];
@@ -686,15 +655,14 @@
let data = new DataView(new ArrayBuffer(1024));
for (let i = 0; i < 1024; ++i)
data.setUint8(i, i & 0xff);
- navigator.usb.test.removeFakeDevice(guid);
+ usb.mockDeviceManager.removeMockDevice(usb.fakeDevices[0]);
return assertRejectsWithNotFoundError(device.transferOut(2, data));
});
});
}, 'transferOut rejects if called on a disconnected device');
-usb_test(() => {
- navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(devices.length, 1);
let device = devices[0];
@@ -726,9 +694,8 @@
});
}, 'can issue IN isochronous transfer');
-usb_test(() => {
- let guid = navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(devices.length, 1);
let device = devices[0];
@@ -737,16 +704,15 @@
.then(() => device.claimInterface(0))
.then(() => device.selectAlternateInterface(0, 1))
.then(() => {
- navigator.usb.test.removeFakeDevice(guid);
+ usb.mockDeviceManager.removeMockDevice(usb.fakeDevices[0]);
return assertRejectsWithNotFoundError(device.isochronousTransferIn(
1, [64, 64, 64, 64, 64, 64, 64, 64]));
});
});
}, 'isochronousTransferIn rejects when called on a disconnected device');
-usb_test(() => {
- navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(devices.length, 1);
let device = devices[0];
@@ -778,9 +744,8 @@
});
}, 'can issue OUT isochronous transfer');
-usb_test(() => {
- let guid = navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(devices.length, 1);
let device = devices[0];
@@ -794,16 +759,15 @@
for (let j = 0; j < 64; ++j)
data.setUint8(i * j, j & 0xff);
}
- navigator.usb.test.removeFakeDevice(guid);
+ usb.mockDeviceManager.removeMockDevice(usb.fakeDevices[0]);
return assertRejectsWithNotFoundError(device.isochronousTransferOut(
1, data, [64, 64, 64, 64, 64, 64, 64, 64]));
});
});
}, 'isochronousTransferOut rejects when called on a disconnected device');
-usb_test(() => {
- navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(1, devices.length);
let device = devices[0];
@@ -811,14 +775,13 @@
});
}, 'can reset the device');
-usb_test(() => {
- let guid = navigator.usb.test.addFakeDevice(fakeDeviceInit);
-
+usb_test(usb => {
+ usb.mockDeviceManager.addMockDevice(usb.fakeDevices[0]);
return navigator.usb.getDevices().then(devices => {
assert_equals(1, devices.length);
let device = devices[0];
return device.open().then(() => {
- navigator.usb.test.removeFakeDevice(guid);
+ usb.mockDeviceManager.removeMockDevice(usb.fakeDevices[0]);
return assertRejectsWithNotFoundError(device.reset());
});
});
« no previous file with comments | « third_party/WebKit/LayoutTests/usb/usb-connection-event.html ('k') | third_party/WebKit/LayoutTests/usb/usbDevice-iframe.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698