This converts the Shill clients to allow propagation of shill errors

chromeos/dbus/shill_service_client_unittest.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/values.h"
 #include "chromeos/dbus/shill_client_unittest_base.h"
 #include "chromeos/dbus/shill_service_client.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/values_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
+using testing::_;
+using testing::ByRef;
+
 namespace chromeos {
 
 namespace {
 
 const char kExampleServicePath[] = "/foo/bar";
 
 }  // namespace
 
 class ShillServiceClientTest : public ShillClientUnittestBase {
  public:
@@ skipping 23 matching lines @@
   const int kValue = 42;
   // Create a signal.
   dbus::Signal signal(flimflam::kFlimflamServiceInterface,
                       flimflam::kMonitorPropertyChanged);
   dbus::MessageWriter writer(&signal);
   writer.AppendString(flimflam::kSignalStrengthProperty);
   writer.AppendVariantOfByte(kValue);
 
   // Set expectations.
   const base::FundamentalValue value(kValue);
-  client_->SetPropertyChangedHandler(
+  MockPropertyChangeObserver observer;
+  EXPECT_CALL(observer,
+              OnPropertyChanged(
+                  flimflam::kSignalStrengthProperty,
+                  ValueEq(ByRef(value)))).Times(1);
+
+  // Add the observer
+  client_->AddPropertyChangedObserver(
       dbus::ObjectPath(kExampleServicePath),
-      base::Bind(&ExpectPropertyChanged,
-                 flimflam::kSignalStrengthProperty,
-                 &value));
+      &observer);
+
   // Run the signal callback.
   SendPropertyChangedSignal(&signal);
 
-  // Reset the handler.
-  client_->ResetPropertyChangedHandler(dbus::ObjectPath(kExampleServicePath));
+  // Remove the observer.
+  client_->RemovePropertyChangedObserver(
+      dbus::ObjectPath(kExampleServicePath),
+      &observer);
+
+  EXPECT_CALL(observer, OnPropertyChanged(_, _)).Times(0);
+
+  // Run the signal callback again and make sure the observer isn't called.
+  SendPropertyChangedSignal(&signal);
 }
 
 TEST_F(ShillServiceClientTest, GetProperties) {
   const int kValue = 42;
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(response.get());
   dbus::MessageWriter array_writer(NULL);
   writer.OpenArray("{sv}", &array_writer);
   dbus::MessageWriter entry_writer(NULL);
@@ skipping 23 matching lines @@
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Set expectations.
   const base::StringValue value(kValue);
   PrepareForMethodCall(flimflam::kSetPropertyFunction,
                        base::Bind(&ExpectStringAndValueArguments,
                                   flimflam::kPassphraseProperty,
                                   &value),
                        response.get());
   // Call method.
+  MockClosure mock_closure;
+  MockErrorCallback mock_error_callback;
   client_->SetProperty(dbus::ObjectPath(kExampleServicePath),
                        flimflam::kPassphraseProperty,
                        value,
-                       base::Bind(&ExpectNoResultValue));
+                       mock_closure.GetCallback(),
+                       mock_error_callback.GetCallback());
+  EXPECT_CALL(mock_closure, Run()).Times(1);
+  EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0);
+
   // Run the message loop.
   message_loop_.RunAllPending();
 }
 
 TEST_F(ShillServiceClientTest, ClearProperty) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Set expectations.
   PrepareForMethodCall(flimflam::kClearPropertyFunction,
                        base::Bind(&ExpectStringArgument,
                                   flimflam::kPassphraseProperty),
                        response.get());
   // Call method.
+  MockClosure mock_closure;
+  MockErrorCallback mock_error_callback;
   client_->ClearProperty(dbus::ObjectPath(kExampleServicePath),
                          flimflam::kPassphraseProperty,
-                         base::Bind(&ExpectNoResultValue));
+                         mock_closure.GetCallback(),
+                         mock_error_callback.GetCallback());
+  EXPECT_CALL(mock_closure, Run()).Times(1);
+  EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0);
+
   // Run the message loop.
   message_loop_.RunAllPending();
 }
 
 TEST_F(ShillServiceClientTest, Connect) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Set expectations.
   MockClosure mock_closure;
@@ skipping 13 matching lines @@
 
 TEST_F(ShillServiceClientTest, Disconnect) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Set expectations.
   PrepareForMethodCall(flimflam::kDisconnectFunction,
                        base::Bind(&ExpectNoArgument),
                        response.get());
   // Call method.
+  MockClosure mock_closure;
+  MockErrorCallback mock_error_callback;
   client_->Disconnect(dbus::ObjectPath(kExampleServicePath),
-                   base::Bind(&ExpectNoResultValue));
+                      mock_closure.GetCallback(),
+                      mock_error_callback.GetCallback());
+  EXPECT_CALL(mock_closure, Run()).Times(1);
+  EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0);
+
   // Run the message loop.
   message_loop_.RunAllPending();
 }
 
 TEST_F(ShillServiceClientTest, Remove) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Set expectations.
   PrepareForMethodCall(flimflam::kRemoveServiceFunction,
                        base::Bind(&ExpectNoArgument),
                        response.get());
   // Call method.
+  MockClosure mock_closure;
+  MockErrorCallback mock_error_callback;
   client_->Remove(dbus::ObjectPath(kExampleServicePath),
-                  base::Bind(&ExpectNoResultValue));
+                  mock_closure.GetCallback(),
+                  mock_error_callback.GetCallback());
+  EXPECT_CALL(mock_closure, Run()).Times(1);
+  EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0);
+
   // Run the message loop.
   message_loop_.RunAllPending();
 }
 
 TEST_F(ShillServiceClientTest, ActivateCellularModem) {
   const char kCarrier[] = "carrier";
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Set expectations.
   PrepareForMethodCall(flimflam::kActivateCellularModemFunction,
                        base::Bind(&ExpectStringArgument, kCarrier),
                        response.get());
   // Call method.
+  MockClosure mock_closure;
+  MockErrorCallback mock_error_callback;
   client_->ActivateCellularModem(dbus::ObjectPath(kExampleServicePath),
                                  kCarrier,
-                                 base::Bind(&ExpectNoResultValue));
+                                 mock_closure.GetCallback(),
+                                 mock_error_callback.GetCallback());
+  EXPECT_CALL(mock_closure, Run()).Times(1);
+  EXPECT_CALL(mock_error_callback, Run(_, _)).Times(0);
+
   // Run the message loop.
   message_loop_.RunAllPending();
 }
 
 TEST_F(ShillServiceClientTest, CallActivateCellularModemAndBlock) {
   const char kCarrier[] = "carrier";
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Set expectations.
   PrepareForMethodCall(flimflam::kActivateCellularModemFunction,
                        base::Bind(&ExpectStringArgument, kCarrier),
                        response.get());
   // Call method.
   const bool result = client_->CallActivateCellularModemAndBlock(
       dbus::ObjectPath(kExampleServicePath), kCarrier);
   EXPECT_TRUE(result);
 }
 
 }  // namespace chromeos