From: Thomas Fitzsimmons <fitzsim@cisco.com>
Date: Wed, 27 Mar 2013 20:14:16 +0000 (-0400)
Subject: dbus/dbus-object-tree.c: Add test case for parent removal fix
X-Git-Tag: dbus-1.7.6~43^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f03f7f3d815ca02a75b40ffbd1886d4c36fea15;p=thirdparty%2Fdbus.git

dbus/dbus-object-tree.c: Add test case for parent removal fix
---

diff --git a/dbus/dbus-object-tree.c b/dbus/dbus-object-tree.c
index 95d5234d8..14061e8a6 100644
--- a/dbus/dbus-object-tree.c
+++ b/dbus/dbus-object-tree.c
@@ -1685,6 +1685,7 @@ object_tree_test_iteration (void *data)
   const char *path6[] = { "blah", "boof", NULL };
   const char *path7[] = { "blah", "boof", "this", "is", "really", "long", NULL };
   const char *path8[] = { "childless", NULL };
+  DBusObjectPathVTable test_vtable = { NULL, test_message_function, NULL };
   DBusObjectTree *tree;
   TreeTestData tree_test_data[9];
   int i;
@@ -2112,6 +2113,20 @@ object_tree_test_iteration (void *data)
   _dbus_assert (!find_subtree_registered_or_unregistered (tree, path2));
   _dbus_assert (find_subtree_registered_or_unregistered (tree, path0));
 
+  /* Test with NULL unregister_function and user_data */
+  if (!_dbus_object_tree_register (tree, TRUE, path2,
+                                   &test_vtable,
+                                   NULL,
+                                   NULL))
+    goto out;
+
+  _dbus_assert (_dbus_object_tree_get_user_data_unlocked (tree, path2) == NULL);
+  _dbus_object_tree_unregister_and_unlock (tree, path2);
+  _dbus_assert (!find_subtree (tree, path2, NULL));
+  _dbus_assert (!find_subtree_registered_or_unregistered (tree, path2));
+  _dbus_assert (!find_subtree_registered_or_unregistered (tree, path1));
+  _dbus_assert (find_subtree_registered_or_unregistered (tree, path0));
+
   /* Register it all again, and test dispatch */
   
   if (!do_register (tree, path0, TRUE, 0, tree_test_data))