Add unit testing for more org.bluez.Error.*

chromeos/dbus/fake_bluetooth_gatt_characteristic_client.cc

 // Copyright 2014 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 "chromeos/dbus/fake_bluetooth_gatt_characteristic_client.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/rand_util.h"
 #include "base/time/time.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_bluetooth_gatt_descriptor_client.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 namespace {
 
 const int kStartNotifyResponseIntervalMs = 200;
 const int kHeartRateMeasurementNotificationIntervalMs = 2000;
 
 }  // namespace
 
+FakeBluetoothGattCharacteristicClient::DelayedCallback::DelayedCallback(
+    base::Closure callback,
+    size_t delay)
+    : callback_(callback), delay_(delay) {
+}
+
+FakeBluetoothGattCharacteristicClient::DelayedCallback::~DelayedCallback() {
+  return;

[armansito, 2014/10/01 20:08:22]

Return statement necessary?

[Marie Janssen, 2014/10/01 22:22:22]

Hmm.  I swore I had issues with the Chromium about an explicit destructor until
I added it. Done.

+}
+
 // static
 const char FakeBluetoothGattCharacteristicClient::
     kHeartRateMeasurementPathComponent[] = "char0000";
 const char FakeBluetoothGattCharacteristicClient::
     kBodySensorLocationPathComponent[] = "char0001";
 const char FakeBluetoothGattCharacteristicClient::
     kHeartRateControlPointPathComponent[] = "char0002";
 
 // static
 const char FakeBluetoothGattCharacteristicClient::kHeartRateMeasurementUUID[] =
@@ skipping 27 matching lines @@
 
 void FakeBluetoothGattCharacteristicClient::Properties::Set(
     dbus::PropertyBase* property,
     dbus::PropertySet::SetCallback callback) {
   VLOG(1) << "Set " << property->name();
   callback.Run(false);
 }
 
 FakeBluetoothGattCharacteristicClient::FakeBluetoothGattCharacteristicClient()
     : heart_rate_visible_(false),
+      authorized_(true),
       calories_burned_(0),
+      extra_requests_(0),
       weak_ptr_factory_(this) {
 }
 
 FakeBluetoothGattCharacteristicClient::
     ~FakeBluetoothGattCharacteristicClient() {
 }
 
 void FakeBluetoothGattCharacteristicClient::Init(dbus::Bus* bus) {
 }
 
