diff options
Diffstat (limited to 'dbus')
| -rw-r--r-- | dbus/dbus-gobject.c | 40 | ||||
| -rw-r--r-- | dbus/dbus-gvalue.c | 6 |
2 files changed, 23 insertions, 23 deletions
diff --git a/dbus/dbus-gobject.c b/dbus/dbus-gobject.c index 4925cd8..f0942e8 100644 --- a/dbus/dbus-gobject.c +++ b/dbus/dbus-gobject.c @@ -3340,14 +3340,14 @@ _dbus_gobject_test (const char *test_data_dir) &(dbus_glib_internal_test_methods[1])); g_assert (*arg != '\0'); arg = arg_iterate (arg, &arg_name, &arg_in, &constval, &retval, &arg_signature); - g_assert (!strcmp (arg_name, "x")); + g_assert_cmpstr (arg_name, ==, "x"); g_assert (arg_in == TRUE); - g_assert (!strcmp (arg_signature, "u")); + g_assert_cmpstr (arg_signature, ==, "u"); g_assert (*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_cmpstr (arg_signature, ==, "u"); g_assert (*arg == '\0'); /* IncrementRetval */ @@ -3355,14 +3355,14 @@ _dbus_gobject_test (const char *test_data_dir) &(dbus_glib_internal_test_methods[2])); g_assert (*arg != '\0'); arg = arg_iterate (arg, &arg_name, &arg_in, &constval, &retval, &arg_signature); - g_assert (!strcmp (arg_name, "x")); + g_assert_cmpstr (arg_name, ==, "x"); g_assert (arg_in == TRUE); - g_assert (!strcmp (arg_signature, "u")); + g_assert_cmpstr (arg_signature, ==, "u"); g_assert (*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_cmpstr (arg_signature, ==, "u"); g_assert (*arg == '\0'); /* IncrementRetvalError */ @@ -3370,14 +3370,14 @@ _dbus_gobject_test (const char *test_data_dir) &(dbus_glib_internal_test_methods[3])); g_assert (*arg != '\0'); arg = arg_iterate (arg, &arg_name, &arg_in, &constval, &retval, &arg_signature); - g_assert (!strcmp (arg_name, "x")); + g_assert_cmpstr (arg_name, ==, "x"); g_assert (arg_in == TRUE); - g_assert (!strcmp (arg_signature, "u")); + g_assert_cmpstr (arg_signature, ==, "u"); g_assert (*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_cmpstr (arg_signature, ==, "u"); g_assert (*arg == '\0'); /* Stringify */ @@ -3385,33 +3385,33 @@ _dbus_gobject_test (const char *test_data_dir) &(dbus_glib_internal_test_methods[8])); g_assert (*arg != '\0'); arg = arg_iterate (arg, &arg_name, &arg_in, &constval, &retval, &arg_signature); - g_assert (!strcmp (arg_name, "val")); + g_assert_cmpstr (arg_name, ==, "val"); g_assert (arg_in == TRUE); - g_assert (!strcmp (arg_signature, "v")); + g_assert_cmpstr (arg_signature, ==, "v"); g_assert (*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_cmpstr (arg_signature, ==, "s"); g_assert (*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'); diff --git a/dbus/dbus-gvalue.c b/dbus/dbus-gvalue.c index 7220f50..bd97e65 100644 --- a/dbus/dbus-gvalue.c +++ b/dbus/dbus-gvalue.c @@ -2029,7 +2029,7 @@ assert_type_maps_to (GType gtype, const char *expected_sig) char *sig; sig = _dbus_gtype_to_signature (gtype); g_assert_nonnull (sig); - g_assert (!strcmp (expected_sig, sig)); + g_assert_cmpstr (expected_sig, ==, sig); g_free (sig); } @@ -2075,14 +2075,14 @@ _dbus_gvalue_test (const char *test_data_dir) rectype = dbus_g_type_get_collection ("GArray", G_TYPE_UINT); g_assert (rectype != G_TYPE_INVALID); - g_assert (!strcmp (g_type_name (rectype), "GArray_guint_")); + g_assert_cmpstr (g_type_name (rectype), ==, "GArray_guint_"); type = _dbus_gtype_from_signature ("au", TRUE); g_assert (type == rectype); rectype = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING); g_assert (rectype != G_TYPE_INVALID); - g_assert (!strcmp (g_type_name (rectype), "GHashTable_gchararray+gchararray_")); + g_assert_cmpstr (g_type_name (rectype), ==, "GHashTable_gchararray+gchararray_"); type = _dbus_gtype_from_signature ("a{ss}", TRUE); g_assert (type == rectype); |