luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 15:36:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

gio, glib: Use g_assert_cmpstrv where it makes sense

Browse Source
This commit is contained in:
Niels De Graef 2020-11-12 19:05:25 +01:00 committed by Philip Withnall
parent f98f2c5d0f
commit 6fa5c13c30
3 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gio/tests/desktop-app-info.c
View File

@ -350,6 +350,7 @@ wait_for_file (const gchar *want_this,
static void
test_actions (void)
{
const char *expected[] = { "frob", "tweak", "twiddle", "broken", NULL };
const gchar * const *actions;
GDesktopAppInfo *appinfo;
gchar *name;
@ -358,11 +359,7 @@ test_actions (void)
g_assert_nonnull (appinfo);
actions = g_desktop_app_info_list_actions (appinfo);
g_assert_cmpstr (actions[0], ==, "frob");
g_assert_cmpstr (actions[1], ==, "tweak");
g_assert_cmpstr (actions[2], ==, "twiddle");
g_assert_cmpstr (actions[3], ==, "broken");
g_assert_cmpstr (actions[4], ==, NULL);
g_assert_cmpstrv (actions, expected);
name = g_desktop_app_info_get_action_name (appinfo, "frob");
g_assert_cmpstr (name, ==, "Frobnicate");

24
glib/tests/gvariant.c
View File

@ -2992,18 +2992,6 @@ test_varargs_empty_array (void)
g_assert_not_reached ();
}
static void
assert_cmpstrv (const gchar **strv1, const gchar **strv2)
{
gsize i;
for (i = 0; strv1[i] != NULL && strv2[i] != NULL; i++)
g_assert_cmpstr (strv1[i], ==, strv2[i]);
g_assert_null (strv1[i]);
g_assert_null (strv2[i]);
}
static void
test_varargs (void)
{
@ -3153,8 +3141,8 @@ test_varargs (void)
g_variant_iter_next (&tuple, "^a&s", &strv);
g_variant_iter_next (&tuple, "^as", &my_strv);
assert_cmpstrv (strv, strvector);
assert_cmpstrv ((const char **)my_strv, strvector);
g_assert_cmpstrv (strv, strvector);
g_assert_cmpstrv (my_strv, strvector);
g_variant_unref (value);
g_strfreev (my_strv);
@ -3223,8 +3211,8 @@ test_varargs (void)
g_variant_iter_next (&tuple, "^a&ay", &strv);
g_variant_iter_next (&tuple, "^aay", &my_strv);
assert_cmpstrv (strv, strvector);
assert_cmpstrv ((const char **)my_strv, strvector);
g_assert_cmpstrv (strv, strvector);
g_assert_cmpstrv (my_strv, strvector);
g_variant_unref (value);
g_strfreev (my_strv);
@ -3272,8 +3260,8 @@ test_varargs (void)
g_variant_iter_next (&tuple, "^a&o", &strv);
g_variant_iter_next (&tuple, "^ao", &my_strv);
assert_cmpstrv (strv, strvector);
assert_cmpstrv ((const char **)my_strv, strvector);
g_assert_cmpstrv (strv, strvector);
g_assert_cmpstrv (my_strv, strvector);
g_variant_unref (value);
g_strfreev (my_strv);

4
glib/tests/strfuncs.c
View File

@ -525,9 +525,7 @@ test_strdupv (void)
copy = g_strdupv (vec);
g_assert_nonnull (copy);
g_assert_cmpstr (copy[0], ==, "Foo");
g_assert_cmpstr (copy[1], ==, "Bar");
g_assert_null (copy[2]);
g_assert_cmpstrv (copy, vec);
g_strfreev (copy);
}