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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: device/bluetooth/bluetooth_gatt_characteristic_unittest.cc

Issue 1465863003: bluetooth: Fix crash when trying to read or write when operation pending (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@my-origin
Patch Set: Add override Created 5 years, 1 month 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_device_unittest.cc ('k') | device/bluetooth/bluetooth_gatt_service_unittest.cc » ('j') | device/bluetooth/test/bluetooth_test.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_gatt_characteristic_unittest.cc
diff --git a/device/bluetooth/bluetooth_gatt_characteristic_unittest.cc b/device/bluetooth/bluetooth_gatt_characteristic_unittest.cc
index cf2fdddb1eccb0644e659f798de6b9c4fccc3484..1424234b0929d4e0461e85dd61d1f9b8c05badbd 100644
--- a/device/bluetooth/bluetooth_gatt_characteristic_unittest.cc
+++ b/device/bluetooth/bluetooth_gatt_characteristic_unittest.cc
@@ -24,8 +24,8 @@ class BluetoothGattCharacteristicTest : public BluetoothTest {
InitWithFakeAdapter();
StartLowEnergyDiscoverySession();
device_ = DiscoverLowEnergyDevice(3);
- device_->CreateGattConnection(GetGattConnectionCallback(),
- GetConnectErrorCallback());
+ device_->CreateGattConnection(GetGattConnectionCallback(Call::EXPECTED),
+ GetConnectErrorCallback(Call::NOT_EXPECTED));
SimulateGattConnection(device_);
std::vector<std::string> services;
std::string uuid("00000000-0000-1000-8000-00805f9b34fb");
@@ -55,10 +55,10 @@ TEST_F(BluetoothGattCharacteristicTest, GetIdentifier) {
// 2 devices to verify unique IDs across them.
BluetoothDevice* device1 = DiscoverLowEnergyDevice(3);
BluetoothDevice* device2 = DiscoverLowEnergyDevice(4);
- device1->CreateGattConnection(GetGattConnectionCallback(),
- GetConnectErrorCallback());
- device2->CreateGattConnection(GetGattConnectionCallback(),
- GetConnectErrorCallback());
+ device1->CreateGattConnection(GetGattConnectionCallback(Call::EXPECTED),
+ GetConnectErrorCallback(Call::NOT_EXPECTED));
+ device2->CreateGattConnection(GetGattConnectionCallback(Call::EXPECTED),
+ GetConnectErrorCallback(Call::NOT_EXPECTED));
SimulateGattConnection(device1);
SimulateGattConnection(device2);
@@ -116,8 +116,8 @@ TEST_F(BluetoothGattCharacteristicTest, GetUUID) {
InitWithFakeAdapter();
StartLowEnergyDiscoverySession();
BluetoothDevice* device = DiscoverLowEnergyDevice(3);
- device->CreateGattConnection(GetGattConnectionCallback(),
- GetConnectErrorCallback());
+ device->CreateGattConnection(GetGattConnectionCallback(Call::EXPECTED),
+ GetConnectErrorCallback(Call::NOT_EXPECTED));
SimulateGattConnection(device);
std::vector<std::string> services;
services.push_back("00000000-0000-1000-8000-00805f9b34fb");
@@ -154,8 +154,8 @@ TEST_F(BluetoothGattCharacteristicTest, GetProperties) {
InitWithFakeAdapter();
StartLowEnergyDiscoverySession();
BluetoothDevice* device = DiscoverLowEnergyDevice(3);
- device->CreateGattConnection(GetGattConnectionCallback(),
- GetConnectErrorCallback());
+ device->CreateGattConnection(GetGattConnectionCallback(Call::EXPECTED),
+ GetConnectErrorCallback(Call::NOT_EXPECTED));
SimulateGattConnection(device);
std::vector<std::string> services;
std::string uuid("00000000-0000-1000-8000-00805f9b34fb");
@@ -182,8 +182,9 @@ TEST_F(BluetoothGattCharacteristicTest, GetProperties) {
TEST_F(BluetoothGattCharacteristicTest, ReadRemoteCharacteristic_Empty) {
ASSERT_NO_FATAL_FAILURE(FakeCharacteristicBoilerplate());
- characteristic1_->ReadRemoteCharacteristic(GetReadValueCallback(),
- GetGattErrorCallback());
+ characteristic1_->ReadRemoteCharacteristic(
+ GetReadValueCallback(Call::EXPECTED),
+ GetGattErrorCallback(Call::NOT_EXPECTED));
EXPECT_EQ(1, gatt_read_characteristic_attempts_);
std::vector<uint8_t> empty_vector;
SimulateGattCharacteristicRead(characteristic1_, empty_vector);
@@ -204,8 +205,9 @@ TEST_F(BluetoothGattCharacteristicTest, WriteRemoteCharacteristic_Empty) {
ASSERT_NO_FATAL_FAILURE(FakeCharacteristicBoilerplate());
std::vector<uint8_t> empty_vector;
- characteristic1_->WriteRemoteCharacteristic(empty_vector, GetCallback(),
- GetGattErrorCallback());
+ characteristic1_->WriteRemoteCharacteristic(
+ empty_vector, GetCallback(Call::EXPECTED),
+ GetGattErrorCallback(Call::NOT_EXPECTED));
EXPECT_EQ(1, gatt_write_characteristic_attempts_);
SimulateGattCharacteristicWrite(characteristic1_);
@@ -220,8 +222,9 @@ TEST_F(BluetoothGattCharacteristicTest, WriteRemoteCharacteristic_Empty) {
TEST_F(BluetoothGattCharacteristicTest, ReadRemoteCharacteristic) {
ASSERT_NO_FATAL_FAILURE(FakeCharacteristicBoilerplate());
- characteristic1_->ReadRemoteCharacteristic(GetReadValueCallback(),
- GetGattErrorCallback());
+ characteristic1_->ReadRemoteCharacteristic(
+ GetReadValueCallback(Call::EXPECTED),
+ GetGattErrorCallback(Call::NOT_EXPECTED));
EXPECT_EQ(1, gatt_read_characteristic_attempts_);
uint8_t values[] = {0, 1, 2, 3, 4, 0xf, 0xf0, 0xff};
@@ -246,8 +249,9 @@ TEST_F(BluetoothGattCharacteristicTest, WriteRemoteCharacteristic) {
uint8_t values[] = {0, 1, 2, 3, 4, 0xf, 0xf0, 0xff};
std::vector<uint8_t> test_vector(values, values + arraysize(values));
- characteristic1_->WriteRemoteCharacteristic(test_vector, GetCallback(),
- GetGattErrorCallback());
+ characteristic1_->WriteRemoteCharacteristic(
+ test_vector, GetCallback(Call::EXPECTED),
+ GetGattErrorCallback(Call::NOT_EXPECTED));
EXPECT_EQ(1, gatt_write_characteristic_attempts_);
SimulateGattCharacteristicWrite(characteristic1_);
@@ -263,8 +267,9 @@ TEST_F(BluetoothGattCharacteristicTest, WriteRemoteCharacteristic) {
TEST_F(BluetoothGattCharacteristicTest, ReadRemoteCharacteristic_Twice) {
ASSERT_NO_FATAL_FAILURE(FakeCharacteristicBoilerplate());
- characteristic1_->ReadRemoteCharacteristic(GetReadValueCallback(),
- GetGattErrorCallback());
+ characteristic1_->ReadRemoteCharacteristic(
+ GetReadValueCallback(Call::EXPECTED),
+ GetGattErrorCallback(Call::NOT_EXPECTED));
EXPECT_EQ(1, gatt_read_characteristic_attempts_);
uint8_t values[] = {0, 1, 2, 3, 4, 0xf, 0xf0, 0xff};
@@ -277,8 +282,9 @@ TEST_F(BluetoothGattCharacteristicTest, ReadRemoteCharacteristic_Twice) {
// Read again, with different value:
ResetEventCounts();
- characteristic1_->ReadRemoteCharacteristic(GetReadValueCallback(),
- GetGattErrorCallback());
+ characteristic1_->ReadRemoteCharacteristic(
+ GetReadValueCallback(Call::EXPECTED),
+ GetGattErrorCallback(Call::NOT_EXPECTED));
EXPECT_EQ(1, gatt_read_characteristic_attempts_);
std::vector<uint8_t> empty_vector;
SimulateGattCharacteristicRead(characteristic1_, empty_vector);
@@ -296,8 +302,9 @@ TEST_F(BluetoothGattCharacteristicTest, WriteRemoteCharacteristic_Twice) {
uint8_t values[] = {0, 1, 2, 3, 4, 0xf, 0xf0, 0xff};
std::vector<uint8_t> test_vector(values, values + arraysize(values));
- characteristic1_->WriteRemoteCharacteristic(test_vector, GetCallback(),
- GetGattErrorCallback());
+ characteristic1_->WriteRemoteCharacteristic(
+ test_vector, GetCallback(Call::EXPECTED),
+ GetGattErrorCallback(Call::NOT_EXPECTED));
EXPECT_EQ(1, gatt_write_characteristic_attempts_);
SimulateGattCharacteristicWrite(characteristic1_);
@@ -308,8 +315,9 @@ TEST_F(BluetoothGattCharacteristicTest, WriteRemoteCharacteristic_Twice) {
// Write again, with different value:
ResetEventCounts();
std::vector<uint8_t> empty_vector;
- characteristic1_->WriteRemoteCharacteristic(empty_vector, GetCallback(),
- GetGattErrorCallback());
+ characteristic1_->WriteRemoteCharacteristic(
+ empty_vector, GetCallback(Call::EXPECTED),
+ GetGattErrorCallback(Call::NOT_EXPECTED));
EXPECT_EQ(1, gatt_write_characteristic_attempts_);
SimulateGattCharacteristicWrite(characteristic1_);
EXPECT_EQ(1, callback_count_);
@@ -324,10 +332,12 @@ TEST_F(BluetoothGattCharacteristicTest,
ReadRemoteCharacteristic_MultipleCharacteristics) {
ASSERT_NO_FATAL_FAILURE(FakeCharacteristicBoilerplate());
- characteristic1_->ReadRemoteCharacteristic(GetReadValueCallback(),
- GetGattErrorCallback());
- characteristic2_->ReadRemoteCharacteristic(GetReadValueCallback(),
- GetGattErrorCallback());
+ characteristic1_->ReadRemoteCharacteristic(
+ GetReadValueCallback(Call::EXPECTED),
+ GetGattErrorCallback(Call::NOT_EXPECTED));
+ characteristic2_->ReadRemoteCharacteristic(
+ GetReadValueCallback(Call::EXPECTED),
+ GetGattErrorCallback(Call::NOT_EXPECTED));
EXPECT_EQ(2, gatt_read_characteristic_attempts_);
EXPECT_EQ(0, callback_count_);
EXPECT_EQ(0, error_callback_count_);
@@ -357,14 +367,16 @@ TEST_F(BluetoothGattCharacteristicTest,
std::vector<uint8_t> test_vector1;
test_vector1.push_back(111);
- characteristic1_->WriteRemoteCharacteristic(test_vector1, GetCallback(),
- GetGattErrorCallback());
+ characteristic1_->WriteRemoteCharacteristic(
+ test_vector1, GetCallback(Call::EXPECTED),
+ GetGattErrorCallback(Call::NOT_EXPECTED));
EXPECT_EQ(test_vector1, last_write_value_);
std::vector<uint8_t> test_vector2;
test_vector2.push_back(222);
- characteristic2_->WriteRemoteCharacteristic(test_vector2, GetCallback(),
- GetGattErrorCallback());
+ characteristic2_->WriteRemoteCharacteristic(
+ test_vector2, GetCallback(Call::EXPECTED),
+ GetGattErrorCallback(Call::NOT_EXPECTED));
EXPECT_EQ(test_vector2, last_write_value_);
EXPECT_EQ(2, gatt_write_characteristic_attempts_);
@@ -384,8 +396,9 @@ TEST_F(BluetoothGattCharacteristicTest,
TEST_F(BluetoothGattCharacteristicTest, ReadError) {
ASSERT_NO_FATAL_FAILURE(FakeCharacteristicBoilerplate());
- characteristic1_->ReadRemoteCharacteristic(GetReadValueCallback(),
- GetGattErrorCallback());
+ characteristic1_->ReadRemoteCharacteristic(
+ GetReadValueCallback(Call::NOT_EXPECTED),
+ GetGattErrorCallback(Call::EXPECTED));
SimulateGattCharacteristicReadError(
characteristic1_, BluetoothGattService::GATT_ERROR_INVALID_LENGTH);
SimulateGattCharacteristicReadError(characteristic1_,
@@ -403,8 +416,9 @@ TEST_F(BluetoothGattCharacteristicTest, WriteError) {
ASSERT_NO_FATAL_FAILURE(FakeCharacteristicBoilerplate());
std::vector<uint8_t> empty_vector;
- characteristic1_->WriteRemoteCharacteristic(empty_vector, GetCallback(),
- GetGattErrorCallback());
+ characteristic1_->WriteRemoteCharacteristic(
+ empty_vector, GetCallback(Call::NOT_EXPECTED),
+ GetGattErrorCallback(Call::EXPECTED));
SimulateGattCharacteristicWriteError(
characteristic1_, BluetoothGattService::GATT_ERROR_INVALID_LENGTH);
SimulateGattCharacteristicWriteError(characteristic1_,
@@ -422,8 +436,9 @@ TEST_F(BluetoothGattCharacteristicTest, ReadSynchronousError) {
ASSERT_NO_FATAL_FAILURE(FakeCharacteristicBoilerplate());
SimulateGattCharacteristicReadWillFailSynchronouslyOnce(characteristic1_);
- characteristic1_->ReadRemoteCharacteristic(GetReadValueCallback(),
- GetGattErrorCallback());
+ characteristic1_->ReadRemoteCharacteristic(
+ GetReadValueCallback(Call::NOT_EXPECTED),
+ GetGattErrorCallback(Call::EXPECTED));
EXPECT_EQ(0, gatt_read_characteristic_attempts_);
base::RunLoop().RunUntilIdle();
EXPECT_EQ(0, callback_count_);
@@ -432,8 +447,9 @@ TEST_F(BluetoothGattCharacteristicTest, ReadSynchronousError) {
// After failing once, can succeed:
ResetEventCounts();
- characteristic1_->ReadRemoteCharacteristic(GetReadValueCallback(),
- GetGattErrorCallback());
+ characteristic1_->ReadRemoteCharacteristic(
+ GetReadValueCallback(Call::EXPECTED),
+ GetGattErrorCallback(Call::NOT_EXPECTED));
EXPECT_EQ(1, gatt_read_characteristic_attempts_);
std::vector<uint8_t> empty_vector;
SimulateGattCharacteristicRead(characteristic1_, empty_vector);
@@ -449,8 +465,9 @@ TEST_F(BluetoothGattCharacteristicTest, WriteSynchronousError) {
SimulateGattCharacteristicWriteWillFailSynchronouslyOnce(characteristic1_);
std::vector<uint8_t> empty_vector;
- characteristic1_->WriteRemoteCharacteristic(empty_vector, GetCallback(),
- GetGattErrorCallback());
+ characteristic1_->WriteRemoteCharacteristic(
+ empty_vector, GetCallback(Call::NOT_EXPECTED),
+ GetGattErrorCallback(Call::EXPECTED));
EXPECT_EQ(0, gatt_write_characteristic_attempts_);
base::RunLoop().RunUntilIdle();
EXPECT_EQ(0, callback_count_);
@@ -459,8 +476,9 @@ TEST_F(BluetoothGattCharacteristicTest, WriteSynchronousError) {
// After failing once, can succeed:
ResetEventCounts();
- characteristic1_->WriteRemoteCharacteristic(empty_vector, GetCallback(),
- GetGattErrorCallback());
+ characteristic1_->WriteRemoteCharacteristic(
+ empty_vector, GetCallback(Call::EXPECTED),
+ GetGattErrorCallback(Call::NOT_EXPECTED));
EXPECT_EQ(1, gatt_write_characteristic_attempts_);
SimulateGattCharacteristicWrite(characteristic1_);
EXPECT_EQ(1, callback_count_);
@@ -473,10 +491,15 @@ TEST_F(BluetoothGattCharacteristicTest, WriteSynchronousError) {
TEST_F(BluetoothGattCharacteristicTest, ReadRemoteCharacteristic_ReadPending) {
ASSERT_NO_FATAL_FAILURE(FakeCharacteristicBoilerplate());
- characteristic1_->ReadRemoteCharacteristic(GetReadValueCallback(),
- GetGattErrorCallback());
- characteristic1_->ReadRemoteCharacteristic(GetReadValueCallback(),
- GetGattErrorCallback());
+ characteristic1_->ReadRemoteCharacteristic(
+ GetReadValueCallback(Call::EXPECTED),
+ GetGattErrorCallback(Call::NOT_EXPECTED));
+ characteristic1_->ReadRemoteCharacteristic(
+ GetReadValueCallback(Call::NOT_EXPECTED),
+ GetGattErrorCallback(Call::EXPECTED));
+
+ base::RunLoop().RunUntilIdle();
+
EXPECT_EQ(0, callback_count_);
EXPECT_EQ(1, error_callback_count_);
EXPECT_EQ(BluetoothGattService::GATT_ERROR_IN_PROGRESS,
@@ -498,10 +521,15 @@ TEST_F(BluetoothGattCharacteristicTest,
ASSERT_NO_FATAL_FAILURE(FakeCharacteristicBoilerplate());
std::vector<uint8_t> empty_vector;
- characteristic1_->WriteRemoteCharacteristic(empty_vector, GetCallback(),
- GetGattErrorCallback());
- characteristic1_->WriteRemoteCharacteristic(empty_vector, GetCallback(),
- GetGattErrorCallback());
+ characteristic1_->WriteRemoteCharacteristic(
+ empty_vector, GetCallback(Call::EXPECTED),
+ GetGattErrorCallback(Call::NOT_EXPECTED));
+ characteristic1_->WriteRemoteCharacteristic(
+ empty_vector, GetCallback(Call::NOT_EXPECTED),
+ GetGattErrorCallback(Call::EXPECTED));
+
+ base::RunLoop().RunUntilIdle();
+
EXPECT_EQ(0, callback_count_);
EXPECT_EQ(1, error_callback_count_);
EXPECT_EQ(BluetoothGattService::GATT_ERROR_IN_PROGRESS,
@@ -521,10 +549,15 @@ TEST_F(BluetoothGattCharacteristicTest, ReadRemoteCharacteristic_WritePending) {
ASSERT_NO_FATAL_FAILURE(FakeCharacteristicBoilerplate());
std::vector<uint8_t> empty_vector;
- characteristic1_->WriteRemoteCharacteristic(empty_vector, GetCallback(),
- GetGattErrorCallback());
- characteristic1_->ReadRemoteCharacteristic(GetReadValueCallback(),
- GetGattErrorCallback());
+ characteristic1_->WriteRemoteCharacteristic(
+ empty_vector, GetCallback(Call::EXPECTED),
+ GetGattErrorCallback(Call::NOT_EXPECTED));
+ characteristic1_->ReadRemoteCharacteristic(
+ GetReadValueCallback(Call::NOT_EXPECTED),
+ GetGattErrorCallback(Call::EXPECTED));
+
+ base::RunLoop().RunUntilIdle();
+
EXPECT_EQ(0, callback_count_);
EXPECT_EQ(1, error_callback_count_);
EXPECT_EQ(BluetoothGattService::GATT_ERROR_IN_PROGRESS,
@@ -544,10 +577,14 @@ TEST_F(BluetoothGattCharacteristicTest, WriteRemoteCharacteristic_ReadPending) {
ASSERT_NO_FATAL_FAILURE(FakeCharacteristicBoilerplate());
std::vector<uint8_t> empty_vector;
- characteristic1_->ReadRemoteCharacteristic(GetReadValueCallback(),
- GetGattErrorCallback());
- characteristic1_->WriteRemoteCharacteristic(empty_vector, GetCallback(),
- GetGattErrorCallback());
+ characteristic1_->ReadRemoteCharacteristic(
+ GetReadValueCallback(Call::EXPECTED),
+ GetGattErrorCallback(Call::NOT_EXPECTED));
+ characteristic1_->WriteRemoteCharacteristic(
+ empty_vector, GetCallback(Call::NOT_EXPECTED),
+ GetGattErrorCallback(Call::EXPECTED));
+ base::RunLoop().RunUntilIdle();
+
EXPECT_EQ(0, callback_count_);
EXPECT_EQ(1, error_callback_count_);
EXPECT_EQ(BluetoothGattService::GATT_ERROR_IN_PROGRESS,
@@ -566,8 +603,9 @@ TEST_F(BluetoothGattCharacteristicTest, WriteRemoteCharacteristic_ReadPending) {
TEST_F(BluetoothGattCharacteristicTest, StartNotifySession) {
ASSERT_NO_FATAL_FAILURE(FakeCharacteristicBoilerplate());
- characteristic1_->StartNotifySession(GetNotifyCallback(),
- GetGattErrorCallback());
+ characteristic1_->StartNotifySession(
+ GetNotifyCallback(Call::EXPECTED),
+ GetGattErrorCallback(Call::NOT_EXPECTED));
EXPECT_EQ(1, gatt_notify_characteristic_attempts_);
EXPECT_EQ(0, callback_count_);
SimulateGattNotifySessionStarted(characteristic1_);
@@ -588,8 +626,8 @@ TEST_F(BluetoothGattCharacteristicTest, StartNotifySession_SynchronousError) {
SimulateGattCharacteristicSetNotifyWillFailSynchronouslyOnce(
characteristic1_);
- characteristic1_->StartNotifySession(GetNotifyCallback(),
- GetGattErrorCallback());
+ characteristic1_->StartNotifySession(GetNotifyCallback(Call::NOT_EXPECTED),
+ GetGattErrorCallback(Call::EXPECTED));
EXPECT_EQ(0, error_callback_count_);
base::RunLoop().RunUntilIdle();
EXPECT_EQ(0, gatt_notify_characteristic_attempts_);
@@ -604,10 +642,12 @@ TEST_F(BluetoothGattCharacteristicTest, StartNotifySession_SynchronousError) {
TEST_F(BluetoothGattCharacteristicTest, StartNotifySession_Multiple) {
ASSERT_NO_FATAL_FAILURE(FakeCharacteristicBoilerplate());
- characteristic1_->StartNotifySession(GetNotifyCallback(),
- GetGattErrorCallback());
- characteristic1_->StartNotifySession(GetNotifyCallback(),
- GetGattErrorCallback());
+ characteristic1_->StartNotifySession(
+ GetNotifyCallback(Call::EXPECTED),
+ GetGattErrorCallback(Call::NOT_EXPECTED));
+ characteristic1_->StartNotifySession(
+ GetNotifyCallback(Call::EXPECTED),
+ GetGattErrorCallback(Call::NOT_EXPECTED));
#if defined(OS_ANDROID)
// TODO(crbug.com/551634): Decide when implementing IsNotifying if Android
// should trust the notification request always worked, or if we should always
« no previous file with comments | « device/bluetooth/bluetooth_device_unittest.cc ('k') | device/bluetooth/bluetooth_gatt_service_unittest.cc » ('j') | device/bluetooth/test/bluetooth_test.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698