@@ skipping 31 matching lines @@
     DCHECK(heart_rate_control_point_properties_.get());
     return heart_rate_control_point_properties_.get();
   }
   return NULL;
 }
 
 void FakeBluetoothGattCharacteristicClient::ReadValue(
     const dbus::ObjectPath& object_path,
     const ValueCallback& callback,
     const ErrorCallback& error_callback) {
-  if (!IsHeartRateVisible()) {
-    error_callback.Run(kUnknownCharacteristicError, "");
+  if (!authorized_) {
+    error_callback.Run("org.bluez.Error.NotAuthorized", "Authenticate first");

[armansito, 2014/10/01 20:08:22]

"Authorize first"?

[Marie Janssen, 2014/10/01 22:22:22]

Done.

     return;
   }
 
   if (object_path.value() == heart_rate_measurement_path_ ||
       object_path.value() == heart_rate_control_point_path_) {
     error_callback.Run("org.bluez.Error.ReadNotPermitted",
                        "Reads of this value are not allowed");
     return;
   }
 
   if (object_path.value() != body_sensor_location_path_) {
     error_callback.Run(kUnknownCharacteristicError, "");
     return;
   }
 
-  std::vector<uint8> value;
-  value.push_back(0x06);  // Location is "foot".
-  callback.Run(value);
+  if (action_extra_requests_.find("ReadValue") !=
+      action_extra_requests_.end()) {
+    struct DelayedCallback* delayed = action_extra_requests_["ReadValue"];

[armansito, 2014/10/01 20:08:22]

struct keyword not necessary in C++

[Marie Janssen, 2014/10/01 22:22:22]

Done.

+    delayed->delay_--;
+    error_callback.Run("org.bluez.Error.InProgress",
+                       "Another read is currenty in progress");
+    if (delayed->delay_ == 0) {
+      delayed->callback_.Run();
+      action_extra_requests_.erase("ReadValue");
+      delete delayed;
+    }
+    return;
+  }
+  base::Closure completed_callback;
+  if (!IsHeartRateVisible()) {
+    completed_callback =
+        base::Bind(error_callback, kUnknownCharacteristicError, "");
+  } else {
+    std::vector<uint8> value;
+    value.push_back(0x06);  // Location is "foot".
+    completed_callback = base::Bind(callback, value);
+  }
+
+  if (extra_requests_ > 0) {
+    action_extra_requests_["ReadValue"] =
+        new DelayedCallback(completed_callback, extra_requests_);
+    return;
+  }
+  completed_callback.Run();
 }
 
 void FakeBluetoothGattCharacteristicClient::WriteValue(
     const dbus::ObjectPath& object_path,
     const std::vector<uint8>& value,
     const base::Closure& callback,
     const ErrorCallback& error_callback) {
+  if (!authorized_) {
+    error_callback.Run("org.bluez.Error.NotAuthorized", "Authenticate first");
+    return;
+  }
+
   if (!IsHeartRateVisible()) {
     error_callback.Run(kUnknownCharacteristicError, "");
     return;
   }
 
   if (object_path.value() != heart_rate_control_point_path_) {
     error_callback.Run("org.bluez.Error.WriteNotPermitted",
                        "Writes of this value are not allowed");
     return;
   }
 
   DCHECK(heart_rate_control_point_properties_.get());
-  if (value.size() != 1) {
-    error_callback.Run("org.bluez.Error.InvalidValueLength",
-                       "Invalid length for write");
+  if (action_extra_requests_.find("WriteValue") !=
+      action_extra_requests_.end()) {
+    struct DelayedCallback* delayed = action_extra_requests_["WriteValue"];
+    delayed->delay_--;
+    error_callback.Run("org.bluez.Error.InProgress",
+                       "Another write is in progress");
+    if (delayed->delay_ == 0) {
+      delayed->callback_.Run();
+      action_extra_requests_.erase("WriteValue");
+      delete delayed;
+    }
     return;
   }
-  if (value[0] > 1) {
-    error_callback.Run("org.bluez.Error.Failed",
-                       "Invalid value given for write");
+  base::Closure completed_callback;
+  if (value.size() != 1) {
+    completed_callback = base::Bind(error_callback,
+                                    "org.bluez.Error.InvalidValueLength",
+                                    "Invalid length for write");
+  } else if (value[0] > 1) {
+    completed_callback = base::Bind(error_callback,
+                                    "org.bluez.Error.Failed",
+                                    "Invalid value given for write");
+  } else if (value[0] == 1) {
+    // TODO(jamuraa): make this happen when the callback happens
+    calories_burned_ = 0;
+    completed_callback = callback;
+  }
+
+  if (extra_requests_ > 0) {
+    action_extra_requests_["WriteValue"] =
+        new DelayedCallback(completed_callback, extra_requests_);
     return;
   }
-
-  if (value[0] == 1)
-    calories_burned_ = 0;
-
-  callback.Run();
+  completed_callback.Run();
 }
 
 void FakeBluetoothGattCharacteristicClient::StartNotify(
     const dbus::ObjectPath& object_path,
     const base::Closure& callback,
     const ErrorCallback& error_callback) {
   if (!IsHeartRateVisible()) {
     error_callback.Run(kUnknownCharacteristicError, "");
     return;
   }
@@ skipping 138 matching lines @@
   heart_rate_measurement_properties_.reset();
   body_sensor_location_properties_.reset();
   heart_rate_control_point_properties_.reset();
 
   heart_rate_measurement_path_.clear();
   body_sensor_location_path_.clear();
   heart_rate_control_point_path_.clear();
   heart_rate_visible_ = false;
 }
 
+void FakeBluetoothGattCharacteristicClient::SetExtraProcessing(
+    size_t requests) {
+  extra_requests_ = requests;
+  if (extra_requests_ == 0) {
+    for (const auto& it : action_extra_requests_) {

[armansito, 2014/10/01 20:08:22]

Nice, I guess we should start adopting these C++11 idioms. That said, we should
try to make the rest of the code consistent with this, so maybe add a TODO to
use foreach loops elsewhere in this file?

[Marie Janssen, 2014/10/01 22:22:22]

This is the only foreach loop in this file.

+      it.second->callback_.Run();
+      delete it.second;
+    }
+    action_extra_requests_.clear();
+  }
+}
+
+size_t FakeBluetoothGattCharacteristicClient::GetExtraProcessing() const {
+  return extra_requests_;
+}
+
 dbus::ObjectPath
 FakeBluetoothGattCharacteristicClient::GetHeartRateMeasurementPath() const {
   return dbus::ObjectPath(heart_rate_measurement_path_);
 }
 
 dbus::ObjectPath
 FakeBluetoothGattCharacteristicClient::GetBodySensorLocationPath() const {
   return dbus::ObjectPath(body_sensor_location_path_);
 }
 
@@ skipping 100 matching lines @@
   DCHECK(heart_rate_visible_ != heart_rate_measurement_path_.empty());
   DCHECK(heart_rate_visible_ != body_sensor_location_path_.empty());
   DCHECK(heart_rate_visible_ != heart_rate_control_point_path_.empty());
   DCHECK(heart_rate_visible_ == !!heart_rate_measurement_properties_.get());
   DCHECK(heart_rate_visible_ == !!body_sensor_location_properties_.get());
   DCHECK(heart_rate_visible_ == !!heart_rate_control_point_properties_.get());
   return heart_rate_visible_;
 }
 
 }  // namespace chromeos