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

Unified Diff: chrome/test/data/extensions/api_test/usb/device_handling/test.js

Issue 16316004: Separate usb device handle from usb device. (deprecate) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix the threading mess Created 7 years, 6 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
Index: chrome/test/data/extensions/api_test/usb/device_handling/test.js
diff --git a/chrome/test/data/extensions/api_test/usb/device_handling/test.js b/chrome/test/data/extensions/api_test/usb/device_handling/test.js
index 55d657c1d71930aa99b9c968c17b4513a7b36e62..2d357d4ed808b728f39952de1be6d1062179940b 100644
--- a/chrome/test/data/extensions/api_test/usb/device_handling/test.js
+++ b/chrome/test/data/extensions/api_test/usb/device_handling/test.js
@@ -6,32 +6,35 @@ var usb = chrome.usb;
var tests = [
function explicitCloseDevice() {
- usb.findDevices({vendorId: 0, productId: 0}, function(devices) {
- usb.closeDevice(devices[0]);
- chrome.test.succeed();
+ usb.getDevices({vendorId: 0, productId: 0}, function(devices) {
+ usb.openDevice(devices[0], function(device) {
+ usb.closeDevice(device, function() {
+ chrome.test.assertEq(undefined, chrome.runtime.lastError);
+ chrome.test.succeed();
+ });
+ });
});
},
function resetDevice() {
- usb.findDevices({vendorId: 0, productId: 0}, function(devices) {
- usb.resetDevice(devices[0], function(result) {
- chrome.test.assertEq(result, true);
- // Ensure the device is still open.
- var transfer = {
- direction: "out",
- endpoint: 2,
- data: new ArrayBuffer(1)
- };
- usb.interruptTransfer(devices[0], transfer, function(result) {
- // This is designed to fail.
- usb.resetDevice(devices[0], function(result) {
- chrome.test.assertEq(result, false);
- usb.interruptTransfer(devices[0], transfer, function(result) {
- chrome.test.assertEq(result, undefined);
- chrome.test.assertEq(
- chrome.runtime.lastError && chrome.runtime.lastError.message,
- 'No such device.'
- );
- chrome.test.succeed();
+ usb.getDevices({vendorId: 0, productId: 0}, function(devices) {
+ usb.openDevice(devices[0], function(device) {
+ usb.resetDevice(device, function(result) {
+ chrome.test.assertEq(result, true);
+ // Ensure the device is still open.
+ var transfer = {direction: "out", endpoint: 2,
+ data: new ArrayBuffer(1)};
+ usb.interruptTransfer(device, transfer, function(result) {
+ // This is designed to fail.
+ usb.resetDevice(device, function(result) {
+ chrome.test.assertEq(result, false);
+ usb.interruptTransfer(device, transfer, function(result) {
+ chrome.test.assertEq(result, undefined);
+ chrome.test.assertEq(
+ chrome.runtime.lastError &&
+ chrome.runtime.lastError.message,
+ 'No such device.');
+ chrome.test.succeed();
+ });
});
});
});
« no previous file with comments | « chrome/common/extensions/api/usb.idl ('k') | chrome/test/data/extensions/api_test/usb/invalid_length_transfer/test.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698