diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/connection-test.c | 8 | ||||
| -rw-r--r-- | tests/session-test.c | 15 | ||||
| -rw-r--r-- | tests/ssl-test.c | 9 | ||||
| -rw-r--r-- | tests/test-utils.c | 4 |
4 files changed, 9 insertions, 27 deletions
diff --git a/tests/connection-test.c b/tests/connection-test.c index 34981705..12359252 100644 --- a/tests/connection-test.c +++ b/tests/connection-test.c @@ -753,9 +753,7 @@ do_connection_state_test_for_session (SoupSession *session) debug_printf (1, " https -- SKIPPING\n"); resolver = g_simple_proxy_resolver_new (HTTP_PROXY, NULL); - g_object_set (G_OBJECT (session), - "proxy-resolver", resolver, - NULL); + soup_session_set_proxy_resolver (session, resolver); g_object_unref (resolver); debug_printf (1, " http with proxy\n"); @@ -892,9 +890,7 @@ do_connection_event_test_for_session (SoupSession *session) debug_printf (1, " https -- SKIPPING\n"); resolver = g_simple_proxy_resolver_new (HTTP_PROXY, NULL); - g_object_set (G_OBJECT (session), - "proxy-resolver", resolver, - NULL); + soup_session_set_proxy_resolver (session, resolver); g_object_unref (resolver); debug_printf (1, " http with proxy\n"); diff --git a/tests/session-test.c b/tests/session-test.c index dc503e73..32c318df 100644 --- a/tests/session-test.c +++ b/tests/session-test.c @@ -199,8 +199,7 @@ do_priority_tests (void) g_test_bug ("696277"); - session = soup_test_session_new (NULL); - g_object_set (session, "max-conns", 1, NULL); + session = soup_test_session_new ("max-conns", 1, NULL); expected_priorities[0] = SOUP_MESSAGE_PRIORITY_HIGH; expected_priorities[1] = SOUP_MESSAGE_PRIORITY_NORMAL; @@ -236,13 +235,8 @@ test_session_properties (const char *name, GProxyResolver *expected_proxy_resolver, GTlsDatabase *expected_tls_database) { - GProxyResolver *proxy_resolver = NULL; - GTlsDatabase *tlsdb = NULL; - - g_object_get (G_OBJECT (session), - "proxy-resolver", &proxy_resolver, - "tls-database", &tlsdb, - NULL); + GProxyResolver *proxy_resolver = soup_session_get_proxy_resolver (session); + GTlsDatabase *tlsdb = soup_session_get_tls_database (session); soup_test_assert (proxy_resolver == expected_proxy_resolver, "%s has %s proxy resolver", @@ -250,9 +244,6 @@ test_session_properties (const char *name, soup_test_assert (tlsdb == expected_tls_database, "%s has %s TLS database", name, tlsdb ? (expected_tls_database ? "wrong" : "a") : "no"); - - g_clear_object (&proxy_resolver); - g_clear_object (&tlsdb); } static void diff --git a/tests/ssl-test.c b/tests/ssl-test.c index 359d72d0..061954f9 100644 --- a/tests/ssl-test.c +++ b/tests/ssl-test.c @@ -48,9 +48,7 @@ do_strictness_test (gconstpointer data) GTlsDatabase *tlsdb; tlsdb = g_tls_backend_get_default_database (g_tls_backend_get_default ()); - g_object_set (G_OBJECT (session), - "tls-database", tlsdb, - NULL); + soup_session_set_tls_database (session, tlsdb); g_object_unref (tlsdb); } @@ -163,7 +161,7 @@ do_tls_interaction_test (gconstpointer data) SOUP_TEST_SKIP_IF_NO_TLS; session = soup_test_session_new (NULL); - g_object_get (session, "tls-database", &tls_db, NULL); + tls_db = soup_session_get_tls_database (session); g_signal_connect (server, "request-started", G_CALLBACK (server_request_started), @@ -184,7 +182,7 @@ do_tls_interaction_test (gconstpointer data) "certificate", g_object_ref (certificate), g_object_unref); - g_object_set (session, "tls-interaction", interaction, NULL); + soup_session_set_tls_interaction (session, interaction); g_object_unref (interaction); /* With a GTlsInteraction */ @@ -199,7 +197,6 @@ do_tls_interaction_test (gconstpointer data) g_signal_handlers_disconnect_by_data (server, tls_db); soup_test_session_abort_unref (session); - g_object_unref (tls_db); g_object_unref (certificate); } diff --git a/tests/test-utils.c b/tests/test-utils.c index 9308972f..accf79d1 100644 --- a/tests/test-utils.c +++ b/tests/test-utils.c @@ -281,9 +281,7 @@ soup_test_session_new (const char *propname, ...) g_assert_no_error (error); } - g_object_set (G_OBJECT (session), - "tls-database", tlsdb, - NULL); + soup_session_set_tls_database (session, tlsdb); g_clear_object (&tlsdb); } |