This converts the Shill clients to allow propagation of shill errors

chromeos/dbus/shill_client_unittest_base.h

 // 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.
 
 #ifndef CHROMEOS_DBUS_SHILL_CLIENT_UNITTEST_BASE_H_
 #define CHROMEOS_DBUS_SHILL_CLIENT_UNITTEST_BASE_H_
 
 #include <string>
 
+#include "base/json/json_writer.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
+#include "base/values.h"
 #include "chromeos/dbus/dbus_method_call_status.h"
 #include "chromeos/dbus/shill_client_helper.h"
 #include "dbus/mock_bus.h"
 #include "dbus/mock_object_proxy.h"
 #include "dbus/object_proxy.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using ::testing::MatcherInterface;
+using ::testing::MatchResultListener;
+using ::testing::Matcher;
+using ::testing::MakeMatcher;
+
 namespace base {
 
 class Value;
 class DictionaryValue;
 
 }  // namespace base
 
 namespace dbus {
 
 class MessageReader;
 
 }  // namespace dbus
 
 namespace chromeos {
 
+// A gmock matcher for base::Value types, so we can match them in expectations.
+class ValueMatcher
+    : public MatcherInterface<const base::Value&> {
+ public:
+  explicit ValueMatcher(const base::Value& value)
+    : expected_value_(value.DeepCopy()) {}
+
+  virtual bool MatchAndExplain(const base::Value& value,
+                               MatchResultListener* listener) const {

[hashimoto, 2012/09/21 11:52:01]

Could you move these method definitions to .cc file and add OVERRIDEs?

[Greg Spencer (Chromium), 2012/09/21 22:03:47]

Done.

+    return expected_value_->Equals(&value);
+  }
+
+  virtual void DescribeTo(::std::ostream* os) const {
+    std::string expected_value_str;
+    base::JSONWriter::WriteWithOptions(expected_value_.get(),
+                                       base::JSONWriter::OPTIONS_PRETTY_PRINT,
+                                       &expected_value_str);
+    *os << "value equals " << expected_value_str;
+  }
+
+  virtual void DescribeNegationTo(::std::ostream* os) const {
+    std::string expected_value_str;
+    base::JSONWriter::WriteWithOptions(expected_value_.get(),
+                                       base::JSONWriter::OPTIONS_PRETTY_PRINT,
+                                       &expected_value_str);
+    *os << "value does not equal " << expected_value_str;
+  }
+ private:
+  scoped_ptr<base::Value> expected_value_;
+};
+
+inline Matcher<const base::Value&> ValueEq(const base::Value& expected_value) {
+  return MakeMatcher(new ValueMatcher(expected_value));
+}
+
 // A class to provide functionalities needed for testing Shill D-Bus clients.
 class ShillClientUnittestBase : public testing::Test {
  public:
   // A mock Closure.
   class MockClosure {
    public:
     MockClosure();
     ~MockClosure();
     MOCK_METHOD0(Run, void());
     base::Closure GetCallback();
   };
 
   // A mock ErrorCallback.
   class MockErrorCallback {
    public:
     MockErrorCallback();
     ~MockErrorCallback();
     MOCK_METHOD2(Run, void(const std::string& error_name,
                            const std::string& error_mesage));
     ShillClientHelper::ErrorCallback GetCallback();
   };
 
+  // A mock PropertyChangedObserver that can be used to check expected values.
+  class MockPropertyChangeObserver
+      : public ShillClientHelper::PropertyChangedObserver {
+   public:
+    MockPropertyChangeObserver();
+    ~MockPropertyChangeObserver();
+    MOCK_METHOD2(OnPropertyChanged, void(const std::string& name,
+                                         const base::Value& value));
+  };
+
   explicit ShillClientUnittestBase(const std::string& interface_name,
                                       const dbus::ObjectPath& object_path);
   virtual ~ShillClientUnittestBase();
 
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
  protected:
   // A callback to intercept and check the method call arguments.
   typedef base::Callback<void(
       dbus::MessageReader* reader)> ArgumentCheckCallback;
 
   // Sets expectations for called method name and arguments, and sets response.
   void PrepareForMethodCall(const std::string& method_name,
                             const ArgumentCheckCallback& argument_checker,
                             dbus::Response* response);
 
   // Sends property changed signal to the tested client.
   void SendPropertyChangedSignal(dbus::Signal* signal);
 
-  // Checks the name and the value which are sent by PropertyChanged signal.
-  static void ExpectPropertyChanged(const std::string& expected_name,
-                                    const base::Value* expected_value,
-                                    const std::string& name,
-                                    const base::Value& value);
-
   // Expects the reader to be empty.
   static void ExpectNoArgument(dbus::MessageReader* reader);
 
   // Expects the reader to have a string.
   static void ExpectStringArgument(const std::string& expected_string,
                                    dbus::MessageReader* reader);
 
   // Expects the reader to have a Value.
   static void ExpectValueArgument(const base::Value* expected_value,
                                   dbus::MessageReader* reader);
 
   // Expects the reader to have a string and a Value.
   static void ExpectStringAndValueArguments(const std::string& expected_string,
                                             const base::Value* expected_value,
                                             dbus::MessageReader* reader);
 
   // Expects the call status to be SUCCESS.
   static void ExpectNoResultValue(DBusMethodCallStatus call_status);
 
   // Checks the result and expects the call status to be SUCCESS.
   static void ExpectObjectPathResult(const dbus::ObjectPath& expected_result,
                                      DBusMethodCallStatus call_status,
                                      const dbus::ObjectPath& result);
 
   // Checks the result and expects the call status to be SUCCESS.
   static void ExpectDictionaryValueResult(
       const base::DictionaryValue* expected_result,
       DBusMethodCallStatus call_status,
       const base::DictionaryValue& result);
+  static void ExpectDictionaryValueResultWithoutStatus(
+      const base::DictionaryValue* expected_result,
+      const base::DictionaryValue& result);
 
   // A message loop to emulate asynchronous behavior.
   MessageLoop message_loop_;
   // The mock bus.
   scoped_refptr<dbus::MockBus> mock_bus_;
 
  private:
   // Checks the requested interface name and signal name.
   // Used to implement the mock proxy.
   void OnConnectToSignal(
@@ skipping 34 matching lines @@
   std::string expected_method_name_;
   // The response which the mock object proxy returns.
   dbus::Response* response_;
   // A callback to intercept and check the method call arguments.
   ArgumentCheckCallback argument_checker_;
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_SHILL_CLIENT_UNITTEST_BASE_H_