SoupServer: add exciting new APIs, deprecate musty old oneswip/server

FIXME: server-howto

1 files changed, 21 insertions, 20 deletions

diff --git a/tests/session-test.c b/tests/session-test.c
index 205885d7..d149d0fd 100644
--- a/tests/session-test.c
+++ b/tests/session-test.c
@@ -25,7 +25,7 @@ server_handler (SoupServer        *server,
 		gpointer           user_data)
 {
 	if (!strcmp (path, "/request-timeout")) {
-		GMainContext *context = soup_server_get_async_context (server);
+		GMainContext *context = g_main_context_get_thread_default ();
 		GSource *timer;
 
 		timer = g_timeout_source_new (100);
@@ -58,7 +58,7 @@ cancel_message_cb (SoupMessage *msg, gpointer session)
 
 static void
 do_test_for_session (SoupSession *session,
-		     const char *uri, const char *timeout_uri,
+		     SoupURI *uri, SoupURI *timeout_uri,
 		     gboolean queue_is_async,
 		     gboolean send_is_blocking,
 		     gboolean cancel_is_immediate)
@@ -69,11 +69,11 @@ do_test_for_session (SoupSession *session,
 
 	debug_printf (1, "  queue_message\n");
 	debug_printf (2, "    requesting timeout\n");
-	msg = soup_message_new ("GET", timeout_uri);
+	msg = soup_message_new_from_uri ("GET", timeout_uri);
 	soup_session_send_message (session, msg);
 	g_object_unref (msg);
 
-	msg = soup_message_new ("GET", uri);
+	msg = soup_message_new_from_uri ("GET", uri);
 	server_processed_message = timeout = finished = FALSE;
 	soup_session_queue_message (session, msg, finished_cb, &finished);
 	while (!timeout)
@@ -107,7 +107,7 @@ do_test_for_session (SoupSession *session,
 	}
 
 	debug_printf (1, "  send_message\n");
-	msg = soup_message_new ("GET", uri);
+	msg = soup_message_new_from_uri ("GET", uri);
 	server_processed_message = local_timeout = FALSE;
 	timeout_id = g_idle_add_full (G_PRIORITY_HIGH, timeout_cb, &local_timeout, NULL);
 	soup_session_send_message (session, msg);
@@ -136,7 +136,7 @@ do_test_for_session (SoupSession *session,
 		return;
 
 	debug_printf (1, "  cancel_message\n");
-	msg = soup_message_new ("GET", uri);
+	msg = soup_message_new_from_uri ("GET", uri);
 	g_object_ref (msg);
 	finished = FALSE;
 	soup_session_queue_message (session, msg, finished_cb, &finished);
@@ -173,7 +173,7 @@ do_test_for_session (SoupSession *session,
 }
 
 static void
-do_plain_tests (char *uri, char *timeout_uri)
+do_plain_tests (SoupURI *uri, SoupURI *timeout_uri)
 {
 	SoupSession *session;
 
@@ -185,7 +185,7 @@ do_plain_tests (char *uri, char *timeout_uri)
 }
 
 static void
-do_async_tests (char *uri, char *timeout_uri)
+do_async_tests (SoupURI *uri, SoupURI *timeout_uri)
 {
 	SoupSession *session;
 
@@ -197,7 +197,7 @@ do_async_tests (char *uri, char *timeout_uri)
 }
 
 static void
-do_sync_tests (char *uri, char *timeout_uri)
+do_sync_tests (SoupURI *uri, SoupURI *timeout_uri)
 {
 	SoupSession *session;
 
@@ -226,7 +226,7 @@ priority_test_finished_cb (SoupSession *session, SoupMessage *msg, gpointer user
 }
 
 static void
-do_priority_tests (char *uri)
+do_priority_tests (SoupURI *uri)
 {
 	SoupSession *session;
 	int i, finished_count = 0;
@@ -245,12 +245,14 @@ do_priority_tests (char *uri)
 	expected_priorities[2] = SOUP_MESSAGE_PRIORITY_LOW;
 
 	for (i = 0; i < 3; i++) {
-		char *msg_uri;
+		SoupURI *msg_uri;
 		SoupMessage *msg;
+		char buf[5];
 
-		msg_uri = g_strdup_printf ("%s/%d", uri, i);
-		msg = soup_message_new ("GET", uri);
-		g_free (msg_uri);
+		g_snprintf (buf, sizeof (buf), "%d", i);
+		msg_uri = soup_uri_new_with_base (uri, buf);
+		msg = soup_message_new_from_uri ("GET", msg_uri);
+		soup_uri_free (msg_uri);
 
 		soup_message_set_priority (msg, priorities[i]);
 		soup_session_queue_message (session, msg, priority_test_finished_cb, &finished_count);
@@ -401,15 +403,14 @@ int
 main (int argc, char **argv)
 {
 	SoupServer *server;
-	char *uri, *timeout_uri;
+	SoupURI *uri, *timeout_uri;
 
 	test_init (argc, argv, NULL);
 
 	server = soup_test_server_new (TRUE);
 	soup_server_add_handler (server, NULL, server_handler, NULL, NULL);
-	uri = g_strdup_printf ("http://127.0.0.1:%u",
-			       soup_server_get_port (server));
-	timeout_uri = g_strdup_printf ("%s/request-timeout", uri);
+	uri = soup_test_server_get_uri (server, "http", NULL);
+	timeout_uri = soup_uri_new_with_base (uri, "/request-timeout");
 
 	do_plain_tests (uri, timeout_uri);
 	do_async_tests (uri, timeout_uri);
@@ -417,8 +418,8 @@ main (int argc, char **argv)
 	do_priority_tests (uri);
 	do_property_tests ();
 
-	g_free (uri);
-	g_free (timeout_uri);
+	soup_uri_free (uri);
+	soup_uri_free (timeout_uri);
 	soup_test_server_quit_unref (server);
 
 	test_cleanup ();