From 82b598edbf6fee110fbf149ae068203e8a793d2b Mon Sep 17 00:00:00 2001
From: George Kiagiadakis <george.kiagiadakis@collabora.com>
Date: Mon, 4 May 2020 16:05:14 +0300
Subject: [PATCH] tests/si-*: use new WpObjectManager API
---
tests/modules/si-audio-softdsp-endpoint.c | 14 +++++---------
tests/modules/si-simple-node-endpoint.c | 14 +++++---------
2 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/tests/modules/si-audio-softdsp-endpoint.c b/tests/modules/si-audio-softdsp-endpoint.c
index a986ed74..50f1d332 100644
--- a/tests/modules/si-audio-softdsp-endpoint.c
+++ b/tests/modules/si-audio-softdsp-endpoint.c
@@ -185,19 +185,15 @@ test_si_audio_softdsp_endpoint_export (TestFixture * f, gconstpointer user_data)
/* find self_client, to be used for verifying endpoint.client.id */
clients_om = wp_object_manager_new ();
- wp_object_manager_add_interest (clients_om, WP_TYPE_CLIENT, NULL,
- WP_PROXY_FEATURE_BOUND);
+ wp_object_manager_add_interest_1 (clients_om, WP_TYPE_CLIENT, NULL);
+ wp_object_manager_request_proxy_features (clients_om,
+ WP_TYPE_CLIENT, WP_PROXY_FEATURE_BOUND);
g_signal_connect_swapped (clients_om, "objects-changed",
G_CALLBACK (g_main_loop_quit), f->base.loop);
wp_core_install_object_manager (f->base.core, clients_om);
g_main_loop_run (f->base.loop);
-
- {
- g_autoptr (WpIterator) it = wp_object_manager_iterate (clients_om);
- g_auto (GValue) val = G_VALUE_INIT;
- g_assert_true (wp_iterator_next (it, &val));
- g_assert_nonnull (self_client = g_value_dup_object (&val));
- }
+ g_assert_nonnull (self_client =
+ wp_object_manager_lookup (clients_om, WP_TYPE_CLIENT, NULL));
/* create item */
diff --git a/tests/modules/si-simple-node-endpoint.c b/tests/modules/si-simple-node-endpoint.c
index 25afa940..29bfb2c1 100644
--- a/tests/modules/si-simple-node-endpoint.c
+++ b/tests/modules/si-simple-node-endpoint.c
@@ -235,19 +235,15 @@ test_si_simple_node_endpoint_export (TestFixture * f, gconstpointer user_data)
/* find self_client, to be used for verifying endpoint.client.id */
clients_om = wp_object_manager_new ();
- wp_object_manager_add_interest (clients_om, WP_TYPE_CLIENT, NULL,
- WP_PROXY_FEATURE_BOUND);
+ wp_object_manager_add_interest_1 (clients_om, WP_TYPE_CLIENT, NULL);
+ wp_object_manager_request_proxy_features (clients_om,
+ WP_TYPE_CLIENT, WP_PROXY_FEATURE_BOUND);
g_signal_connect_swapped (clients_om, "objects-changed",
G_CALLBACK (g_main_loop_quit), f->base.loop);
wp_core_install_object_manager (f->base.core, clients_om);
g_main_loop_run (f->base.loop);
-
- {
- g_autoptr (WpIterator) it = wp_object_manager_iterate (clients_om);
- g_auto (GValue) val = G_VALUE_INIT;
- g_assert_true (wp_iterator_next (it, &val));
- g_assert_nonnull (self_client = g_value_dup_object (&val));
- }
+ g_assert_nonnull (self_client = wp_object_manager_lookup (clients_om,
+ WP_TYPE_CLIENT, NULL));
/* create item */
--
GitLab