[libgdata] tests: Replace GDataMock for uhttpmock
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgdata] tests: Replace GDataMock for uhttpmock
- Date: Sun, 27 Oct 2013 23:46:22 +0000 (UTC)
commit 88e22b33cabf5555f3865dd38598f145fbd89d8b
Author: Fabiano Fidêncio <fidencio redhat com>
Date: Sun Sep 15 22:00:11 2013 +0200
tests: Replace GDataMock for uhttpmock
https://bugzilla.gnome.org/show_bug.cgi?id=709691
configure.ac | 5 +
gdata/tests/Makefile.am | 8 +-
gdata/tests/calendar.c | 70 +-
gdata/tests/client-login-authorizer.c | 32 +-
gdata/tests/common.c | 50 +-
gdata/tests/common.h | 20 +-
gdata/tests/contacts.c | 82 +-
gdata/tests/documents.c | 102 +-
gdata/tests/mock-resolver.c | 336 -------
gdata/tests/mock-resolver.h | 58 --
gdata/tests/mock-server.c | 1647 ---------------------------------
gdata/tests/mock-server.h | 92 --
gdata/tests/oauth1-authorizer.c | 44 +-
gdata/tests/picasaweb.c | 82 +-
gdata/tests/youtube.c | 120 ++--
15 files changed, 313 insertions(+), 2435 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b56123d..94d18cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,6 +123,11 @@ AC_SUBST([GNOME_PACKAGES_PRIVATE])
AC_SUBST([GNOME_PACKAGES])
AC_SUBST([GOA_ENABLED])
+dnl ****************************
+dnl Check for uhttpmock
+dnl ****************************
+PKG_CHECK_MODULES(UHTTPMOCK, libuhttpmock-0.0)
+
# Various necessary functions and headers
AC_CHECK_FUNCS([strchr])
AC_CHECK_FUNCS([strstr])
diff --git a/gdata/tests/Makefile.am b/gdata/tests/Makefile.am
index 8e50c29..40f1c5f 100644
--- a/gdata/tests/Makefile.am
+++ b/gdata/tests/Makefile.am
@@ -13,23 +13,21 @@ AM_CFLAGS = \
$(WARN_CFLAGS) \
$(GDATA_CFLAGS) \
$(GNOME_CFLAGS) \
+ $(UHTTPMOCK_CFLAGS) \
$(NULL)
LIBS = \
$(top_builddir)/gdata/libgdata.la \
$(GDK_PIXBUF_LIBS) \
$(GDATA_LIBS) \
- $(GNOME_LIBS)
+ $(GNOME_LIBS) \
+ $(UHTTPMOCK_LIBS)
noinst_PROGRAMS = $(TEST_PROGS)
TEST_SRCS = \
common.c \
common.h \
- mock-resolver.c \
- mock-resolver.h \
- mock-server.c \
- mock-server.h \
$(NULL)
TEST_PROGS += general
diff --git a/gdata/tests/calendar.c b/gdata/tests/calendar.c
index 5bbbf5c..c54ddda 100644
--- a/gdata/tests/calendar.c
+++ b/gdata/tests/calendar.c
@@ -24,7 +24,7 @@
#include "gdata.h"
#include "common.h"
-static GDataMockServer *mock_server = NULL;
+static UhmServer *mock_server = NULL;
typedef struct {
GDataCalendarCalendar *calendar;
@@ -51,7 +51,7 @@ set_up_temp_calendar (TempCalendarData *data, gconstpointer service)
g_assert (GDATA_IS_CALENDAR_CALENDAR (data->calendar));
g_object_unref (calendar);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -64,7 +64,7 @@ tear_down_temp_calendar (TempCalendarData *data, gconstpointer service)
GDATA_ENTRY (data->calendar), NULL, NULL) == TRUE);
g_object_unref (data->calendar);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -96,7 +96,7 @@ test_authentication (void)
g_object_unref (authorizer);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_TEST_FUNCTIONS (authentication, void,
@@ -175,7 +175,7 @@ set_up_query_calendars (QueryCalendarsData *data, gconstpointer service)
g_assert (GDATA_IS_CALENDAR_CALENDAR (data->calendar2));
g_object_unref (calendar);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -192,7 +192,7 @@ tear_down_query_calendars (QueryCalendarsData *data, gconstpointer service)
GDATA_ENTRY (data->calendar2), NULL, NULL) == TRUE);
g_object_unref (data->calendar2);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -212,7 +212,7 @@ test_query_all_calendars (QueryCalendarsData *data, gconstpointer service)
g_object_unref (feed);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_CLOSURE_FUNCTIONS (query_calendars, QueryCalendarsData);
@@ -260,7 +260,7 @@ test_query_all_calendars_async_progress_closure (QueryCalendarsData *query_data,
g_slice_free (GDataAsyncProgressClosure, data);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -280,7 +280,7 @@ test_query_own_calendars (QueryCalendarsData *data, gconstpointer service)
g_object_unref (feed);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_TEST_FUNCTIONS (query_own_calendars, QueryCalendarsData,
@@ -326,7 +326,7 @@ test_query_own_calendars_async_progress_closure (QueryCalendarsData *query_data,
g_slice_free (GDataAsyncProgressClosure, data);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
typedef struct {
@@ -365,7 +365,7 @@ set_up_query_events (QueryEventsData *data, gconstpointer service)
g_assert (GDATA_IS_CALENDAR_EVENT (data->event3));
g_object_unref (event);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -386,7 +386,7 @@ tear_down_query_events (QueryEventsData *data, gconstpointer service)
GDATA_ENTRY (data->event3), NULL, NULL) == TRUE);
g_object_unref (data->event3);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
/* Delete the calendar */
tear_down_temp_calendar ((TempCalendarData*) data, service);
@@ -410,7 +410,7 @@ test_query_events (QueryEventsData *data, gconstpointer service)
g_object_unref (feed);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_CLOSURE_FUNCTIONS (query_events, QueryEventsData);
@@ -457,7 +457,7 @@ test_query_events_async_progress_closure (QueryEventsData *query_data, gconstpoi
g_slice_free (GDataAsyncProgressClosure, data);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
typedef struct {
@@ -482,7 +482,7 @@ tear_down_insert_event (InsertEventData *data, gconstpointer service)
GDATA_ENTRY (data->new_event), NULL, NULL) == TRUE);
g_object_unref (data->new_event);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
/* Delete the calendar too */
tear_down_temp_calendar ((TempCalendarData*) data, service);
@@ -528,7 +528,7 @@ test_event_insert (InsertEventData *data, gconstpointer service)
g_object_unref (event);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_CLOSURE_FUNCTIONS (insert_event, InsertEventData);
@@ -1022,7 +1022,7 @@ set_up_temp_calendar_acls (TempCalendarAclsData *data, gconstpointer service)
g_object_unref (rule);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -1044,7 +1044,7 @@ tear_down_temp_calendar_acls (TempCalendarAclsData *data, gconstpointer service)
g_object_unref (data->rule);
}
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
/* Delete the calendar */
tear_down_temp_calendar ((TempCalendarData*) data, service);
@@ -1068,7 +1068,7 @@ test_access_rule_get (TempCalendarAclsData *data, gconstpointer service)
g_object_unref (feed);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -1121,7 +1121,7 @@ test_access_rule_insert (TempCalendarAclsData *data, gconstpointer service)
g_object_unref (rule);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -1154,7 +1154,7 @@ test_access_rule_update (TempCalendarAclsData *data, gconstpointer service)
g_object_unref (new_rule);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -1175,7 +1175,7 @@ test_access_rule_delete (TempCalendarAclsData *data, gconstpointer service)
g_object_unref (data->rule);
data->rule = NULL;
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -1290,7 +1290,7 @@ test_batch (gconstpointer service)
g_object_unref (operation);
g_object_unref (inserted_entry3);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
typedef struct {
@@ -1316,7 +1316,7 @@ setup_batch_async (BatchAsyncData *data, gconstpointer service)
g_object_unref (event);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -1356,7 +1356,7 @@ test_batch_async (BatchAsyncData *data, gconstpointer service)
g_main_loop_unref (main_loop);
g_object_unref (operation);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -1405,7 +1405,7 @@ test_batch_async_cancellation (BatchAsyncData *data, gconstpointer service)
g_object_unref (cancellable);
g_object_unref (operation);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -1423,25 +1423,25 @@ teardown_batch_async (BatchAsyncData *data, gconstpointer service)
g_object_unref (data->new_event);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
mock_server_notify_resolver_cb (GObject *object, GParamSpec *pspec, gpointer user_data)
{
- GDataMockServer *server;
- GDataMockResolver *resolver;
+ UhmServer *server;
+ UhmResolver *resolver;
- server = GDATA_MOCK_SERVER (object);
+ server = UHM_SERVER (object);
/* Set up the expected domain names here. This should technically be split up between
* the different unit test suites, but that's too much effort. */
- resolver = gdata_mock_server_get_resolver (server);
+ resolver = uhm_server_get_resolver (server);
if (resolver != NULL) {
- const gchar *ip_address = soup_address_get_physical (gdata_mock_server_get_address (server));
+ const gchar *ip_address = uhm_server_get_address (server);
- gdata_mock_resolver_add_A (resolver, "www.google.com", ip_address);
+ uhm_resolver_add_A (resolver, "www.google.com", ip_address);
}
}
@@ -1458,13 +1458,13 @@ main (int argc, char *argv[])
mock_server = gdata_test_get_mock_server ();
g_signal_connect (G_OBJECT (mock_server), "notify::resolver", (GCallback)
mock_server_notify_resolver_cb, NULL);
trace_directory = g_file_new_for_path (TEST_FILE_DIR "traces/calendar");
- gdata_mock_server_set_trace_directory (mock_server, trace_directory);
+ uhm_server_set_trace_directory (mock_server, trace_directory);
g_object_unref (trace_directory);
gdata_test_mock_server_start_trace (mock_server, "global-authentication");
authorizer = GDATA_AUTHORIZER (gdata_client_login_authorizer_new (CLIENT_ID,
GDATA_TYPE_CALENDAR_SERVICE));
gdata_client_login_authorizer_authenticate (GDATA_CLIENT_LOGIN_AUTHORIZER (authorizer), USERNAME,
PASSWORD, NULL, NULL);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
service = GDATA_SERVICE (gdata_calendar_service_new (authorizer));
diff --git a/gdata/tests/client-login-authorizer.c b/gdata/tests/client-login-authorizer.c
index 6c8a87a..78211ac 100644
--- a/gdata/tests/client-login-authorizer.c
+++ b/gdata/tests/client-login-authorizer.c
@@ -23,7 +23,7 @@
#include "common.h"
static GThread *main_thread = NULL;
-static GDataMockServer *mock_server = NULL;
+static UhmServer *mock_server = NULL;
static void
test_client_login_authorizer_constructor (void)
@@ -142,7 +142,7 @@ set_up_client_login_authorizer_data_authenticated (ClientLoginAuthorizerData *da
g_assert (gdata_client_login_authorizer_authenticate (data->authorizer, USERNAME, PASSWORD, NULL,
NULL) == TRUE);
connect_to_client_login_authorizer (data);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -342,7 +342,7 @@ test_client_login_authorizer_authenticate_sync (ClientLoginAuthorizerData *data,
post_test_authentication (data, TRUE);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
/* Test that authentication using an incorrect password fails */
@@ -365,7 +365,7 @@ test_client_login_authorizer_authenticate_sync_bad_password (ClientLoginAuthoriz
post_test_authentication (data, FALSE);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
/* Test that authentication against multiple authorization domains simultaneously and synchronously works */
@@ -391,7 +391,7 @@ test_client_login_authorizer_authenticate_sync_multiple_domains (ClientLoginAuth
post_test_authentication (data, TRUE);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
/* Test that synchronous authentication can be cancelled */
@@ -420,7 +420,7 @@ test_client_login_authorizer_authenticate_sync_cancellation (ClientLoginAuthoriz
g_object_unref (cancellable);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
typedef struct {
@@ -500,7 +500,7 @@ test_client_login_authorizer_authenticate_async (ClientLoginAuthorizerAsyncData
g_main_loop_run (data->main_loop);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -539,7 +539,7 @@ test_client_login_authorizer_authenticate_async_multiple_domains (ClientLoginAut
g_main_loop_run (data->main_loop);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -582,7 +582,7 @@ test_client_login_authorizer_authenticate_async_cancellation (ClientLoginAuthori
g_object_unref (cancellable);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
/* Test that gdata_authorizer_refresh_authorization() is a no-op (when authorised or not) */
@@ -705,19 +705,19 @@ test_client_login_authorizer_process_request_insecure (ClientLoginAuthorizerData
static void
mock_server_notify_resolver_cb (GObject *object, GParamSpec *pspec, gpointer user_data)
{
- GDataMockServer *server;
- GDataMockResolver *resolver;
+ UhmServer *server;
+ UhmResolver *resolver;
- server = GDATA_MOCK_SERVER (object);
+ server = UHM_SERVER (object);
/* Set up the expected domain names here. This should technically be split up between
* the different unit test suites, but that's too much effort. */
- resolver = gdata_mock_server_get_resolver (server);
+ resolver = uhm_server_get_resolver (server);
if (resolver != NULL) {
- const gchar *ip_address = soup_address_get_physical (gdata_mock_server_get_address (server));
+ const gchar *ip_address = uhm_server_get_address (server);
- gdata_mock_resolver_add_A (resolver, "www.google.com", ip_address);
+ uhm_resolver_add_A (resolver, "www.google.com", ip_address);
}
}
@@ -731,7 +731,7 @@ main (int argc, char *argv[])
mock_server = gdata_test_get_mock_server ();
g_signal_connect (G_OBJECT (mock_server), "notify::resolver", (GCallback)
mock_server_notify_resolver_cb, NULL);
trace_directory = g_file_new_for_path (TEST_FILE_DIR "traces/client-login-authorizer");
- gdata_mock_server_set_trace_directory (mock_server, trace_directory);
+ uhm_server_set_trace_directory (mock_server, trace_directory);
g_object_unref (trace_directory);
main_thread = g_thread_self ();
diff --git a/gdata/tests/common.c b/gdata/tests/common.c
index 72e4417..a519476 100644
--- a/gdata/tests/common.c
+++ b/gdata/tests/common.c
@@ -25,7 +25,6 @@
#include <libxml/xmlsave.h>
#include "common.h"
-#include "mock-server.h"
/* %TRUE if interactive tests should be skipped because we're running automatically (for example) */
static gboolean no_interactive = FALSE;
@@ -49,11 +48,13 @@ static gboolean write_traces = FALSE;
static gboolean compare_traces = FALSE;
/* Global mock server instance used by all tests. */
-static GDataMockServer *mock_server = NULL;
+static UhmServer *mock_server = NULL;
void
gdata_test_init (int argc, char **argv)
{
+ GTlsCertificate *cert;
+ GError *child_error = NULL;
gint i;
#if !GLIB_CHECK_VERSION (2, 35, 0)
@@ -126,21 +127,28 @@ gdata_test_init (int argc, char **argv)
g_setenv ("G_MESSAGES_DEBUG", "libgdata", FALSE);
g_setenv ("LIBGDATA_LAX_SSL_CERTIFICATES", "1", FALSE);
- mock_server = gdata_mock_server_new ();
- gdata_mock_server_set_enable_logging (mock_server, write_traces);
- gdata_mock_server_set_enable_online (mock_server, write_traces || compare_traces);
+ mock_server = uhm_server_new ();
+ uhm_server_set_enable_logging (mock_server, write_traces);
+ uhm_server_set_enable_online (mock_server, write_traces || compare_traces);
+
+ /* Build the certificate. */
+ cert = g_tls_certificate_new_from_files (TEST_FILE_DIR "cert.pem", TEST_FILE_DIR "key.pem",
&child_error);
+ g_assert_no_error (child_error);
+ /* Set it as the property. */
+ uhm_server_set_tls_certificate (mock_server, cert);
+ g_object_unref (cert);
}
/*
* gdata_test_get_mock_server:
*
- * Returns the singleton #GDataMockServer instance used throughout the test suite.
+ * Returns the singleton #UhmServer instance used throughout the test suite.
*
* Return value: (transfer none): the mock server
*
* Since: 0.13.4
*/
-GDataMockServer *
+UhmServer *
gdata_test_get_mock_server (void)
{
return mock_server;
@@ -911,7 +919,7 @@ gdata_test_debug_handler (const gchar *log_domain, GLogLevelFlags log_level, con
/* Log to the trace file. */
if (message != NULL && (*message == '<' || *message == '>' || *message == ' ') && *(message + 1) == '
') {
- gdata_mock_server_received_message_chunk (mock_server, message, strlen (message));
+ uhm_server_received_message_chunk (mock_server, message, strlen (message), NULL);
}
}
@@ -924,7 +932,7 @@ gdata_test_assert_handler (const gchar *message)
/**
* gdata_test_set_https_port:
- * @server: a #GDataMockServer
+ * @server: a #UhmServer
*
* Sets the HTTPS port used for all future libgdata requests to that used by the given mock @server,
* effectively redirecting all client requests to the mock server.
@@ -932,44 +940,44 @@ gdata_test_assert_handler (const gchar *message)
* Since: 0.13.4
*/
void
-gdata_test_set_https_port (GDataMockServer *server)
+gdata_test_set_https_port (UhmServer *server)
{
- gchar *port_string = g_strdup_printf ("%u", gdata_mock_server_get_port (server));
+ gchar *port_string = g_strdup_printf ("%u", uhm_server_get_port (server));
g_setenv ("LIBGDATA_HTTPS_PORT", port_string, TRUE);
g_free (port_string);
}
/**
* gdata_test_mock_server_start_trace:
- * @server: a #GDataMockServer
+ * @server: a #UhmServer
* @trace_filename: filename of the trace to load
*
- * Wrapper around gdata_mock_server_start_trace() which additionally sets the <code
class="literal">LIBGDATA_HTTPS_PORT</code>
+ * Wrapper around uhm_server_start_trace() which additionally sets the <code
class="literal">LIBGDATA_HTTPS_PORT</code>
* environment variable to redirect all libgdata requests to the mock server.
*
* Since: 0.13.4
*/
void
-gdata_test_mock_server_start_trace (GDataMockServer *server, const gchar *trace_filename)
+gdata_test_mock_server_start_trace (UhmServer *server, const gchar *trace_filename)
{
- gdata_mock_server_start_trace (server, trace_filename);
+ uhm_server_start_trace (server, trace_filename, NULL);
gdata_test_set_https_port (server);
}
/**
* gdata_test_mock_server_handle_message_error:
- * @server: a #GDataMockServer
+ * @server: a #UhmServer
* @message: the message whose response should be filled
* @client: the currently connected client
* @user_data: user data provided when connecting the signal
*
- * Handler for #GDataMockServer::handle-message which sets the HTTP response for @message to the HTTP error
status
+ * Handler for #UhmServer::handle-message which sets the HTTP response for @message to the HTTP error status
* specified in a #GDataTestRequestErrorData structure passed to @user_data.
*
* Since: 0.13.4
*/
gboolean
-gdata_test_mock_server_handle_message_error (GDataMockServer *server, SoupMessage *message,
SoupClientContext *client, gpointer user_data)
+gdata_test_mock_server_handle_message_error (UhmServer *server, SoupMessage *message, SoupClientContext
*client, gpointer user_data)
{
const GDataTestRequestErrorData *data = user_data;
@@ -981,19 +989,19 @@ gdata_test_mock_server_handle_message_error (GDataMockServer *server, SoupMessag
/**
* gdata_test_mock_server_handle_message_timeout:
- * @server: a #GDataMockServer
+ * @server: a #UhmServer
* @message: the message whose response should be filled
* @client: the currently connected client
* @user_data: user data provided when connecting the signal
*
- * Handler for #GDataMockServer::handle-message which waits for 2 seconds before returning a
%SOUP_STATUS_REQUEST_TIMEOUT status
+ * Handler for #UhmServer::handle-message which waits for 2 seconds before returning a
%SOUP_STATUS_REQUEST_TIMEOUT status
* and appropriate error message body. If used in conjunction with a 1 second timeout in the client code
under test, this can
* simulate network error conditions and timeouts, in order to test the error handling code for such
conditions.
*
* Since: 0.13.4
*/
gboolean
-gdata_test_mock_server_handle_message_timeout (GDataMockServer *server, SoupMessage *message,
SoupClientContext *client, gpointer user_data)
+gdata_test_mock_server_handle_message_timeout (UhmServer *server, SoupMessage *message, SoupClientContext
*client, gpointer user_data)
{
/* Sleep for longer than the timeout set on the client. */
g_usleep (2 * G_USEC_PER_SEC);
diff --git a/gdata/tests/common.h b/gdata/tests/common.h
index 1159ef5..38f274c 100644
--- a/gdata/tests/common.h
+++ b/gdata/tests/common.h
@@ -20,7 +20,7 @@
#include <glib.h>
#include <gdata/gdata.h>
-#include "mock-server.h"
+#include <uhttpmock/uhm.h>
#ifndef GDATA_TEST_COMMON_H
#define GDATA_TEST_COMMON_H
@@ -48,7 +48,7 @@ G_BEGIN_DECLS
void gdata_test_init (int argc, char **argv);
-GDataMockServer *gdata_test_get_mock_server (void) G_GNUC_WARN_UNUSED_RESULT;
+UhmServer *gdata_test_get_mock_server (void) G_GNUC_WARN_UNUSED_RESULT;
gboolean gdata_test_interactive (void);
@@ -184,7 +184,7 @@ tear_down_##CLOSURE_NAME##_async (GDataAsyncTestData *async_data, gconstpointer
* <function>test_<replaceable>TEST_NAME</replaceable>_async</function> and
* <function>test_<replaceable>TEST_NAME</replaceable>_async_cancellation</function>.
*
- * These functions assume the existence of a <varname>mock_server</varname> variable which points to the
current #GDataMockServer instance. They
+ * These functions assume the existence of a <varname>mock_server</varname> variable which points to the
current #UhmServer instance. They
* will automatically use traces <varname><replaceable>TEST_NAME</replaceable>-async</varname> and
* <varname><replaceable>TEST_NAME</replaceable>-async-cancellation</varname>.
*
@@ -242,7 +242,7 @@ test_##TEST_NAME##_async (GDataAsyncTestData *async_data, gconstpointer service)
\
g_main_loop_run (async_data->main_loop); \
\
- gdata_mock_server_end_trace (mock_server); \
+ uhm_server_end_trace (mock_server); \
} \
\
static void \
@@ -295,7 +295,7 @@ test_##TEST_NAME##_async_cancellation (GDataAsyncTestData *async_data, gconstpoi
async_data->cancellation_timeout *= GDATA_ASYNC_TIMEOUT_MULTIPLIER; \
} \
\
- gdata_mock_server_end_trace (mock_server); \
+ uhm_server_end_trace (mock_server); \
} while (async_data->cancellation_successful == TRUE); \
\
/* Clean up the last timeout callback */ \
@@ -319,7 +319,7 @@ void gdata_test_debug_output (void);
* @error_domain_func: constant function returning the #GQuark for the expected error domain
* @error_code: expected error code
*
- * A mapping between a HTTP response emitted by a #GDataMockServer and the error expected to be thrown by
the HTTP client.
+ * A mapping between a HTTP response emitted by a #UhmServer and the error expected to be thrown by the HTTP
client.
* This is designed for testing error handling in the client code, typically by running a single request
through an array
* of these such mappings and testing the client code throws the correct error in each case.
*
@@ -335,10 +335,10 @@ typedef struct {
gint error_code;
} GDataTestRequestErrorData;
-void gdata_test_set_https_port (GDataMockServer *server);
-void gdata_test_mock_server_start_trace (GDataMockServer *server, const gchar *trace_filename);
-gboolean gdata_test_mock_server_handle_message_error (GDataMockServer *server, SoupMessage *message,
SoupClientContext *client, gpointer user_data);
-gboolean gdata_test_mock_server_handle_message_timeout (GDataMockServer *server, SoupMessage *message,
SoupClientContext *client, gpointer user_data);
+void gdata_test_set_https_port (UhmServer *server);
+void gdata_test_mock_server_start_trace (UhmServer *server, const gchar *trace_filename);
+gboolean gdata_test_mock_server_handle_message_error (UhmServer *server, SoupMessage *message,
SoupClientContext *client, gpointer user_data);
+gboolean gdata_test_mock_server_handle_message_timeout (UhmServer *server, SoupMessage *message,
SoupClientContext *client, gpointer user_data);
G_END_DECLS
diff --git a/gdata/tests/contacts.c b/gdata/tests/contacts.c
index e240993..0b3e973 100644
--- a/gdata/tests/contacts.c
+++ b/gdata/tests/contacts.c
@@ -24,7 +24,7 @@
#include "gdata.h"
#include "common.h"
-static GDataMockServer *mock_server = NULL;
+static UhmServer *mock_server = NULL;
typedef struct {
GDataContactsContact *contact;
@@ -48,10 +48,10 @@ set_up_temp_contact (TempContactData *data, gconstpointer service)
g_object_unref (contact);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
/* HACK. Wait for the server to propagate distributed changes. */
- if (gdata_mock_server_get_enable_online (mock_server) == TRUE) {
+ if (uhm_server_get_enable_online (mock_server) == TRUE) {
sleep (10);
}
}
@@ -77,7 +77,7 @@ tear_down_temp_contact (TempContactData *data, gconstpointer service)
g_object_unref (updated_contact);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_CLOSURE_FUNCTIONS (temp_contact, TempContactData);
@@ -111,7 +111,7 @@ test_authentication (void)
g_object_unref (authorizer);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_TEST_FUNCTIONS (authentication, void,
@@ -183,11 +183,11 @@ set_up_query_all_contacts (QueryAllContactsData *data, gconstpointer service)
data->contact3 = gdata_contacts_service_insert_contact (GDATA_CONTACTS_SERVICE (service), contact,
NULL, NULL);
g_object_unref (contact);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
/* It takes a few seconds for the contacts to reliably propagate around Google's servers. Distributed
systems are so fun. Not.
* Thankfully, we don't have to wait when running against the mock server. */
- if (gdata_mock_server_get_enable_online (mock_server) == TRUE) {
+ if (uhm_server_get_enable_online (mock_server) == TRUE) {
g_usleep (G_USEC_PER_SEC * 5);
}
}
@@ -210,7 +210,7 @@ tear_down_query_all_contacts (QueryAllContactsData *data, gconstpointer service)
GDATA_ENTRY (data->contact3), NULL, NULL) == TRUE);
g_object_unref (data->contact3);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -230,7 +230,7 @@ test_query_all_contacts (QueryAllContactsData *data, gconstpointer service)
g_object_unref (feed);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_CLOSURE_FUNCTIONS (query_all_contacts, QueryAllContactsData);
@@ -277,7 +277,7 @@ test_query_all_contacts_async_progress_closure (QueryAllContactsData *query_data
g_slice_free (GDataAsyncProgressClosure, data);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
typedef struct {
@@ -301,7 +301,7 @@ tear_down_insert (InsertData *data, gconstpointer service)
g_object_unref (data->new_contact);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -445,7 +445,7 @@ test_contact_insert (InsertData *data, gconstpointer service)
* servers can allow this to happen. Somehow.
* This check isn't run when testing against a mock server because the dates in the trace file may be
waaaay out of date. */
edited = gdata_contacts_contact_get_edited (contact);
- if (gdata_mock_server_get_enable_online (mock_server) == TRUE) {
+ if (uhm_server_get_enable_online (mock_server) == TRUE) {
creation_time = gdata_contacts_contact_get_edited (new_contact);
g_assert_cmpint (creation_time + TIME_FUZZINESS, >=, edited);
g_assert_cmpint (creation_time - TIME_FUZZINESS, <=, edited);
@@ -578,7 +578,7 @@ test_contact_insert (InsertData *data, gconstpointer service)
g_object_unref (contact);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -609,7 +609,7 @@ test_contact_update (TempContactData *data, gconstpointer service)
g_object_unref (new_contact);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
typedef struct {
@@ -643,10 +643,10 @@ set_up_query_all_groups (QueryAllGroupsData *data, gconstpointer service)
g_assert (GDATA_IS_CONTACTS_GROUP (data->group3));
g_object_unref (group);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
/* HACK! Guess what? Distributed system inconsistency strikes again! */
- if (gdata_mock_server_get_enable_online (mock_server) == TRUE) {
+ if (uhm_server_get_enable_online (mock_server) == TRUE) {
sleep (10);
}
}
@@ -668,7 +668,7 @@ tear_down_query_all_groups (QueryAllGroupsData *data, gconstpointer service)
GDATA_ENTRY (data->group3), NULL, NULL) == TRUE);
g_object_unref (data->group3);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -688,7 +688,7 @@ test_query_all_groups (QueryAllGroupsData *data, gconstpointer service)
g_object_unref (feed);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_CLOSURE_FUNCTIONS (query_all_groups, QueryAllGroupsData);
@@ -736,7 +736,7 @@ test_query_all_groups_async_progress_closure (QueryAllGroupsData *query_data, gc
g_slice_free (GDataAsyncProgressClosure, data);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
typedef struct {
@@ -753,7 +753,7 @@ static void
tear_down_insert_group (InsertGroupData *data, gconstpointer service)
{
/* HACK! Distributed systems suck. */
- if (gdata_mock_server_get_enable_online (mock_server) == TRUE) {
+ if (uhm_server_get_enable_online (mock_server) == TRUE) {
sleep (10);
}
@@ -764,7 +764,7 @@ tear_down_insert_group (InsertGroupData *data, gconstpointer service)
GDATA_ENTRY (data->new_group), NULL, NULL) == TRUE);
g_object_unref (data->new_group);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -798,7 +798,7 @@ test_group_insert (InsertGroupData *data, gconstpointer service)
/* Check the properties. Time-based properties can't be checked when running against a mock server,
since
* the trace files may be quite old. */
- if (gdata_mock_server_get_enable_online (mock_server) == TRUE) {
+ if (uhm_server_get_enable_online (mock_server) == TRUE) {
g_assert_cmpint (gdata_contacts_group_get_edited (new_group), >=, time_val.tv_sec);
}
g_assert (gdata_contacts_group_is_deleted (new_group) == FALSE);
@@ -811,7 +811,7 @@ test_group_insert (InsertGroupData *data, gconstpointer service)
g_object_unref (group);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_CLOSURE_FUNCTIONS (insert_group, InsertGroupData);
@@ -2012,7 +2012,7 @@ test_photo_add (TempContactData *data, gconstpointer service)
g_clear_error (&error);
g_free (photo_data);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_TEST_FUNCTIONS (photo_add, TempContactData,
@@ -2067,7 +2067,7 @@ add_photo_to_contact (GDataContactsService *service, GDataContactsContact **cont
/* HACK: It fairly consistently seems to take the Google servers about 4 seconds to process uploaded
photos. Before this
* time, a query for the photo will return an error. So let's wait for 10.
* Helps: bgo#679072 */
- if (gdata_mock_server_get_enable_online (mock_server) == TRUE) {
+ if (uhm_server_get_enable_online (mock_server) == TRUE) {
sleep (10);
}
@@ -2090,7 +2090,7 @@ set_up_temp_contact_with_photo (TempContactWithPhotoData *data, gconstpointer se
gdata_test_mock_server_start_trace (mock_server, "setup-temp-contact-with-photo");
add_photo_to_contact (GDATA_CONTACTS_SERVICE (service), &data->contact);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -2126,7 +2126,7 @@ test_photo_get (TempContactData *data, gconstpointer service)
g_free (photo_data);
g_clear_error (&error);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_TEST_FUNCTIONS (photo_get, TempContactData,
@@ -2178,7 +2178,7 @@ test_photo_delete (TempContactData *data, gconstpointer service)
g_clear_error (&error);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_TEST_FUNCTIONS (photo_delete, TempContactData,
@@ -2317,7 +2317,7 @@ test_batch (gconstpointer service)
/*g_object_unref (operation);*/
g_object_unref (inserted_entry3);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
typedef struct {
@@ -2343,7 +2343,7 @@ setup_batch_async (BatchAsyncData *data, gconstpointer service)
g_object_unref (contact);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -2383,7 +2383,7 @@ test_batch_async (BatchAsyncData *data, gconstpointer service)
g_main_loop_unref (main_loop);
g_object_unref (operation);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -2432,7 +2432,7 @@ test_batch_async_cancellation (BatchAsyncData *data, gconstpointer service)
g_object_unref (cancellable);
g_object_unref (operation);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -2450,7 +2450,7 @@ teardown_batch_async (BatchAsyncData *data, gconstpointer service)
g_object_unref (data->new_contact);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -2532,19 +2532,19 @@ test_contact_id (void)
static void
mock_server_notify_resolver_cb (GObject *object, GParamSpec *pspec, gpointer user_data)
{
- GDataMockServer *server;
- GDataMockResolver *resolver;
+ UhmServer *server;
+ UhmResolver *resolver;
- server = GDATA_MOCK_SERVER (object);
+ server = UHM_SERVER (object);
/* Set up the expected domain names here. This should technically be split up between
* the different unit test suites, but that's too much effort. */
- resolver = gdata_mock_server_get_resolver (server);
+ resolver = uhm_server_get_resolver (server);
if (resolver != NULL) {
- const gchar *ip_address = soup_address_get_physical (gdata_mock_server_get_address (server));
+ const gchar *ip_address = uhm_server_get_address (server);
- gdata_mock_resolver_add_A (resolver, "www.google.com", ip_address);
+ uhm_resolver_add_A (resolver, "www.google.com", ip_address);
}
}
@@ -2561,13 +2561,13 @@ main (int argc, char *argv[])
mock_server = gdata_test_get_mock_server ();
g_signal_connect (G_OBJECT (mock_server), "notify::resolver", (GCallback)
mock_server_notify_resolver_cb, NULL);
trace_directory = g_file_new_for_path (TEST_FILE_DIR "traces/contacts");
- gdata_mock_server_set_trace_directory (mock_server, trace_directory);
+ uhm_server_set_trace_directory (mock_server, trace_directory);
g_object_unref (trace_directory);
gdata_test_mock_server_start_trace (mock_server, "global-authentication");
authorizer = GDATA_AUTHORIZER (gdata_client_login_authorizer_new (CLIENT_ID,
GDATA_TYPE_CONTACTS_SERVICE));
gdata_client_login_authorizer_authenticate (GDATA_CLIENT_LOGIN_AUTHORIZER (authorizer), USERNAME,
PASSWORD, NULL, NULL);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
service = GDATA_SERVICE (gdata_contacts_service_new (authorizer));
diff --git a/gdata/tests/documents.c b/gdata/tests/documents.c
index c3033f8..3b90370 100644
--- a/gdata/tests/documents.c
+++ b/gdata/tests/documents.c
@@ -30,7 +30,7 @@
#include "gdata.h"
#include "common.h"
-static GDataMockServer *mock_server = NULL;
+static UhmServer *mock_server = NULL;
static gboolean
check_document_is_in_folder (GDataDocumentsDocument *document, GDataDocumentsFolder *folder)
@@ -137,7 +137,7 @@ test_authentication (void)
g_object_unref (authorizer);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_TEST_FUNCTIONS (authentication, void,
@@ -209,7 +209,7 @@ set_up_temp_folder (TempFolderData *data, gconstpointer service)
g_free (upload_uri);
g_object_unref (folder);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -222,7 +222,7 @@ tear_down_temp_folder (TempFolderData *data, gconstpointer service)
g_object_unref (data->folder);
}
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
typedef struct {
@@ -272,7 +272,7 @@ _set_up_temp_document (GDataDocumentsEntry *entry, GDataService *service, GFile
/* HACK: Query for the new document, as Google's servers appear to modify it behind our back when
creating the document:
* http://code.google.com/a/google.com/p/apps-api-issues/issues/detail?id=2337. We have to wait a few
seconds before trying this to allow the
* various Google servers to catch up with each other. Thankfully, we don't have to wait when running
against the mock server. */
- if (gdata_mock_server_get_enable_online (mock_server) == TRUE) {
+ if (uhm_server_get_enable_online (mock_server) == TRUE) {
g_usleep (5 * G_USEC_PER_SEC);
}
@@ -309,7 +309,7 @@ set_up_temp_document_spreadsheet (TempDocumentData *data, gconstpointer service)
g_object_unref (document_file);
g_object_unref (document);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -322,7 +322,7 @@ tear_down_temp_document (TempDocumentData *data, gconstpointer service)
g_object_unref (data->document);
}
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -357,7 +357,7 @@ test_delete_folder (TempFolderData *data, gconstpointer service)
g_object_unref (data->folder);
data->folder = NULL;
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -392,7 +392,7 @@ test_delete_document (TempDocumentData *data, gconstpointer service)
g_object_unref (data->document);
data->document = NULL;
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
typedef struct {
@@ -458,7 +458,7 @@ set_up_temp_documents (TempDocumentsData *data, gconstpointer service)
g_object_unref (document_file);
g_free (upload_uri);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -479,7 +479,7 @@ tear_down_temp_documents (TempDocumentsData *data, gconstpointer service)
delete_entry (GDATA_DOCUMENTS_ENTRY (data->arbitrary_document), GDATA_SERVICE (service));
g_object_unref (data->arbitrary_document);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
/* Delete the folder */
tear_down_temp_folder ((TempFolderData*) data, service);
@@ -507,7 +507,7 @@ test_query_all_documents_with_folder (TempDocumentsData *data, gconstpointer ser
g_object_unref (feed);
g_object_unref (query);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -527,7 +527,7 @@ test_query_all_documents (TempDocumentsData *data, gconstpointer service)
g_object_unref (feed);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_CLOSURE_FUNCTIONS (temp_documents, TempDocumentsData);
@@ -575,7 +575,7 @@ test_query_all_documents_async_progress_closure (TempDocumentsData *documents_da
g_slice_free (GDataAsyncProgressClosure, data);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
typedef enum {
@@ -669,7 +669,7 @@ set_up_upload_document (UploadDocumentData *data, gconstpointer _test_params)
g_assert_not_reached ();
}
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -692,7 +692,7 @@ tear_down_upload_document (UploadDocumentData *data, gconstpointer _test_params)
/* HACK: Query for the new document, as Google's servers appear to modify it behind our back
if we don't upload both metadata and data
* when creating the document:
http://code.google.com/a/google.com/p/apps-api-issues/issues/detail?id=2337. We have to wait a few
* seconds before trying this to allow the various Google servers to catch up with each
other. */
- if (gdata_mock_server_get_enable_online (mock_server) == TRUE) {
+ if (uhm_server_get_enable_online (mock_server) == TRUE) {
g_usleep (5 * G_USEC_PER_SEC);
}
@@ -706,7 +706,7 @@ tear_down_upload_document (UploadDocumentData *data, gconstpointer _test_params)
g_object_unref (data->folder);
}
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -940,7 +940,7 @@ test_upload (UploadDocumentData *data, gconstpointer _test_params)
g_clear_object (&document_file);
g_clear_object (&document);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
typedef struct {
@@ -985,7 +985,7 @@ set_up_update_document (UpdateDocumentData *data, gconstpointer _test_params)
g_object_unref (document_file);
g_object_unref (document);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -1006,7 +1006,7 @@ tear_down_update_document (UpdateDocumentData *data, gconstpointer _test_params)
/* HACK: Query for the new document, as Google's servers appear to modify it behind our back
if we don't update both metadata and data
* when creating the document:
http://code.google.com/a/google.com/p/apps-api-issues/issues/detail?id=2337. We have to wait a few
* seconds before trying this to allow the various Google servers to catch up with each
other. */
- if (gdata_mock_server_get_enable_online (mock_server) == TRUE) {
+ if (uhm_server_get_enable_online (mock_server) == TRUE) {
g_usleep (5 * G_USEC_PER_SEC);
}
@@ -1014,7 +1014,7 @@ tear_down_update_document (UpdateDocumentData *data, gconstpointer _test_params)
g_object_unref (data->document);
}
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -1134,7 +1134,7 @@ test_update (UpdateDocumentData *data, gconstpointer _test_params)
g_free (original_title);
g_object_unref (updated_document);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
typedef struct {
@@ -1160,7 +1160,7 @@ tear_down_copy_document (TempCopyDocumentData *data, gconstpointer service)
delete_entry (GDATA_DOCUMENTS_ENTRY (data->new_document), GDATA_SERVICE (service));
g_object_unref (data->new_document);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
/* Delete the folder */
tear_down_temp_document ((TempDocumentData*) data, service);
@@ -1182,7 +1182,7 @@ test_copy_document (TempCopyDocumentData *data, gconstpointer service)
g_assert_cmpstr (gdata_entry_get_id (GDATA_ENTRY (data->parent.document)), !=, gdata_entry_get_id
(GDATA_ENTRY (data->new_document)));
g_assert_cmpstr (gdata_entry_get_title (GDATA_ENTRY (data->parent.document)), ==,
gdata_entry_get_title (GDATA_ENTRY (data->new_document)));
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
typedef struct {
@@ -1259,7 +1259,7 @@ set_up_folders (FoldersData *data, GDataDocumentsService *service, gboolean init
/* HACK: Query for the new document, as Google's servers appear to modify it behind our back when
creating the document:
* http://code.google.com/a/google.com/p/apps-api-issues/issues/detail?id=2337. We have to wait a few
seconds before trying this to allow the
* various Google servers to catch up with each other. */
- if (gdata_mock_server_get_enable_online (mock_server) == TRUE) {
+ if (uhm_server_get_enable_online (mock_server) == TRUE) {
g_usleep (5 * G_USEC_PER_SEC);
}
@@ -1275,7 +1275,7 @@ set_up_folders_add_to_folder (FoldersData *data, gconstpointer service)
{
gdata_test_mock_server_start_trace (mock_server, "setup-folders-add-to-folder");
set_up_folders (data, GDATA_DOCUMENTS_SERVICE (service), FALSE);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -1289,7 +1289,7 @@ tear_down_folders_add_to_folder (FoldersData *data, gconstpointer service)
delete_entry (GDATA_DOCUMENTS_ENTRY (data->folder), GDATA_SERVICE (service));
g_object_unref (data->folder);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -1313,7 +1313,7 @@ test_folders_add_to_folder (FoldersData *data, gconstpointer service)
g_object_unref (new_document);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_CLOSURE_FUNCTIONS (folders_add_to_folder, FoldersData);
@@ -1347,7 +1347,7 @@ set_up_folders_remove_from_folder (FoldersData *data, gconstpointer service)
{
gdata_test_mock_server_start_trace (mock_server, "setup-folders-remove-from-folder");
set_up_folders (data, GDATA_DOCUMENTS_SERVICE (service), TRUE);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -1377,7 +1377,7 @@ test_folders_remove_from_folder (FoldersData *data, gconstpointer service)
g_object_unref (new_document);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_CLOSURE_FUNCTIONS (folders_remove_from_folder, FoldersData);
@@ -1408,7 +1408,7 @@ G_STMT_START {
/* Since this code is called for the cancellation tests, we don't know exactly how many requests will
be made
* before cancellation kicks in; so the epilogue request (below) needs to be in a separate trace
file. */
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
gdata_test_mock_server_start_trace (mock_server, "folders_remove_from_folder-async-epilogue");
/* With the longer cancellation timeouts, the server can somehow modify the document without getting
around to completely
@@ -1504,7 +1504,7 @@ test_download_document (TempDocumentsData *data, gconstpointer service)
_test_download_document (GDATA_DOCUMENTS_DOCUMENT (data->text_document), GDATA_SERVICE (service));
_test_download_document (GDATA_DOCUMENTS_DOCUMENT (data->arbitrary_document), GDATA_SERVICE
(service));
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -1582,7 +1582,7 @@ test_download_thumbnail (TempDocumentData *data, gconstpointer service)
}
#endif /* HAVE_GDK_PIXBUF */
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -1616,7 +1616,7 @@ test_access_rule_insert (TempDocumentData *data, gconstpointer service)
g_object_unref (access_rule);
g_object_unref (new_access_rule);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -1883,7 +1883,7 @@ test_batch (gconstpointer service)
g_object_unref (operation);
g_object_unref (inserted_entry3);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
typedef struct {
@@ -1915,7 +1915,7 @@ set_up_batch_async (BatchAsyncData *data, gconstpointer service)
g_object_unref (doc);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -1955,7 +1955,7 @@ test_batch_async (BatchAsyncData *data, gconstpointer service)
g_main_loop_unref (main_loop);
g_object_unref (operation);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -2004,7 +2004,7 @@ test_batch_async_cancellation (BatchAsyncData *data, gconstpointer service)
g_object_unref (cancellable);
g_object_unref (operation);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -2015,29 +2015,29 @@ tear_down_batch_async (BatchAsyncData *data, gconstpointer service)
delete_entry (GDATA_DOCUMENTS_ENTRY (data->new_doc), GDATA_SERVICE (service));
g_object_unref (data->new_doc);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
mock_server_notify_resolver_cb (GObject *object, GParamSpec *pspec, gpointer user_data)
{
- GDataMockServer *server;
- GDataMockResolver *resolver;
+ UhmServer *server;
+ UhmResolver *resolver;
- server = GDATA_MOCK_SERVER (object);
+ server = UHM_SERVER (object);
/* Set up the expected domain names here. This should technically be split up between
* the different unit test suites, but that's too much effort. */
- resolver = gdata_mock_server_get_resolver (server);
+ resolver = uhm_server_get_resolver (server);
if (resolver != NULL) {
- const gchar *ip_address = soup_address_get_physical (gdata_mock_server_get_address (server));
+ const gchar *ip_address = uhm_server_get_address (server);
- gdata_mock_resolver_add_A (resolver, "www.google.com", ip_address);
- gdata_mock_resolver_add_A (resolver, "docs.google.com", ip_address);
- gdata_mock_resolver_add_A (resolver, "lh3.googleusercontent.com", ip_address);
- gdata_mock_resolver_add_A (resolver, "lh5.googleusercontent.com", ip_address);
- gdata_mock_resolver_add_A (resolver, "lh6.googleusercontent.com", ip_address);
+ uhm_resolver_add_A (resolver, "www.google.com", ip_address);
+ uhm_resolver_add_A (resolver, "docs.google.com", ip_address);
+ uhm_resolver_add_A (resolver, "lh3.googleusercontent.com", ip_address);
+ uhm_resolver_add_A (resolver, "lh5.googleusercontent.com", ip_address);
+ uhm_resolver_add_A (resolver, "lh6.googleusercontent.com", ip_address);
}
}
@@ -2054,13 +2054,13 @@ main (int argc, char *argv[])
mock_server = gdata_test_get_mock_server ();
g_signal_connect (G_OBJECT (mock_server), "notify::resolver", (GCallback)
mock_server_notify_resolver_cb, NULL);
trace_directory = g_file_new_for_path (TEST_FILE_DIR "traces/documents");
- gdata_mock_server_set_trace_directory (mock_server, trace_directory);
+ uhm_server_set_trace_directory (mock_server, trace_directory);
g_object_unref (trace_directory);
gdata_test_mock_server_start_trace (mock_server, "global-authentication");
authorizer = GDATA_AUTHORIZER (gdata_client_login_authorizer_new (CLIENT_ID,
GDATA_TYPE_DOCUMENTS_SERVICE));
gdata_client_login_authorizer_authenticate (GDATA_CLIENT_LOGIN_AUTHORIZER (authorizer),
DOCUMENTS_USERNAME, PASSWORD, NULL, NULL);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
service = GDATA_SERVICE (gdata_documents_service_new (authorizer));
diff --git a/gdata/tests/oauth1-authorizer.c b/gdata/tests/oauth1-authorizer.c
index 537df1a..aa08e99 100644
--- a/gdata/tests/oauth1-authorizer.c
+++ b/gdata/tests/oauth1-authorizer.c
@@ -23,7 +23,7 @@
#include "common.h"
static GThread *main_thread = NULL;
-static GDataMockServer *mock_server = NULL;
+static UhmServer *mock_server = NULL;
static void
test_oauth1_authorizer_constructor (void)
@@ -198,7 +198,7 @@ skip_test:
g_free (token_secret);
g_free (verifier);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -395,7 +395,7 @@ test_oauth1_authorizer_refresh_authorization (OAuth1AuthorizerData *data, gconst
g_assert_no_error (error);
g_clear_error (&error);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
/* Test that processing a request with a NULL domain will not change the request. */
@@ -508,7 +508,7 @@ test_oauth1_authorizer_request_authentication_uri_sync (OAuth1AuthorizerData *da
g_free (token);
g_free (token_secret);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
/* Test that requesting an authentication URI synchronously can be cancelled */
@@ -540,7 +540,7 @@ test_oauth1_authorizer_request_authentication_uri_sync_cancellation (OAuth1Autho
g_object_unref (cancellable);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
typedef struct {
@@ -614,7 +614,7 @@ test_oauth1_authorizer_request_authentication_uri_async (OAuth1AuthorizerAsyncDa
g_main_loop_run (data->main_loop);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -661,7 +661,7 @@ test_oauth1_authorizer_request_authentication_uri_async_cancellation (OAuth1Auth
g_object_unref (cancellable);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
typedef struct {
@@ -692,7 +692,7 @@ set_up_oauth1_authorizer_interactive_data (OAuth1AuthorizerInteractiveData *data
g_free (authentication_uri);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -715,7 +715,7 @@ set_up_oauth1_authorizer_interactive_data_bad_credentials (OAuth1AuthorizerInter
g_free (authentication_uri);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -759,7 +759,7 @@ test_oauth1_authorizer_request_authorization_sync (OAuth1AuthorizerInteractiveDa
g_assert (gdata_authorizer_is_authorized_for_domain (GDATA_AUTHORIZER (data->parent.authorizer),
gdata_contacts_service_get_primary_authorization_domain ()) == TRUE);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
/* Test that synchronously authorizing a request token fails if an invalid verifier is provided. */
@@ -786,7 +786,7 @@ test_oauth1_authorizer_request_authorization_sync_bad_credentials (OAuth1Authori
g_assert (gdata_authorizer_is_authorized_for_domain (GDATA_AUTHORIZER (data->parent.authorizer),
gdata_contacts_service_get_primary_authorization_domain ()) == FALSE);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
/* Test that cancellation of synchronously authorizing a request token works. Note that this test has to be
interactive, as the user has to visit the
@@ -826,7 +826,7 @@ test_oauth1_authorizer_request_authorization_sync_cancellation (OAuth1Authorizer
g_object_unref (cancellable);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
typedef struct {
@@ -906,7 +906,7 @@ test_oauth1_authorizer_request_authorization_async (OAuth1AuthorizerInteractiveA
g_main_loop_run (data->main_loop);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -947,7 +947,7 @@ test_oauth1_authorizer_request_authorization_async_bad_credentials (OAuth1Author
g_main_loop_run (data->main_loop);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -1001,25 +1001,25 @@ test_oauth1_authorizer_request_authorization_async_cancellation (OAuth1Authorize
g_object_unref (cancellable);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
mock_server_notify_resolver_cb (GObject *object, GParamSpec *pspec, gpointer user_data)
{
- GDataMockServer *server;
- GDataMockResolver *resolver;
+ UhmServer *server;
+ UhmResolver *resolver;
- server = GDATA_MOCK_SERVER (object);
+ server = UHM_SERVER (object);
/* Set up the expected domain names here. This should technically be split up between
* the different unit test suites, but that's too much effort. */
- resolver = gdata_mock_server_get_resolver (server);
+ resolver = uhm_server_get_resolver (server);
if (resolver != NULL) {
- const gchar *ip_address = soup_address_get_physical (gdata_mock_server_get_address (server));
+ const gchar *ip_address = uhm_server_get_address (server);
- gdata_mock_resolver_add_A (resolver, "www.google.com", ip_address);
+ uhm_resolver_add_A (resolver, "www.google.com", ip_address);
}
}
@@ -1033,7 +1033,7 @@ main (int argc, char *argv[])
mock_server = gdata_test_get_mock_server ();
g_signal_connect (G_OBJECT (mock_server), "notify::resolver", (GCallback)
mock_server_notify_resolver_cb, NULL);
trace_directory = g_file_new_for_path (TEST_FILE_DIR "traces/oauth1-authorizer");
- gdata_mock_server_set_trace_directory (mock_server, trace_directory);
+ uhm_server_set_trace_directory (mock_server, trace_directory);
g_object_unref (trace_directory);
main_thread = g_thread_self ();
diff --git a/gdata/tests/picasaweb.c b/gdata/tests/picasaweb.c
index 1653e3c..8319a1d 100644
--- a/gdata/tests/picasaweb.c
+++ b/gdata/tests/picasaweb.c
@@ -33,7 +33,7 @@
#define PW_USERNAME "libgdata picasaweb gmail com"
-static GDataMockServer *mock_server = NULL;
+static UhmServer *mock_server = NULL;
/* Assert that two albums have equal properties, but aren't the same object instance. For use in, e.g.,
comparing an inserted album from the server
* to the original instance which was inserted. */
@@ -370,7 +370,7 @@ test_authentication (void)
g_object_unref (authorizer);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_TEST_FUNCTIONS (authentication, void,
@@ -493,7 +493,7 @@ set_up_query_files (QueryFilesData *data, gconstpointer service)
data->file3 = upload_file (GDATA_PICASAWEB_SERVICE (service), "Test file 3", data->album);
data->file4 = upload_file (GDATA_PICASAWEB_SERVICE (service), "Test file 4", data->album);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -508,7 +508,7 @@ tear_down_query_files (QueryFilesData *data, gconstpointer service)
g_object_unref (data->file1);
/* HACK! Wait for the distributed Google servers to synchronise. */
- if (gdata_mock_server_get_enable_online (mock_server) == TRUE) {
+ if (uhm_server_get_enable_online (mock_server) == TRUE) {
sleep (10);
}
@@ -525,7 +525,7 @@ tear_down_query_files (QueryFilesData *data, gconstpointer service)
g_object_unref (album_feed);
g_object_unref (data->album);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
/* Checks to perform on a photo feed from test_query_files() or test_query_files_async(). */
@@ -579,7 +579,7 @@ test_query_files (QueryFilesData *data, gconstpointer service)
g_object_unref (photo_feed);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_CLOSURE_FUNCTIONS (query_files, QueryFilesData);
@@ -630,7 +630,7 @@ test_query_files_async_progress_closure (QueryFilesData *query_data, gconstpoint
g_slice_free (GDataAsyncProgressClosure, data);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -651,7 +651,7 @@ test_query_files_single (QueryFilesData *data, gconstpointer service)
g_object_unref (file);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -713,7 +713,7 @@ test_download_thumbnails (QueryFilesData *data, gconstpointer service)
/* FIXME. The mock server currently doesn't support binary data, so we can't get JPEG files
* from it. Hence, only perform the GdkPixbuf tests when running tests online. */
- if (gdata_mock_server_get_enable_online (mock_server) == FALSE) {
+ if (uhm_server_get_enable_online (mock_server) == FALSE) {
break;
}
@@ -737,7 +737,7 @@ test_download_thumbnails (QueryFilesData *data, gconstpointer service)
}
#endif /* HAVE_GDK_PIXBUF */
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -790,7 +790,7 @@ test_download_photo (QueryFilesData *data, gconstpointer service)
g_file_delete (destination_file, NULL, NULL);
g_object_unref (destination_file);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
typedef struct {
@@ -826,7 +826,7 @@ tear_down_insert_album (InsertAlbumData *data, gconstpointer service)
g_object_unref (data->album);
g_object_unref (data->inserted_album);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -860,7 +860,7 @@ test_insert_album (InsertAlbumData *data, gconstpointer service)
g_object_unref (inserted_album);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_CLOSURE_FUNCTIONS (insert_album, InsertAlbumData);
@@ -937,7 +937,7 @@ set_up_query_all_albums (QueryAllAlbumsData *data, gconstpointer service)
g_object_unref (album);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -961,7 +961,7 @@ tear_down_query_all_albums (QueryAllAlbumsData *data, gconstpointer service)
GDATA_ENTRY (data->album4), NULL, NULL) == TRUE);
g_object_unref (data->album4);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -1052,7 +1052,7 @@ test_query_all_albums (QueryAllAlbumsData *data, gconstpointer service)
g_object_unref (album_feed);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -1101,7 +1101,7 @@ test_query_all_albums_with_limits (QueryAllAlbumsData *data, gconstpointer servi
g_object_unref (album_feed_1);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_CLOSURE_FUNCTIONS (query_all_albums, QueryAllAlbumsData);
@@ -1153,7 +1153,7 @@ test_query_all_albums_async_progress_closure (QueryAllAlbumsData *unused_data, g
g_slice_free (GDataAsyncProgressClosure, data);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -1211,7 +1211,7 @@ set_up_query_comments (QueryCommentsData *data, gconstpointer service)
g_assert (GDATA_IS_PICASAWEB_COMMENT (data->comment1));
g_object_unref (comment_);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -1238,7 +1238,7 @@ tear_down_query_comments (QueryCommentsData *data, gconstpointer service)
g_object_unref (data->comment3);
}
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
/* Delete the test files and albums. */
tear_down_query_files ((QueryFilesData*) data, service);
@@ -1308,7 +1308,7 @@ test_comment_query (QueryCommentsData *data, gconstpointer service)
g_object_unref (comments_feed);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_CLOSURE_FUNCTIONS (query_comments, QueryCommentsData);
@@ -1360,7 +1360,7 @@ test_comment_query_async_progress_closure (QueryCommentsData *query_data, gconst
g_slice_free (GDataAsyncProgressClosure, data);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
typedef struct {
@@ -1399,7 +1399,7 @@ tear_down_insert_comment (InsertCommentData *data, gconstpointer service)
g_object_unref (data->comment);
}
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
tear_down_query_files ((QueryFilesData*) data, service);
}
@@ -1443,7 +1443,7 @@ test_comment_insert (InsertCommentData *data, gconstpointer service)
data->new_comment = GDATA_PICASAWEB_COMMENT (new_comment);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_CLOSURE_FUNCTIONS (insert_comment, InsertCommentData);
@@ -1484,7 +1484,7 @@ test_comment_delete (QueryCommentsData *data, gconstpointer service)
g_object_unref (data->comment1);
data->comment1 = NULL;
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_TEST_FUNCTIONS (comment_delete, QueryCommentsData,
@@ -1532,7 +1532,7 @@ test_query_user (gconstpointer service)
g_object_unref (user);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
/* Check that asynchronously querying for the currently authenticated user's details works and returns the
correct details. */
@@ -1630,7 +1630,7 @@ set_up_upload (UploadData *data, gconstpointer service)
g_assert_no_error (error);
g_assert (G_IS_FILE_INPUT_STREAM (data->file_stream));
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -1652,7 +1652,7 @@ tear_down_upload (UploadData *data, gconstpointer service)
g_object_unref (data->file_stream);
g_object_unref (data->service);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -1695,7 +1695,7 @@ test_upload_default_album (UploadData *data, gconstpointer service)
g_assert_cmpstr (tags2[1], ==, tags[1]);
g_assert_cmpstr (tags2[2], ==, tags[2]);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_CLOSURE_FUNCTIONS (upload, UploadData);
@@ -2064,23 +2064,23 @@ test_query_etag (void)
static void
mock_server_notify_resolver_cb (GObject *object, GParamSpec *pspec, gpointer user_data)
{
- GDataMockServer *server;
- GDataMockResolver *resolver;
+ UhmServer *server;
+ UhmResolver *resolver;
- server = GDATA_MOCK_SERVER (object);
+ server = UHM_SERVER (object);
/* Set up the expected domain names here. This should technically be split up between
* the different unit test suites, but that's too much effort. */
- resolver = gdata_mock_server_get_resolver (server);
+ resolver = uhm_server_get_resolver (server);
if (resolver != NULL) {
- const gchar *ip_address = soup_address_get_physical (gdata_mock_server_get_address (server));
+ const gchar *ip_address = uhm_server_get_address (server);
- gdata_mock_resolver_add_A (resolver, "www.google.com", ip_address);
- gdata_mock_resolver_add_A (resolver, "picasaweb.google.com", ip_address);
- gdata_mock_resolver_add_A (resolver, "lh3.googleusercontent.com", ip_address);
- gdata_mock_resolver_add_A (resolver, "lh5.googleusercontent.com", ip_address);
- gdata_mock_resolver_add_A (resolver, "lh6.googleusercontent.com", ip_address);
+ uhm_resolver_add_A (resolver, "www.google.com", ip_address);
+ uhm_resolver_add_A (resolver, "picasaweb.google.com", ip_address);
+ uhm_resolver_add_A (resolver, "lh3.googleusercontent.com", ip_address);
+ uhm_resolver_add_A (resolver, "lh5.googleusercontent.com", ip_address);
+ uhm_resolver_add_A (resolver, "lh6.googleusercontent.com", ip_address);
}
}
@@ -2097,13 +2097,13 @@ main (int argc, char *argv[])
mock_server = gdata_test_get_mock_server ();
g_signal_connect (G_OBJECT (mock_server), "notify::resolver", (GCallback)
mock_server_notify_resolver_cb, NULL);
trace_directory = g_file_new_for_path (TEST_FILE_DIR "traces/picasaweb");
- gdata_mock_server_set_trace_directory (mock_server, trace_directory);
+ uhm_server_set_trace_directory (mock_server, trace_directory);
g_object_unref (trace_directory);
gdata_test_mock_server_start_trace (mock_server, "global-authentication");
authorizer = GDATA_AUTHORIZER (gdata_client_login_authorizer_new (CLIENT_ID,
GDATA_TYPE_PICASAWEB_SERVICE));
gdata_client_login_authorizer_authenticate (GDATA_CLIENT_LOGIN_AUTHORIZER (authorizer), PW_USERNAME,
PASSWORD, NULL, NULL);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
service = GDATA_SERVICE (gdata_picasaweb_service_new (authorizer));
diff --git a/gdata/tests/youtube.c b/gdata/tests/youtube.c
index 4a98e20..1195bc3 100644
--- a/gdata/tests/youtube.c
+++ b/gdata/tests/youtube.c
@@ -26,27 +26,27 @@
#define DEVELOPER_KEY
"AI39si7Me3Q7zYs6hmkFvpRBD2nrkVjYYsUO5lh_3HdOkGRc9g6Z4nzxZatk_aAo2EsA21k7vrda0OO6oFg2rnhMedZXPyXoEw"
-static GDataMockServer *mock_server = NULL;
+static UhmServer *mock_server = NULL;
-/* Effectively gdata_test_mock_server_start_trace() but calling gdata_mock_server_run() instead of
gdata_mock_server_start_trace(). */
+/* Effectively gdata_test_mock_server_start_trace() but calling uhm_server_run() instead of
uhm_server_start_trace(). */
static void
-gdata_test_mock_server_run (GDataMockServer *server)
+gdata_test_mock_server_run (UhmServer *server)
{
const gchar *ip_address;
- GDataMockResolver *resolver;
+ UhmResolver *resolver;
- gdata_mock_server_run (server);
+ uhm_server_run (server);
gdata_test_set_https_port (server);
- if (gdata_mock_server_get_enable_online (server) == FALSE) {
+ if (uhm_server_get_enable_online (server) == FALSE) {
/* Set up the expected domain names here. This should technically be split up between
* the different unit test suites, but that's too much effort. */
- ip_address = soup_address_get_physical (gdata_mock_server_get_address (server));
- resolver = gdata_mock_server_get_resolver (server);
+ ip_address = uhm_server_get_address (server);
+ resolver = uhm_server_get_resolver (server);
- gdata_mock_resolver_add_A (resolver, "www.google.com", ip_address);
- gdata_mock_resolver_add_A (resolver, "gdata.youtube.com", ip_address);
- gdata_mock_resolver_add_A (resolver, "uploads.gdata.youtube.com", ip_address);
+ uhm_resolver_add_A (resolver, "www.google.com", ip_address);
+ uhm_resolver_add_A (resolver, "gdata.youtube.com", ip_address);
+ uhm_resolver_add_A (resolver, "uploads.gdata.youtube.com", ip_address);
}
}
@@ -79,7 +79,7 @@ test_authentication (void)
g_object_unref (authorizer);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
/* HTTP message responses and the expected associated GData error domain/code. */
@@ -138,10 +138,10 @@ test_authentication_error (void)
gulong handler_id;
guint i;
- if (gdata_mock_server_get_enable_logging (mock_server) == TRUE) {
+ if (uhm_server_get_enable_logging (mock_server) == TRUE) {
g_test_message ("Ignoring test due to logging being enabled.");
return;
- } else if (gdata_mock_server_get_enable_online (mock_server) == TRUE) {
+ } else if (uhm_server_get_enable_online (mock_server) == TRUE) {
g_test_message ("Ignoring test due to running online and test not being reproducible.");
return;
}
@@ -172,7 +172,7 @@ test_authentication_error (void)
g_object_unref (authorizer);
- gdata_mock_server_stop (mock_server);
+ uhm_server_stop (mock_server);
g_signal_handler_disconnect (mock_server, handler_id);
}
}
@@ -185,16 +185,16 @@ test_authentication_timeout (void)
GError *error = NULL;
gulong handler_id;
- if (gdata_mock_server_get_enable_logging (mock_server) == TRUE) {
+ if (uhm_server_get_enable_logging (mock_server) == TRUE) {
g_test_message ("Ignoring test due to logging being enabled.");
return;
- } else if (gdata_mock_server_get_enable_online (mock_server) == TRUE) {
+ } else if (uhm_server_get_enable_online (mock_server) == TRUE) {
g_test_message ("Ignoring test due to running online and test not being reproducible.");
return;
}
handler_id = g_signal_connect (mock_server, "handle-message", (GCallback)
gdata_test_mock_server_handle_message_timeout, NULL);
- gdata_mock_server_run (mock_server);
+ uhm_server_run (mock_server);
gdata_test_set_https_port (mock_server);
/* Create an authorizer and set its timeout as low as possible (1 second). */
@@ -218,7 +218,7 @@ test_authentication_timeout (void)
g_object_unref (authorizer);
- gdata_mock_server_stop (mock_server);
+ uhm_server_stop (mock_server);
g_signal_handler_disconnect (mock_server, handler_id);
}
@@ -313,7 +313,7 @@ test_query_standard_feeds (gconstpointer service)
g_object_unref (feed);
}
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -333,7 +333,7 @@ test_query_standard_feed (gconstpointer service)
g_object_unref (feed);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -358,7 +358,7 @@ test_query_standard_feed_with_query (gconstpointer service)
g_object_unref (query);
g_object_unref (feed);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
/* HTTP message responses and the expected associated GData error domain/code. */
@@ -420,10 +420,10 @@ test_query_standard_feed_error (gconstpointer service)
gulong handler_id;
guint i;
- if (gdata_mock_server_get_enable_logging (mock_server) == TRUE) {
+ if (uhm_server_get_enable_logging (mock_server) == TRUE) {
g_test_message ("Ignoring test due to logging being enabled.");
return;
- } else if (gdata_mock_server_get_enable_online (mock_server) == TRUE) {
+ } else if (uhm_server_get_enable_online (mock_server) == TRUE) {
g_test_message ("Ignoring test due to running online and test not being reproducible.");
return;
}
@@ -440,7 +440,7 @@ test_query_standard_feed_error (gconstpointer service)
g_assert (feed == NULL);
g_clear_error (&error);
- gdata_mock_server_stop (mock_server);
+ uhm_server_stop (mock_server);
g_signal_handler_disconnect (mock_server, handler_id);
}
}
@@ -452,10 +452,10 @@ test_query_standard_feed_timeout (gconstpointer service)
GError *error = NULL;
gulong handler_id;
- if (gdata_mock_server_get_enable_logging (mock_server) == TRUE) {
+ if (uhm_server_get_enable_logging (mock_server) == TRUE) {
g_test_message ("Ignoring test due to logging being enabled.");
return;
- } else if (gdata_mock_server_get_enable_online (mock_server) == TRUE) {
+ } else if (uhm_server_get_enable_online (mock_server) == TRUE) {
g_test_message ("Ignoring test due to running online and test not being reproducible.");
return;
}
@@ -472,7 +472,7 @@ test_query_standard_feed_timeout (gconstpointer service)
g_assert (feed == NULL);
g_clear_error (&error);
- gdata_mock_server_stop (mock_server);
+ uhm_server_stop (mock_server);
g_signal_handler_disconnect (mock_server, handler_id);
}
@@ -520,7 +520,7 @@ test_query_standard_feed_async_progress_closure (gconstpointer service)
g_slice_free (GDataAsyncProgressClosure, data);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static GDataYouTubeVideo *
@@ -612,7 +612,7 @@ test_query_related (gconstpointer service)
g_object_unref (video);
g_object_unref (feed);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_TEST_FUNCTIONS (query_related, void,
@@ -667,7 +667,7 @@ test_query_related_async_progress_closure (gconstpointer service)
g_slice_free (GDataAsyncProgressClosure, data);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
typedef struct {
@@ -733,7 +733,7 @@ tear_down_upload (UploadData *data, gconstpointer service)
g_free (data->content_type);
g_object_unref (data->service);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -786,7 +786,7 @@ test_upload_simple (UploadData *data, gconstpointer service)
g_assert_cmpstr (tags2[1], ==, tags[1]);
g_assert_cmpstr (tags2[2], ==, tags[2]);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_CLOSURE_FUNCTIONS (upload, UploadData);
@@ -1724,7 +1724,7 @@ test_query_single (gconstpointer service)
g_object_unref (video);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_TEST_FUNCTIONS (query_single, void,
@@ -1765,7 +1765,7 @@ set_up_comment (CommentData *data, gconstpointer service)
GDATA_TYPE_YOUTUBE_VIDEO, NULL,
NULL));
g_assert (GDATA_IS_YOUTUBE_VIDEO (data->video));
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -1819,7 +1819,7 @@ test_comment_query (CommentData *data, gconstpointer service)
g_object_unref (comments_feed);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_CLOSURE_FUNCTIONS (comment, CommentData);
@@ -1869,7 +1869,7 @@ test_comment_query_async_progress_closure (CommentData *query_data, gconstpointe
g_slice_free (GDataAsyncProgressClosure, data);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
typedef struct {
@@ -1890,7 +1890,7 @@ set_up_insert_comment (InsertCommentData *data, gconstpointer service)
gdata_entry_set_content (GDATA_ENTRY (data->comment), "This is a test comment.");
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -1904,7 +1904,7 @@ tear_down_insert_comment (InsertCommentData *data, gconstpointer service)
tear_down_comment ((CommentData*) data, service);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -1948,7 +1948,7 @@ test_comment_insert (InsertCommentData *data, gconstpointer service)
g_object_unref (new_comment);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_CLOSURE_FUNCTIONS (insert_comment, InsertCommentData);
@@ -1988,7 +1988,7 @@ test_comment_delete (InsertCommentData *data, gconstpointer service)
g_assert (success == FALSE);
g_clear_error (&error);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_TEST_FUNCTIONS (comment_delete, InsertCommentData,
@@ -2093,7 +2093,7 @@ test_categories (gconstpointer service)
gdata_service_set_locale (GDATA_SERVICE (service), old_locale);
g_free (old_locale);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
GDATA_ASYNC_TEST_FUNCTIONS (categories, void,
@@ -2150,7 +2150,7 @@ setup_batch (BatchData *data, gconstpointer service)
data->new_video2 = video;
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -2208,7 +2208,7 @@ test_batch (BatchData *data, gconstpointer service)
g_clear_error (&error);
g_object_unref (operation);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -2243,7 +2243,7 @@ test_batch_async (BatchData *data, gconstpointer service)
g_main_loop_run (main_loop);
g_main_loop_unref (main_loop);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -2288,7 +2288,7 @@ test_batch_async_cancellation (BatchData *data, gconstpointer service)
g_object_unref (cancellable);
g_object_unref (operation);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
}
static void
@@ -2301,24 +2301,24 @@ teardown_batch (BatchData *data, gconstpointer service)
static void
mock_server_notify_resolver_cb (GObject *object, GParamSpec *pspec, gpointer user_data)
{
- GDataMockServer *server;
- GDataMockResolver *resolver;
+ UhmServer *server;
+ UhmResolver *resolver;
- server = GDATA_MOCK_SERVER (object);
+ server = UHM_SERVER (object);
/* Set up the expected domain names here. This should technically be split up between
* the different unit test suites, but that's too much effort. */
- resolver = gdata_mock_server_get_resolver (server);
+ resolver = uhm_server_get_resolver (server);
if (resolver != NULL) {
- const gchar *ip_address = soup_address_get_physical (gdata_mock_server_get_address (server));
-
- gdata_mock_resolver_add_A (resolver, "www.google.com", ip_address);
- gdata_mock_resolver_add_A (resolver, "gdata.youtube.com", ip_address);
- gdata_mock_resolver_add_A (resolver, "uploads.gdata.youtube.com", ip_address);
- gdata_mock_resolver_add_A (resolver, "lh3.googleusercontent.com", ip_address);
- gdata_mock_resolver_add_A (resolver, "lh5.googleusercontent.com", ip_address);
- gdata_mock_resolver_add_A (resolver, "lh6.googleusercontent.com", ip_address);
+ const gchar *ip_address = uhm_server_get_address (server);
+
+ uhm_resolver_add_A (resolver, "www.google.com", ip_address);
+ uhm_resolver_add_A (resolver, "gdata.youtube.com", ip_address);
+ uhm_resolver_add_A (resolver, "uploads.gdata.youtube.com", ip_address);
+ uhm_resolver_add_A (resolver, "lh3.googleusercontent.com", ip_address);
+ uhm_resolver_add_A (resolver, "lh5.googleusercontent.com", ip_address);
+ uhm_resolver_add_A (resolver, "lh6.googleusercontent.com", ip_address);
}
}
@@ -2335,13 +2335,13 @@ main (int argc, char *argv[])
mock_server = gdata_test_get_mock_server ();
g_signal_connect (G_OBJECT (mock_server), "notify::resolver", (GCallback)
mock_server_notify_resolver_cb, NULL);
trace_directory = g_file_new_for_path (TEST_FILE_DIR "traces/youtube");
- gdata_mock_server_set_trace_directory (mock_server, trace_directory);
+ uhm_server_set_trace_directory (mock_server, trace_directory);
g_object_unref (trace_directory);
gdata_test_mock_server_start_trace (mock_server, "global-authentication");
authorizer = GDATA_AUTHORIZER (gdata_client_login_authorizer_new (CLIENT_ID,
GDATA_TYPE_YOUTUBE_SERVICE));
gdata_client_login_authorizer_authenticate (GDATA_CLIENT_LOGIN_AUTHORIZER (authorizer), USERNAME,
PASSWORD, NULL, NULL);
- gdata_mock_server_end_trace (mock_server);
+ uhm_server_end_trace (mock_server);
service = GDATA_SERVICE (gdata_youtube_service_new (DEVELOPER_KEY, authorizer));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
