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

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

Issue 1353053002: Handle RESCAN events from the Bluetooth chooser by starting or extending a discovery session. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr
Patch Set: Sync Created 5 years, 3 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
« no previous file with comments | « device/bluetooth/test/mock_bluetooth_adapter.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/LayoutTests/bluetooth/requestDevice.html
diff --git a/third_party/WebKit/LayoutTests/bluetooth/requestDevice.html b/third_party/WebKit/LayoutTests/bluetooth/requestDevice.html
index efd10a41f8c48974a0c71fe64f36ebe6332b0641..525d6ab3b83812578788d2e87a4cca0f88cd3d3d 100644
--- a/third_party/WebKit/LayoutTests/bluetooth/requestDevice.html
+++ b/third_party/WebKit/LayoutTests/bluetooth/requestDevice.html
@@ -191,4 +191,39 @@ promise_test(() => {
filters: [{services: ['generic_access', 'battery_service']}]
}), 'NotFoundError');
}, 'Too-strict filters do prevent matching.');
+
+promise_test(() => {
+ testRunner.setBluetoothMockDataSet('SecondDiscoveryFindsHeartRateAdapter');
+ testRunner.setBluetoothManualChooser();
+
+ // Open the chooser, looking for a Heart Rate device.
+ let requestDevicePromise = requestDeviceWithKeyDown({
+ filters: [{services: ['heart_rate']}]
+ });
+
+ // The adapter finds nothing, so we just see discovery start and stop.
+ getBluetoothManualChooserEvents(3).then(events => {
+ assert_array_equals(events,
+ ['chooser-opened(file:///)',
+ 'discovering',
+ 'discovery-idle',
+ ]);
+
+ // On the second discovery, the adapter finds the Heart Rate device.
+ testRunner.sendBluetoothManualChooserEvent('rescan', '');
+ return getBluetoothManualChooserEvents(3);
+ }).then(events => {
+ assert_equals(events.length, 3, events);
+ assert_equals(events[0], 'discovering', 'events[0]');
+ let idsByName = new AddDeviceEventSet();
+ idsByName.assert_add_device_event(events[1]);
+ assert_true(idsByName.has('Heart Rate Device'));
+ assert_equals(events[2], 'discovery-idle');
+
+ // Select it and let the test complete.
+ testRunner.sendBluetoothManualChooserEvent('selected',
+ idsByName.get('Heart Rate Device'));
+ return requestDevicePromise;
+ }).then(device => assert_equals(device.name, 'Heart Rate Device'));
+}, 'The chooser can restart the BT scan.');
</script>
« no previous file with comments | « device/bluetooth/test/mock_bluetooth_adapter.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698