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

Unified Diff: dbus/object_manager_unittest.cc

Issue 1559873005: dbus: Use randomly generated string as a TestService's service name (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 | « dbus/end_to_end_sync_unittest.cc ('k') | dbus/object_proxy_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dbus/object_manager_unittest.cc
diff --git a/dbus/object_manager_unittest.cc b/dbus/object_manager_unittest.cc
index fa830346fed2e2f89b9e33c844e63da39f3fda0e..443210c98e21f6b5f5bcb60def13942952a62dba 100644
--- a/dbus/object_manager_unittest.cc
+++ b/dbus/object_manager_unittest.cc
@@ -87,7 +87,7 @@ class ObjectManagerTest
ASSERT_TRUE(bus_->HasDBusThread());
object_manager_ = bus_->GetObjectManager(
- "org.chromium.TestService",
+ test_service_->service_name(),
ObjectPath("/org/chromium/TestService"));
object_manager_->RegisterInterface("org.chromium.TestInterface", this);
@@ -189,7 +189,7 @@ class ObjectManagerTest
void PerformAction(const std::string& action, const ObjectPath& object_path) {
ObjectProxy* object_proxy = bus_->GetObjectProxy(
- "org.chromium.TestService",
+ test_service_->service_name(),
ObjectPath("/org/chromium/TestObject"));
MethodCall method_call("org.chromium.TestInterface", "PerformAction");
@@ -288,7 +288,7 @@ TEST_F(ObjectManagerTest, GetObjectsWithUnknownInterface) {
TEST_F(ObjectManagerTest, SameObject) {
ObjectManager* object_manager = bus_->GetObjectManager(
- "org.chromium.TestService",
+ test_service_->service_name(),
ObjectPath("/org/chromium/TestService"));
EXPECT_EQ(object_manager_, object_manager);
}
@@ -302,7 +302,7 @@ TEST_F(ObjectManagerTest, DifferentObjectForService) {
TEST_F(ObjectManagerTest, DifferentObjectForPath) {
ObjectManager* object_manager = bus_->GetObjectManager(
- "org.chromium.TestService",
+ test_service_->service_name(),
ObjectPath("/org/chromium/DifferentService"));
EXPECT_NE(object_manager_, object_manager);
}
@@ -387,7 +387,7 @@ TEST_F(ObjectManagerTest, PropertiesChangedAsObjectsReceived) {
object_manager_->UnregisterInterface("org.chromium.TestInterface");
run_loop_.reset(new base::RunLoop);
EXPECT_TRUE(bus_->RemoveObjectManager(
- "org.chromium.TestService",
+ test_service_->service_name(),
ObjectPath("/org/chromium/TestService"),
run_loop_->QuitClosure()));
run_loop_->Run();
@@ -396,7 +396,7 @@ TEST_F(ObjectManagerTest, PropertiesChangedAsObjectsReceived) {
ObjectPath("/org/chromium/TestService"));
object_manager_ = bus_->GetObjectManager(
- "org.chromium.TestService",
+ test_service_->service_name(),
ObjectPath("/org/chromium/TestService"));
object_manager_->RegisterInterface("org.chromium.TestInterface", this);
« no previous file with comments | « dbus/end_to_end_sync_unittest.cc ('k') | dbus/object_proxy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698