Attachment 27528 Details for Bug 22316 – adds an asserting test case

[patch] adds an asserting test case

omg-assert.patch (text/plain), 1.65 KB, created by Scott James Remnant on 2009-07-09 08:22:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Scott James Remnant

Created: 2009-07-09 08:22:03 UTC

Size: 1.65 KB

patch

obsolete

>diff --git a/dbus/dbus-message-util.c b/dbus/dbus-message-util.c
>index 46cbe4e..3d5a00f 100644
>--- a/dbus/dbus-message-util.c
>+++ b/dbus/dbus-message-util.c
>@@ -939,6 +939,7 @@ _dbus_message_test (const char *test_data_dir)
>   unsigned char v_BYTE;
>   unsigned char v2_BYTE;
>   dbus_bool_t v_BOOLEAN;
>+  DBusMessageIter iter, array_iter, struct_iter;
> 
>   message = dbus_message_new_method_call ("org.freedesktop.DBus.TestService",
>                                           "/org/freedesktop/TestPath",
>@@ -1272,6 +1273,34 @@ _dbus_message_test (const char *test_data_dir)
> 
>   check_memleaks ();
> 
>+  /* Check that we can abandon a container */
>+  message = dbus_message_new_method_call ("org.freedesktop.DBus.TestService",
>+		  			  "/org/freedesktop/TestPath",
>+					  "Foo.TestInterface",
>+					  "Method");
>+
>+  dbus_message_iter_init_append (message, &iter);
>+
>+  _dbus_assert (dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY,
>+			  			  (DBUS_STRUCT_BEGIN_CHAR_AS_STRING
>+						   DBUS_TYPE_STRING_AS_STRING
>+						   DBUS_TYPE_STRING_AS_STRING
>+						   DBUS_STRUCT_END_CHAR_AS_STRING),
>+						  &array_iter));
>+  _dbus_assert (dbus_message_iter_open_container (&array_iter, DBUS_TYPE_STRUCT,
>+			  			  NULL, &struct_iter));
>+
>+  s = "peaches";
>+  _dbus_assert (dbus_message_iter_append_basic (&struct_iter, DBUS_TYPE_STRING,
>+			  			&s));
>+
>+  /* uh-oh, error, try and unwind */
>+
>+  _dbus_assert (dbus_message_iter_close_container (&array_iter, &struct_iter));
>+  _dbus_assert (dbus_message_iter_close_container (&array_iter, &iter));
>+
>+  dbus_message_unref (message);
>+
>   /* Load all the sample messages from the message factory */
>   {
>     DBusMessageDataIter diter;

Actions: View | Splinter Review

Attachments on bug 22316: 26854 | 26855 | 26859 | 27528

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.