DBus: Bus::AddMatch and RemoveMatch support repeated rules.

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 "dbus/scoped_dbus_error.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;
@@ skipping 166 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();
 }
+
+TEST(BusTest, DoubleAddAndRemoveMatch) {
+  dbus::Bus::Options options;
+  scoped_refptr<dbus::Bus> bus = new dbus::Bus(options);
+  dbus::ScopedDBusError error;
+
+  bus->Connect();
+
+  // Adds the same rule twice.
+  bus->AddMatch(
+      "type='signal',interface='org.chromium.TestService',path='/'",
+      error.get());
+  ASSERT_FALSE(error.is_set());
+
+  bus->AddMatch(
+      "type='signal',interface='org.chromium.TestService',path='/'",
+      error.get());
+  ASSERT_FALSE(error.is_set());
+
+  // Removes the same rule twice.
+  ASSERT_TRUE(bus->RemoveMatch(
+      "type='signal',interface='org.chromium.TestService',path='/'",
+      error.get()));
+  ASSERT_FALSE(error.is_set());
+
+  // The rule should be still in the bus since it was removed only once.
+  // A second removal shouldn't give an error.
+  ASSERT_TRUE(bus->RemoveMatch(
+      "type='signal',interface='org.chromium.TestService',path='/'",
+      error.get()));
+  ASSERT_FALSE(error.is_set());
+
+  // A third attemp to remove the same rule should fail.
+  ASSERT_FALSE(bus->RemoveMatch(
+      "type='signal',interface='org.chromium.TestService',path='/'",
+      error.get()));
+
+  bus->ShutdownAndBlock();
+}