| OLD | NEW |
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <script src="../resources/testharness.js"></script> | 2 <script src="../resources/testharness.js"></script> |
| 3 <script src="../resources/testharnessreport.js"></script> | 3 <script src="../resources/testharnessreport.js"></script> |
| 4 <script src="bluetooth-helpers.js"></script> | 4 <script src="bluetooth-helpers.js"></script> |
| 5 <script> | 5 <script> |
| 6 test(function(t) { assert_exists(window, "testRunner"); t.done(); }, | 6 test(function(t) { assert_exists(window, "testRunner"); t.done(); }, |
| 7 "window.testRunner is required for the following tests."); | 7 "window.testRunner is required for the following tests."); |
| 8 | 8 |
| 9 sequential_promise_test(function() { | 9 sequential_promise_test(function() { |
| 10 testRunner.setBluetoothMockDataSet('ConnectableDeviceAdapter'); | 10 testRunner.setBluetoothMockDataSet('ConnectableDeviceAdapter'); |
| 11 return navigator.bluetooth.requestDevice().then(function(device) { | 11 return navigator.bluetooth.requestDevice({ |
| 12 filters: [{services: [genericAccessServiceUuid]}] |
| 13 }).then(function(device) { |
| 12 testRunner.setBluetoothMockDataSet('EmptyAdapter'); | 14 testRunner.setBluetoothMockDataSet('EmptyAdapter'); |
| 13 return device.connectGATT().then(function() { | 15 return device.connectGATT().then(function() { |
| 14 assert_unreached('Should return error if device not in adapter.'); | 16 assert_unreached('Should return error if device not in adapter.'); |
| 15 }, function(e) { | 17 }, function(e) { |
| 16 assert_equals(e.name, 'NetworkError'); | 18 assert_equals(e.name, 'NetworkError'); |
| 17 }); | 19 }); |
| 18 }); | 20 }); |
| 19 }, 'Device goes out of range. Reject with NetworkError.'); | 21 }, 'Device goes out of range. Reject with NetworkError.'); |
| 20 | 22 |
| 21 sequential_promise_test(function() { | 23 sequential_promise_test(function() { |
| 22 testRunner.setBluetoothMockDataSet('UnconnectableDeviceAdapter'); | 24 testRunner.setBluetoothMockDataSet('UnconnectableDeviceAdapter'); |
| 23 return navigator.bluetooth.requestDevice().then(function(device) { | 25 return navigator.bluetooth.requestDevice({ |
| 26 filters: [{services: [genericAccessServiceUuid]}] |
| 27 }).then(function(device) { |
| 24 return device.connectGATT().then(function() { | 28 return device.connectGATT().then(function() { |
| 25 assert_unreached('Should return error since device failed to connect.'); | 29 assert_unreached('Should return error since device failed to connect.'); |
| 26 }, function(e) { | 30 }, function(e) { |
| 27 assert_equals(e.name, 'NetworkError'); | 31 assert_equals(e.name, 'NetworkError'); |
| 28 }); | 32 }); |
| 29 }); | 33 }); |
| 30 }, 'Device failed to connect. Reject with NetworkError.'); | 34 }, 'Device failed to connect. Reject with NetworkError.'); |
| 31 | 35 |
| 32 sequential_promise_test(function() { | 36 sequential_promise_test(function() { |
| 33 testRunner.setBluetoothMockDataSet('ConnectableDeviceAdapter'); | 37 testRunner.setBluetoothMockDataSet('ConnectableDeviceAdapter'); |
| 34 return navigator.bluetooth.requestDevice().then(function(device) { | 38 return navigator.bluetooth.requestDevice({ |
| 39 filters: [{services: [genericAccessServiceUuid]}] |
| 40 }).then(function(device) { |
| 35 return device.connectGATT(); | 41 return device.connectGATT(); |
| 36 }).then(function(gattConnection) { | 42 }).then(function(gattConnection) { |
| 37 assert_true(gattConnection.connected); | 43 assert_true(gattConnection.connected); |
| 38 }); | 44 }); |
| 39 }, 'Device will connect'); | 45 }, 'Device will connect'); |
| 40 </script> | 46 </script> |
| OLD | NEW |