device/bluetooth/bluetooth_device_unittest.cc - Issue 2708513002: bluetooth: Post a task when sending GATT events to simulate another thread.

Unified Diff: device/bluetooth/bluetooth_device_unittest.cc

Issue 2708513002: bluetooth: Post a task when sending GATT events to simulate another thread. (Closed)

Patch Set: Remove unnecessary if statement Created 3 years, 9 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

« no previous file with comments | « device/bluetooth/bluetooth_adapter_unittest.cc ('k') | device/bluetooth/bluetooth_remote_gatt_characteristic_unittest.cc » ('j') | no next file with comments »
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 19826117c94d04328119fa93535cd1fdb4cc2c1b..83e1d789f5205dd3408c55794825444ffe7b862f 100644

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

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

@@ -337,6 +337,7 @@ TEST_F(BluetoothTest, GetUUIDs_Connection) {

device->CreateGattConnection(GetGattConnectionCallback(Call::EXPECTED),

GetConnectErrorCallback(Call::NOT_EXPECTED));

SimulateGattConnection(device);

+ base::RunLoop().RunUntilIdle();

ASSERT_TRUE(device->IsConnected());

EXPECT_TRUE(device->GetUUIDs().empty());

@@ -348,6 +349,7 @@ TEST_F(BluetoothTest, GetUUIDs_Connection) {

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

services.push_back(kTestUUIDGenericAccess);

SimulateGattServicesDiscovered(device, services);

+ base::RunLoop().RunUntilIdle();

EXPECT_EQ(1, observer.device_changed_count());

@@ -374,6 +376,7 @@ TEST_F(BluetoothTest, GetUUIDs_Connection) {

// Services discovered again, should notify of device changed.

// - GetUUIDs: Should return Service UUIDs.

SimulateGattServicesDiscovered(device, {} /* services */);

+ base::RunLoop().RunUntilIdle();

EXPECT_EQ(2, observer.device_changed_count());

EXPECT_EQ(UUIDSet({BluetoothUUID(kTestUUIDGenericAccess)}),

@@ -388,6 +391,7 @@ TEST_F(BluetoothTest, GetUUIDs_Connection) {

// the device holds and notify of device changed.

gatt_connections_[0]->Disconnect();

SimulateGattDisconnection(device);

+ base::RunLoop().RunUntilIdle();

ASSERT_FALSE(device->IsGattConnected());

EXPECT_EQ(1, observer.device_changed_count());

@@ -424,6 +428,7 @@ TEST_F(BluetoothTest, AdvertisementData_DiscoveryDuringConnection) {

device->CreateGattConnection(GetGattConnectionCallback(Call::EXPECTED),

GetConnectErrorCallback(Call::NOT_EXPECTED));

SimulateGattConnection(device);

+ base::RunLoop().RunUntilIdle();

ASSERT_TRUE(device->IsConnected());

observer.Reset();

@@ -459,6 +464,7 @@ TEST_F(BluetoothTest, AdvertisementData_DiscoveryDuringConnection) {

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

services.push_back(kTestUUIDHeartRate);

SimulateGattServicesDiscovered(device, services);

+ base::RunLoop().RunUntilIdle();

EXPECT_EQ(2, observer.device_changed_count());

@@ -516,6 +522,7 @@ TEST_F(BluetoothTest, AdvertisementData_DiscoveryDuringConnection) {

// - GetUUIDs: Should return no UUIDs.

gatt_connections_[0]->Disconnect();

SimulateGattDisconnection(device);

+ base::RunLoop().RunUntilIdle();

ASSERT_FALSE(device->IsGattConnected());

EXPECT_EQ(5, observer.device_changed_count());

@@ -565,6 +572,7 @@ TEST_F(BluetoothTest, AdvertisementData_ConnectionDuringDiscovery) {

device->CreateGattConnection(GetGattConnectionCallback(Call::EXPECTED),

GetConnectErrorCallback(Call::NOT_EXPECTED));

SimulateGattConnection(device);

+ base::RunLoop().RunUntilIdle();

ASSERT_TRUE(device->IsConnected());

observer.Reset();

@@ -598,6 +606,7 @@ TEST_F(BluetoothTest, AdvertisementData_ConnectionDuringDiscovery) {

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

services.push_back(kTestUUIDHeartRate);

SimulateGattServicesDiscovered(device, services);

+ base::RunLoop().RunUntilIdle();

EXPECT_EQ(2, observer.device_changed_count());

@@ -613,6 +622,7 @@ TEST_F(BluetoothTest, AdvertisementData_ConnectionDuringDiscovery) {

// - GetInquiryTxPower: Should return the last packet's advertised Tx Power.

gatt_connections_[0]->Disconnect();

SimulateGattDisconnection(device);

+ base::RunLoop().RunUntilIdle();

ASSERT_FALSE(device->IsGattConnected());

EXPECT_EQ(3, observer.device_changed_count());

@@ -719,6 +729,8 @@ TEST_F(BluetoothTest, CreateGattConnection) {

device->CreateGattConnection(GetGattConnectionCallback(Call::EXPECTED),

GetConnectErrorCallback(Call::NOT_EXPECTED));

SimulateGattConnection(device);

+ base::RunLoop().RunUntilIdle();

ASSERT_EQ(1u, gatt_connections_.size());

EXPECT_TRUE(device->IsGattConnected());

EXPECT_TRUE(gatt_connections_[0]->IsConnected());

@@ -738,11 +750,14 @@ TEST_F(BluetoothTest, DisconnectionNotifiesDeviceChanged) {

device->CreateGattConnection(GetGattConnectionCallback(Call::EXPECTED),

GetConnectErrorCallback(Call::NOT_EXPECTED));

SimulateGattConnection(device);

+ base::RunLoop().RunUntilIdle();

EXPECT_EQ(1, observer.device_changed_count());

EXPECT_TRUE(device->IsConnected());

EXPECT_TRUE(device->IsGattConnected());

SimulateGattDisconnection(device);

+ base::RunLoop().RunUntilIdle();

EXPECT_EQ(2, observer.device_changed_count());

EXPECT_FALSE(device->IsConnected());

EXPECT_FALSE(device->IsGattConnected());

@@ -767,7 +782,10 @@ TEST_F(BluetoothTest, BluetoothGattConnection) {

device->CreateGattConnection(GetGattConnectionCallback(Call::EXPECTED),

GetConnectErrorCallback(Call::NOT_EXPECTED));

EXPECT_EQ(1, gatt_connection_attempts_);

SimulateGattConnection(device);

+ base::RunLoop().RunUntilIdle();

EXPECT_EQ(1, callback_count_);

EXPECT_EQ(0, error_callback_count_);

ASSERT_EQ(1u, gatt_connections_.size());

@@ -833,6 +851,8 @@ TEST_F(BluetoothTest,

GetConnectErrorCallback(Call::NOT_EXPECTED));

SimulateGattConnection(device);

+ base::RunLoop().RunUntilIdle();

EXPECT_EQ(1, gatt_connection_attempts_);

EXPECT_EQ(1, callback_count_);

EXPECT_EQ(0, error_callback_count_);

@@ -840,6 +860,7 @@ TEST_F(BluetoothTest,

// Become disconnected:

SimulateGattDisconnection(device);

+ base::RunLoop().RunUntilIdle();

EXPECT_FALSE(gatt_connections_[0]->IsConnected());

}

#endif // defined(OS_ANDROID) || defined(OS_MACOSX)

@@ -859,6 +880,7 @@ TEST_F(BluetoothTest, BluetoothGattConnection_AlreadyConnected) {

device->CreateGattConnection(GetGattConnectionCallback(Call::EXPECTED),

GetConnectErrorCallback(Call::NOT_EXPECTED));

SimulateGattConnection(device);

+ base::RunLoop().RunUntilIdle();

EXPECT_TRUE(gatt_connections_[0]->IsConnected());

// Then CreateGattConnection:

@@ -886,15 +908,18 @@ TEST_F(BluetoothTest,

device->CreateGattConnection(GetGattConnectionCallback(Call::EXPECTED),

GetConnectErrorCallback(Call::NOT_EXPECTED));

SimulateGattConnection(device);

+ base::RunLoop().RunUntilIdle();

// Disconnect connection:

gatt_connections_[0]->Disconnect();

SimulateGattDisconnection(device);

+ base::RunLoop().RunUntilIdle();

// Create 2nd connection:

device->CreateGattConnection(GetGattConnectionCallback(Call::EXPECTED),

GetConnectErrorCallback(Call::NOT_EXPECTED));

SimulateGattConnection(device);

+ base::RunLoop().RunUntilIdle();

EXPECT_FALSE(gatt_connections_[0]->IsConnected())

<< "The disconnected connection shouldn't become connected when another "

@@ -920,6 +945,7 @@ TEST_F(BluetoothTest, BluetoothGattConnection_DisconnectWhenObjectsDestroyed) {

device->CreateGattConnection(GetGattConnectionCallback(Call::EXPECTED),

GetConnectErrorCallback(Call::NOT_EXPECTED));

SimulateGattConnection(device);

+ base::RunLoop().RunUntilIdle();

// Delete all CreateGattConnection objects, observe disconnection:

ResetEventCounts();

@@ -945,6 +971,7 @@ TEST_F(BluetoothTest, BluetoothGattConnection_DisconnectInProgress) {

device->CreateGattConnection(GetGattConnectionCallback(Call::EXPECTED),

GetConnectErrorCallback(Call::NOT_EXPECTED));

SimulateGattConnection(device);

+ base::RunLoop().RunUntilIdle();

// Disconnect all CreateGattConnection objects & create a new connection.

// But, don't yet simulate the device disconnecting:

@@ -964,6 +991,7 @@ TEST_F(BluetoothTest, BluetoothGattConnection_DisconnectInProgress) {

// Actually disconnect:

SimulateGattDisconnection(device);

+ base::RunLoop().RunUntilIdle();

for (const auto& connection : gatt_connections_)

EXPECT_FALSE(connection->IsConnected());

}

@@ -986,6 +1014,7 @@ TEST_F(BluetoothTest, BluetoothGattConnection_SimulateDisconnect) {

GetConnectErrorCallback(Call::EXPECTED));

EXPECT_EQ(1, gatt_connection_attempts_);

SimulateGattDisconnection(device);

+ base::RunLoop().RunUntilIdle();

EXPECT_EQ(BluetoothDevice::ERROR_FAILED, last_connect_error_code_);

for (const auto& connection : gatt_connections_)

EXPECT_FALSE(connection->IsConnected());

@@ -1009,12 +1038,16 @@ TEST_F(BluetoothTest, BluetoothGattConnection_DisconnectGatt_SimulateConnect) {

device->DisconnectGatt();

EXPECT_EQ(1, gatt_connection_attempts_);

EXPECT_EQ(1, gatt_disconnection_attempts_);

SimulateGattConnection(device);

+ base::RunLoop().RunUntilIdle();

EXPECT_EQ(1, callback_count_);

EXPECT_EQ(0, error_callback_count_);

EXPECT_TRUE(gatt_connections_.back()->IsConnected());

ResetEventCounts();

SimulateGattDisconnection(device);

+ base::RunLoop().RunUntilIdle();

EXPECT_EQ(0, callback_count_);

EXPECT_EQ(0, error_callback_count_);

}

@@ -1039,6 +1072,7 @@ TEST_F(BluetoothTest,

EXPECT_EQ(1, gatt_connection_attempts_);

EXPECT_EQ(1, gatt_disconnection_attempts_);

SimulateGattDisconnection(device);

+ base::RunLoop().RunUntilIdle();

EXPECT_EQ(BluetoothDevice::ERROR_FAILED, last_connect_error_code_);

for (const auto& connection : gatt_connections_)

EXPECT_FALSE(connection->IsConnected());

@@ -1064,6 +1098,7 @@ TEST_F(BluetoothTest, BluetoothGattConnection_DisconnectGatt_Cleanup) {

GetConnectErrorCallback(Call::NOT_EXPECTED));

TestBluetoothAdapterObserver observer(adapter_);

SimulateGattConnection(device);

+ base::RunLoop().RunUntilIdle();

EXPECT_TRUE(device->IsConnected());

// Discover services

@@ -1071,6 +1106,7 @@ TEST_F(BluetoothTest, BluetoothGattConnection_DisconnectGatt_Cleanup) {

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

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

SimulateGattServicesDiscovered(device, services);

+ base::RunLoop().RunUntilIdle();

EXPECT_TRUE(device->IsGattServicesDiscoveryComplete());

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

EXPECT_EQ(1, observer.gatt_services_discovered_count());

@@ -1078,6 +1114,7 @@ TEST_F(BluetoothTest, BluetoothGattConnection_DisconnectGatt_Cleanup) {

// Disconnect from the device

device->DisconnectGatt();

SimulateGattDisconnection(device);

+ base::RunLoop().RunUntilIdle();

EXPECT_FALSE(device->IsConnected());

EXPECT_FALSE(device->IsGattServicesDiscoveryComplete());

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

@@ -1086,12 +1123,14 @@ TEST_F(BluetoothTest, BluetoothGattConnection_DisconnectGatt_Cleanup) {

device->CreateGattConnection(GetGattConnectionCallback(Call::EXPECTED),

GetConnectErrorCallback(Call::NOT_EXPECTED));

SimulateGattConnection(device);

+ base::RunLoop().RunUntilIdle();

EXPECT_TRUE(device->IsConnected());

// Verify that service discovery can be done again

std::vector<std::string> services2;

services2.push_back("00000002-0000-1000-8000-00805f9b34fb");

SimulateGattServicesDiscovered(device, services2);

+ base::RunLoop().RunUntilIdle();

EXPECT_TRUE(device->IsGattServicesDiscoveryComplete());

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

EXPECT_EQ(2, observer.gatt_services_discovered_count());

@@ -1116,6 +1155,7 @@ TEST_F(BluetoothTest, BluetoothGattConnection_ErrorAfterConnection) {

EXPECT_EQ(1, gatt_connection_attempts_);

SimulateGattConnectionError(device, BluetoothDevice::ERROR_AUTH_FAILED);

SimulateGattConnectionError(device, BluetoothDevice::ERROR_FAILED);

+ base::RunLoop().RunUntilIdle();

#if defined(OS_ANDROID)

// TODO: Change to ERROR_AUTH_FAILED. We should be getting a callback

// only with the first error, but our android framework doesn't yet

@@ -1144,12 +1184,14 @@ TEST_F(BluetoothTest, GattServices_ObserversCalls) {

TestBluetoothAdapterObserver observer(adapter_);

ResetEventCounts();

SimulateGattConnection(device);

+ base::RunLoop().RunUntilIdle();

EXPECT_EQ(1, gatt_discovery_attempts_);

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

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

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

SimulateGattServicesDiscovered(device, services);

+ base::RunLoop().RunUntilIdle();

EXPECT_EQ(1, observer.gatt_services_discovered_count());

EXPECT_EQ(2, observer.gatt_service_added_count());

@@ -1174,6 +1216,7 @@ TEST_F(BluetoothTest, GattServicesDiscovered_AfterDeleted) {

GetConnectErrorCallback(Call::NOT_EXPECTED));

ResetEventCounts();

SimulateGattConnection(device);

+ base::RunLoop().RunUntilIdle();

EXPECT_EQ(1, gatt_discovery_attempts_);

RememberDeviceForSubsequentAction(device);

@@ -1183,6 +1226,7 @@ TEST_F(BluetoothTest, GattServicesDiscovered_AfterDeleted) {

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

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

SimulateGattServicesDiscovered(nullptr /* use remembered device */, services);

+ base::RunLoop().RunUntilIdle();

}

#endif // defined(OS_ANDROID)

@@ -1204,12 +1248,14 @@ TEST_F(BluetoothTest, GattServicesDiscoveredError_AfterDeleted) {

GetConnectErrorCallback(Call::NOT_EXPECTED));

ResetEventCounts();

SimulateGattConnection(device);

+ base::RunLoop().RunUntilIdle();

EXPECT_EQ(1, gatt_discovery_attempts_);

RememberDeviceForSubsequentAction(device);

DeleteDevice(device);

SimulateGattServicesDiscoveryError(nullptr /* use remembered device */);

+ base::RunLoop().RunUntilIdle();

}

#endif // defined(OS_ANDROID)

@@ -1228,14 +1274,17 @@ TEST_F(BluetoothTest, GattServicesDiscovered_AfterDisconnection) {

GetConnectErrorCallback(Call::NOT_EXPECTED));

ResetEventCounts();

SimulateGattConnection(device);

+ base::RunLoop().RunUntilIdle();

EXPECT_EQ(1, gatt_discovery_attempts_);

SimulateGattDisconnection(device);

+ base::RunLoop().RunUntilIdle();

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

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

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

SimulateGattServicesDiscovered(device, services);

+ base::RunLoop().RunUntilIdle();

EXPECT_FALSE(device->IsGattServicesDiscoveryComplete());

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

@@ -1257,11 +1306,14 @@ TEST_F(BluetoothTest, GattServicesDiscoveredError_AfterDisconnection) {

GetConnectErrorCallback(Call::NOT_EXPECTED));

ResetEventCounts();

SimulateGattConnection(device);

+ base::RunLoop().RunUntilIdle();

EXPECT_EQ(1, gatt_discovery_attempts_);

SimulateGattDisconnection(device);

+ base::RunLoop().RunUntilIdle();

SimulateGattServicesDiscoveryError(device);

+ base::RunLoop().RunUntilIdle();

EXPECT_FALSE(device->IsGattServicesDiscoveryComplete());

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

}

@@ -1280,6 +1332,7 @@ TEST_F(BluetoothTest, GetGattServices_and_GetGattService) {

GetConnectErrorCallback(Call::NOT_EXPECTED));

ResetEventCounts();

SimulateGattConnection(device);

+ base::RunLoop().RunUntilIdle();

EXPECT_EQ(1, gatt_discovery_attempts_);

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

@@ -1288,6 +1341,7 @@ TEST_F(BluetoothTest, GetGattServices_and_GetGattService) {

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

SimulateGattServicesDiscovered(device, services);

+ base::RunLoop().RunUntilIdle();

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

// Test GetGattService:

@@ -1313,9 +1367,11 @@ TEST_F(BluetoothTest, GetGattServices_DiscoveryError) {

GetConnectErrorCallback(Call::NOT_EXPECTED));

ResetEventCounts();

SimulateGattConnection(device);

+ base::RunLoop().RunUntilIdle();

EXPECT_EQ(1, gatt_discovery_attempts_);

SimulateGattServicesDiscoveryError(device);

+ base::RunLoop().RunUntilIdle();

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

}

#endif // defined(OS_ANDROID) || defined(OS_MACOSX)