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::ExpectedChangeNotifyValueAttempts(int attempts) {
+  EXPECT_EQ(attempts, gatt_write_descriptor_attempts_);
+}
+
+void BluetoothTestBase::ExpectedNotifyValue(
+    NotifyValueState expected_value_state) {
+  ASSERT_EQ(2u, last_write_value_.size());
+  switch (expected_value_state) {
+    case NotifyValueState::NONE:
+      EXPECT_EQ(0, last_write_value_[0]);
+      EXPECT_EQ(0, last_write_value_[1]);
+      break;
+    case NotifyValueState::NOTIFY:
+      EXPECT_EQ(1, last_write_value_[0]);
+      EXPECT_EQ(0, last_write_value_[1]);
+      break;
+    case NotifyValueState::INDICATE:
+      EXPECT_EQ(2, last_write_value_[0]);
+      EXPECT_EQ(0, last_write_value_[1]);
+      break;
+  }
+}
+
 std::vector<BluetoothLocalGattService*>
 BluetoothTestBase::RegisteredGattServices() {
   NOTIMPLEMENTED();
   return std::vector<BluetoothLocalGattService*>();
 }
 
 void BluetoothTestBase::DeleteDevice(BluetoothDevice* device) {
   adapter_->DeleteDeviceForTesting(device->GetAddress());
 }
 
@@ skipping 262 matching lines @@
       weak_factory_.GetWeakPtr(), expected, characteristic, error_in_reentrant);
 }
 
 void BluetoothTestBase::ResetEventCounts() {
   last_connect_error_code_ = BluetoothDevice::ERROR_UNKNOWN;
   callback_count_ = 0;
   error_callback_count_ = 0;
   gatt_connection_attempts_ = 0;
   gatt_disconnection_attempts_ = 0;
   gatt_discovery_attempts_ = 0;
-  gatt_notify_characteristic_attempts_ = 0;

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

Both android[1] and windows[2] have "StartNotifications" functions that we need
to call in addition to writing to the descriptor. That's what this variable was
counting. We should include it in ExpectedChangeNotifyValueAttempts 


[1] Android function
https://developer.android.com/reference/android/bluetooth/BluetoothGatt.html#...,
boolean)
[2] Windows function
https://msdn.microsoft.com/en-us/library/windows/hardware/hh450804(v=vs.85).aspx
[3] Android using the variable
https://cs.chromium.org/chromium/src/device/bluetooth/test/bluetooth_test_and...
[4] Windows using the variable:
https://cs.chromium.org/chromium/src/device/bluetooth/test/bluetooth_test_win...

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

Sorry about that. I was a bit fast.

   gatt_read_characteristic_attempts_ = 0;
   gatt_write_characteristic_attempts_ = 0;
   gatt_read_descriptor_attempts_ = 0;
   gatt_write_descriptor_attempts_ = 0;
 }
 
 void BluetoothTestBase::RemoveTimedOutDevices() {
   adapter_->RemoveTimedOutDevices();
 }
 
 }  // namespace device