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

Side by Side Diff: third_party/WebKit/LayoutTests/bluetooth/requestDevice/chooser/restart-scan-includes-previous-device.html

Issue 2217573002: bluetooth: Only add new devices, connected devices and devices that changed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-add-or-update
Patch Set: Fix typo Created 4 years, 4 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 unified diff | Download patch
OLDNEW
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="../../resources/bluetooth/bluetooth-helpers.js"></script> 4 <script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>
5 <script> 5 <script>
6 'use strict'; 6 'use strict';
7 promise_test(() => { 7 promise_test(() => {
8 testRunner.setBluetoothManualChooser(true); 8 testRunner.setBluetoothManualChooser(true);
9 9
10 // Open the chooser, looking for a Heart Rate device. 10 // Open the chooser, looking for a Heart Rate device.
11 let requestDevicePromise = 11 let requestDevicePromise =
12 setBluetoothFakeAdapter('HeartRateAdapter') 12 setBluetoothFakeAdapter('DeviceEventAdapter')
13 .then(() => requestDeviceWithKeyDown({ 13 .then(() => requestDeviceWithKeyDown({
14 filters: [{services: ['heart_rate']}] 14 filters: [{services: ['heart_rate']}]
15 })); 15 }));
16 16
17 // The existing Heart Rate Device is added to the chooser. 17 // The connected Heart Rate Device is added to the chooser.
18 return getBluetoothManualChooserEvents(4).then(events => { 18 return getBluetoothManualChooserEvents(4).then(events => {
19 assert_equals(events.length, 4, events); 19 assert_equals(events.length, 4, events);
20 assert_equals(events[0], 'chooser-opened(file://)'); 20 assert_equals(events[0], 'chooser-opened(file://)');
21 let idsByName = new AddDeviceEventSet(); 21 let idsByName = new AddDeviceEventSet();
22 idsByName.assert_add_device_event(events[1]); 22 idsByName.assert_add_device_event(events[1]);
23 assert_true(idsByName.has('Heart Rate Device')); 23 assert_true(idsByName.has('Connected Heart Rate Device'));
24 assert_equals(events[2], 'discovering'); 24 assert_equals(events[2], 'discovering');
25 assert_equals(events[3], 'discovery-idle'); 25 assert_equals(events[3], 'discovery-idle');
26 26
27 // After restarting a scan the existing device should be added to the 27 // After restarting a scan the connected device should be added to the
28 // chooser. 28 // chooser.
29 testRunner.sendBluetoothManualChooserEvent('rescan', ''); 29 testRunner.sendBluetoothManualChooserEvent('rescan', '');
30 return getBluetoothManualChooserEvents(3); 30 return getBluetoothManualChooserEvents(3);
31 }).then(events => { 31 }).then(events => {
32 let idsByName = new AddDeviceEventSet(); 32 let idsByName = new AddDeviceEventSet();
33 assert_equals(events.length, 3, events); 33 assert_equals(events.length, 3, events);
34 idsByName.assert_add_device_event(events[0]); 34 idsByName.assert_add_device_event(events[0]);
35 assert_true(idsByName.has('Heart Rate Device')); 35 assert_true(idsByName.has('Connected Heart Rate Device'));
36 assert_equals(events[1], 'discovering', events[0]); 36 assert_equals(events[1], 'discovering', events[1]);
37 assert_equals(events[2], 'discovery-idle'); 37 assert_equals(events[2], 'discovery-idle');
38 38
39 // Select it and let the test complete. 39 // Select it and let the test complete.
40 testRunner.sendBluetoothManualChooserEvent('selected', 40 testRunner.sendBluetoothManualChooserEvent(
41 idsByName.get('Heart Rate Device' )); 41 'selected', idsByName.get('Connected Heart Rate Device'));
42 return requestDevicePromise; 42 return requestDevicePromise;
43 }).then(device => assert_equals(device.name, 'Heart Rate Device')); 43 }).then(device => assert_equals(device.name, 'Connected Heart Rate Device'));
44 }, 'The chooser shows previously discovered devices.'); 44 }, 'The chooser shows previously connected devices.');
45 </script> 45 </script>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698