| Index: device/bluetooth/bluez/bluetooth_gatt_bluez_unittest.cc
|
| diff --git a/device/bluetooth/bluez/bluetooth_gatt_bluez_unittest.cc b/device/bluetooth/bluez/bluetooth_gatt_bluez_unittest.cc
|
| index d8538b6e0734214fa8b8e1704f42931132fd4edc..30eed1b86ea1bb0c4c31995da4fd0c087d408e23 100644
|
| --- a/device/bluetooth/bluez/bluetooth_gatt_bluez_unittest.cc
|
| +++ b/device/bluetooth/bluez/bluetooth_gatt_bluez_unittest.cc
|
| @@ -1101,8 +1101,7 @@ TEST_F(BluetoothGattBlueZTest, GattCharacteristicValue) {
|
| EXPECT_EQ(BluetoothRemoteGattService::GATT_ERROR_FAILED, last_service_error_);
|
| EXPECT_EQ(0, observer.gatt_characteristic_value_changed_count());
|
|
|
| - // Issue a read request. A successful read results in a
|
| - // CharacteristicValueChanged notification.
|
| + // Issue a read request.
|
| characteristic = service->GetCharacteristic(
|
| fake_bluetooth_gatt_characteristic_client_->GetBodySensorLocationPath()
|
| .value());
|
| @@ -1119,7 +1118,7 @@ TEST_F(BluetoothGattBlueZTest, GattCharacteristicValue) {
|
| base::Unretained(this)));
|
| EXPECT_EQ(2, success_callback_count_);
|
| EXPECT_EQ(4, error_callback_count_);
|
| - EXPECT_EQ(1, observer.gatt_characteristic_value_changed_count());
|
| + EXPECT_EQ(0, observer.gatt_characteristic_value_changed_count());
|
| EXPECT_TRUE(ValuesEqual(characteristic->GetValue(), last_read_value_));
|
|
|
| // Test long-running actions.
|
| @@ -1143,7 +1142,7 @@ TEST_F(BluetoothGattBlueZTest, GattCharacteristicValue) {
|
| // tne next one.
|
| EXPECT_EQ(2, success_callback_count_);
|
| EXPECT_EQ(4, error_callback_count_);
|
| - EXPECT_EQ(1, observer.gatt_characteristic_value_changed_count());
|
| + EXPECT_EQ(0, observer.gatt_characteristic_value_changed_count());
|
|
|
| // Next read should error because IN_PROGRESS
|
| characteristic->ReadRemoteCharacteristic(
|
| @@ -1157,7 +1156,7 @@ TEST_F(BluetoothGattBlueZTest, GattCharacteristicValue) {
|
|
|
| // But previous call finished.
|
| EXPECT_EQ(3, success_callback_count_);
|
| - EXPECT_EQ(2, observer.gatt_characteristic_value_changed_count());
|
| + EXPECT_EQ(0, observer.gatt_characteristic_value_changed_count());
|
| EXPECT_TRUE(ValuesEqual(characteristic->GetValue(), last_read_value_));
|
| fake_bluetooth_gatt_characteristic_client_->SetExtraProcessing(0);
|
|
|
| @@ -1172,7 +1171,7 @@ TEST_F(BluetoothGattBlueZTest, GattCharacteristicValue) {
|
| EXPECT_EQ(6, error_callback_count_);
|
| EXPECT_EQ(BluetoothRemoteGattService::GATT_ERROR_NOT_AUTHORIZED,
|
| last_service_error_);
|
| - EXPECT_EQ(2, observer.gatt_characteristic_value_changed_count());
|
| + EXPECT_EQ(0, observer.gatt_characteristic_value_changed_count());
|
| fake_bluetooth_gatt_characteristic_client_->SetAuthorized(true);
|
|
|
| // Test unauthenticated / needs login.
|
| @@ -1186,7 +1185,7 @@ TEST_F(BluetoothGattBlueZTest, GattCharacteristicValue) {
|
| EXPECT_EQ(7, error_callback_count_);
|
| EXPECT_EQ(BluetoothRemoteGattService::GATT_ERROR_NOT_PAIRED,
|
| last_service_error_);
|
| - EXPECT_EQ(2, observer.gatt_characteristic_value_changed_count());
|
| + EXPECT_EQ(0, observer.gatt_characteristic_value_changed_count());
|
| fake_bluetooth_gatt_characteristic_client_->SetAuthenticated(true);
|
| }
|
|
|
|
|