This converts the Shill clients to allow propagation of shill errors

chromeos/dbus/shill_manager_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_manager_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 {
 
 // Pops a string-to-string dictionary from the reader.
 base::DictionaryValue* PopStringToStringDictionary(
     dbus::MessageReader* reader) {
   dbus::MessageReader array_reader(NULL);
   if (!reader->PopArray(&array_reader))
     return NULL;
@@ skipping 175 matching lines @@
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   // Set expectations.
   base::StringValue value("portal list");
   PrepareForMethodCall(flimflam::kSetPropertyFunction,
                        base::Bind(ExpectStringAndValueArguments,
                                   flimflam::kCheckPortalListProperty,
                                   &value),
                        response.get());
   // Call method.
+  MockClosure mock_closure;
+  MockErrorCallback mock_error_callback;
   client_->SetProperty(flimflam::kCheckPortalListProperty,
                        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(ShillManagerClientTest, RequestScan) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   // Set expectations.
   PrepareForMethodCall(flimflam::kRequestScanFunction,
                        base::Bind(&ExpectStringArgument, flimflam::kTypeWifi),
                        response.get());
   // Call method.
-  client_->RequestScan(flimflam::kTypeWifi, base::Bind(&ExpectNoResultValue));
+  MockClosure mock_closure;
+  MockErrorCallback mock_error_callback;
+  client_->RequestScan(flimflam::kTypeWifi,
+                       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(ShillManagerClientTest, EnableTechnology) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   // Set expectations.
   PrepareForMethodCall(flimflam::kEnableTechnologyFunction,
                        base::Bind(&ExpectStringArgument, flimflam::kTypeWifi),
                        response.get());
   // Call method.
+  MockClosure mock_closure;
+  MockErrorCallback mock_error_callback;
   client_->EnableTechnology(flimflam::kTypeWifi,
-                            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(ShillManagerClientTest, DisableTechnology) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   // Set expectations.
   PrepareForMethodCall(flimflam::kDisableTechnologyFunction,
                        base::Bind(&ExpectStringArgument, flimflam::kTypeWifi),
                        response.get());
   // Call method.
+  MockClosure mock_closure;
+  MockErrorCallback mock_error_callback;
   client_->DisableTechnology(flimflam::kTypeWifi,
-                             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(ShillManagerClientTest, ConfigureService) {
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   // Create the argument dictionary.
   scoped_ptr<base::DictionaryValue> arg(CreateExampleProperties());
   // Set expectations.
   PrepareForMethodCall(flimflam::kConfigureServiceFunction,
                        base::Bind(&ExpectDictionaryValueArgument, arg.get()),
                        response.get());
   // Call method.
-  client_->ConfigureService(*arg, base::Bind(&ExpectNoResultValue));
+  MockClosure mock_closure;
+  MockErrorCallback mock_error_callback;
+  client_->ConfigureService(*arg,
+                            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(ShillManagerClientTest, GetService) {
+  MockErrorCallback error_callback;

[hashimoto, 2012/09/24 02:28:56]

Move this to the line before the actual method call and set expectations.

[Greg Spencer (Chromium), 2012/09/24 21:50:54]

Done.

   // Create response.
   const dbus::ObjectPath object_path("/");
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(response.get());
   writer.AppendObjectPath(object_path);
   // Create the argument dictionary.
   scoped_ptr<base::DictionaryValue> arg(CreateExampleProperties());
   // Set expectations.
   PrepareForMethodCall(flimflam::kGetServiceFunction,
                        base::Bind(&ExpectDictionaryValueArgument, arg.get()),
                        response.get());
   // Call method.
-  client_->GetService(*arg, base::Bind(&ExpectObjectPathResult, object_path));
+  client_->GetService(*arg,
+                      base::Bind(&ExpectObjectPathResultWithoutStatus,
+                                 object_path),
+                      error_callback.GetCallback());
   // Run the message loop.
   message_loop_.RunAllPending();
 }
 
 }  // namespace chromeos