summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2021-03-26 12:17:58 +0000
committerSimon McVittie <smcv@collabora.com>2021-03-26 12:22:14 +0000
commit26620f4916f4e9bfe68c57e81ec58bd2ae1c7b9f (patch)
tree5fe429890d1d225435056efec7e80309075a0ed0
parent97590d6071d8deb82e09794119c9e680a3488c49 (diff)
downloaddbus-glib-26620f4916f4e9bfe68c57e81ec58bd2ae1c7b9f.tar.gz
test: Use g_assert_true, g_assert_false for comparisons with TRUE, FALSE
Signed-off-by: Simon McVittie <smcv@collabora.com>
-rw-r--r--dbus/dbus-gobject.c16
-rw-r--r--test/core/test-dbus-glib.c4
2 files changed, 10 insertions, 10 deletions
diff --git a/dbus/dbus-gobject.c b/dbus/dbus-gobject.c
index ad5ee8b..9c405d4 100644
--- a/dbus/dbus-gobject.c
+++ b/dbus/dbus-gobject.c
@@ -3341,11 +3341,11 @@ _dbus_gobject_test (const char *test_data_dir)
g_assert_cmpint (*arg, !=, '\0');
arg = arg_iterate (arg, &arg_name, &arg_in, &constval, &retval, &arg_signature);
g_assert_cmpstr (arg_name, ==, "x");
- g_assert (arg_in == TRUE);
+ 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_false (arg_in);
g_assert_cmpint (retval, ==, RETVAL_NONE);
g_assert_cmpstr (arg_signature, ==, "u");
g_assert_cmpint (*arg, ==, '\0');
@@ -3356,12 +3356,12 @@ _dbus_gobject_test (const char *test_data_dir)
g_assert_cmpint (*arg, !=, '\0');
arg = arg_iterate (arg, &arg_name, &arg_in, &constval, &retval, &arg_signature);
g_assert_cmpstr (arg_name, ==, "x");
- g_assert (arg_in == TRUE);
+ 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_cmpint (retval, ==, RETVAL_NOERROR);
- g_assert (arg_in == FALSE);
+ g_assert_false (arg_in);
g_assert_cmpstr (arg_signature, ==, "u");
g_assert_cmpint (*arg, ==, '\0');
@@ -3371,12 +3371,12 @@ _dbus_gobject_test (const char *test_data_dir)
g_assert_cmpint (*arg, !=, '\0');
arg = arg_iterate (arg, &arg_name, &arg_in, &constval, &retval, &arg_signature);
g_assert_cmpstr (arg_name, ==, "x");
- g_assert (arg_in == TRUE);
+ 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_cmpint (retval, ==, RETVAL_ERROR);
- g_assert (arg_in == FALSE);
+ g_assert_false (arg_in);
g_assert_cmpstr (arg_signature, ==, "u");
g_assert_cmpint (*arg, ==, '\0');
@@ -3386,12 +3386,12 @@ _dbus_gobject_test (const char *test_data_dir)
g_assert_cmpint (*arg, !=, '\0');
arg = arg_iterate (arg, &arg_name, &arg_in, &constval, &retval, &arg_signature);
g_assert_cmpstr (arg_name, ==, "val");
- g_assert (arg_in == TRUE);
+ 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_cmpint (retval, ==, RETVAL_NONE);
- g_assert (arg_in == FALSE);
+ g_assert_false (arg_in);
g_assert_cmpstr (arg_signature, ==, "s");
g_assert_cmpint (*arg, ==, '\0');
diff --git a/test/core/test-dbus-glib.c b/test/core/test-dbus-glib.c
index 3633677..0807193 100644
--- a/test/core/test-dbus-glib.c
+++ b/test/core/test-dbus-glib.c
@@ -2212,7 +2212,7 @@ main (int argc, char **argv)
G_TYPE_VALUE, &value, G_TYPE_INVALID))
lose_gerror ("Failed GetProperty call of \"should-be-hidden\" property", error);
g_assert (G_VALUE_HOLDS_BOOLEAN (&value));
- g_assert (g_value_get_boolean (&value) == FALSE);
+ g_assert_false (g_value_get_boolean (&value));
g_value_unset (&value);
}
@@ -2254,7 +2254,7 @@ main (int argc, char **argv)
G_TYPE_VALUE, &value, G_TYPE_INVALID))
lose_gerror ("Failed GetProperty call of \"should-be-hidden\" property", error);
g_assert (G_VALUE_HOLDS_BOOLEAN (&value));
- g_assert (g_value_get_boolean (&value) == FALSE);
+ g_assert_false (g_value_get_boolean (&value));
g_value_unset (&value);
}