summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auth-test.c8
-rw-r--r--tests/cache-test.c32
-rw-r--r--tests/continue-test.c2
-rw-r--r--tests/hsts-db-test.c5
-rw-r--r--tests/hsts-test.c10
-rw-r--r--tests/misc-test.c2
-rw-r--r--tests/ntlm-test.c10
-rw-r--r--tests/proxy-test.c3
-rw-r--r--tests/server-auth-test.c12
9 files changed, 36 insertions, 48 deletions
diff --git a/tests/auth-test.c b/tests/auth-test.c
index 44b94b43..d5e27b23 100644
--- a/tests/auth-test.c
+++ b/tests/auth-test.c
@@ -900,16 +900,16 @@ do_select_auth_test (void)
basic_auth_domain = soup_auth_domain_basic_new (
"realm", "auth-test",
- "add-path", "/",
"auth-callback", server_basic_auth_callback,
NULL);
+ soup_auth_domain_add_path (basic_auth_domain, "/");
soup_server_add_auth_domain (server, basic_auth_domain);
digest_auth_domain = soup_auth_domain_digest_new (
"realm", "auth-test",
- "add-path", "/",
"auth-callback", server_digest_auth_callback,
NULL);
+ soup_auth_domain_add_path (digest_auth_domain, "/");
soup_server_add_auth_domain (server, digest_auth_domain);
debug_printf (1, " Testing with no auth\n");
@@ -1051,9 +1051,9 @@ do_auth_close_test (void)
basic_auth_domain = soup_auth_domain_basic_new (
"realm", "auth-test",
- "add-path", "/",
"auth-callback", server_basic_auth_callback,
NULL);
+ soup_auth_domain_add_path (basic_auth_domain, "/");
soup_server_add_auth_domain (server, basic_auth_domain);
g_object_unref (basic_auth_domain);
@@ -1178,9 +1178,9 @@ do_disappearing_auth_test (void)
auth_domain = soup_auth_domain_basic_new (
"realm", "auth-test",
- "add-path", "/",
"auth-callback", server_basic_auth_callback,
NULL);
+ soup_auth_domain_add_path (auth_domain, "/");
soup_server_add_auth_domain (server, auth_domain);
g_signal_connect (server, "request-read",
G_CALLBACK (disappear_request_read), NULL);
diff --git a/tests/cache-test.c b/tests/cache-test.c
index 6cfadaad..1a5df948 100644
--- a/tests/cache-test.c
+++ b/tests/cache-test.c
@@ -294,9 +294,8 @@ 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,
- "add-feature", cache,
- NULL);
+ session = soup_test_session_new (SOUP_TYPE_SESSION, NULL);
+ soup_session_add_feature (session, SOUP_SESSION_FEATURE (cache));
g_signal_connect (session, "request-queued",
G_CALLBACK (request_queued), NULL);
@@ -488,9 +487,9 @@ 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,
- "add-feature", cache,
- NULL);
+ session = soup_test_session_new (SOUP_TYPE_SESSION, NULL);
+ soup_session_add_feature (session, SOUP_SESSION_FEATURE (cache));
+
g_signal_connect (session, "request-unqueued",
G_CALLBACK (request_unqueued), NULL);
@@ -521,9 +520,9 @@ do_cancel_test (gconstpointer data)
soup_test_session_abort_unref (session);
- session = soup_test_session_new (SOUP_TYPE_SESSION,
- "add-feature", cache,
- NULL);
+ session = soup_test_session_new (SOUP_TYPE_SESSION, NULL);
+ soup_session_add_feature (session, SOUP_SESSION_FEATURE (cache));
+
g_signal_connect (session, "request-unqueued",
G_CALLBACK (request_unqueued), NULL);
@@ -582,9 +581,8 @@ 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,
- "add-feature", cache,
- NULL);
+ session = soup_test_session_new (SOUP_TYPE_SESSION, NULL);
+ soup_session_add_feature (session, SOUP_SESSION_FEATURE (cache));
last_request_validated = last_request_hit_network = FALSE;
cancelled_requests = 0;
@@ -637,9 +635,8 @@ 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,
- "add-feature", cache,
- NULL);
+ session = soup_test_session_new (SOUP_TYPE_SESSION, NULL);
+ soup_session_add_feature (session, SOUP_SESSION_FEATURE (cache));
g_signal_connect (session, "request-queued",
G_CALLBACK (request_queued), NULL);
@@ -714,9 +711,8 @@ 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,
- "add-feature", cache,
- NULL);
+ session = soup_test_session_new (SOUP_TYPE_SESSION, NULL);
+ soup_session_add_feature (session, SOUP_SESSION_FEATURE (cache));
debug_printf (2, " Initial requests\n");
body = do_request (session, base_uri, "GET", "/1", NULL,
diff --git a/tests/continue-test.c b/tests/continue-test.c
index bea725a7..844c1ad4 100644
--- a/tests/continue-test.c
+++ b/tests/continue-test.c
@@ -520,9 +520,9 @@ setup_server (void)
auth_domain = soup_auth_domain_basic_new (
"realm", "continue-test",
- "add-path", "/auth",
"auth-callback", auth_callback,
NULL);
+ soup_auth_domain_add_path (auth_domain, "/auth");
soup_server_add_auth_domain (server, auth_domain);
g_object_unref (auth_domain);
diff --git a/tests/hsts-db-test.c b/tests/hsts-db-test.c
index 783f8fe4..f1034867 100644
--- a/tests/hsts-db-test.c
+++ b/tests/hsts-db-test.c
@@ -112,9 +112,8 @@ hsts_db_session_new (void)
{
SoupHSTSEnforcer *hsts_db = soup_hsts_enforcer_db_new (DB_FILE);
- SoupSession *session = soup_test_session_new (SOUP_TYPE_SESSION,
- "add-feature", hsts_db,
- NULL);
+ SoupSession *session = soup_test_session_new (SOUP_TYPE_SESSION, 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 bc9a10d0..1f859f7f 100644
--- a/tests/hsts-test.c
+++ b/tests/hsts-test.c
@@ -156,16 +156,12 @@ on_request_queued (SoupSession *session,
static SoupSession *
hsts_session_new (SoupHSTSEnforcer *enforcer)
{
- SoupSession *session;
+ SoupSession *session = session = soup_test_session_new (SOUP_TYPE_SESSION, NULL);
if (enforcer)
- session = soup_test_session_new (SOUP_TYPE_SESSION,
- "add-feature", enforcer,
- NULL);
+ soup_session_add_feature (session, SOUP_SESSION_FEATURE (enforcer));
else
- session = soup_test_session_new (SOUP_TYPE_SESSION,
- "add-feature-by-type", SOUP_TYPE_HSTS_ENFORCER,
- NULL);
+ soup_session_add_feature_by_type (session, SOUP_TYPE_HSTS_ENFORCER);
g_signal_connect (session, "request-queued", G_CALLBACK (on_request_queued), NULL);
diff --git a/tests/misc-test.c b/tests/misc-test.c
index 063fb703..2d06f0c8 100644
--- a/tests/misc-test.c
+++ b/tests/misc-test.c
@@ -676,9 +676,9 @@ main (int argc, char **argv)
auth_domain = soup_auth_domain_basic_new (
"realm", "misc-test",
- "add-path", "/auth",
"auth-callback", auth_callback,
NULL);
+ soup_auth_domain_add_path (auth_domain, "/auth");
soup_server_add_auth_domain (server, auth_domain);
g_object_unref (auth_domain);
diff --git a/tests/ntlm-test.c b/tests/ntlm-test.c
index aca219eb..bf6a2319 100644
--- a/tests/ntlm-test.c
+++ b/tests/ntlm-test.c
@@ -672,9 +672,8 @@ do_retrying_test (TestServer *ts,
debug_printf (1, " /alice\n");
- session = soup_test_session_new (SOUP_TYPE_SESSION,
- "add-feature-by-type", SOUP_TYPE_AUTH_NTLM,
- NULL);
+ session = soup_test_session_new (SOUP_TYPE_SESSION, NULL);
+ soup_session_add_feature_by_type (session, SOUP_TYPE_AUTH_NTLM);
uri = soup_uri_new_with_base (ts->uri, "/alice");
msg = soup_message_new_from_uri ("GET", uri);
@@ -694,9 +693,8 @@ do_retrying_test (TestServer *ts,
debug_printf (1, " /bob\n");
- session = soup_test_session_new (SOUP_TYPE_SESSION,
- "add-feature-by-type", SOUP_TYPE_AUTH_NTLM,
- NULL);
+ session = soup_test_session_new (SOUP_TYPE_SESSION, NULL);
+ soup_session_add_feature_by_type (session, SOUP_TYPE_AUTH_NTLM);
retried = FALSE;
uri = soup_uri_new_with_base (ts->uri, "/bob");
msg = soup_message_new_from_uri ("GET", uri);
diff --git a/tests/proxy-test.c b/tests/proxy-test.c
index ca947e42..938a23b0 100644
--- a/tests/proxy-test.c
+++ b/tests/proxy-test.c
@@ -324,9 +324,8 @@ do_proxy_auth_cache_test (void)
session = soup_test_session_new (SOUP_TYPE_SESSION,
"proxy-resolver", proxy_resolvers[AUTH_PROXY],
- "add-feature", cache,
NULL);
-
+ soup_session_add_feature (session, SOUP_SESSION_FEATURE (cache));
url = g_strconcat (HTTP_SERVER, "/Basic/realm1/", NULL);
debug_printf (1, " GET %s via %s (from network)\n", url, proxy_names[AUTH_PROXY]);
diff --git a/tests/server-auth-test.c b/tests/server-auth-test.c
index f6da2b05..0d57c88c 100644
--- a/tests/server-auth-test.c
+++ b/tests/server-auth-test.c
@@ -346,21 +346,21 @@ main (int argc, char **argv)
auth_domain = soup_auth_domain_basic_new (
"realm", "server-auth-test",
- "add-path", "/Basic",
- "add-path", "/Any",
- "remove-path", "/Any/Not",
"auth-callback", basic_auth_callback,
NULL);
+ soup_auth_domain_add_path (auth_domain, "/Basic");
+ soup_auth_domain_add_path (auth_domain, "/Any");
+ soup_auth_domain_remove_path (auth_domain, "/Any/Not");
soup_server_add_auth_domain (server, auth_domain);
g_object_unref (auth_domain);
auth_domain = soup_auth_domain_digest_new (
"realm", "server-auth-test",
- "add-path", "/Digest",
- "add-path", "/Any",
- "remove-path", "/Any/Not",
"auth-callback", digest_auth_callback,
NULL);
+ soup_auth_domain_add_path (auth_domain, "/Digest");
+ soup_auth_domain_add_path (auth_domain, "/Any");
+ soup_auth_domain_remove_path (auth_domain, "/Any/Not");
soup_server_add_auth_domain (server, auth_domain);
g_object_unref (auth_domain);
View Lorry Controller Status