device/bluetooth/bluez/bluetooth_bluez_unittest.cc - Issue 2167013002: bluetooth: Clean up bluez fake device name/alias code.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: device/bluetooth/bluez/bluetooth_bluez_unittest.cc

Issue 2167013002: bluetooth: Clean up bluez fake device name/alias code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bt-GetName-

Patch Set: fix patch dep 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 | « chrome/browser/ui/webui/options/chromeos/bluetooth_options_browsertest.js ('k') | device/bluetooth/dbus/fake_bluetooth_device_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/bluetooth/bluez/bluetooth_bluez_unittest.cc

diff --git a/device/bluetooth/bluez/bluetooth_bluez_unittest.cc b/device/bluetooth/bluez/bluetooth_bluez_unittest.cc

index c78e7cd7c21527bd4d6a6f271ddc62badd9db2e3..c26a5d5c5796a94395e3c574ee252bc336c86491 100644

--- a/device/bluetooth/bluez/bluetooth_bluez_unittest.cc

+++ b/device/bluetooth/bluez/bluetooth_bluez_unittest.cc

@@ -2152,7 +2152,7 @@ TEST_F(BluetoothBlueZTest, DeviceProperties) {

// Verify the other device properties.

EXPECT_EQ(

- base::UTF8ToUTF16(bluez::FakeBluetoothDeviceClient::kPairedDeviceName),

+ base::UTF8ToUTF16(bluez::FakeBluetoothDeviceClient::kPairedDeviceAlias),

devices[idx]->GetNameForDisplay());

EXPECT_EQ(BluetoothDevice::DEVICE_COMPUTER, devices[idx]->GetDeviceType());

EXPECT_TRUE(devices[idx]->IsPaired());

@@ -2327,7 +2327,7 @@ TEST_F(BluetoothBlueZTest, DeviceNameChanged) {

ASSERT_EQ(bluez::FakeBluetoothDeviceClient::kPairedDeviceAddress,

devices[idx]->GetAddress());

ASSERT_EQ(

- base::UTF8ToUTF16(bluez::FakeBluetoothDeviceClient::kPairedDeviceName),

+ base::UTF8ToUTF16(bluez::FakeBluetoothDeviceClient::kPairedDeviceAlias),

devices[idx]->GetNameForDisplay());

// Install an observer; expect the DeviceChanged method to be called when

@@ -2360,7 +2360,7 @@ TEST_F(BluetoothBlueZTest, DeviceAddressChanged) {

ASSERT_EQ(bluez::FakeBluetoothDeviceClient::kPairedDeviceAddress,

devices[idx]->GetAddress());

ASSERT_EQ(

- base::UTF8ToUTF16(bluez::FakeBluetoothDeviceClient::kPairedDeviceName),

+ base::UTF8ToUTF16(bluez::FakeBluetoothDeviceClient::kPairedDeviceAlias),

devices[idx]->GetNameForDisplay());

// Install an observer; expect the DeviceAddressChanged method to be called