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

tests: Add more tests to finish branch coverage of GHashTable

Browse Source 
Test a few situations where NULL values for optional out parameters
weren’t being tested. This takes the branch coverage of GHashTable up to
100% (ignoring g_return_if_fail() branches).

Signed-off-by: Philip Withnall <withnall@endlessm.com>
This commit is contained in:
Philip Withnall 2018-08-31 12:05:15 +01:00
parent 8dc8b33dfa
commit 0e5f9aa143
1 changed files with 114 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
glib/tests/hash.c
View File

@ -803,6 +803,11 @@ test_remove_all (void)
g_assert_cmpint (destroy_counter, ==, 0); g_assert_cmpint (destroy_counter, ==, 0);
g_assert_cmpint (destroy_key_counter, ==, 0); g_assert_cmpint (destroy_key_counter, ==, 0);
/* Test stealing on an empty hash table. */
g_hash_table_steal_all (h);
g_assert_cmpint (destroy_counter, ==, 0);
g_assert_cmpint (destroy_key_counter, ==, 0);
g_hash_table_insert (h, "abc", "ABC"); g_hash_table_insert (h, "abc", "ABC");
g_hash_table_insert (h, "cde", "CDE"); g_hash_table_insert (h, "cde", "CDE");
g_hash_table_insert (h, "xyz", "XYZ"); g_hash_table_insert (h, "xyz", "XYZ");
@ -1233,6 +1238,113 @@ test_steal_extended (void)
g_hash_table_unref (hash); g_hash_table_unref (hash);
} }
/* Test that passing %NULL to the optional g_hash_table_steal_extended()
* arguments works. */
static void
test_steal_extended_optional (void)
{
GHashTable *hash;
const gchar *stolen_key = NULL, *stolen_value = NULL;
hash = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, NULL);
g_hash_table_insert (hash, "b", "B");
g_hash_table_insert (hash, "c", "C");
g_hash_table_insert (hash, "d", "D");
g_hash_table_insert (hash, "e", "E");
g_hash_table_insert (hash, "f", "F");
g_assert_true (g_hash_table_steal_extended (hash, "b",
(gpointer *) &stolen_key,
NULL));
g_assert_cmpstr (stolen_key, ==, "b");
g_assert_cmpuint (g_hash_table_size (hash), ==, 4);
g_assert_false (g_hash_table_steal_extended (hash, "b",
(gpointer *) &stolen_key,
NULL));
g_assert_null (stolen_key);
g_assert_true (g_hash_table_steal_extended (hash, "c",
NULL,
(gpointer *) &stolen_value));
g_assert_cmpstr (stolen_value, ==, "C");
g_assert_cmpuint (g_hash_table_size (hash), ==, 3);
g_assert_false (g_hash_table_steal_extended (hash, "c",
NULL,
(gpointer *) &stolen_value));
g_assert_null (stolen_value);
g_assert_true (g_hash_table_steal_extended (hash, "d", NULL, NULL));
g_assert_cmpuint (g_hash_table_size (hash), ==, 2);
g_assert_false (g_hash_table_steal_extended (hash, "d", NULL, NULL));
g_assert_cmpuint (g_hash_table_size (hash), ==, 2);
g_hash_table_unref (hash);
}
/* Test g_hash_table_lookup_extended() works with its optional parameters
* sometimes set to %NULL. */
static void
test_lookup_extended (void)
{
GHashTable *hash;
const gchar *original_key = NULL, *value = NULL;
hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
g_hash_table_insert (hash, g_strdup ("a"), g_strdup ("A"));
g_hash_table_insert (hash, g_strdup ("b"), g_strdup ("B"));
g_hash_table_insert (hash, g_strdup ("c"), g_strdup ("C"));
g_hash_table_insert (hash, g_strdup ("d"), g_strdup ("D"));
g_hash_table_insert (hash, g_strdup ("e"), g_strdup ("E"));
g_hash_table_insert (hash, g_strdup ("f"), g_strdup ("F"));
g_assert_true (g_hash_table_lookup_extended (hash, "a",
(gpointer *) &original_key,
(gpointer *) &value));
g_assert_cmpstr (original_key, ==, "a");
g_assert_cmpstr (value, ==, "A");
g_assert_true (g_hash_table_lookup_extended (hash, "b",
NULL,
(gpointer *) &value));
g_assert_cmpstr (value, ==, "B");
g_assert_true (g_hash_table_lookup_extended (hash, "c",
(gpointer *) &original_key,
NULL));
g_assert_cmpstr (original_key, ==, "c");
g_assert_true (g_hash_table_lookup_extended (hash, "d", NULL, NULL));
g_assert_false (g_hash_table_lookup_extended (hash, "not a key",
(gpointer *) &original_key,
(gpointer *) &value));
g_assert_null (original_key);
g_assert_null (value);
g_assert_false (g_hash_table_lookup_extended (hash, "not a key",
NULL,
(gpointer *) &value));
g_assert_null (value);
g_assert_false (g_hash_table_lookup_extended (hash, "not a key",
(gpointer *) &original_key,
NULL));
g_assert_null (original_key);
g_assert_false (g_hash_table_lookup_extended (hash, "not a key", NULL, NULL));
g_hash_table_unref (hash);
}
struct _GHashTable struct _GHashTable
{ {
gint size; gint size;
@ -1558,6 +1670,8 @@ main (int argc, char *argv[])
g_test_add_func ("/hash/foreach", test_foreach); g_test_add_func ("/hash/foreach", test_foreach);
g_test_add_func ("/hash/foreach-steal", test_foreach_steal); g_test_add_func ("/hash/foreach-steal", test_foreach_steal);
g_test_add_func ("/hash/steal-extended", test_steal_extended); g_test_add_func ("/hash/steal-extended", test_steal_extended);
g_test_add_func ("/hash/steal-extended/optional", test_steal_extended_optional);
g_test_add_func ("/hash/lookup-extended", test_lookup_extended);
/* tests for individual bugs */ /* tests for individual bugs */
g_test_add_func ("/hash/lookup-null-key", test_lookup_null_key); g_test_add_func ("/hash/lookup-null-key", test_lookup_null_key);