Adding BluetoothTestBase::CheckNotifySessionValue() method

device/bluetooth/test/bluetooth_test.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/bluetooth/test/bluetooth_test.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 74 matching lines @@
   NOTIMPLEMENTED();
   return false;
 }
 
 std::vector<uint8_t> BluetoothTestBase::LastNotifactionValueForCharacteristic(
     BluetoothLocalGattCharacteristic* characteristic) {
   NOTIMPLEMENTED();
   return std::vector<uint8_t>();
 }
 
+void BluetoothTestBase::CheckNotifySessionValue(

[ortuno, 2017/02/20 07:28:02]

Great idea! Two suggestiongs:

1. What do you think about separating the attempts from the value checking?
2. What do you think about an enum to make the first value clearer? e.g. enum
class NotifyValueState { NOTIFY, INDICATE, NOTIFY_AND_INDICATE}.

I think both of those things make the code more readable:

CheckNotifySessionValue(1 /* expected_ccc_descriptor_value */, 1 /* attempts
*/);

vs.

ExpectedChangeNotifyValueAttempts(1);
ExpectedNotifyValue(NotifyValueState:NOTIFY);

[ortuno, 2017/02/20 07:32:50]

Small correction: This should be {NOTIFY, INDICATE} no need for
NOTIFY_AND_INDICATE.

[jlebel, 2017/02/21 21:46:30]

Done.

+    uint16_t expected_config_descriptor_value,
+    int attempts) {
+  EXPECT_EQ(attempts, gatt_write_descriptor_attempts_);

[ortuno, 2017/02/20 07:28:02]

Could we include gatt_notify_characteristic_attempts_ here?

[jlebel, 2017/02/21 21:46:30]

This is mac only. So either I use #define for mac only, or I override the method
for the mac. What do you prefer?

[ortuno, 2017/02/22 03:26:21]

Actually all platforms use gatt_notify_characteristic_attempts_. See comment in
latest patchset.

[jlebel, 2017/02/22 12:02:08]

Done.

+  ASSERT_EQ(2u, last_write_value_.size());
+  uint8_t expected_byte0 = expected_config_descriptor_value & 0xFF;
+  uint8_t expected_byte1 = (expected_config_descriptor_value >> 8) & 0xFF;
+  EXPECT_EQ(expected_byte0, last_write_value_[0]);
+  EXPECT_EQ(expected_byte1, last_write_value_[1]);
+}
+
 std::vector<BluetoothLocalGattService*>
 BluetoothTestBase::RegisteredGattServices() {
   NOTIMPLEMENTED();
   return std::vector<BluetoothLocalGattService*>();
 }
 
 void BluetoothTestBase::DeleteDevice(BluetoothDevice* device) {
   adapter_->DeleteDeviceForTesting(device->GetAddress());
 }
 
@@ skipping 274 matching lines @@
   gatt_write_characteristic_attempts_ = 0;
   gatt_read_descriptor_attempts_ = 0;
   gatt_write_descriptor_attempts_ = 0;
 }
 
 void BluetoothTestBase::RemoveTimedOutDevices() {
   adapter_->RemoveTimedOutDevices();
 }
 
 }  // namespace device