Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 'use strict'; | 1 'use strict'; |
| 2 | 2 |
| 3 function usb_test(func, name, properties) { | 3 function usb_test(func, name, properties) { |
| 4 promise_test(() => { | 4 promise_test(() => { |
| 5 return navigator.usb.test.initialize().then(() => { | 5 return navigator.usb.test.initialize().then(() => { |
| 6 let testResult = func(); | 6 let testResult = func(); |
| 7 let cleanup = () => { | 7 let cleanup = () => { |
| 8 navigator.usb.test.reset(); | 8 navigator.usb.test.reset(); |
| 9 }; | 9 }; |
| 10 testResult.then(cleanup, cleanup); | 10 testResult.then(cleanup, cleanup); |
| 11 return testResult; | 11 return testResult; |
| 12 }); | 12 }); |
| 13 }, name, properties); | 13 }, name, properties); |
| 14 } | 14 } |
| 15 | 15 |
| 16 // Returns a promise that is resolved when the next USBConnectionEvent of the | |
| 17 // given type is received. | |
| 18 function connectionEventPromise(eventType) { | |
| 19 return new Promise(resolve => { | |
| 20 let eventHandler = e => { | |
| 21 assert_true(e instanceof USBConnectionEvent); | |
| 22 navigator.usb.removeEventListener(eventType, eventHandler); | |
| 23 resolve(e.device); | |
| 24 }; | |
| 25 navigator.usb.addEventListener(eventType, eventHandler); | |
| 26 }); | |
| 27 } | |
| 28 | |
| 29 // Returns a promise that is resolved with an object containing a fake | |
| 30 // USBDevice and its guid (for calling navigator.usb.test.removeFakeDevice(). | |
|
ortuno
2017/04/18 00:44:22
optional:
// Creates a fake device and returns a
Reilly Grant (use Gerrit)
2017/04/18 01:27:52
Done.
| |
| 31 function getFakeDeviceAndGuid() { | |
| 32 let promise = connectionEventPromise('connect'); | |
| 33 let guid = navigator.usb.test.addFakeDevice(fakeDeviceInit); | |
| 34 return promise.then(device => { | |
| 35 return { device: device, guid: guid }; | |
|
ortuno
2017/04/18 00:44:22
optional: Would it make sense/be worth it to retur
Reilly Grant (use Gerrit)
2017/04/18 01:27:52
Done.
| |
| 36 }); | |
| 37 } | |
| 38 | |
| 39 // Returns a promise that is resolved with just a fake USBDevice. | |
| 40 function getFakeDevice() { | |
| 41 return getFakeDeviceAndGuid().then(({ device, guid }) => { | |
| 42 return device; | |
| 43 }); | |
| 44 } | |
| 45 | |
| 46 // Disconnects the given device and returns a promise that is resolved when it | |
| 47 // is done. | |
| 48 function waitForDisconnect(guid) { | |
| 49 let promise = connectionEventPromise('disconnect'); | |
| 50 navigator.usb.test.removeFakeDevice(guid); | |
| 51 return promise; | |
| 52 } | |
| 53 | |
| 16 function assertRejectsWithError(promise, name, message) { | 54 function assertRejectsWithError(promise, name, message) { |
| 17 return promise.then(() => { | 55 return promise.then(() => { |
| 18 assert_unreached('expected promise to reject with ' + name); | 56 assert_unreached('expected promise to reject with ' + name); |
| 19 }, error => { | 57 }, error => { |
| 20 assert_equals(error.name, name); | 58 assert_equals(error.name, name); |
| 21 if (message !== undefined) | 59 if (message !== undefined) |
| 22 assert_equals(error.message, message); | 60 assert_equals(error.message, message); |
| 23 }); | 61 }); |
| 24 } | 62 } |
| 25 | 63 |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 56 }); | 94 }); |
| 57 } | 95 } |
| 58 | 96 |
| 59 function runGarbageCollection() { | 97 function runGarbageCollection() { |
| 60 // Run gc() as a promise. | 98 // Run gc() as a promise. |
| 61 return new Promise((resolve, reject) => { | 99 return new Promise((resolve, reject) => { |
| 62 GCController.collect(); | 100 GCController.collect(); |
| 63 setTimeout(resolve, 0); | 101 setTimeout(resolve, 0); |
| 64 }); | 102 }); |
| 65 } | 103 } |
| OLD | NEW |