diff options
author | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-07 15:12:32 +0000 |
---|---|---|
committer | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-07 15:12:32 +0000 |
commit | dc98bb2643a9df4a6ca0f4a2b10ca3f30e071a6f (patch) | |
tree | 3b1f29e46ae4b7151ef9f0c9f492f001c5a1a2a4 /chromeos/dbus/shill_client_unittest_base.h | |
parent | 8f64625aa018c789968f2ae65ccf707abb341125 (diff) | |
download | chromium_src-dc98bb2643a9df4a6ca0f4a2b10ca3f30e071a6f.zip chromium_src-dc98bb2643a9df4a6ca0f4a2b10ca3f30e071a6f.tar.gz chromium_src-dc98bb2643a9df4a6ca0f4a2b10ca3f30e071a6f.tar.bz2 |
Added ClearProperties to the Shill service client.
Must be committed only after the corresponding service_constants.h
change goes in.
BUG=chromium-os:35900
TEST=built
Review URL: https://chromiumcodereview.appspot.com/11364089
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166427 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/dbus/shill_client_unittest_base.h')
-rw-r--r-- | chromeos/dbus/shill_client_unittest_base.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/chromeos/dbus/shill_client_unittest_base.h b/chromeos/dbus/shill_client_unittest_base.h index 96f4e93..f893bfd 100644 --- a/chromeos/dbus/shill_client_unittest_base.h +++ b/chromeos/dbus/shill_client_unittest_base.h @@ -69,13 +69,21 @@ class ShillClientUnittestBase : public testing::Test { base::Closure GetCallback(); }; + class MockListValueCallback { + public: + MockListValueCallback(); + ~MockListValueCallback(); + MOCK_METHOD1(Run, void(const base::ListValue& list)); + ShillClientHelper::ListValueCallback GetCallback(); + }; + // A mock ErrorCallback. class MockErrorCallback { public: MockErrorCallback(); ~MockErrorCallback(); MOCK_METHOD2(Run, void(const std::string& error_name, - const std::string& error_mesage)); + const std::string& error_message)); ShillClientHelper::ErrorCallback GetCallback(); }; @@ -122,6 +130,10 @@ class ShillClientUnittestBase : public testing::Test { static void ExpectStringArgument(const std::string& expected_string, dbus::MessageReader* reader); + static void ExpectArrayOfStringsArgument( + const std::vector<std::string>& expected_strings, + dbus::MessageReader* reader); + // Expects the reader to have a Value. static void ExpectValueArgument(const base::Value* expected_value, dbus::MessageReader* reader); |