Index: third_party/WebKit/LayoutTests/bluetooth/server/connect/get-same-gatt-server.html |
diff --git a/third_party/WebKit/LayoutTests/bluetooth/server/connect/get-same-gatt-server.html b/third_party/WebKit/LayoutTests/bluetooth/server/connect/get-same-gatt-server.html |
index 1c7774f5bbf1d422576ce20b8e9f2f50a2bae0af..bffc2efbcae756d9ab993636386dc8374a9c691e 100644 |
--- a/third_party/WebKit/LayoutTests/bluetooth/server/connect/get-same-gatt-server.html |
+++ b/third_party/WebKit/LayoutTests/bluetooth/server/connect/get-same-gatt-server.html |
@@ -2,16 +2,23 @@ |
<script src="../../../resources/testharness.js"></script> |
<script src="../../../resources/testharnessreport.js"></script> |
<script src="../../../resources/bluetooth/bluetooth-helpers.js"></script> |
+<script src="../../../resources/bluetooth/web-bluetooth-test.js"></script> |
+<script src="../../../resources/mojo-helpers.js"></script> |
<script> |
'use strict'; |
promise_test(() => { |
- return setBluetoothFakeAdapter('HeartRateAdapter') |
- .then(() => requestDeviceWithKeyDown({ |
- filters: [{services: ['heart_rate']}]})) |
- .then(device => { |
- return Promise.all([device.gatt.connect(), device.gatt.connect()]) |
- }).then(gattServers => { |
- assert_equals(gattServers[0], gattServers[1]); |
+ return setUpHealthThermometerAndHeartRateDevices() |
+ .then(([fake_peripheral]) => { |
+ return requestDeviceWithKeyDown({ |
+ filters: [{services: ['health_thermometer']}]}) |
+ .then(device => Promise.all([ |
+ device.gatt.connect(), |
+ device.gatt.connect(), |
+ fake_peripheral.simulateGATTConnectionResponse({code: HCI_SUCCESS}), |
scheib
2017/05/12 05:43:56
Not OK to have simulate calls in parallel to the c
ortuno
2017/05/15 07:01:31
I don't think there is an alternative. The only al
|
+ fake_peripheral.simulateGATTConnectionResponse({code: HCI_SUCCESS}), |
+ ])) |
+ .then(([gattServer1, gattServer2]) => assert_equals( |
+ gattServer1, gattServer2)); |
}); |
}, 'Multiple connects should return the same gatt object.'); |
</script> |