device/bluetooth/bluetooth_device_unittest.cc - Issue 1395783005: bluetooth: android: BluetoothRemoteGattServiceAndroid::GetUUID

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/bluetooth_device_unittest.cc

Issue 1395783005: bluetooth: android: BluetoothRemoteGattServiceAndroid::GetUUID (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 2 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

« device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java ('K') | « device/bluetooth/bluetooth_device_android.cc ('k') | device/bluetooth/bluetooth_gatt_service_unittest.cc » ('j') | device/bluetooth/bluetooth_gatt_service_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/bluetooth/bluetooth_device_unittest.cc

diff --git a/device/bluetooth/bluetooth_device_unittest.cc b/device/bluetooth/bluetooth_device_unittest.cc

index a89fc887a946cfc678888759460ed283a3c662c4..c6066ca9f7f3556cb0bfbb9bf7f80e44f4b34794 100644

--- a/device/bluetooth/bluetooth_device_unittest.cc

+++ b/device/bluetooth/bluetooth_device_unittest.cc

@@ -436,10 +436,13 @@ TEST_F(BluetoothTest, SimulateGattServicesDiscovered) {

SimulateGattConnection(device);

EXPECT_EQ(1, gatt_discovery_attempts_);

- // TODO(scheib): Add more control over how many services are created and

- // their properties. http://crbug.com/541400

Jeffrey Yasskin 2015/10/15 23:48:30 If you're fixing this, put it in the patch's BUG=

scheib 2015/10/16 00:23:36 Done.

- SimulateGattServicesDiscovered(device);

- EXPECT_EQ(2u, device->GetGattServices().size());

+ std::vector<std::string> services;

+ services.push_back("00000000-0000-1000-8000-00805f9b34fb");

+ // 2 duplicate UUIDs creating 2 instances.

+ services.push_back("00000001-0000-1000-8000-00805f9b34fb");

+ SimulateGattServicesDiscovered(device, services);

+ EXPECT_EQ(3u, device->GetGattServices().size());

}

#endif // defined(OS_ANDROID)