luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-11 23:16:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use the new g_strv_contains

Browse Source 
No need to keep our own copy of this in the testsuite.
This commit is contained in:
Matthias Clasen 2014-11-27 09:12:42 -05:00
parent 71944b1bfd
commit 7f2f4ab12d
1 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gio/tests/contenttype.c
View File

@ -199,21 +199,6 @@ test_description (void)
g_free (type); g_free (type);
} }
static gboolean
strv_contains (const gchar * const *strv,
const gchar *s)
{
gint i;
for (i = 0; strv[i]; i++)
{
if (g_strcmp0 (strv[i], s) == 0)
return TRUE;
}
return FALSE;
}
static void static void
test_icon (void) test_icon (void)
{ {
@ -228,8 +213,8 @@ test_icon (void)
const gchar *const *names; const gchar *const *names;
names = g_themed_icon_get_names (G_THEMED_ICON (icon)); names = g_themed_icon_get_names (G_THEMED_ICON (icon));
g_assert (strv_contains (names, "text-plain")); g_assert (g_strv_contains (names, "text-plain"));
g_assert (strv_contains (names, "text-x-generic")); g_assert (g_strv_contains (names, "text-x-generic"));
} }
g_object_unref (icon); g_object_unref (icon);
g_free (type); g_free (type);
@ -242,8 +227,8 @@ test_icon (void)
const gchar *const *names; const gchar *const *names;
names = g_themed_icon_get_names (G_THEMED_ICON (icon)); names = g_themed_icon_get_names (G_THEMED_ICON (icon));
g_assert (strv_contains (names, "application-rtf")); g_assert (g_strv_contains (names, "application-rtf"));
g_assert (strv_contains (names, "x-office-document")); g_assert (g_strv_contains (names, "x-office-document"));
} }
g_object_unref (icon); g_object_unref (icon);
g_free (type); g_free (type);
@ -263,10 +248,10 @@ test_symbolic_icon (void)
const gchar *const *names; const gchar *const *names;
names = g_themed_icon_get_names (G_THEMED_ICON (icon)); names = g_themed_icon_get_names (G_THEMED_ICON (icon));
g_assert (strv_contains (names, "text-plain-symbolic")); g_assert (g_strv_contains (names, "text-plain-symbolic"));
g_assert (strv_contains (names, "text-x-generic-symbolic")); g_assert (g_strv_contains (names, "text-x-generic-symbolic"));
g_assert (strv_contains (names, "text-plain")); g_assert (g_strv_contains (names, "text-plain"));
g_assert (strv_contains (names, "text-x-generic")); g_assert (g_strv_contains (names, "text-x-generic"));
} }
g_object_unref (icon); g_object_unref (icon);
g_free (type); g_free (type);
@ -279,10 +264,10 @@ test_symbolic_icon (void)
const gchar *const *names; const gchar *const *names;
names = g_themed_icon_get_names (G_THEMED_ICON (icon)); names = g_themed_icon_get_names (G_THEMED_ICON (icon));
g_assert (strv_contains (names, "application-rtf-symbolic")); g_assert (g_strv_contains (names, "application-rtf-symbolic"));
g_assert (strv_contains (names, "x-office-document-symbolic")); g_assert (g_strv_contains (names, "x-office-document-symbolic"));
g_assert (strv_contains (names, "application-rtf")); g_assert (g_strv_contains (names, "application-rtf"));
g_assert (strv_contains (names, "x-office-document")); g_assert (g_strv_contains (names, "x-office-document"));
} }
g_object_unref (icon); g_object_unref (icon);
g_free (type); g_free (type);