Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

Unified Diff: chromeos/dbus/shill_profile_client_unittest.cc

Issue 10949030: This converts the Shill clients to allow propagation of shill errors (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix bad merge Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/dbus/shill_profile_client.cc ('k') | chromeos/dbus/shill_service_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/shill_profile_client_unittest.cc
diff --git a/chromeos/dbus/shill_profile_client_unittest.cc b/chromeos/dbus/shill_profile_client_unittest.cc
index 5e024a1f5cefca55bb2af7c5246dd1773b32829d..47d6cc069659adcafc543261d2fdfd8e1e28e2eb 100644
--- a/chromeos/dbus/shill_profile_client_unittest.cc
+++ b/chromeos/dbus/shill_profile_client_unittest.cc
@@ -116,8 +116,13 @@ TEST_F(ShillProfileClientTest, GetProperties) {
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());
+ EXPECT_CALL(error_callback, Run(_, _)).Times(0);
+
// Run the message loop.
message_loop_.RunAllPending();
}
@@ -145,9 +150,13 @@ TEST_F(ShillProfileClientTest, GetEntry) {
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();
}
@@ -165,9 +174,15 @@ TEST_F(ShillProfileClientTest, DeleteEntry) {
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();
}
« no previous file with comments | « chromeos/dbus/shill_profile_client.cc ('k') | chromeos/dbus/shill_service_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698