diff options
Diffstat (limited to 'dbus/dbus-gobject.c')
| -rw-r--r-- | dbus/dbus-gobject.c | 90 |
1 files changed, 45 insertions, 45 deletions
diff --git a/dbus/dbus-gobject.c b/dbus/dbus-gobject.c index 4925cd8..9c405d4 100644 --- a/dbus/dbus-gobject.c +++ b/dbus/dbus-gobject.c @@ -3333,85 +3333,85 @@ _dbus_gobject_test (const char *test_data_dir) /* DoNothing */ arg = method_arg_info_from_object_info (&dbus_glib_internal_test_object_info, &(dbus_glib_internal_test_methods[0])); - g_assert (*arg == '\0'); + g_assert_cmpint (*arg, ==, '\0'); /* Increment */ arg = method_arg_info_from_object_info (&dbus_glib_internal_test_object_info, &(dbus_glib_internal_test_methods[1])); - g_assert (*arg != '\0'); + g_assert_cmpint (*arg, !=, '\0'); arg = arg_iterate (arg, &arg_name, &arg_in, &constval, &retval, &arg_signature); - g_assert (!strcmp (arg_name, "x")); - g_assert (arg_in == TRUE); - g_assert (!strcmp (arg_signature, "u")); - g_assert (*arg != '\0'); + g_assert_cmpstr (arg_name, ==, "x"); + g_assert_true (arg_in); + g_assert_cmpstr (arg_signature, ==, "u"); + g_assert_cmpint (*arg, !=, '\0'); arg = arg_iterate (arg, &arg_name, &arg_in, &constval, &retval, &arg_signature); - g_assert (arg_in == FALSE); - g_assert (retval == RETVAL_NONE); - g_assert (!strcmp (arg_signature, "u")); - g_assert (*arg == '\0'); + g_assert_false (arg_in); + g_assert_cmpint (retval, ==, RETVAL_NONE); + g_assert_cmpstr (arg_signature, ==, "u"); + g_assert_cmpint (*arg, ==, '\0'); /* IncrementRetval */ arg = method_arg_info_from_object_info (&dbus_glib_internal_test_object_info, &(dbus_glib_internal_test_methods[2])); - g_assert (*arg != '\0'); + g_assert_cmpint (*arg, !=, '\0'); arg = arg_iterate (arg, &arg_name, &arg_in, &constval, &retval, &arg_signature); - g_assert (!strcmp (arg_name, "x")); - g_assert (arg_in == TRUE); - g_assert (!strcmp (arg_signature, "u")); - g_assert (*arg != '\0'); + g_assert_cmpstr (arg_name, ==, "x"); + g_assert_true (arg_in); + g_assert_cmpstr (arg_signature, ==, "u"); + g_assert_cmpint (*arg, !=, '\0'); arg = arg_iterate (arg, &arg_name, &arg_in, &constval, &retval, &arg_signature); - g_assert (retval == RETVAL_NOERROR); - g_assert (arg_in == FALSE); - g_assert (!strcmp (arg_signature, "u")); - g_assert (*arg == '\0'); + g_assert_cmpint (retval, ==, RETVAL_NOERROR); + g_assert_false (arg_in); + g_assert_cmpstr (arg_signature, ==, "u"); + g_assert_cmpint (*arg, ==, '\0'); /* IncrementRetvalError */ arg = method_arg_info_from_object_info (&dbus_glib_internal_test_object_info, &(dbus_glib_internal_test_methods[3])); - g_assert (*arg != '\0'); + g_assert_cmpint (*arg, !=, '\0'); arg = arg_iterate (arg, &arg_name, &arg_in, &constval, &retval, &arg_signature); - g_assert (!strcmp (arg_name, "x")); - g_assert (arg_in == TRUE); - g_assert (!strcmp (arg_signature, "u")); - g_assert (*arg != '\0'); + g_assert_cmpstr (arg_name, ==, "x"); + g_assert_true (arg_in); + g_assert_cmpstr (arg_signature, ==, "u"); + g_assert_cmpint (*arg, !=, '\0'); arg = arg_iterate (arg, &arg_name, &arg_in, &constval, &retval, &arg_signature); - g_assert (retval == RETVAL_ERROR); - g_assert (arg_in == FALSE); - g_assert (!strcmp (arg_signature, "u")); - g_assert (*arg == '\0'); + g_assert_cmpint (retval, ==, RETVAL_ERROR); + g_assert_false (arg_in); + g_assert_cmpstr (arg_signature, ==, "u"); + g_assert_cmpint (*arg, ==, '\0'); /* Stringify */ arg = method_arg_info_from_object_info (&dbus_glib_internal_test_object_info, &(dbus_glib_internal_test_methods[8])); - g_assert (*arg != '\0'); + g_assert_cmpint (*arg, !=, '\0'); arg = arg_iterate (arg, &arg_name, &arg_in, &constval, &retval, &arg_signature); - g_assert (!strcmp (arg_name, "val")); - g_assert (arg_in == TRUE); - g_assert (!strcmp (arg_signature, "v")); - g_assert (*arg != '\0'); + g_assert_cmpstr (arg_name, ==, "val"); + g_assert_true (arg_in); + g_assert_cmpstr (arg_signature, ==, "v"); + g_assert_cmpint (*arg, !=, '\0'); arg = arg_iterate (arg, &arg_name, &arg_in, &constval, &retval, &arg_signature); - g_assert (retval == RETVAL_NONE); - g_assert (arg_in == FALSE); - g_assert (!strcmp (arg_signature, "s")); - g_assert (*arg == '\0'); + g_assert_cmpint (retval, ==, RETVAL_NONE); + g_assert_false (arg_in); + g_assert_cmpstr (arg_signature, ==, "s"); + g_assert_cmpint (*arg, ==, '\0'); sigdata = dbus_glib_internal_test_object_info.exported_signals; g_assert (*sigdata != '\0'); sigdata = signal_iterate (sigdata, &iface, &signame); - g_assert (!strcmp (iface, "org.freedesktop.DBus.Tests.MyObject")); - g_assert (!strcmp (signame, "Frobnicate")); + g_assert_cmpstr (iface, ==, "org.freedesktop.DBus.Tests.MyObject"); + g_assert_cmpstr (signame, ==, "Frobnicate"); g_assert (*sigdata != '\0'); sigdata = signal_iterate (sigdata, &iface, &signame); - g_assert (!strcmp (iface, "org.freedesktop.DBus.Tests.FooObject")); - g_assert (!strcmp (signame, "Sig0")); + g_assert_cmpstr (iface, ==, "org.freedesktop.DBus.Tests.FooObject"); + g_assert_cmpstr (signame, ==, "Sig0"); g_assert (*sigdata != '\0'); sigdata = signal_iterate (sigdata, &iface, &signame); - g_assert (!strcmp (iface, "org.freedesktop.DBus.Tests.FooObject")); - g_assert (!strcmp (signame, "Sig1")); + g_assert_cmpstr (iface, ==, "org.freedesktop.DBus.Tests.FooObject"); + g_assert_cmpstr (signame, ==, "Sig1"); g_assert (*sigdata != '\0'); sigdata = signal_iterate (sigdata, &iface, &signame); - g_assert (!strcmp (iface, "org.freedesktop.DBus.Tests.FooObject")); - g_assert (!strcmp (signame, "Sig2")); + g_assert_cmpstr (iface, ==, "org.freedesktop.DBus.Tests.FooObject"); + g_assert_cmpstr (signame, ==, "Sig2"); g_assert (*sigdata == '\0'); |