D-Bus: ObjectProxy remove function for Bus object.

dbus/bus_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 "dbus/bus.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread.h"
 #include "dbus/exported_object.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // Used to test AddFilterFunction().
 DBusHandlerResult DummyHandler(DBusConnection* connection,
                                DBusMessage* raw_message,
                                void* user_data) {
   return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
 
+// Used to test RemoveObjectProxy
+void OnRemoveObjectProxy(
+    const std::string& service_name,
+    const dbus::ObjectPath& object_path,
+    int options) {
+}
+
 }  // namespace
 
 TEST(BusTest, GetObjectProxy) {
   dbus::Bus::Options options;
   scoped_refptr<dbus::Bus> bus = new dbus::Bus(options);
 
   dbus::ObjectProxy* object_proxy1 =
       bus->GetObjectProxy("org.chromium.TestService",
                           dbus::ObjectPath("/org/chromium/TestObject"));
   ASSERT_TRUE(object_proxy1);
@@ skipping 41 matching lines @@
       bus->GetObjectProxyWithOptions(
           "org.chromium.TestService",
           dbus::ObjectPath("/org/chromium/DifferentTestObject"),
           dbus::ObjectProxy::IGNORE_SERVICE_UNKNOWN_ERRORS);
   ASSERT_TRUE(object_proxy3);
   EXPECT_NE(object_proxy1, object_proxy3);
 
   bus->ShutdownAndBlock();
 }
 
+TEST(BusTest, RemoveObjectProxy) {
+  // Setup the current thread's MessageLoop.
+  MessageLoop message_loop;
+
+  // Start the D-Bus thread.
+  base::Thread::Options thread_options;
+  thread_options.message_loop_type = MessageLoop::TYPE_IO;
+  base::Thread dbus_thread("D-Bus thread");
+  dbus_thread.StartWithOptions(thread_options);
+
+  // Create the bus.
+  dbus::Bus::Options options;
+  options.dbus_thread_message_loop_proxy = dbus_thread.message_loop_proxy();
+  scoped_refptr<dbus::Bus> bus = new dbus::Bus(options);
+  ASSERT_FALSE(bus->shutdown_completed());
+
+  // Try to remove a non existant object proxy should return false.
+  ASSERT_FALSE(
+      bus->RemoveObjectProxy("org.chromium.TestService",
+                             dbus::ObjectPath("/org/chromium/TestObject"),
+                             base::Bind(&OnRemoveObjectProxy)));

[satorux1, 2013/01/25 01:46:06]

If you switch to base::Closure, you can use base::DoNothing.

[deymo, 2013/01/25 20:50:55]

Done.

+
+  dbus::ObjectProxy* object_proxy1 =
+      bus->GetObjectProxy("org.chromium.TestService",
+                          dbus::ObjectPath("/org/chromium/TestObject"));
+  ASSERT_TRUE(object_proxy1);
+
+  // Increment the reference count to the object proxy to avoid destroying it
+  // while removing the object.
+  object_proxy1->AddRef();
+
+  // Remove the object from the bus. This will invalidate any other usage of
+  // object_proxy1 other than destroy it.
+  ASSERT_TRUE(
+      bus->RemoveObjectProxy("org.chromium.TestService",
+                             dbus::ObjectPath("/org/chromium/TestObject"),
+                             base::Bind(&OnRemoveObjectProxy)));
+
+  // This should return a different object because the first object still
+  // exists thanks to the increased reference.
+  dbus::ObjectProxy* object_proxy2 =
+      bus->GetObjectProxy("org.chromium.TestService",
+                          dbus::ObjectPath("/org/chromium/TestObject"));
+  ASSERT_TRUE(object_proxy2);
+  EXPECT_NE(object_proxy1, object_proxy2);
+
+  // Release object_proxy1.
+  object_proxy1->Release();
+
+  // Shut down synchronously.
+  bus->ShutdownOnDBusThreadAndBlock();
+  EXPECT_TRUE(bus->shutdown_completed());
+  dbus_thread.Stop();
+}
+
 TEST(BusTest, GetExportedObject) {
   dbus::Bus::Options options;
   scoped_refptr<dbus::Bus> bus = new dbus::Bus(options);
 
   dbus::ExportedObject* object_proxy1 =
       bus->GetExportedObject(dbus::ObjectPath("/org/chromium/TestObject"));
   ASSERT_TRUE(object_proxy1);
 
   // This should return the same object.
   dbus::ExportedObject* object_proxy2 =
@@ skipping 85 matching lines @@
   ASSERT_FALSE(bus->AddFilterFunction(&DummyHandler, &data1));
   // Can add the same function with different data.
   ASSERT_TRUE(bus->AddFilterFunction(&DummyHandler, &data2));
 
   ASSERT_TRUE(bus->RemoveFilterFunction(&DummyHandler, &data1));
   ASSERT_FALSE(bus->RemoveFilterFunction(&DummyHandler, &data1));
   ASSERT_TRUE(bus->RemoveFilterFunction(&DummyHandler, &data2));
 
   bus->ShutdownAndBlock();
 }