This converts the Shill clients to allow propagation of shill errors

chromeos/dbus/shill_profile_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_profile_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::_;
+
 namespace chromeos {
 
 namespace {
 
 const char kDefaultProfilePath[] = "/profile/default";
 const char kExampleEntryPath[] = "example_entry_path";
 
 void AppendVariantOfArrayOfStrings(dbus::MessageWriter* writer,
                                    const std::vector<std::string>& strings) {
   dbus::MessageWriter variant_writer(NULL);
@@ skipping 33 matching lines @@
   dbus::Signal signal(flimflam::kFlimflamProfileInterface,
                       flimflam::kMonitorPropertyChanged);
   dbus::MessageWriter writer(&signal);
   writer.AppendString(flimflam::kEntriesProperty);
   AppendVariantOfArrayOfStrings(&writer,
                                 std::vector<std::string>(1, kExampleEntryPath));
 
   // Set expectations.
   base::ListValue value;
   value.Append(base::Value::CreateStringValue(kExampleEntryPath));
+  MockPropertyChangeObserver observer;
+  EXPECT_CALL(observer,
+              OnPropertyChanged(
+                  flimflam::kEntriesProperty,
+                  ValueEq(value))).Times(1);
 
-  client_->SetPropertyChangedHandler(dbus::ObjectPath(kDefaultProfilePath),
-                                     base::Bind(&ExpectPropertyChanged,
-                                                flimflam::kEntriesProperty,
-                                                &value));
+  // Add the observer
+  client_->AddPropertyChangedObserver(
+      dbus::ObjectPath(kDefaultProfilePath),
+      &observer);
+
   // Run the signal callback.
   SendPropertyChangedSignal(&signal);
 
-  // Reset the handler.
-  client_->ResetPropertyChangedHandler(dbus::ObjectPath(kDefaultProfilePath));
+  // Remove the observer.
+  client_->RemovePropertyChangedObserver(
+      dbus::ObjectPath(kDefaultProfilePath),
+      &observer);
+
+  EXPECT_CALL(observer, OnPropertyChanged(_, _)).Times(0);
+
+  // Run the signal callback again and make sure the observer isn't called.
+  SendPropertyChangedSignal(&signal);
 }
 
 TEST_F(ShillProfileClientTest, GetProperties) {
   // 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);
   array_writer.OpenDictEntry(&entry_writer);
   entry_writer.AppendString(flimflam::kEntriesProperty);
   AppendVariantOfArrayOfStrings(&entry_writer,
                                 std::vector<std::string>(1, kExampleEntryPath));
   array_writer.CloseContainer(&entry_writer);
   writer.CloseContainer(&array_writer);
 
   // Create the expected value.
   base::ListValue* entries = new base::ListValue;
   entries->Append(base::Value::CreateStringValue(kExampleEntryPath));
   base::DictionaryValue value;
   value.SetWithoutPathExpansion(flimflam::kEntriesProperty, entries);
   // Set expectations.
   PrepareForMethodCall(flimflam::kGetPropertiesFunction,
                        base::Bind(&ExpectNoArgument),
                        response.get());
   // Call method.
+  MockErrorCallback error_callback;
   client_->GetProperties(dbus::ObjectPath(kDefaultProfilePath),
-                         base::Bind(&ExpectDictionaryValueResult, &value));
+                         base::Bind(&ExpectDictionaryValueResultWithoutStatus,
+                                    &value),
+                         error_callback.GetCallback());
   // Run the message loop.
   message_loop_.RunAllPending();
 }
 
 TEST_F(ShillProfileClientTest, GetEntry) {
   // 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);
   array_writer.OpenDictEntry(&entry_writer);
   entry_writer.AppendString(flimflam::kTypeProperty);
   entry_writer.AppendVariantOfString(flimflam::kTypeWifi);
   array_writer.CloseContainer(&entry_writer);
   writer.CloseContainer(&array_writer);
 
   // Create the expected value.
   base::DictionaryValue value;
   value.SetWithoutPathExpansion(
       flimflam::kTypeProperty,
       base::Value::CreateStringValue(flimflam::kTypeWifi));
   // Set expectations.
   PrepareForMethodCall(flimflam::kGetEntryFunction,
                        base::Bind(&ExpectStringArgument, kExampleEntryPath),
                        response.get());
   // Call method.
+  MockErrorCallback error_callback;
   client_->GetEntry(dbus::ObjectPath(kDefaultProfilePath),
                     kExampleEntryPath,
-                    base::Bind(&ExpectDictionaryValueResult, &value));
+                    base::Bind(&ExpectDictionaryValueResultWithoutStatus,
+                               &value),
+                    error_callback.GetCallback());
+  EXPECT_CALL(error_callback, Run(_, _)).Times(0);
   // Run the message loop.
   message_loop_.RunAllPending();
 }
 
 TEST_F(ShillProfileClientTest, DeleteEntry) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Create the expected value.
   base::DictionaryValue value;
   value.SetWithoutPathExpansion(flimflam::kOfflineModeProperty,
                                 base::Value::CreateBooleanValue(true));
   // Set expectations.
   PrepareForMethodCall(flimflam::kDeleteEntryFunction,
                        base::Bind(&ExpectStringArgument, kExampleEntryPath),
                        response.get());
   // Call method.
+  MockClosure mock_closure;
+  MockErrorCallback mock_error_callback;
   client_->DeleteEntry(dbus::ObjectPath(kDefaultProfilePath),
                        kExampleEntryPath,
-                       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();
 }
 
 }  // namespace chromeos