[gupnp/wip/phako/libsoup3] tests: Add fixtures, use gupnp0 device if it exists
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gupnp/wip/phako/libsoup3] tests: Add fixtures, use gupnp0 device if it exists
- Date: Mon, 27 Dec 2021 10:56:01 +0000 (UTC)
commit d3e2a1a6ef8a38302e12e3da98042d778da538d8
Author: Jens Georg <mail jensge org>
Date: Mon Dec 27 11:55:40 2021 +0100
tests: Add fixtures, use gupnp0 device if it exists
README.md | 12 ++
tests/test-context.c | 496 ++++++++++++++++++++++++++++++---------------------
2 files changed, 302 insertions(+), 206 deletions(-)
---
diff --git a/README.md b/README.md
index 9536432..bcb10de 100644
--- a/README.md
+++ b/README.md
@@ -37,3 +37,15 @@ a brief overview.
The developer documentation is available at https://gnome.pages.gitlab.gnome.org/gupnp/docs/
+
+## Running the tests
+
+The tests usually work on localhost (127.0.0.1 and ::1).
+
+On start-up, the ests will check for a network device called "gupnp0". It it exists, it will
+additonally use that for running the tests.
+
+To create such a device you can use NetworkManager, for example:
+```
+$ mcli c a ifname gupnp0 type dummy ipv4.method link-local ipv6.method link-local
+```
diff --git a/tests/test-context.c b/tests/test-context.c
index 73e5cff..d320398 100644
--- a/tests/test-context.c
+++ b/tests/test-context.c
@@ -14,15 +14,61 @@
#include "libgupnp/gupnp.h"
static GUPnPContext *
-create_context (guint16 port, GError **error) {
+create_context (const char *localhost, guint16 port, GError **error)
+{
return GUPNP_CONTEXT (g_initable_new (GUPNP_TYPE_CONTEXT,
NULL,
error,
- "host-ip", "127.0.0.1",
- "msearch-port", port,
+ "host-ip",
+ localhost,
+ "port",
+ port,
NULL));
}
+
+typedef struct {
+ GMainLoop *loop;
+ GUPnPContext *context;
+ SoupSession *session;
+ char *base_uri;
+} ContextTestFixture;
+
+static void
+test_fixture_setup (ContextTestFixture* tf, gconstpointer user_data)
+{
+ GError *error = NULL;
+
+ tf->context = create_context ((const char *)user_data, 0, &error);
+
+ g_assert_nonnull (tf->context);
+ g_assert_no_error (error);
+
+ tf->loop = g_main_loop_new (NULL, FALSE);
+ tf->session = soup_session_new ();
+
+ GSList *uris =
+ soup_server_get_uris (gupnp_context_get_server (tf->context));
+ g_assert_nonnull (uris);
+ g_assert_cmpint (g_slist_length (uris), ==, 1);
+
+ tf->base_uri = g_uri_to_string (uris->data);
+ g_slist_free_full (uris, (GDestroyNotify) g_uri_unref);
+}
+
+static void
+test_fixture_reardown (ContextTestFixture *tf, gconstpointer user_data)
+{
+ g_free (tf->base_uri);
+ g_object_unref (tf->context);
+
+ // Make sure the source teardown handlers get run so we don't confuse valgrind
+ g_timeout_add (500, (GSourceFunc) g_main_loop_quit, tf->loop);
+ g_main_loop_run (tf->loop);
+ g_main_loop_unref (tf->loop);
+ g_object_unref (tf->session);
+}
+
typedef struct {
GMainLoop *loop;
GBytes *body;
@@ -135,7 +181,7 @@ test_gupnp_context_http_ranged_requests (void)
g_assert (error == NULL);
file_length = g_mapped_file_get_length (file);
- context = create_context (0, &error);
+ context = create_context ("127.0.0.1", 0, &error);
g_assert (context != NULL);
g_assert (error == NULL);
port = gupnp_context_get_port (context);
@@ -360,41 +406,37 @@ test_default_handler_on_read_async (GObject *source,
}
void
-test_gupnp_context_http_default_handler ()
+test_gupnp_context_http_default_handler (ContextTestFixture *tf,
+ gconstpointer user_data)
{
GError *error = NULL;
- GUPnPContext *context = create_context (0, &error);
- g_assert_no_error (error);
- g_assert_nonnull (context);
-
GChecksum *checksum = g_checksum_new (G_CHECKSUM_SHA512);
- GMainLoop *loop = g_main_loop_new (NULL, FALSE);
+ GMainLoop *loop = tf->loop;
- GSList *uris =
- soup_server_get_uris (gupnp_context_get_server (context));
- SoupSession *session = soup_session_new ();
for (int i = 0; i < 10; i++) {
guint32 random = g_random_int ();
g_checksum_update (checksum,
(const guchar *) &random,
sizeof (random));
- char *base = g_uri_to_string (uris->data);
char *new_uri = g_uri_resolve_relative (
- base,
+ tf->base_uri,
g_checksum_get_string (checksum),
G_URI_FLAGS_NONE,
&error);
- g_debug ("Trying to get URI %s", new_uri);
- g_free (base);
+ char *rewritten_uri =
+ gupnp_context_rewrite_uri (tf->context, new_uri);
g_assert_nonnull (new_uri);
g_assert_no_error (error);
-
- SoupMessage *msg = soup_message_new (SOUP_METHOD_GET, new_uri);
g_free (new_uri);
+ g_debug ("Trying to get URI %s", rewritten_uri);
+
+ SoupMessage *msg = soup_message_new (SOUP_METHOD_GET, rewritten_uri);
+ g_free (rewritten_uri);
+
g_checksum_reset (checksum);
soup_session_send_and_read_async (
- session,
+ tf->session,
msg,
G_PRIORITY_DEFAULT,
NULL,
@@ -406,14 +448,8 @@ test_gupnp_context_http_default_handler ()
SOUP_STATUS_NOT_FOUND);
g_object_unref (msg);
}
- g_slist_free_full (uris, (GDestroyNotify) g_uri_unref);
+
g_checksum_free (checksum);
- g_object_unref (context);
- // Make sure the source teardown handlers get run so we don't confuse valgrind
- g_timeout_add (500, (GSourceFunc) g_main_loop_quit, loop);
- g_main_loop_run (loop);
- g_main_loop_unref (loop);
- g_object_unref (session);
}
void
@@ -431,65 +467,58 @@ test_default_language_on_read_async (GObject *source,
}
void
-test_gupnp_context_http_language_default ()
+test_gupnp_context_http_language_default (ContextTestFixture *tf,
+ gconstpointer user_data)
{
GError *error = NULL;
- GUPnPContext *context = create_context (0, &error);
- GMainLoop *loop = g_main_loop_new (NULL, FALSE);
// Default default language
- g_assert_cmpstr (gupnp_context_get_default_language (context),
+ g_assert_cmpstr (gupnp_context_get_default_language (tf->context),
==,
"en");
- GSList *uris =
- soup_server_get_uris (gupnp_context_get_server (context));
- gupnp_context_host_path (context, DATA_PATH "/random4k.bin", "/foo");
- SoupSession *session = soup_session_new ();
- char *base = g_uri_to_string (uris->data);
- char *new_uri =
- g_uri_resolve_relative (base, "foo", G_URI_FLAGS_NONE, &error);
- g_free (base);
+ gupnp_context_host_path (tf->context,
+ DATA_PATH "/random4k.bin",
+ "/foo");
+ char *new_uri = g_uri_resolve_relative (tf->base_uri,
+ "foo",
+ G_URI_FLAGS_NONE,
+ &error);
- SoupMessage *msg = soup_message_new (SOUP_METHOD_GET, new_uri);
- soup_session_set_accept_language (session, NULL);
+ g_assert_no_error (error);
+ char *rewritten_uri = gupnp_context_rewrite_uri (tf->context, new_uri);
g_free (new_uri);
- soup_session_send_and_read_async (session,
+ SoupMessage *msg = soup_message_new (SOUP_METHOD_GET, rewritten_uri);
+ soup_session_set_accept_language (tf->session, NULL);
+ g_free (rewritten_uri);
+
+ soup_session_send_and_read_async (tf->session,
msg,
G_PRIORITY_DEFAULT,
NULL,
test_default_language_on_read_async,
- loop);
- g_main_loop_run (loop);
+ tf->loop);
+ g_main_loop_run (tf->loop);
SoupMessageHeaders *hdrs = soup_message_get_response_headers (msg);
g_assert_cmpint (soup_message_get_status (msg), ==, SOUP_STATUS_OK);
g_assert_null (soup_message_headers_get_one (hdrs, "Content-Language"));
- soup_session_set_accept_language (session, "fr");
- soup_session_send_and_read_async (session,
+ soup_session_set_accept_language (tf->session, "fr");
+ soup_session_send_and_read_async (tf->session,
msg,
G_PRIORITY_DEFAULT,
NULL,
test_default_language_on_read_async,
- loop);
- g_main_loop_run (loop);
+ tf->loop);
+ g_main_loop_run (tf->loop);
hdrs = soup_message_get_response_headers (msg);
g_assert_cmpint (soup_message_get_status (msg), ==, SOUP_STATUS_OK);
g_assert_cmpstr (soup_message_headers_get_one (hdrs, "Content-Language"), ==, "en");
g_object_unref (msg);
- g_slist_free_full (uris, (GDestroyNotify) g_uri_unref);
-
- g_object_unref (context);
-
- // Make sure the source teardown handlers get run so we don't confuse valgrind
- g_timeout_add (500, (GSourceFunc)g_main_loop_quit, loop);
- g_main_loop_run (loop);
- g_main_loop_unref (loop);
- g_object_unref (session);
}
typedef struct _DefaultCallbackData {
@@ -513,27 +542,25 @@ soup_message_default_callback (GObject *source,
}
void
-test_gupnp_context_http_language_serve_file ()
+test_gupnp_context_http_language_serve_file (ContextTestFixture *tf,
+ gconstpointer user_data)
{
GError *error = NULL;
- GUPnPContext *context = create_context (0, &error);
DefaultCallbackData d = { .bytes = NULL, .loop = NULL };
- d.loop = g_main_loop_new (NULL, FALSE);
+ d.loop = tf->loop;
- GSList *uris =
- soup_server_get_uris (gupnp_context_get_server (context));
- gupnp_context_host_path (context, DATA_PATH "/default", "/foo");
- SoupSession *session = soup_session_new ();
- char *base = g_uri_to_string (uris->data);
+ gupnp_context_host_path (tf->context, DATA_PATH "/default", "/foo");
char *new_uri =
- g_uri_resolve_relative (base, "foo", G_URI_FLAGS_NONE, &error);
- g_free (base);
+ g_uri_resolve_relative (tf->base_uri, "foo", G_URI_FLAGS_NONE, &error);
+ g_assert_no_error (error);
+ char *rewritten_uri = gupnp_context_rewrite_uri (tf->context, new_uri);
+ g_free (new_uri);
- SoupMessage *msg = soup_message_new (SOUP_METHOD_GET, new_uri);
- soup_session_set_accept_language (session, NULL);
+ SoupMessage *msg = soup_message_new (SOUP_METHOD_GET, rewritten_uri);
+ soup_session_set_accept_language (tf->session, NULL);
- soup_session_send_and_read_async (session,
+ soup_session_send_and_read_async (tf->session,
msg,
G_PRIORITY_DEFAULT,
NULL,
@@ -552,9 +579,9 @@ test_gupnp_context_http_language_serve_file ()
g_bytes_unref (d.bytes);
g_object_unref (msg);
- msg = soup_message_new (SOUP_METHOD_GET, new_uri);
- soup_session_set_accept_language (session, "de");
- soup_session_send_and_read_async (session,
+ msg = soup_message_new (SOUP_METHOD_GET, rewritten_uri);
+ soup_session_set_accept_language (tf->session, "de");
+ soup_session_send_and_read_async (tf->session,
msg,
G_PRIORITY_DEFAULT,
NULL,
@@ -577,9 +604,9 @@ test_gupnp_context_http_language_serve_file ()
g_object_unref (msg);
- msg = soup_message_new (SOUP_METHOD_GET, new_uri);
- soup_session_set_accept_language (session, "fr");
- soup_session_send_and_read_async (session,
+ msg = soup_message_new (SOUP_METHOD_GET, rewritten_uri);
+ soup_session_set_accept_language (tf->session, "fr");
+ soup_session_send_and_read_async (tf->session,
msg,
G_PRIORITY_DEFAULT,
NULL,
@@ -601,9 +628,9 @@ test_gupnp_context_http_language_serve_file ()
g_bytes_unref (d.bytes);
g_object_unref (msg);
- msg = soup_message_new (SOUP_METHOD_GET, new_uri);
- soup_session_set_accept_language (session, "it");
- soup_session_send_and_read_async (session,
+ msg = soup_message_new (SOUP_METHOD_GET, rewritten_uri);
+ soup_session_set_accept_language (tf->session, "it");
+ soup_session_send_and_read_async (tf->session,
msg,
G_PRIORITY_DEFAULT,
NULL,
@@ -626,39 +653,29 @@ test_gupnp_context_http_language_serve_file ()
g_object_unref (msg);
- g_free (new_uri);
- g_object_unref (context);
- g_slist_free_full (uris, (GDestroyNotify) g_uri_unref);
-
- // Make sure the source teardown handlers get run so we don't confuse valgrind
- g_timeout_add (500, (GSourceFunc) g_main_loop_quit, d.loop);
- g_main_loop_run (d.loop);
- g_main_loop_unref (d.loop);
- g_object_unref (session);
+ g_free (rewritten_uri);
}
void
-test_gupnp_context_http_language_serve_folder ()
+test_gupnp_context_http_language_serve_folder (ContextTestFixture *tf,
+ gconstpointer user_data)
{
GError *error = NULL;
- GUPnPContext *context = create_context (0, &error);
DefaultCallbackData d = { .bytes = NULL, .loop = NULL };
- d.loop = g_main_loop_new (NULL, FALSE);
+ d.loop = tf->loop;
- GSList *uris =
- soup_server_get_uris (gupnp_context_get_server (context));
- gupnp_context_host_path (context, DATA_PATH "/locale/test", "/foo");
- SoupSession *session = soup_session_new ();
- char *base = g_uri_to_string (uris->data);
+ gupnp_context_host_path (tf->context, DATA_PATH "/locale/test", "/foo");
char *new_uri =
- g_uri_resolve_relative (base, "foo/", G_URI_FLAGS_NONE, &error);
- g_free (base);
+ g_uri_resolve_relative (tf->base_uri, "foo/", G_URI_FLAGS_NONE, &error);
+ g_assert_no_error (error);
+ char *rewritten_uri = gupnp_context_rewrite_uri (tf->context, new_uri);
+ g_free (new_uri);
- SoupMessage *msg = soup_message_new (SOUP_METHOD_GET, new_uri);
- soup_session_set_accept_language (session, NULL);
+ SoupMessage *msg = soup_message_new (SOUP_METHOD_GET, rewritten_uri);
+ soup_session_set_accept_language (tf->session, NULL);
- soup_session_send_and_read_async (session,
+ soup_session_send_and_read_async (tf->session,
msg,
G_PRIORITY_DEFAULT,
NULL,
@@ -677,9 +694,9 @@ test_gupnp_context_http_language_serve_folder ()
g_bytes_unref (d.bytes);
g_object_unref (msg);
- msg = soup_message_new (SOUP_METHOD_GET, new_uri);
- soup_session_set_accept_language (session, "de");
- soup_session_send_and_read_async (session,
+ msg = soup_message_new (SOUP_METHOD_GET, rewritten_uri);
+ soup_session_set_accept_language (tf->session, "de");
+ soup_session_send_and_read_async (tf->session,
msg,
G_PRIORITY_DEFAULT,
NULL,
@@ -702,9 +719,9 @@ test_gupnp_context_http_language_serve_folder ()
g_object_unref (msg);
- msg = soup_message_new (SOUP_METHOD_GET, new_uri);
- soup_session_set_accept_language (session, "fr");
- soup_session_send_and_read_async (session,
+ msg = soup_message_new (SOUP_METHOD_GET, rewritten_uri);
+ soup_session_set_accept_language (tf->session, "fr");
+ soup_session_send_and_read_async (tf->session,
msg,
G_PRIORITY_DEFAULT,
NULL,
@@ -726,9 +743,9 @@ test_gupnp_context_http_language_serve_folder ()
g_bytes_unref (d.bytes);
g_object_unref (msg);
- msg = soup_message_new (SOUP_METHOD_GET, new_uri);
- soup_session_set_accept_language (session, "it");
- soup_session_send_and_read_async (session,
+ msg = soup_message_new (SOUP_METHOD_GET, rewritten_uri);
+ soup_session_set_accept_language (tf->session, "it");
+ soup_session_send_and_read_async (tf->session,
msg,
G_PRIORITY_DEFAULT,
NULL,
@@ -750,51 +767,41 @@ test_gupnp_context_http_language_serve_folder ()
g_bytes_unref (d.bytes);
g_object_unref (msg);
-
- g_free (new_uri);
- g_object_unref (context);
- g_slist_free_full (uris, (GDestroyNotify) g_uri_unref);
-
- // Make sure the source teardown handlers get run so we don't confuse valgrind
- g_timeout_add (500, (GSourceFunc) g_main_loop_quit, d.loop);
- g_main_loop_run (d.loop);
- g_main_loop_unref (d.loop);
- g_object_unref (session);
+ g_free (rewritten_uri);
}
void
-test_gupnp_context_http_folder_redirect ()
+test_gupnp_context_http_folder_redirect (ContextTestFixture *tf,
+ gconstpointer user_data)
{
GError *error = NULL;
- GUPnPContext *context = create_context (0, &error);
DefaultCallbackData d = { .bytes = NULL, .loop = NULL };
- d.loop = g_main_loop_new (NULL, FALSE);
+ d.loop = tf->loop;
- GSList *uris =
- soup_server_get_uris (gupnp_context_get_server (context));
- g_assert_no_error (error);
+ gupnp_context_host_path (tf->context, DATA_PATH "/locale", "/foo");
- gupnp_context_host_path (context, DATA_PATH "/locale", "/foo");
-
- SoupSession *session = soup_session_new ();
- char *base = g_uri_to_string (uris->data);
- char *new_uri =
- g_uri_resolve_relative (base, "foo", G_URI_FLAGS_NONE, &error);
- g_free (base);
+ char *new_uri = g_uri_resolve_relative (tf->base_uri,
+ "foo",
+ G_URI_FLAGS_NONE,
+ &error);
+ g_assert_no_error (error);
+ char *rewritten_uri = gupnp_context_rewrite_uri (tf->context, new_uri);
+ g_free (new_uri);
- SoupMessage *msg = soup_message_new (SOUP_METHOD_GET, new_uri);
+ SoupMessage *msg = soup_message_new (SOUP_METHOD_GET, rewritten_uri);
+ g_free (rewritten_uri);
// Do not automatically follow the redirect as we want to check if it happened
soup_message_add_flags (msg, SOUP_MESSAGE_NO_REDIRECT);
- soup_session_send_and_read_async (session,
+ soup_session_send_and_read_async (tf->session,
msg,
G_PRIORITY_DEFAULT,
NULL,
soup_message_default_callback,
&d);
- g_main_loop_run (d.loop);
+ g_main_loop_run (tf->loop);
g_assert_cmpint (soup_message_get_status (msg),
==,
@@ -802,66 +809,55 @@ test_gupnp_context_http_folder_redirect ()
g_assert_nonnull (d.bytes);
g_assert_null (g_bytes_get_data (d.bytes, NULL));
g_bytes_unref (d.bytes);
-
-
- g_slist_free_full (uris, (GDestroyNotify) g_uri_unref);
- g_object_unref (context);
g_object_unref (msg);
- g_free (new_uri);
-
- // Make sure the source teardown handlers get run so we don't confuse valgrind
- g_timeout_add (500, (GSourceFunc) g_main_loop_quit, d.loop);
- g_main_loop_run (d.loop);
- g_main_loop_unref (d.loop);
- g_object_unref (session);
}
void
-test_gupnp_context_host_for_agent ()
+test_gupnp_context_host_for_agent (ContextTestFixture *tf, gconstpointer user_data)
{
GError *error = NULL;
- GUPnPContext *context = create_context (0, &error);
DefaultCallbackData d = { .bytes = NULL, .loop = NULL };
- d.loop = g_main_loop_new (NULL, FALSE);
+ d.loop = tf->loop;
- GSList *uris =
- soup_server_get_uris (gupnp_context_get_server (context));
GRegex *user_agent =
g_regex_new ("GUPnP-Context-Test UA", 0, 0, &error);
g_assert_no_error (error);
g_assert_nonnull (user_agent);
// Cannot host path for a user agent if path is not hosted generally
- g_assert_false (gupnp_context_host_path_for_agent (context,
+ g_assert_false (gupnp_context_host_path_for_agent (tf->context,
DATA_PATH "/default",
"/foo",
user_agent));
- gupnp_context_host_path (context, DATA_PATH "/random4k.bin", "/foo");
+ gupnp_context_host_path (tf->context, DATA_PATH "/random4k.bin", "/foo");
// Hosting agent-specific path must now succeed
- g_assert_true (gupnp_context_host_path_for_agent (context,
+ g_assert_true (gupnp_context_host_path_for_agent (tf->context,
DATA_PATH "/default",
"/foo",
user_agent));
- SoupSession *session = soup_session_new ();
- char *base = g_uri_to_string (uris->data);
- char *new_uri =
- g_uri_resolve_relative (base, "foo", G_URI_FLAGS_NONE, &error);
- g_free (base);
+ char *new_uri = g_uri_resolve_relative (tf->base_uri,
+ "foo",
+ G_URI_FLAGS_NONE,
+ &error);
+
+ g_assert_no_error (error);
+ char *rewritten_uri = gupnp_context_rewrite_uri (tf->context, new_uri);
+ g_free (new_uri);
// Checking wihtout user agent - should return the 4k file
- SoupMessage *msg = soup_message_new (SOUP_METHOD_GET, new_uri);
- soup_session_set_accept_language (session, NULL);
+ SoupMessage *msg = soup_message_new (SOUP_METHOD_GET, rewritten_uri);
+ soup_session_set_accept_language (tf->session, NULL);
- soup_session_send_and_read_async (session,
+ soup_session_send_and_read_async (tf->session,
msg,
G_PRIORITY_DEFAULT,
NULL,
soup_message_default_callback,
&d);
- g_main_loop_run (d.loop);
+ g_main_loop_run (tf->loop);
g_assert_cmpint (soup_message_get_status (msg), ==, SOUP_STATUS_OK);
g_assert_nonnull (d.bytes);
@@ -871,16 +867,16 @@ test_gupnp_context_host_for_agent ()
// Checking with user agent - should return the small file
g_object_unref (msg);
- msg = soup_message_new (SOUP_METHOD_GET, new_uri);
- soup_session_set_user_agent (session, "GUPnP-Context-Test UA");
+ msg = soup_message_new (SOUP_METHOD_GET, rewritten_uri);
+ soup_session_set_user_agent (tf->session, "GUPnP-Context-Test UA");
- soup_session_send_and_read_async (session,
+ soup_session_send_and_read_async (tf->session,
msg,
G_PRIORITY_DEFAULT,
NULL,
soup_message_default_callback,
&d);
- g_main_loop_run (d.loop);
+ g_main_loop_run (tf->loop);
g_assert_cmpint (soup_message_get_status (msg), ==, SOUP_STATUS_OK);
g_assert_nonnull (d.bytes);
@@ -892,19 +888,19 @@ test_gupnp_context_host_for_agent ()
g_object_unref (msg);
- gupnp_context_unhost_path (context, "/foo");
+ gupnp_context_unhost_path (tf->context, "/foo");
// there should be no file anymore for the user agent
- msg = soup_message_new (SOUP_METHOD_GET, new_uri);
- soup_session_set_user_agent (session, "GUPnP-Context-Test UA");
+ msg = soup_message_new (SOUP_METHOD_GET, rewritten_uri);
+ soup_session_set_user_agent (tf->session, "GUPnP-Context-Test UA");
- soup_session_send_and_read_async (session,
+ soup_session_send_and_read_async (tf->session,
msg,
G_PRIORITY_DEFAULT,
NULL,
soup_message_default_callback,
&d);
- g_main_loop_run (d.loop);
+ g_main_loop_run (tf->loop);
g_assert_cmpint (soup_message_get_status (msg),
==,
@@ -915,16 +911,16 @@ test_gupnp_context_host_for_agent ()
g_object_unref (msg);
// there should be no file anymore for the user agent
- msg = soup_message_new (SOUP_METHOD_GET, new_uri);
- soup_session_set_user_agent (session, NULL);
+ msg = soup_message_new (SOUP_METHOD_GET, rewritten_uri);
+ soup_session_set_user_agent (tf->session, NULL);
- soup_session_send_and_read_async (session,
+ soup_session_send_and_read_async (tf->session,
msg,
G_PRIORITY_DEFAULT,
NULL,
soup_message_default_callback,
&d);
- g_main_loop_run (d.loop);
+ g_main_loop_run (tf->loop);
g_assert_cmpint (soup_message_get_status (msg),
==,
@@ -932,51 +928,139 @@ test_gupnp_context_host_for_agent ()
g_assert_nonnull (d.bytes);
g_assert_null (g_bytes_get_data(d.bytes, NULL));
g_bytes_unref (d.bytes);
+ g_free (rewritten_uri);
g_object_unref (msg);
-
- g_slist_free_full (uris, (GDestroyNotify) g_uri_unref);
- g_free (new_uri);
- g_object_unref (context);
g_regex_unref (user_agent);
-
- // Make sure the source teardown handlers get run so we don't confuse valgrind
- g_timeout_add (500, (GSourceFunc) g_main_loop_quit, d.loop);
- g_main_loop_run (d.loop);
- g_main_loop_unref (d.loop);
- g_object_unref (session);
}
-int main (int argc, char *argv[]) {
+int
+main (int argc, char *argv[])
+{
+ GError *error;
+
g_test_init (&argc, &argv, NULL);
- g_test_add_func ("/context/http/ranged-requests",
- test_gupnp_context_http_ranged_requests);
- g_test_add_func ("/context/creation/error-when-bound",
- test_gupnp_context_error_when_bound);
- g_test_add_func ("/context/http/default-handler",
- test_gupnp_context_http_default_handler);
+ GPtrArray *addresses = g_ptr_array_sized_new (2);
+ g_ptr_array_add (addresses, g_strdup ("127.0.0.1"));
+ g_ptr_array_add (addresses, g_strdup ("::1"));
- g_test_add_func ("/context/http/language/default",
- test_gupnp_context_http_language_default);
+ // Detect if there is a special network device with "proper" ip addresses to check also link-local
addresses
+ GUPnPContext *c = g_initable_new (GUPNP_TYPE_CONTEXT,
+ NULL,
+ &error,
+ "interface",
+ "gupnp0",
+ "address-family",
+ G_SOCKET_FAMILY_IPV4,
+ NULL);
+
+ if (c != NULL) {
+ g_ptr_array_add (
+ addresses,
+ g_strdup (gssdp_client_get_host_ip (GSSDP_CLIENT (c))));
+ g_object_unref (c);
+ }
- g_test_add_func ("/context/http/language/serve-file",
- test_gupnp_context_http_language_serve_file);
+ c = g_initable_new (GUPNP_TYPE_CONTEXT,
+ NULL,
+ &error,
+ "interface",
+ "gupnp0",
+ "address-family",
+ G_SOCKET_FAMILY_IPV6,
+ NULL);
+
+ if (c != NULL) {
+ g_ptr_array_add (
+ addresses,
+ g_strdup (gssdp_client_get_host_ip (GSSDP_CLIENT (c))));
+ g_object_unref (c);
+ }
- g_test_add_func ("/context/http/language/serve-folder",
- test_gupnp_context_http_language_serve_folder);
+ g_ptr_array_add (addresses, NULL);
- g_test_add_func ("/context/http/host/folder-rewrite",
- test_gupnp_context_http_folder_redirect);
+ g_test_add_func ("/context/http/ranged-requests",
+ test_gupnp_context_http_ranged_requests);
- g_test_add_func ("/context/http/host/for-agent",
- test_gupnp_context_host_for_agent);
+ g_test_add_func ("/context/creation/error-when-bound",
+ test_gupnp_context_error_when_bound);
g_test_add_func ("/context/utility/rewrite_uri",
test_gupnp_context_rewrite_uri);
- g_test_run ();
- return 0;
+ char **data = (char **)g_ptr_array_free (addresses, FALSE);
+ char **it = data;
+ while (*it != NULL) {
+ char *name = NULL;
+
+ name = g_strdup_printf ("/context/http/default-handler/%s",
+ *it);
+ g_test_add (name,
+ ContextTestFixture,
+ *it,
+ test_fixture_setup,
+ test_gupnp_context_http_default_handler,
+ test_fixture_reardown);
+ g_free (name);
+
+ name = g_strdup_printf ("/context/http/language/default/%s",
+ *it);
+ g_test_add (name,
+ ContextTestFixture,
+ *it,
+ test_fixture_setup,
+ test_gupnp_context_http_language_default,
+ test_fixture_reardown);
+ g_free (name);
+
+ name = g_strdup_printf ("/context/http/language/serve-file/%s",
+ *it);
+ g_test_add (name,
+ ContextTestFixture,
+ *it,
+ test_fixture_setup,
+ test_gupnp_context_http_language_serve_file,
+ test_fixture_reardown);
+ g_free (name);
+
+ name = g_strdup_printf (
+ "/context/http/language/serve-folder/%s",
+ *it);
+ g_test_add (name,
+ ContextTestFixture,
+ *it,
+ test_fixture_setup,
+ test_gupnp_context_http_language_serve_folder,
+ test_fixture_reardown);
+ g_free (name);
+
+ name = g_strdup_printf ("/context/http/host/folder-rewrite/%s",
+ *it);
+ g_test_add (name,
+ ContextTestFixture,
+ *it,
+ test_fixture_setup,
+ test_gupnp_context_http_folder_redirect,
+ test_fixture_reardown);
+ g_free (name);
+
+ name = g_strdup_printf ("/context/http/host/for-agent/%s", *it);
+ g_test_add (name,
+ ContextTestFixture,
+ *it,
+ test_fixture_setup,
+ test_gupnp_context_host_for_agent,
+ test_fixture_reardown);
+ g_free (name);
+ it++;
+ }
+
+ int result = g_test_run ();
+
+ g_strfreev (data);
+
+ return result;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
