[Opensync-commits] r1004 - trunk/tests

[<svn...@op...>]

Author: bellmich
Date: Mon Mar 23 11:21:24 2009
New Revision: 1004
URL: http://libsyncml.opensync.org/changeset/1004

Log:
integrated Solaris libsoup 2.2 testing

Modified:
   trunk/tests/check_libsoup.c

Modified: trunk/tests/check_libsoup.c
==============================================================================
--- trunk/tests/check_libsoup.c	Wed Mar 18 21:14:53 2009	(r1003)
+++ trunk/tests/check_libsoup.c	Mon Mar 23 11:21:24 2009	(r1004)
@@ -130,6 +130,25 @@
 
 	smlThreadStart(thread);
 
+	/* prepare message */
+
+	SoupMessage *msg = soup_message_new (SOUP_METHOD_POST, "http://127.0.0.1:13001/");
+        soup_message_headers_append(msg->request_headers, "Accept", "text/plain");
+        soup_message_set_request (msg, "text/plain",
+#ifdef HAVE_LIBSOUP22
+		SOUP_BUFFER_SYSTEM_OWNED,
+#else
+		SOUP_MEMORY_TAKE,
+#endif
+		g_memdup("test", 4), 4);
+
+#ifdef HAVE_LIBSOUP22_SOLARIS
+	/* create synchronous client */
+
+	SoupSession *session = soup_session_sync_new();
+	soup_session_send_message(session, msg);
+	client_callback(msg, NULL);
+#else
 	/* create asynchronous client */
 
 	GMainContext *client_ctx = g_main_context_new();
@@ -142,16 +161,8 @@
 					SOUP_SESSION_TIMEOUT, 5,
 					NULL);
 	sml_fail_unless(session != NULL, NULL);
-	SoupMessage *msg = soup_message_new (SOUP_METHOD_POST, "http://127.0.0.1:13001/");
-        soup_message_headers_append(msg->request_headers, "Accept", "text/plain");
-        soup_message_set_request (msg, "text/plain",
-#ifdef HAVE_LIBSOUP22
-		SOUP_BUFFER_SYSTEM_OWNED,
-#else
-		SOUP_MEMORY_TAKE,
-#endif
-		g_memdup("test", 4), 4);
 	soup_session_queue_message(session, msg, client_callback, NULL);
+#endif
 
 	/* wait until message was received by server */
 
@@ -173,9 +184,11 @@
 	/* cleanup */
 	soup_session_abort(session);
 	g_object_unref(session);
+#ifndef HAVE_LIBSOUP22_SOLARIS
 	smlThreadStop(client_thread);
 	smlThreadFree(client_thread);
 	g_main_context_unref(client_ctx);
+#endif
 
 	smlThreadStop(thread);
 	smlThreadFree(thread);