luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-02 15:33:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '488-assert-gobjects-dont-leak' into 'master'

Browse Source 
gobject: Add a g_assert_finalize_object() macro

Closes #1780 and #488

See merge request GNOME/glib!859
This commit is contained in:
Philip Withnall
2019-07-25 15:42:39 +00:00
parent 17be9e5c4c b6d4da7684
commit 78b1278d44
4 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gio/tests/glistmodel.c
View File

@@ -77,7 +77,6 @@ test_store_boundaries (void)
store = g_list_store_new (G_TYPE_MENU_ITEM);
item = g_menu_item_new (NULL, NULL);
g_object_add_weak_pointer (G_OBJECT (item), (gpointer *) &item);
/* remove an item from an empty list */
g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "*g_sequence*");
@@ -123,8 +122,7 @@ test_store_boundaries (void)
g_assert_cmpuint (g_list_model_get_n_items (G_LIST_MODEL (store)), ==, 1);
g_object_unref (store);
g_object_unref (item);
g_assert_null (item);
g_assert_finalize_object (item);
}
static void

10
gio/tests/tls-interaction.c
View File

@@ -673,18 +673,10 @@ static void
teardown_without_loop (Test *test,
gconstpointer unused)
{
gpointer weak_pointer = test->interaction;
g_object_add_weak_pointer (weak_pointer, &weak_pointer);
g_object_unref (test->connection);
g_object_unref (test->password);
g_object_unref (test->interaction);
g_assert (weak_pointer == NULL);
g_assert_finalize_object (test->interaction);
}
typedef struct {