diff options
author | Patrick Griffis <pgriffis@igalia.com> | 2020-11-06 15:17:03 -0600 |
---|---|---|
committer | Patrick Griffis <pgriffis@igalia.com> | 2020-11-06 15:17:03 -0600 |
commit | 92a4873ecdb97ae812311f676aa1981764958e70 (patch) | |
tree | 56a318a825152240282db7b060f62799c9d60ec6 | |
parent | 7cc93e2fb52cda8f9e8260c4cce10a60b579dd88 (diff) | |
download | libsoup-92a4873ecdb97ae812311f676aa1981764958e70.tar.gz |
Remove type argument from soup_test_session_new()
-rw-r--r-- | tests/auth-test.c | 30 | ||||
-rw-r--r-- | tests/cache-test.c | 12 | ||||
-rw-r--r-- | tests/chunk-io-test.c | 2 | ||||
-rw-r--r-- | tests/coding-test.c | 3 | ||||
-rw-r--r-- | tests/connection-test.c | 17 | ||||
-rw-r--r-- | tests/context-test.c | 9 | ||||
-rw-r--r-- | tests/continue-test.c | 2 | ||||
-rw-r--r-- | tests/cookies-test.c | 6 | ||||
-rw-r--r-- | tests/forms-test.c | 4 | ||||
-rw-r--r-- | tests/hsts-db-test.c | 2 | ||||
-rw-r--r-- | tests/hsts-test.c | 2 | ||||
-rw-r--r-- | tests/misc-test.c | 34 | ||||
-rw-r--r-- | tests/multipart-test.c | 3 | ||||
-rw-r--r-- | tests/no-ssl-test.c | 2 | ||||
-rw-r--r-- | tests/ntlm-test.c | 6 | ||||
-rw-r--r-- | tests/proxy-test.c | 12 | ||||
-rw-r--r-- | tests/range-test.c | 4 | ||||
-rw-r--r-- | tests/redirect-test.c | 3 | ||||
-rw-r--r-- | tests/request-body-test.c | 2 | ||||
-rw-r--r-- | tests/server-test.c | 25 | ||||
-rw-r--r-- | tests/session-test.c | 10 | ||||
-rw-r--r-- | tests/sniffing-test.c | 3 | ||||
-rw-r--r-- | tests/ssl-test.c | 5 | ||||
-rw-r--r-- | tests/streaming-test.c | 6 | ||||
-rw-r--r-- | tests/test-utils.c | 8 | ||||
-rw-r--r-- | tests/test-utils.h | 2 | ||||
-rw-r--r-- | tests/timeout-test.c | 17 | ||||
-rw-r--r-- | tests/websocket-test.c | 4 |
28 files changed, 104 insertions, 131 deletions
diff --git a/tests/auth-test.c b/tests/auth-test.c index d5e27b23..2d94c4ad 100644 --- a/tests/auth-test.c +++ b/tests/auth-test.c @@ -302,7 +302,7 @@ do_pipelined_auth_test (void) SOUP_TEST_SKIP_IF_NO_APACHE; - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); authenticated = FALSE; uri = g_strconcat (base_uri, "Basic/realm1/", NULL); @@ -469,7 +469,7 @@ do_digest_expiration_test (void) SOUP_TEST_SKIP_IF_NO_APACHE; - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); uri = g_strconcat (base_uri, "Digest/realm1/", NULL); do_digest_nonce_test (session, "First", uri, TRUE, TRUE, TRUE); @@ -578,7 +578,7 @@ do_async_auth_good_password_test (void) SOUP_TEST_SKIP_IF_NO_APACHE; loop = g_main_loop_new (NULL, TRUE); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); uri = g_strconcat (base_uri, "Basic/realm1/", NULL); remaining = 0; @@ -659,7 +659,7 @@ do_async_auth_bad_password_test (void) SOUP_TEST_SKIP_IF_NO_APACHE; loop = g_main_loop_new (NULL, TRUE); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); uri = g_strconcat (base_uri, "Basic/realm1/", NULL); remaining = 0; @@ -709,7 +709,7 @@ do_async_auth_no_password_test (void) SOUP_TEST_SKIP_IF_NO_APACHE; loop = g_main_loop_new (NULL, TRUE); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); uri = g_strconcat (base_uri, "Basic/realm1/", NULL); remaining = 0; @@ -803,7 +803,7 @@ select_auth_test_one (SoupURI *uri, SoupMessage *msg; SoupSession *session; - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); if (disable_digest) soup_session_remove_feature_by_type (session, SOUP_TYPE_AUTH_DIGEST); @@ -1060,7 +1060,7 @@ do_auth_close_test (void) g_signal_connect (server, "request-started", G_CALLBACK (auth_close_request_started), NULL); - acd.session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + acd.session = soup_test_session_new (NULL); acd.msg = soup_message_new_from_uri ("GET", uri); g_signal_connect (acd.msg, "authenticate", G_CALLBACK (auth_close_authenticate), &acd); @@ -1102,7 +1102,7 @@ do_infinite_auth_test (void) SOUP_TEST_SKIP_IF_NO_APACHE; - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); uri = g_strconcat (base_uri, "Basic/realm1/", NULL); msg = soup_message_new ("GET", uri); g_signal_connect (msg, "authenticate", @@ -1185,7 +1185,7 @@ do_disappearing_auth_test (void) g_signal_connect (server, "request-read", G_CALLBACK (disappear_request_read), NULL); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); counter = 0; msg = soup_message_new_from_uri ("GET", uri); @@ -1255,7 +1255,7 @@ do_batch_tests (gconstpointer data) SOUP_TEST_SKIP_IF_NO_APACHE; - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); base = soup_uri_new (base_uri); for (i = 0; current_tests[i].url; i++) { @@ -1320,7 +1320,7 @@ do_clear_credentials_test (void) SOUP_TEST_SKIP_IF_NO_APACHE; - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); uri = g_strconcat (base_uri, "Digest/realm1/", NULL); do_digest_nonce_test (session, "First", uri, TRUE, TRUE, TRUE); @@ -1346,7 +1346,7 @@ do_message_do_not_use_auth_cache_test (void) SOUP_TEST_SKIP_IF_NO_APACHE; - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); uri = g_strconcat (base_uri, "Digest/realm1/", NULL); @@ -1426,7 +1426,7 @@ do_async_message_do_not_use_auth_cache_test (void) SOUP_TEST_SKIP_IF_NO_APACHE; loop = g_main_loop_new (NULL, TRUE); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); uri = g_strconcat (base_uri, "Basic/realm1/", NULL); msg = soup_message_new ("GET", uri); @@ -1489,7 +1489,7 @@ do_message_has_authorization_header_test (void) SOUP_TEST_SKIP_IF_NO_APACHE; - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); uri = g_strconcat (base_uri, "Digest/realm1/", NULL); msg = soup_message_new ("GET", uri); @@ -1577,7 +1577,7 @@ do_cancel_after_retry_test (void) SOUP_TEST_SKIP_IF_NO_APACHE; - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); data.session = session; data.cancellable = g_cancellable_new (); diff --git a/tests/cache-test.c b/tests/cache-test.c index 1a5df948..85d66829 100644 --- a/tests/cache-test.c +++ b/tests/cache-test.c @@ -294,7 +294,7 @@ do_basics_test (gconstpointer data) cache_dir = g_dir_make_tmp ("cache-test-XXXXXX", NULL); debug_printf (2, " Caching to %s\n", cache_dir); cache = soup_cache_new (cache_dir, SOUP_CACHE_SINGLE_USER); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); soup_session_add_feature (session, SOUP_SESSION_FEATURE (cache)); g_signal_connect (session, "request-queued", @@ -487,7 +487,7 @@ do_cancel_test (gconstpointer data) cache_dir = g_dir_make_tmp ("cache-test-XXXXXX", NULL); debug_printf (2, " Caching to %s\n", cache_dir); cache = soup_cache_new (cache_dir, SOUP_CACHE_SINGLE_USER); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); soup_session_add_feature (session, SOUP_SESSION_FEATURE (cache)); g_signal_connect (session, "request-unqueued", @@ -520,7 +520,7 @@ do_cancel_test (gconstpointer data) soup_test_session_abort_unref (session); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); soup_session_add_feature (session, SOUP_SESSION_FEATURE (cache)); g_signal_connect (session, "request-unqueued", @@ -581,7 +581,7 @@ do_refcounting_test (gconstpointer data) cache_dir = g_dir_make_tmp ("cache-test-XXXXXX", NULL); debug_printf (2, " Caching to %s\n", cache_dir); cache = soup_cache_new (cache_dir, SOUP_CACHE_SINGLE_USER); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); soup_session_add_feature (session, SOUP_SESSION_FEATURE (cache)); last_request_validated = last_request_hit_network = FALSE; @@ -635,7 +635,7 @@ do_headers_test (gconstpointer data) cache_dir = g_dir_make_tmp ("cache-test-XXXXXX", NULL); debug_printf (2, " Caching to %s\n", cache_dir); cache = soup_cache_new (cache_dir, SOUP_CACHE_SINGLE_USER); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); soup_session_add_feature (session, SOUP_SESSION_FEATURE (cache)); g_signal_connect (session, "request-queued", @@ -711,7 +711,7 @@ do_leaks_test (gconstpointer data) cache_dir = g_dir_make_tmp ("cache-test-XXXXXX", NULL); debug_printf (2, " Caching to %s\n", cache_dir); cache = soup_cache_new (cache_dir, SOUP_CACHE_SINGLE_USER); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); soup_session_add_feature (session, SOUP_SESSION_FEATURE (cache)); debug_printf (2, " Initial requests\n"); diff --git a/tests/chunk-io-test.c b/tests/chunk-io-test.c index 8fd1928f..98df3ce5 100644 --- a/tests/chunk-io-test.c +++ b/tests/chunk-io-test.c @@ -21,7 +21,7 @@ force_io_streams_init (void) server = soup_test_server_new (TRUE); base_uri = soup_test_server_get_uri (server, "http", NULL); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); msg = soup_message_new_from_uri ("POST", base_uri); soup_test_session_send_message (session, msg); g_object_unref (msg); diff --git a/tests/coding-test.c b/tests/coding-test.c index 4f600775..7162a2b3 100644 --- a/tests/coding-test.c +++ b/tests/coding-test.c @@ -177,8 +177,7 @@ setup_coding_test (CodingTestData *data, gconstpointer test_data) SoupMessage *msg; SoupURI *uri; - data->session = soup_test_session_new (SOUP_TYPE_SESSION, - NULL); + data->session = soup_test_session_new (NULL); uri = soup_uri_new_with_base (base_uri, "/mbox"); diff --git a/tests/connection-test.c b/tests/connection-test.c index 2f4964b9..9f5e0a17 100644 --- a/tests/connection-test.c +++ b/tests/connection-test.c @@ -189,7 +189,7 @@ do_content_length_framing_test (void) g_test_bug ("611481"); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); debug_printf (1, " Content-Length larger than message body length\n"); request_uri = soup_uri_new_with_base (base_uri, "/content-length/long"); @@ -320,7 +320,7 @@ do_persistent_connection_timeout_test (void) g_test_bug ("631525"); debug_printf (1, " Normal session, message API\n"); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); do_timeout_test_for_session (session); soup_test_session_abort_unref (session); } @@ -337,7 +337,7 @@ do_persistent_connection_timeout_test_with_cancellation (void) int i; char buf[8192]; - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); g_signal_connect (session, "request-queued", G_CALLBACK (request_queued_socket_collector), @@ -538,8 +538,7 @@ do_max_conns_test (void) g_test_bug ("634422"); - session = soup_test_session_new (SOUP_TYPE_SESSION, - "max-conns", MAX_CONNS, + session = soup_test_session_new ("max-conns", MAX_CONNS, NULL); do_max_conns_test_for_session (session); soup_test_session_abort_unref (session); @@ -619,7 +618,7 @@ do_non_persistent_connection_test (void) g_test_bug ("578990"); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); do_non_persistent_test_for_session (session); soup_test_session_abort_unref (session); } @@ -667,7 +666,7 @@ do_non_idempotent_connection_test (void) { SoupSession *session; - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); do_non_idempotent_test_for_session (session); soup_test_session_abort_unref (session); } @@ -787,7 +786,7 @@ do_connection_state_test (void) SOUP_TEST_SKIP_IF_NO_APACHE; - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); do_connection_state_test_for_session (session); soup_test_session_abort_unref (session); } @@ -926,7 +925,7 @@ do_connection_event_test (void) SOUP_TEST_SKIP_IF_NO_APACHE; - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); do_connection_event_test_for_session (session); soup_test_session_abort_unref (session); } diff --git a/tests/context-test.c b/tests/context-test.c index 64367432..9c58f1f8 100644 --- a/tests/context-test.c +++ b/tests/context-test.c @@ -146,8 +146,7 @@ test1_thread (gpointer user_data) async_context = g_main_context_new (); g_main_context_push_thread_default (async_context); - session = soup_test_session_new (SOUP_TYPE_SESSION, - NULL); + session = soup_test_session_new (NULL); g_main_context_unref (async_context); uri = g_build_filename (base_uri, "slow", NULL); @@ -204,8 +203,7 @@ do_test2 (void) async_context = g_main_context_new (); g_main_context_push_thread_default (async_context); - session = soup_test_session_new (SOUP_TYPE_SESSION, - NULL); + session = soup_test_session_new (NULL); g_main_context_unref (async_context); uri = g_build_filename (base_uri, "slow", NULL); @@ -263,8 +261,7 @@ do_multicontext_test (void) GMainContext *context1, *context2; GMainLoop *loop1, *loop2; - session = soup_test_session_new (SOUP_TYPE_SESSION, - NULL); + session = soup_test_session_new (NULL); context1 = g_main_context_new (); loop1 = g_main_loop_new (context1, FALSE); diff --git a/tests/continue-test.c b/tests/continue-test.c index 844c1ad4..edd9786d 100644 --- a/tests/continue-test.c +++ b/tests/continue-test.c @@ -131,7 +131,7 @@ do_message (const char *path, gboolean long_body, G_CALLBACK (restarted), request_body); events = NULL; - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); g_assert (SOUP_IS_MESSAGE (msg)); response_body = soup_test_session_async_send (session, msg); g_assert (SOUP_IS_MESSAGE (msg)); diff --git a/tests/cookies-test.c b/tests/cookies-test.c index fafd1a0f..fe215469 100644 --- a/tests/cookies-test.c +++ b/tests/cookies-test.c @@ -65,7 +65,7 @@ do_cookies_accept_policy_test (void) GSList *l, *p; int i; - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); soup_session_add_feature_by_type (session, SOUP_TYPE_COOKIE_JAR); jar = SOUP_COOKIE_JAR (soup_session_get_feature (session, SOUP_TYPE_COOKIE_JAR)); @@ -301,7 +301,7 @@ do_cookies_parsing_test (void) g_test_bug ("678753"); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); soup_session_add_feature_by_type (session, SOUP_TYPE_COOKIE_JAR); jar = SOUP_COOKIE_JAR (soup_session_get_feature (session, SOUP_TYPE_COOKIE_JAR)); @@ -403,7 +403,7 @@ do_remove_feature_test (void) SoupURI *uri; GMainLoop *loop; - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); soup_session_add_feature_by_type (session, SOUP_TYPE_COOKIE_JAR); uri = soup_uri_new_with_base (first_party_uri, "/index.html"); msg = soup_message_new_from_uri ("GET", uri); diff --git a/tests/forms-test.c b/tests/forms-test.c index f7d15630..cd0c8b96 100644 --- a/tests/forms-test.c +++ b/tests/forms-test.c @@ -122,7 +122,7 @@ do_hello_test_libsoup (int n, gboolean extra, const char *uri) if (extra) g_datalist_set_data (&data, "extra", (gpointer)"something"); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); msg = soup_message_new_from_encoded_form ("GET", uri, @@ -255,7 +255,7 @@ do_md5_test_libsoup (gconstpointer data) msg = soup_message_new_from_multipart (uri, multipart); soup_multipart_free (multipart); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); body = soup_test_session_send (session, msg, NULL, NULL); soup_test_assert_message_status (msg, SOUP_STATUS_OK); diff --git a/tests/hsts-db-test.c b/tests/hsts-db-test.c index f1034867..b6e7e364 100644 --- a/tests/hsts-db-test.c +++ b/tests/hsts-db-test.c @@ -112,7 +112,7 @@ hsts_db_session_new (void) { SoupHSTSEnforcer *hsts_db = soup_hsts_enforcer_db_new (DB_FILE); - SoupSession *session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + SoupSession *session = soup_test_session_new (NULL); soup_session_add_feature (session, SOUP_SESSION_FEATURE (hsts_db)); g_signal_connect (session, "request-queued", G_CALLBACK (on_request_queued), NULL); g_object_unref (hsts_db); diff --git a/tests/hsts-test.c b/tests/hsts-test.c index b0ff7a43..c8b9342b 100644 --- a/tests/hsts-test.c +++ b/tests/hsts-test.c @@ -156,7 +156,7 @@ on_request_queued (SoupSession *session, static SoupSession * hsts_session_new (SoupHSTSEnforcer *enforcer) { - SoupSession *session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + SoupSession *session = soup_test_session_new (NULL); if (enforcer) soup_session_add_feature (session, SOUP_SESSION_FEATURE (enforcer)); diff --git a/tests/misc-test.c b/tests/misc-test.c index 2d06f0c8..038cdbbc 100644 --- a/tests/misc-test.c +++ b/tests/misc-test.c @@ -111,7 +111,7 @@ do_host_test (void) g_test_bug ("539803"); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); one = soup_message_new_from_uri ("GET", base_uri); two = soup_message_new_from_uri ("GET", base_uri); @@ -147,7 +147,7 @@ do_host_big_header (void) g_test_bug ("792173"); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); msg = soup_message_new_from_uri ("GET", base_uri); for (i = 0; i < 2048; i++) { @@ -212,7 +212,7 @@ do_callback_unref_test (void) bad_uri = soup_test_server_get_uri (bad_server, "http", NULL); soup_test_server_quit_unref (bad_server); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); g_object_add_weak_pointer (G_OBJECT (session), (gpointer *)&session); loop = g_main_loop_new (NULL, TRUE); @@ -301,7 +301,7 @@ do_msg_reuse_test (void) signal_ids = g_signal_list_ids (SOUP_TYPE_MESSAGE, &n_signal_ids); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); debug_printf (1, " First message\n"); msg = soup_message_new_from_uri ("GET", base_uri); @@ -387,7 +387,7 @@ do_early_abort_test (void) g_test_bug ("596074"); g_test_bug ("618641"); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); msg = soup_message_new_from_uri ("GET", base_uri); context = g_main_context_default (); @@ -404,7 +404,7 @@ do_early_abort_test (void) g_main_loop_unref (loop); soup_test_session_abort_unref (session); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); msg = soup_message_new_from_uri ("GET", base_uri); g_signal_connect (msg, "network-event", @@ -424,7 +424,7 @@ do_early_abort_test (void) g_test_bug ("668098"); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); msg = soup_message_new_from_uri ("GET", base_uri); g_signal_connect (msg, "starting", @@ -451,8 +451,7 @@ do_one_accept_language_test (const char *language, const char *expected_header) debug_printf (1, " LANGUAGE=%s\n", language); g_setenv ("LANGUAGE", language, TRUE); - session = soup_test_session_new (SOUP_TYPE_SESSION, - "accept-language-auto", TRUE, + session = soup_test_session_new ("accept-language-auto", TRUE, NULL); msg = soup_message_new_from_uri ("GET", base_uri); soup_test_session_send_message (session, msg); @@ -540,7 +539,7 @@ do_cancel_while_reading_test (void) g_test_bug ("637741"); g_test_bug ("676038"); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); do_cancel_while_reading_test_for_session (session); soup_test_session_abort_unref (session); } @@ -577,8 +576,7 @@ do_cancel_while_reading_immediate_req_test (void) flags = SOUP_TEST_REQUEST_CANCEL_CANCELLABLE | SOUP_TEST_REQUEST_CANCEL_IMMEDIATE; - session = soup_test_session_new (SOUP_TYPE_SESSION, - NULL); + session = soup_test_session_new (NULL); do_cancel_while_reading_req_test_for_session (session, flags); soup_test_session_abort_unref (session); } @@ -591,8 +589,7 @@ do_cancel_while_reading_delayed_req_test (void) flags = SOUP_TEST_REQUEST_CANCEL_CANCELLABLE | SOUP_TEST_REQUEST_CANCEL_SOON; - session = soup_test_session_new (SOUP_TYPE_SESSION, - NULL); + session = soup_test_session_new (NULL); do_cancel_while_reading_req_test_for_session (session, flags); soup_test_session_abort_unref (session); } @@ -607,8 +604,7 @@ do_cancel_while_reading_preemptive_req_test (void) flags = SOUP_TEST_REQUEST_CANCEL_CANCELLABLE | SOUP_TEST_REQUEST_CANCEL_PREEMPTIVE; - session = soup_test_session_new (SOUP_TYPE_SESSION, - NULL); + session = soup_test_session_new (NULL); do_cancel_while_reading_req_test_for_session (session, flags); soup_test_session_abort_unref (session); } @@ -647,8 +643,7 @@ do_aliases_test (void) if (tls_available) { debug_printf (1, " foo-means-https\n"); - session = soup_test_session_new (SOUP_TYPE_SESSION, - "https-aliases", aliases, + session = soup_test_session_new ("https-aliases", aliases, NULL); do_aliases_test_for_session (session, "https"); soup_test_session_abort_unref (session); @@ -656,8 +651,7 @@ do_aliases_test (void) debug_printf (1, " foo-means-https -- SKIPPING\n"); debug_printf (1, " foo-means-nothing\n"); - session = soup_test_session_new (SOUP_TYPE_SESSION, - NULL); + session = soup_test_session_new (NULL); do_aliases_test_for_session (session, NULL); soup_test_session_abort_unref (session); } diff --git a/tests/multipart-test.c b/tests/multipart-test.c index 8d82f90d..8450972d 100644 --- a/tests/multipart-test.c +++ b/tests/multipart-test.c @@ -489,8 +489,7 @@ main (int argc, char **argv) /* FIXME: I had to raise the number of connections allowed here, otherwise I * was hitting the limit, which indicates some connections are not dying. */ - session = soup_test_session_new (SOUP_TYPE_SESSION, - "max-conns", 20, + session = soup_test_session_new ("max-conns", 20, "max-conns-per-host", 20, NULL); soup_session_add_feature_by_type (session, SOUP_TYPE_CONTENT_SNIFFER); diff --git a/tests/no-ssl-test.c b/tests/no-ssl-test.c index 43c7a9bb..258b9027 100644 --- a/tests/no-ssl-test.c +++ b/tests/no-ssl-test.c @@ -25,7 +25,7 @@ do_ssl_tests (gconstpointer data) g_test_bug ("700518"); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); do_ssl_test_for_session (session, uri); soup_test_session_abort_unref (session); } diff --git a/tests/ntlm-test.c b/tests/ntlm-test.c index bf6a2319..d5b3f33e 100644 --- a/tests/ntlm-test.c +++ b/tests/ntlm-test.c @@ -423,7 +423,7 @@ do_ntlm_round (SoupURI *base_uri, gboolean use_ntlm, gboolean bob_via_ntlm = use_ntlm && bob; gboolean alice_via_basic = !use_ntlm && alice; - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); if (user && use_ntlm && !use_builtin_ntlm) g_setenv ("NTLMUSER", user, TRUE); @@ -672,7 +672,7 @@ do_retrying_test (TestServer *ts, debug_printf (1, " /alice\n"); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); soup_session_add_feature_by_type (session, SOUP_TYPE_AUTH_NTLM); uri = soup_uri_new_with_base (ts->uri, "/alice"); @@ -693,7 +693,7 @@ do_retrying_test (TestServer *ts, debug_printf (1, " /bob\n"); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); soup_session_add_feature_by_type (session, SOUP_TYPE_AUTH_NTLM); retried = FALSE; uri = soup_uri_new_with_base (ts->uri, "/bob"); diff --git a/tests/proxy-test.c b/tests/proxy-test.c index 938a23b0..7689b99a 100644 --- a/tests/proxy-test.c +++ b/tests/proxy-test.c @@ -116,8 +116,7 @@ test_url (const char *url, int proxy, guint expected, gboolean close) /* We create a new session for each request to ensure that * connections/auth aren't cached between tests. */ - session = soup_test_session_new (SOUP_TYPE_SESSION, - "proxy-resolver", proxy_resolvers[proxy], + session = soup_test_session_new ("proxy-resolver", proxy_resolvers[proxy], NULL); msg = soup_message_new (SOUP_METHOD_GET, url); @@ -218,8 +217,7 @@ do_proxy_fragment_test (gconstpointer data) SOUP_TEST_SKIP_IF_NO_APACHE; - session = soup_test_session_new (SOUP_TYPE_SESSION, - "proxy-resolver", proxy_resolvers[SIMPLE_PROXY], + session = soup_test_session_new ("proxy-resolver", proxy_resolvers[SIMPLE_PROXY], NULL); req_uri = soup_uri_new_with_base (base_uri, "/#foo"); @@ -245,8 +243,7 @@ do_proxy_redirect_test (void) SOUP_TEST_SKIP_IF_NO_APACHE; SOUP_TEST_SKIP_IF_NO_TLS; - session = soup_test_session_new (SOUP_TYPE_SESSION, - "proxy-resolver", proxy_resolvers[SIMPLE_PROXY], + session = soup_test_session_new ("proxy-resolver", proxy_resolvers[SIMPLE_PROXY], NULL); req_uri = soup_uri_new (HTTPS_SERVER); @@ -322,8 +319,7 @@ do_proxy_auth_cache_test (void) cache = soup_cache_new (cache_dir, SOUP_CACHE_SINGLE_USER); g_free (cache_dir); - session = soup_test_session_new (SOUP_TYPE_SESSION, - "proxy-resolver", proxy_resolvers[AUTH_PROXY], + session = soup_test_session_new ("proxy-resolver", proxy_resolvers[AUTH_PROXY], NULL); soup_session_add_feature (session, SOUP_SESSION_FEATURE (cache)); url = g_strconcat (HTTP_SERVER, "/Basic/realm1/", NULL); diff --git a/tests/range-test.c b/tests/range-test.c index 17d9b2a7..39eb8353 100644 --- a/tests/range-test.c +++ b/tests/range-test.c @@ -340,7 +340,7 @@ do_apache_range_test (void) SOUP_TEST_SKIP_IF_NO_APACHE; - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); do_range_test (session, "http://127.0.0.1:47524/", TRUE, FALSE); @@ -367,7 +367,7 @@ do_libsoup_range_test (void) SoupURI *base_uri; char *base_uri_str; - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); server = soup_test_server_new (SOUP_TEST_SERVER_DEFAULT); soup_server_add_handler (server, NULL, server_handler, NULL, NULL); diff --git a/tests/redirect-test.c b/tests/redirect-test.c index ee2b6388..46c931ee 100644 --- a/tests/redirect-test.c +++ b/tests/redirect-test.c @@ -335,8 +335,7 @@ main (int argc, char **argv) loop = g_main_loop_new (NULL, TRUE); - async_session = soup_test_session_new (SOUP_TYPE_SESSION, - NULL); + async_session = soup_test_session_new (NULL); for (n = 0; n < n_tests; n++) { path = g_strdup_printf ("/redirect/msg/%d-%s-%d", n, diff --git a/tests/request-body-test.c b/tests/request-body-test.c index ca3ab3c9..26c56fc6 100644 --- a/tests/request-body-test.c +++ b/tests/request-body-test.c @@ -184,7 +184,7 @@ main (int argc, char **argv) loop = g_main_loop_new (NULL, TRUE); base_uri = soup_test_server_get_uri (server, "http", NULL); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); g_test_add_data_func ("/request-body/sync/stream", GINT_TO_POINTER (0), do_request_test); g_test_add_data_func ("/request-body/sync/bytes", GINT_TO_POINTER (BYTES), do_request_test); diff --git a/tests/server-test.c b/tests/server-test.c index 0abaaae7..c0a73e9c 100644 --- a/tests/server-test.c +++ b/tests/server-test.c @@ -131,7 +131,7 @@ do_star_test (ServerData *sd, gconstpointer test_data) g_test_bug ("590751"); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); star_uri = soup_uri_copy (sd->base_uri); soup_uri_set_path (star_uri, "*"); @@ -272,7 +272,7 @@ do_dot_dot_test (ServerData *sd, gconstpointer test_data) g_test_bug ("667635"); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); uri = soup_uri_new_with_base (sd->base_uri, "/..%2ftest"); msg = soup_message_new_from_uri ("GET", uri); @@ -401,7 +401,7 @@ do_ipv6_test (ServerData *sd, gconstpointer test_data) sd->base_uri = soup_test_server_get_uri (sd->server, "http", "::1"); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); debug_printf (1, " HTTP/1.1\n"); msg = soup_message_new_from_uri ("GET", sd->base_uri); @@ -462,7 +462,7 @@ do_multi_test (ServerData *sd, SoupURI *uri1, SoupURI *uri2) server_add_handler (sd, NULL, multi_server_callback, NULL, NULL); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); uristr = soup_uri_to_string (uri1, FALSE); msg = soup_message_new ("GET", uristr); @@ -644,7 +644,7 @@ do_gsocket_import_test (void) g_assert_cmpint (g_slist_length (listeners), ==, 1); g_slist_free (listeners); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); msg = soup_message_new_from_uri ("GET", uri); body = soup_test_session_async_send (session, msg); soup_test_assert_message_status (msg, SOUP_STATUS_OK); @@ -710,7 +710,7 @@ do_fd_import_test (void) g_assert_cmpint (g_slist_length (listeners), ==, 1); g_slist_free (listeners); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); msg = soup_message_new_from_uri ("GET", uri); body = soup_test_session_async_send (session, msg); soup_test_assert_message_status (msg, SOUP_STATUS_OK); @@ -917,7 +917,7 @@ do_fail_404_test (ServerData *sd, gconstpointer test_data) server_add_handler (sd, "/not-a-match", unhandled_server_callback, &usd, NULL); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); msg = soup_message_new_from_uri ("GET", sd->base_uri); body = soup_test_session_async_send (session, msg); soup_test_assert_message_status (msg, SOUP_STATUS_NOT_FOUND); @@ -942,7 +942,7 @@ do_fail_500_test (ServerData *sd, gconstpointer pause) server_add_handler (sd, NULL, unhandled_server_callback, &usd, NULL); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); msg = soup_message_new_from_uri ("GET", sd->base_uri); if (pause) soup_message_headers_append (soup_message_get_request_headers (msg), "X-Test-Server-Pause", "true"); @@ -1016,7 +1016,7 @@ do_early_stream_test (ServerData *sd, gconstpointer test_data) server_add_early_handler (sd, NULL, early_stream_callback, NULL, NULL); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); msg = soup_message_new_from_uri ("POST", sd->base_uri); @@ -1056,7 +1056,7 @@ do_early_respond_test (ServerData *sd, gconstpointer test_data) server_add_early_handler (sd, NULL, early_respond_callback, NULL, NULL); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); /* The early handler will intercept, and the normal handler will be skipped */ msg = soup_message_new_from_uri ("GET", sd->base_uri); @@ -1120,7 +1120,7 @@ do_early_multi_test (ServerData *sd, gconstpointer test_data) server_add_handler (sd, "/both", server_callback, NULL, NULL); server_add_early_handler (sd, "/both", early_multi_callback, NULL, NULL); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); for (i = 0; i < G_N_ELEMENTS (multi_tests); i++) { uri = soup_uri_new_with_base (sd->base_uri, multi_tests[i].path); @@ -1399,8 +1399,7 @@ do_steal_connect_test (ServerData *sd, gconstpointer test_data) soup_server_add_handler (proxy, NULL, proxy_server_callback, NULL, NULL); resolver = g_simple_proxy_resolver_new (proxy_uri_str, NULL); - session = soup_test_session_new (SOUP_TYPE_SESSION, - "proxy-resolver", resolver, + session = soup_test_session_new ("proxy-resolver", resolver, NULL); msg = soup_message_new_from_uri ("GET", sd->ssl_base_uri); soup_test_session_send_message (session, msg); diff --git a/tests/session-test.c b/tests/session-test.c index 6e01267b..2d0c73b2 100644 --- a/tests/session-test.c +++ b/tests/session-test.c @@ -169,7 +169,7 @@ do_plain_tests (void) { SoupSession *session; - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); do_test_for_session (session, TRUE, TRUE, FALSE); soup_test_session_abort_unref (session); } @@ -202,7 +202,7 @@ do_priority_tests (void) g_test_bug ("696277"); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); g_object_set (session, "max-conns", 1, NULL); expected_priorities[0] = SOUP_MESSAGE_PRIORITY_HIGH; @@ -350,7 +350,7 @@ do_features_test (void) GSList *features; SoupSessionFeature *feature; - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); features = soup_session_get_features (session, SOUP_TYPE_SESSION_FEATURE); /* SoupAuthManager is always added */ @@ -441,7 +441,7 @@ do_read_uri_test (gconstpointer data) GError *error = NULL; GetTestFlags flags = GPOINTER_TO_UINT (data); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); uri = soup_uri_new_with_base (base_uri, "/index.txt"); uri_string = soup_uri_to_string (uri, FALSE); @@ -520,7 +520,7 @@ do_load_uri_error_tests (void) SoupSession *session; guint i; - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); for (i = 0; i < G_N_ELEMENTS (get_error_tests); i++) { GError *error = NULL; diff --git a/tests/sniffing-test.c b/tests/sniffing-test.c index 03cfd874..792e8c63 100644 --- a/tests/sniffing-test.c +++ b/tests/sniffing-test.c @@ -356,8 +356,7 @@ main (int argc, char **argv) soup_server_add_handler (server, NULL, server_callback, NULL, NULL); base_uri = soup_test_server_get_uri (server, "http", NULL); - session = soup_test_session_new (SOUP_TYPE_SESSION, - NULL); + session = soup_test_session_new (NULL); soup_session_add_feature_by_type (session, SOUP_TYPE_CONTENT_SNIFFER); g_test_add_data_func ("/sniffing/signals/no-sniffer", diff --git a/tests/ssl-test.c b/tests/ssl-test.c index 764d0433..defd2081 100644 --- a/tests/ssl-test.c +++ b/tests/ssl-test.c @@ -40,8 +40,7 @@ do_strictness_test (gconstpointer data) SOUP_TEST_SKIP_IF_NO_TLS; - session = soup_test_session_new (SOUP_TYPE_SESSION, - NULL); + session = soup_test_session_new (NULL); if (!test->with_ca_list) { g_object_set (G_OBJECT (session), "ssl-use-system-ca-file", TRUE, @@ -214,7 +213,7 @@ do_tls_interaction_test (void) soup_uri_set_port (test_uri, g_inet_socket_address_get_port (G_INET_SOCKET_ADDRESS (bound_address))); g_object_unref (bound_address); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); /* Without a GTlsInteraction */ msg = soup_message_new_from_uri ("GET", test_uri); diff --git a/tests/streaming-test.c b/tests/streaming-test.c index a9280cb8..264e352a 100644 --- a/tests/streaming-test.c +++ b/tests/streaming-test.c @@ -114,7 +114,7 @@ do_chunked_test (gconstpointer data) SoupURI *base_uri = (SoupURI *)data; SoupSession *session; - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); do_request (session, base_uri, "chunked"); soup_test_session_abort_unref (session); } @@ -125,7 +125,7 @@ do_content_length_test (gconstpointer data) SoupURI *base_uri = (SoupURI *)data; SoupSession *session; - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); do_request (session, base_uri, "content-length"); soup_test_session_abort_unref (session); } @@ -138,7 +138,7 @@ do_eof_test (gconstpointer data) g_test_bug ("572153"); - session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + session = soup_test_session_new (NULL); do_request (session, base_uri, "eof"); soup_test_session_abort_unref (session); } diff --git a/tests/test-utils.c b/tests/test-utils.c index a0e164d9..09094752 100644 --- a/tests/test-utils.c +++ b/tests/test-utils.c @@ -247,18 +247,16 @@ apache_cleanup (void) #endif /* HAVE_APACHE */ SoupSession * -soup_test_session_new (GType type, ...) +soup_test_session_new (const char *propname, ...) { va_list args; - const char *propname; SoupSession *session; GTlsDatabase *tlsdb; char *cafile; GError *error = NULL; - va_start (args, type); - propname = va_arg (args, const char *); - session = (SoupSession *)g_object_new_valist (type, propname, args); + va_start (args, propname); + session = (SoupSession *)g_object_new_valist (SOUP_TYPE_SESSION, propname, args); va_end (args); if (tls_available) { diff --git a/tests/test-utils.h b/tests/test-utils.h index 6da73e41..e44051f3 100644 --- a/tests/test-utils.h +++ b/tests/test-utils.h @@ -51,7 +51,7 @@ typedef enum { SOUP_TEST_REQUEST_CANCEL_AFTER_SEND_FINISH = (1 << 5), } SoupTestRequestFlags; -SoupSession *soup_test_session_new (GType type, ...); +SoupSession *soup_test_session_new (const char *propname, ...); void soup_test_session_abort_unref (SoupSession *session); GBytes *soup_test_session_async_send (SoupSession *session, SoupMessage *msg); diff --git a/tests/timeout-test.c b/tests/timeout-test.c index 38cd7072..434c06ab 100644 --- a/tests/timeout-test.c +++ b/tests/timeout-test.c @@ -121,18 +121,15 @@ do_async_timeout_tests (gconstpointer data) } else extra_slow = FALSE; - timeout_session = soup_test_session_new (SOUP_TYPE_SESSION, - "timeout", extra_slow ? 3 : 1, + timeout_session = soup_test_session_new ("timeout", extra_slow ? 3 : 1, NULL); - idle_session = soup_test_session_new (SOUP_TYPE_SESSION, - "idle-timeout", extra_slow ? 2 : 1, + idle_session = soup_test_session_new ("idle-timeout", extra_slow ? 2 : 1, NULL); /* The "plain" session also has an idle timeout, but it's longer * than the test takes, so for our purposes it should behave like * it has no timeout. */ - plain_session = soup_test_session_new (SOUP_TYPE_SESSION, - "idle-timeout", 20, + plain_session = soup_test_session_new ("idle-timeout", 20, NULL); do_msg_tests_for_session (timeout_session, idle_session, plain_session, @@ -162,12 +159,10 @@ do_sync_timeout_tests (gconstpointer data) } else extra_slow = FALSE; - timeout_session = soup_test_session_new (SOUP_TYPE_SESSION, - "timeout", extra_slow ? 3 : 1, + timeout_session = soup_test_session_new ("timeout", extra_slow ? 3 : 1, NULL); /* SoupSession:timeout doesn't work with sync sessions */ - plain_session = soup_test_session_new (SOUP_TYPE_SESSION, - NULL); + plain_session = soup_test_session_new (NULL); do_msg_tests_for_session (timeout_session, NULL, plain_session, fast_uri, slow_uri); soup_test_session_abort_unref (timeout_session); soup_test_session_abort_unref (plain_session); @@ -226,7 +221,7 @@ main (int argc, char **argv) https_uri = soup_test_server_get_uri (server, "https", "127.0.0.1"); /* The 1-second timeouts are too fast for some machines... */ - test_session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + test_session = soup_test_session_new (NULL); start = g_get_monotonic_time (); #if 0 do_message_to_session (test_session, uri, NULL, SOUP_STATUS_OK); diff --git a/tests/websocket-test.c b/tests/websocket-test.c index ce1b9f81..9c9d9817 100644 --- a/tests/websocket-test.c +++ b/tests/websocket-test.c @@ -266,7 +266,7 @@ client_connect (Test *test, SoupCookieJar *jar; GList *l; - test->session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + test->session = soup_test_session_new (NULL); if (test->enable_extensions) soup_session_add_feature_by_type (test->session, SOUP_TYPE_WEBSOCKET_EXTENSION_MANAGER); @@ -451,7 +451,7 @@ test_handshake_unsupported_extension (Test *test, soup_server_add_websocket_handler (test->soup_server, "/unix", NULL, NULL, got_server_connection, test, NULL); - test->session = soup_test_session_new (SOUP_TYPE_SESSION, NULL); + test->session = soup_test_session_new (NULL); g_signal_connect (test->session, "request-unqueued", G_CALLBACK (request_unqueued), test); |