luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-gdbus-peer-object-manager-test' into 'main'

Browse Source 
tests: Use G_TEST_OPTION_ISOLATE_DIRS in gdbus-peer-object-manager

See merge request GNOME/glib!2603
This commit is contained in:
Sebastian Dröge 2022-04-29 08:04:33 +00:00
commit ef8e0035a5
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gio/tests/gdbus-peer-object-manager.c
View File

@ -180,10 +180,10 @@ on_server_connection (GObject *source,
Test *test = user_data; Test *test = user_data;
GError *error = NULL; GError *error = NULL;
g_assert (test->server == NULL); g_assert_null (test->server);
test->server = g_dbus_connection_new_finish (result, &error); test->server = g_dbus_connection_new_finish (result, &error);
g_assert_no_error (error); g_assert_no_error (error);
g_assert (test->server != NULL); g_assert_nonnull (test->server);
if (test->server && test->client) if (test->server && test->client)
g_main_loop_quit (test->loop); g_main_loop_quit (test->loop);
@ -197,10 +197,10 @@ on_client_connection (GObject *source,
Test *test = user_data; Test *test = user_data;
GError *error = NULL; GError *error = NULL;
g_assert (test->client == NULL); g_assert_null (test->client);
test->client = g_dbus_connection_new_finish (result, &error); test->client = g_dbus_connection_new_finish (result, &error);
g_assert_no_error (error); g_assert_no_error (error);
g_assert (test->client != NULL); g_assert_nonnull (test->client);
if (test->server && test->client) if (test->server && test->client)
g_main_loop_quit (test->loop); g_main_loop_quit (test->loop);
@ -231,7 +231,7 @@ setup (Test *test,
g_assert_no_error (error); g_assert_no_error (error);
stream = g_socket_connection_factory_create_connection (socket); stream = g_socket_connection_factory_create_connection (socket);
g_assert (stream != NULL); g_assert_nonnull (stream);
g_object_unref (socket); g_object_unref (socket);
guid = g_dbus_generate_guid (); guid = g_dbus_generate_guid ();
@ -247,7 +247,7 @@ setup (Test *test,
g_assert_no_error (error); g_assert_no_error (error);
stream = g_socket_connection_factory_create_connection (socket); stream = g_socket_connection_factory_create_connection (socket);
g_assert (stream != NULL); g_assert_nonnull (stream);
g_object_unref (socket); g_object_unref (socket);
g_dbus_connection_new (G_IO_STREAM (stream), NULL, g_dbus_connection_new (G_IO_STREAM (stream), NULL,
@ -257,8 +257,8 @@ setup (Test *test,
g_main_loop_run (test->loop); g_main_loop_run (test->loop);
g_assert (test->server); g_assert_nonnull (test->server);
g_assert (test->client); g_assert_nonnull (test->client);
g_object_unref (stream); g_object_unref (stream);
} }
@ -278,7 +278,7 @@ on_result (GObject *source,
gpointer user_data) gpointer user_data)
{ {
Test *test = user_data; Test *test = user_data;
g_assert (test->result == NULL); g_assert_null (test->result);
test->result = g_object_ref (result); test->result = g_object_ref (result);
g_main_loop_quit (test->loop); g_main_loop_quit (test->loop);
@ -337,28 +337,28 @@ test_object_manager (Test *test,
g_clear_object (&test->result); g_clear_object (&test->result);
proxy = g_dbus_object_manager_get_interface (client, number1_path, "org.mock.Interface"); proxy = g_dbus_object_manager_get_interface (client, number1_path, "org.mock.Interface");
g_assert (proxy != NULL); g_assert_nonnull (proxy);
prop = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "Path"); prop = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "Path");
g_assert (prop != NULL); g_assert_nonnull (prop);
g_assert_cmpstr ((gchar *)g_variant_get_type (prop), ==, (gchar *)G_VARIANT_TYPE_OBJECT_PATH); g_assert_cmpstr ((gchar *)g_variant_get_type (prop), ==, (gchar *)G_VARIANT_TYPE_OBJECT_PATH);
g_assert_cmpstr (g_variant_get_string (prop, NULL), ==, number1_path); g_assert_cmpstr (g_variant_get_string (prop, NULL), ==, number1_path);
g_variant_unref (prop); g_variant_unref (prop);
prop = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "Number"); prop = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "Number");
g_assert (prop != NULL); g_assert_nonnull (prop);
g_assert_cmpstr ((gchar *)g_variant_get_type (prop), ==, (gchar *)G_VARIANT_TYPE_INT32); g_assert_cmpstr ((gchar *)g_variant_get_type (prop), ==, (gchar *)G_VARIANT_TYPE_INT32);
g_assert_cmpint (g_variant_get_int32 (prop), ==, 1); g_assert_cmpint (g_variant_get_int32 (prop), ==, 1);
g_variant_unref (prop); g_variant_unref (prop);
g_object_unref (proxy); g_object_unref (proxy);
proxy = g_dbus_object_manager_get_interface (client, number2_path, "org.mock.Interface"); proxy = g_dbus_object_manager_get_interface (client, number2_path, "org.mock.Interface");
g_assert (proxy != NULL); g_assert_nonnull (proxy);
prop = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "Path"); prop = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "Path");
g_assert (prop != NULL); g_assert_nonnull (prop);
g_assert_cmpstr ((gchar *)g_variant_get_type (prop), ==, (gchar *)G_VARIANT_TYPE_OBJECT_PATH); g_assert_cmpstr ((gchar *)g_variant_get_type (prop), ==, (gchar *)G_VARIANT_TYPE_OBJECT_PATH);
g_assert_cmpstr (g_variant_get_string (prop, NULL), ==, number2_path); g_assert_cmpstr (g_variant_get_string (prop, NULL), ==, number2_path);
g_variant_unref (prop); g_variant_unref (prop);
prop = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "Number"); prop = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "Number");
g_assert (prop != NULL); g_assert_nonnull (prop);
g_assert_cmpstr ((gchar *)g_variant_get_type (prop), ==, (gchar *)G_VARIANT_TYPE_INT32); g_assert_cmpstr ((gchar *)g_variant_get_type (prop), ==, (gchar *)G_VARIANT_TYPE_INT32);
g_assert_cmpint (g_variant_get_int32 (prop), ==, 2); g_assert_cmpint (g_variant_get_int32 (prop), ==, 2);
g_variant_unref (prop); g_variant_unref (prop);
@ -375,7 +375,7 @@ int
main (int argc, main (int argc,
char *argv[]) char *argv[])
{ {
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
g_test_add ("/gdbus/peer-object-manager/normal", Test, "/objects", g_test_add ("/gdbus/peer-object-manager/normal", Test, "/objects",
setup, test_object_manager, teardown); setup, test_object_manager, teardown);