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

Unified Diff: third_party/WebKit/LayoutTests/bluetooth/getCharacteristic.html

Issue 1815483003: bluetooth: Create Mojo equivalent of SetBluetoothMockDataSet (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-mojo
Patch Set: MMerge with ToT Created 4 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
Index: third_party/WebKit/LayoutTests/bluetooth/getCharacteristic.html
diff --git a/third_party/WebKit/LayoutTests/bluetooth/getCharacteristic.html b/third_party/WebKit/LayoutTests/bluetooth/getCharacteristic.html
index 75c9e5732f4d21adf2a6848d737980a678f3e300..e03c72606e59ea19ec3437d0031793fc733ca12b 100644
--- a/third_party/WebKit/LayoutTests/bluetooth/getCharacteristic.html
+++ b/third_party/WebKit/LayoutTests/bluetooth/getCharacteristic.html
@@ -9,43 +9,47 @@ test(t => { assert_true(window.testRunner instanceof Object); t.done(); },
'window.testRunner is required for the following tests.');
promise_test(() => {
- testRunner.setBluetoothMockDataSet('HeartRateAdapter');
- return requestDeviceWithKeyDown({filters: [{services: ['heart_rate']}],
- optionalServices: ['generic_access']})
+ return setBluetoothFakeAdapter('HeartRateAdapter')
+ .then(() => requestDeviceWithKeyDown({
+ filters: [{services: ['heart_rate']}],
+ optionalServices: ['generic_access']}))
.then(device => device.gatt.connect())
.then(gattServer => gattServer.getPrimaryService('generic_access'))
.then(service => {
- testRunner.setBluetoothMockDataSet('EmptyAdapter');
- return assert_promise_rejects_with_message(
- service.getCharacteristic('gap.device_name'),
- new DOMException('Bluetooth Device is no longer in range.',
- 'NetworkError'),
- 'Device went out of range.');
+ return setBluetoothFakeAdapter('EmptyAdapter')
+ .then(() => assert_promise_rejects_with_message(
+ service.getCharacteristic('gap.device_name'),
+ new DOMException('Bluetooth Device is no longer in range.',
+ 'NetworkError'),
+ 'Device went out of range.'));
});
}, 'Device goes out of range. Reject with NetworkError.');
promise_test(() => {
- testRunner.setBluetoothMockDataSet('HeartRateAdapter');
- return requestDeviceWithKeyDown({filters: [{services: ['heart_rate']}],
- optionalServices: ['generic_access']})
+ return setBluetoothFakeAdapter('HeartRateAdapter')
+ .then(() => requestDeviceWithKeyDown({
+ filters: [{services: ['heart_rate']}],
+ optionalServices: ['generic_access']}))
.then(device => device.gatt.connect())
.then(gattService => gattService.getPrimaryService('generic_access'))
.then(service => {
- testRunner.setBluetoothMockDataSet('MissingServiceHeartRateAdapter');
- return assert_promise_rejects_with_message(
- service.getCharacteristic('gap.device_name'),
- new DOMException('GATT Service no longer exists.',
- 'InvalidStateError'),
- 'Service got removed.');
+ return setBluetoothFakeAdapter('MissingServiceHeartRateAdapter')
+ .then(() => assert_promise_rejects_with_message(
+ service.getCharacteristic('gap.device_name'),
+ new DOMException('GATT Service no longer exists.',
+ 'InvalidStateError'),
+ 'Service got removed.'));
});
}, 'Service is removed. Reject with InvalidStateError.');
promise_test(() => {
- testRunner.setBluetoothMockDataSet('HeartRateAdapter');
- let expected = new DOMException('No Characteristics with specified UUID found in Service.',
- 'NotFoundError');
- return requestDeviceWithKeyDown({filters: [{services: ['heart_rate']}],
- optionalServices: ['generic_access']})
+ let expected = new DOMException(
+ 'No Characteristics with specified UUID found in Service.',
+ 'NotFoundError');
+ return setBluetoothFakeAdapter('HeartRateAdapter')
+ .then(() => requestDeviceWithKeyDown({
+ filters: [{services: ['heart_rate']}],
+ optionalServices: ['generic_access']}))
.then(device => device.gatt.connect())
.then(gattServer => gattServer.getPrimaryService('generic_access'))
.then(service => Promise.all(
@@ -58,9 +62,10 @@ promise_test(() => {
}, 'Request for wrong characteristic. Reject with NotFoundError.');
promise_test(() => {
- testRunner.setBluetoothMockDataSet('HeartRateAdapter');
- return requestDeviceWithKeyDown({filters: [{services: ['heart_rate']}],
- optionalServices: ['generic_access']})
+ return setBluetoothFakeAdapter('HeartRateAdapter')
+ .then(() => requestDeviceWithKeyDown({
+ filters: [{services: ['heart_rate']}],
+ optionalServices: ['generic_access']}))
.then(device => device.gatt.connect())
.then(gattServer => gattServer.getPrimaryService('generic_access'))
.then(service => Promise.all(
@@ -77,9 +82,10 @@ promise_test(() => {
}, 'Request for characteristic. Should return right characteristic');
promise_test(() => {
- testRunner.setBluetoothMockDataSet('HeartRateAdapter');
- return requestDeviceWithKeyDown({filters: [{services: ['heart_rate']}],
- optionalServices: ['generic_access']})
+ return setBluetoothFakeAdapter('HeartRateAdapter')
+ .then(() => requestDeviceWithKeyDown({
+ filters: [{services: ['heart_rate']}],
+ optionalServices: ['generic_access']}))
.then(device => device.gatt.connect())
.then(gattServer => gattServer.getPrimaryService('generic_access'))
.then(services => Promise.all(
@@ -102,9 +108,10 @@ promise_test(() => {
}, 'Calls to get the same characteristic should return the same object.');
promise_test(() => {
- testRunner.setBluetoothMockDataSet('HeartRateAdapter');
- return requestDeviceWithKeyDown({filters: [{services: ['heart_rate']}],
- optionalServices: ['generic_access']})
+ return setBluetoothFakeAdapter('HeartRateAdapter')
+ .then(() => requestDeviceWithKeyDown({
+ filters: [{services: ['heart_rate']}],
+ optionalServices: ['generic_access']}))
.then(device => device.gatt.connect())
.then(gattServer => gattServer.getPrimaryService('generic_access'))
.then(service => {

Powered by Google App Engine
This is Rietveld 408576698