luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-05-31 18:00:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

glib/tests/dataset: Use existing code

Browse Source 
`destroy_index` duplicates `destroy_count`, and `foreach_func()`
essentially duplicates `notify()`.
This commit is contained in:
Peter Bloomfield 2022-06-23 20:52:59 -04:00
parent a437a97ffd
commit e95a6bdd7d
1 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
glib/tests/dataset.c
View File

@ -250,16 +250,6 @@ test_datalist_id (void)
g_datalist_clear (&list);
}
static void
foreach_func (GQuark key_id,
gpointer data,
gpointer user_data)
{
int *count = user_data;
(*count)++;
}
static void
test_datalist_id_remove_multiple (void)
{
@ -274,7 +264,6 @@ test_datalist_id_remove_multiple (void)
two,
three,
};
int count;
g_test_bug ("https://gitlab.gnome.org/GNOME/glib/issues/2672");
@ -283,24 +272,22 @@ test_datalist_id_remove_multiple (void)
g_datalist_id_set_data (&list, two, GINT_TO_POINTER (2));
g_datalist_id_set_data (&list, three, GINT_TO_POINTER (3));
count = 0;
g_datalist_foreach (&list, foreach_func, &count);
g_assert_cmpint (count, ==, 3);
destroy_count = 0;
g_datalist_foreach (&list, (GDataForeachFunc) notify, NULL);
g_assert_cmpint (destroy_count, ==, 3);
g_datalist_id_remove_multiple (&list, keys, G_N_ELEMENTS (keys));
count = 0;
g_datalist_foreach (&list, foreach_func, &count);
g_assert_cmpint (count, ==, 0);
destroy_count = 0;
g_datalist_foreach (&list, (GDataForeachFunc) notify, NULL);
g_assert_cmpint (destroy_count, ==, 0);
}
static int destroy_index;
static void
destroy_func (gpointer data)
{
destroy_index++;
g_assert_cmpint (GPOINTER_TO_INT (data), ==, destroy_index);
destroy_count++;
g_assert_cmpint (GPOINTER_TO_INT (data), ==, destroy_count);
}
static void
@ -326,10 +313,10 @@ test_datalist_id_remove_multiple_destroy_order (void)
g_datalist_id_set_data_full (&list, three, GINT_TO_POINTER (3), destroy_func);
g_datalist_id_set_data_full (&list, one, GINT_TO_POINTER (1), destroy_func);
destroy_index = 0;
destroy_count = 0;
g_datalist_id_remove_multiple (&list, keys, G_N_ELEMENTS (keys));
/* This verifies that destroy_func() was called three times: */
g_assert_cmpint (destroy_index, ==, 3);
g_assert_cmpint (destroy_count, ==, 3);
}
int