[glib: 2/3] tests: Use g_object_assert_last_unref() in various tests
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib: 2/3] tests: Use g_object_assert_last_unref() in various tests
- Date: Thu, 25 Jul 2019 15:43:01 +0000 (UTC)
commit b6d4da7684cafe62060066bee64f14a3d6fd4545
Author: Philip Withnall <withnall endlessm com>
Date: Tue May 21 12:53:21 2019 +0100
tests: Use g_object_assert_last_unref() in various tests
Signed-off-by: Philip Withnall <withnall endlessm com>
gio/tests/glistmodel.c | 4 +---
gio/tests/tls-interaction.c | 10 +---------
2 files changed, 2 insertions(+), 12 deletions(-)
---
diff --git a/gio/tests/glistmodel.c b/gio/tests/glistmodel.c
index 2fef4ccbe..b867bd54a 100644
--- a/gio/tests/glistmodel.c
+++ b/gio/tests/glistmodel.c
@@ -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
diff --git a/gio/tests/tls-interaction.c b/gio/tests/tls-interaction.c
index 345656e29..4f0737d7e 100644
--- a/gio/tests/tls-interaction.c
+++ b/gio/tests/tls-interaction.c
@@ -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 {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]