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.

Unified 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/LayoutTests/bluetooth/requestDevice/chooser/restart-scan-finds-new-device.html ('k') | third_party/WebKit/LayoutTests/bluetooth/requestDevice/consecutive-calls.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/third_party/WebKit/LayoutTests/bluetooth/requestDevice/restart-scan-includes-previous-device.html b/third_party/WebKit/LayoutTests/bluetooth/requestDevice/chooser/restart-scan-includes-previous-device.html

similarity index 56%

rename from third_party/WebKit/LayoutTests/bluetooth/requestDevice/restart-scan-includes-previous-device.html

rename to third_party/WebKit/LayoutTests/bluetooth/requestDevice/chooser/restart-scan-includes-previous-device.html

index 46881ff335174cb3400939e81188fccf8cbd29c7..9acdc87ddf2370e8201a3b50b8a365a73d15aa86 100644

--- a/third_party/WebKit/LayoutTests/bluetooth/requestDevice/restart-scan-includes-previous-device.html

+++ b/third_party/WebKit/LayoutTests/bluetooth/requestDevice/chooser/restart-scan-includes-previous-device.html

@@ -1,7 +1,7 @@

<!DOCTYPE html>

-<script src="../../resources/testharness.js"></script>

-<script src="../../resources/testharnessreport.js"></script>

-<script src="../../resources/bluetooth/bluetooth-helpers.js"></script>

+<script src="../../../resources/testharness.js"></script>

+<script src="../../../resources/testharnessreport.js"></script>

+<script src="../../../resources/bluetooth/bluetooth-helpers.js"></script>

'use strict';

promise_test(() => {

@@ -9,22 +9,22 @@ promise_test(() => {

// Open the chooser, looking for a Heart Rate device.

let requestDevicePromise =

- setBluetoothFakeAdapter('HeartRateAdapter')

+ setBluetoothFakeAdapter('DeviceEventAdapter')

.then(() => requestDeviceWithKeyDown({

filters: [{services: ['heart_rate']}]

}));

- // The existing Heart Rate Device is added to the chooser.

+ // The connected Heart Rate Device is added to the chooser.

return getBluetoothManualChooserEvents(4).then(events => {

assert_equals(events.length, 4, events);

assert_equals(events[0], 'chooser-opened(file://)');

let idsByName = new AddDeviceEventSet();

idsByName.assert_add_device_event(events[1]);

- assert_true(idsByName.has('Heart Rate Device'));

+ assert_true(idsByName.has('Connected Heart Rate Device'));

assert_equals(events[2], 'discovering');

assert_equals(events[3], 'discovery-idle');

- // After restarting a scan the existing device should be added to the

+ // After restarting a scan the connected device should be added to the

// chooser.

testRunner.sendBluetoothManualChooserEvent('rescan', '');

return getBluetoothManualChooserEvents(3);

@@ -32,14 +32,14 @@ promise_test(() => {

let idsByName = new AddDeviceEventSet();

assert_equals(events.length, 3, events);

idsByName.assert_add_device_event(events[0]);

- assert_true(idsByName.has('Heart Rate Device'));

- assert_equals(events[1], 'discovering', events[0]);

+ assert_true(idsByName.has('Connected Heart Rate Device'));

+ assert_equals(events[1], 'discovering', events[1]);

assert_equals(events[2], 'discovery-idle');

// Select it and let the test complete.

- testRunner.sendBluetoothManualChooserEvent('selected',

- idsByName.get('Heart Rate Device'));

+ testRunner.sendBluetoothManualChooserEvent(

+ 'selected', idsByName.get('Connected Heart Rate Device'));

return requestDevicePromise;

- }).then(device => assert_equals(device.name, 'Heart Rate Device'));

-}, 'The chooser shows previously discovered devices.');

+ }).then(device => assert_equals(device.name, 'Connected Heart Rate Device'));

+}, 'The chooser shows previously connected devices.');

</script>