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

Unified Diff: device/bluetooth/bluetooth_device_unittest.cc

Issue 2853933002: bluetooth: macOS: Support for extra didConnectPeripheral event from macOS. (Closed)
Patch Set: Fixing test for observer.device_changed_count() Created 3 years, 8 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
Index: device/bluetooth/bluetooth_device_unittest.cc
diff --git a/device/bluetooth/bluetooth_device_unittest.cc b/device/bluetooth/bluetooth_device_unittest.cc
index b19d78e6998dde3a7c449d763228e156bbd0c1cc..5eef236bda089f70e0254954e64cf4df782fc264 100644
--- a/device/bluetooth/bluetooth_device_unittest.cc
+++ b/device/bluetooth/bluetooth_device_unittest.cc
@@ -1015,6 +1015,7 @@ TEST_F(BluetoothTest,
return;
}
InitWithFakeAdapter();
+ TestBluetoothAdapterObserver observer(adapter_);
StartLowEnergyDiscoverySession();
BluetoothDevice* device = SimulateLowEnergyDevice(3);
@@ -1027,6 +1028,16 @@ TEST_F(BluetoothTest,
SimulateGattConnection(device);
base::RunLoop().RunUntilIdle();
+#if defined(OS_ANDROID)
+ // Android incorrectly starts second discovery for devices that are already
+ // connected.
+ // TODO(crbug.com/718168): Remove once Android is fixed.
+ EXPECT_EQ(2, gatt_discovery_attempts_);
+ EXPECT_EQ(2, observer.device_changed_count());
+#else // !defined(OS_ANDROID)
+ EXPECT_EQ(1, gatt_discovery_attempts_);
+ EXPECT_EQ(1, observer.device_changed_count());
+#endif // defined(OS_ANDROID)
EXPECT_EQ(1, gatt_connection_attempts_);
EXPECT_EQ(1, callback_count_);
EXPECT_EQ(0, error_callback_count_);

Powered by Google App Engine
This is Rietveld 408576698