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

Unified Diff: device/bluetooth/bluetooth_device_unittest.cc

Issue 2853933002: bluetooth: macOS: Support for extra didConnectPeripheral event from macOS. (Closed)
Patch Set: merge Created 3 years, 7 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 | « device/bluetooth/bluetooth_adapter_mac.mm ('k') | device/bluetooth/bluetooth_low_energy_device_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 73ee585e2d2739896ec47a1fd473887d789cc481..19fc5cda67c89eb583e3d84c6cc9a9c8e651f316 100644
--- a/device/bluetooth/bluetooth_device_unittest.cc
+++ b/device/bluetooth/bluetooth_device_unittest.cc
@@ -1027,6 +1027,7 @@ TEST_F(BluetoothTest,
return;
}
InitWithFakeAdapter();
+ TestBluetoothAdapterObserver observer(adapter_);
StartLowEnergyDiscoverySession();
BluetoothDevice* device = SimulateLowEnergyDevice(3);
@@ -1039,6 +1040,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_);
« no previous file with comments | « device/bluetooth/bluetooth_adapter_mac.mm ('k') | device/bluetooth/bluetooth_low_energy_device_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698