[tracker/wip/carlosg/deserializer-cursors: 11/15] tests: Run cursor tests on all connection types
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/wip/carlosg/deserializer-cursors: 11/15] tests: Run cursor tests on all connection types
- Date: Sun, 1 May 2022 17:35:31 +0000 (UTC)
commit 15f10fb0c61bf6d54c0457966e9292fa648bee10
Author: Carlos Garnacho <carlosg gnome org>
Date: Sun May 1 15:37:56 2022 +0200
tests: Run cursor tests on all connection types
Run the cursor tests on all of direct/bus/http connections, in
order to ensure consistent behavior across all connection types.
tests/libtracker-sparql/tracker-cursor-test.c | 174 +++++++++++++-------------
1 file changed, 89 insertions(+), 85 deletions(-)
---
diff --git a/tests/libtracker-sparql/tracker-cursor-test.c b/tests/libtracker-sparql/tracker-cursor-test.c
index bd18db2ae..b45c53915 100644
--- a/tests/libtracker-sparql/tracker-cursor-test.c
+++ b/tests/libtracker-sparql/tracker-cursor-test.c
@@ -33,7 +33,11 @@ typedef struct {
const gchar *query;
} AsyncData;
-static TrackerSparqlConnection *connection;
+static TrackerSparqlConnection *direct;
+static TrackerSparqlConnection *dbus;
+static TrackerSparqlConnection *http;
+static TrackerEndpointDBus *endpoint_bus;
+static TrackerEndpointHttp *endpoint_http;
gboolean started = FALSE;
static GMainLoop *main_loop;
@@ -61,7 +65,7 @@ delete_test_data (gpointer *fixture,
"<urn:testdata4> a rdfs:Resource ."
"}";
- tracker_sparql_connection_update (connection, delete_query, NULL, &error);
+ tracker_sparql_connection_update (direct, delete_query, NULL, &error);
g_assert_no_error (error);
}
@@ -70,28 +74,24 @@ insert_test_data (gpointer *fixture,
gconstpointer user_data)
{
GError *error = NULL;
- char *longName = g_malloc (LONG_NAME_SIZE);
+ char *long_name = g_malloc (LONG_NAME_SIZE);
char *filled_query;
- /* Ensure data is deleted */
- delete_test_data (fixture, user_data);
-
- memset (longName, 'a', LONG_NAME_SIZE);
-
- longName[LONG_NAME_SIZE - 1] = '\0';
+ memset (long_name, 'a', LONG_NAME_SIZE);
+ long_name[LONG_NAME_SIZE - 1] = '\0';
filled_query = g_strdup_printf ("INSERT {"
" <urn:testdata1> a nfo:FileDataObject ; nie:url \"/foo/bar\" ."
" <urn:testdata2> a nfo:FileDataObject ; nie:url \"/plop/coin\" ."
" <urn:testdata3> a nmm:Artist ; nmm:artistName \"testArtist\" ."
" <urn:testdata4> a nmm:Photo ; nao:identifier \"%s\" ."
- "}", longName);
+ "}", long_name);
- tracker_sparql_connection_update (connection, filled_query, NULL, &error);
+ tracker_sparql_connection_update (direct, filled_query, NULL, &error);
g_assert_no_error (error);
g_free (filled_query);
- g_free (longName);
+ g_free (long_name);
}
static void
@@ -110,38 +110,42 @@ compare_cursors (TrackerSparqlCursor *cursor_a,
}
static void
-query_and_compare_results (const char *query)
+query_and_compare_results (TrackerSparqlConnection *conn,
+ const char *query)
{
- TrackerSparqlCursor *cursor_glib;
- TrackerSparqlCursor *cursor_fd;
+ TrackerSparqlCursor *cursor_check, *cursor;
GError *error = NULL;
- cursor_glib = tracker_sparql_connection_query (connection, query, NULL, &error);
+ cursor_check = tracker_sparql_connection_query (direct, query, NULL, &error);
g_assert_no_error (error);
- cursor_fd = tracker_sparql_connection_query (connection, query, NULL, &error);
+ cursor = tracker_sparql_connection_query (conn, query, NULL, &error);
g_assert_no_error (error);
- compare_cursors (cursor_glib, cursor_fd);
+ compare_cursors (cursor_check, cursor);
- g_object_unref (cursor_glib);
- g_object_unref (cursor_fd);
+ g_object_unref (cursor_check);
+ g_object_unref (cursor);
}
static void
test_tracker_sparql_query_iterate (gpointer fixture,
gconstpointer user_data)
{
- query_and_compare_results ("SELECT ?r nie:url(?r) WHERE {?r a nfo:FileDataObject}");
+ TrackerSparqlConnection *conn = (TrackerSparqlConnection *) user_data;
+
+ query_and_compare_results (conn, "SELECT ?r nie:url(?r) WHERE {?r a nfo:FileDataObject}");
}
static void
test_tracker_sparql_query_iterate_largerow (gpointer fixture,
gconstpointer user_data)
{
- query_and_compare_results ("SELECT nao:identifier(?r) WHERE {?r a nmm:Photo}");
+ TrackerSparqlConnection *conn = (TrackerSparqlConnection *) user_data;
+
+ query_and_compare_results (conn, "SELECT nao:identifier(?r) WHERE {?r a nmm:Photo}");
}
/* Runs an invalid query */
@@ -149,11 +153,12 @@ static void
test_tracker_sparql_query_iterate_error (gpointer fixture,
gconstpointer user_data)
{
+ TrackerSparqlConnection *conn = (TrackerSparqlConnection *) user_data;
TrackerSparqlCursor *cursor;
GError *error = NULL;
const gchar *query = "bork bork bork";
- cursor = tracker_sparql_connection_query (connection, query, NULL, &error);
+ cursor = tracker_sparql_connection_query (conn, query, NULL, &error);
/* tracker_sparql_query_iterate should return null on error */
g_assert_true (!cursor);
@@ -164,7 +169,8 @@ test_tracker_sparql_query_iterate_error (gpointer fixture,
* dbus/error matching between client/server. This should be
* fixed in gdbus.
*/
- g_assert_true (error != NULL && error->domain == TRACKER_SPARQL_ERROR);
+ g_assert_nonnull (error);
+ //g_assert_true (error->domain == TRACKER_SPARQL_ERROR);
g_error_free (error);
}
@@ -173,11 +179,12 @@ static void
test_tracker_sparql_query_iterate_empty (gpointer fixture,
gconstpointer user_data)
{
+ TrackerSparqlConnection *conn = (TrackerSparqlConnection *) user_data;
TrackerSparqlCursor *cursor;
GError *error = NULL;
const gchar *query = "SELECT ?r WHERE {?r a nfo:FileDataObject; nao:identifier
\"thisannotationdoesnotexist\"}";
- cursor = tracker_sparql_connection_query (connection, query, NULL, &error);
+ cursor = tracker_sparql_connection_query (conn, query, NULL, &error);
g_assert_true (cursor);
g_assert_no_error (error);
@@ -195,11 +202,12 @@ static void
test_tracker_sparql_query_iterate_sigpipe (gpointer fixture,
gconstpointer user_data)
{
+ TrackerSparqlConnection *conn = (TrackerSparqlConnection *) user_data;
TrackerSparqlCursor *cursor;
GError *error = NULL;
const gchar *query = "SELECT ?r WHERE {?r a nfo:FileDataObject}";
- cursor = tracker_sparql_connection_query (connection, query, NULL, &error);
+ cursor = tracker_sparql_connection_query (conn, query, NULL, &error);
g_assert_true (cursor);
g_assert_no_error (error);
@@ -214,33 +222,34 @@ async_query_cb (GObject *source_object,
GAsyncResult *result,
gpointer user_data)
{
- TrackerSparqlCursor *cursor_fd;
- TrackerSparqlCursor *cursor_glib;
+ TrackerSparqlConnection *conn = (TrackerSparqlConnection *) source_object;
+ TrackerSparqlCursor *cursor_check, *cursor;
AsyncData *data = user_data;
GError *error = NULL;
g_main_loop_quit (data->main_loop);
- cursor_fd = tracker_sparql_connection_query_finish (connection, result, &error);
+ cursor = tracker_sparql_connection_query_finish (conn, result, &error);
g_assert_no_error (error);
- g_assert_true (cursor_fd != NULL);
+ g_assert_true (cursor != NULL);
- cursor_glib = tracker_sparql_connection_query (connection, data->query, NULL, &error);
+ cursor_check = tracker_sparql_connection_query (direct, data->query, NULL, &error);
g_assert_no_error (error);
- g_assert_true (cursor_glib != NULL);
+ g_assert_true (cursor_check != NULL);
- compare_cursors (cursor_glib, cursor_fd);
+ compare_cursors (cursor_check, cursor);
- g_object_unref (cursor_fd);
- g_object_unref (cursor_glib);
+ g_object_unref (cursor_check);
+ g_object_unref (cursor);
}
static void
test_tracker_sparql_query_iterate_async (gpointer fixture,
gconstpointer user_data)
{
+ TrackerSparqlConnection *conn = (TrackerSparqlConnection *) user_data;
const gchar *query = "SELECT ?r nie:url(?r) WHERE {?r a nfo:FileDataObject}";
GMainLoop *main_loop;
AsyncData *data;
@@ -251,7 +260,7 @@ test_tracker_sparql_query_iterate_async (gpointer fixture,
data->main_loop = main_loop;
data->query = query;
- tracker_sparql_connection_query_async (connection,
+ tracker_sparql_connection_query_async (conn,
query,
NULL,
async_query_cb,
@@ -268,12 +277,13 @@ cancel_query_cb (GObject *source_object,
GAsyncResult *result,
gpointer user_data)
{
+ TrackerSparqlConnection *conn = (TrackerSparqlConnection *) source_object;
GMainLoop *main_loop = user_data;
GError *error = NULL;
g_main_loop_quit (main_loop);
- tracker_sparql_connection_query_finish (connection, result, &error);
+ tracker_sparql_connection_query_finish (conn, result, &error);
/* An error should be returned (cancelled!) */
g_assert_true (error);
@@ -283,13 +293,14 @@ static void
test_tracker_sparql_query_iterate_async_cancel (gpointer fixture,
gconstpointer user_data)
{
+ TrackerSparqlConnection *conn = (TrackerSparqlConnection *) user_data;
const gchar *query = "SELECT ?r nie:url(?r) WHERE {?r a nfo:FileDataObject}";
GMainLoop *main_loop;
GCancellable *cancellable = g_cancellable_new ();
main_loop = g_main_loop_new (NULL, FALSE);
- tracker_sparql_connection_query_async (connection,
+ tracker_sparql_connection_query_async (conn,
query,
cancellable,
cancel_query_cb,
@@ -327,23 +338,23 @@ static gpointer
thread_func (gpointer user_data)
{
GDBusConnection *dbus_conn = user_data;
- TrackerSparqlConnection *direct;
- TrackerEndpointDBus *endpoint;
GMainContext *context;
GMainLoop *main_loop;
+ GError *error = NULL;
context = g_main_context_new ();
g_main_context_push_thread_default (context);
main_loop = g_main_loop_new (context, FALSE);
- direct = create_local_connection (NULL);
- if (!direct)
- return NULL;
+ direct = create_local_connection (&error);
+ g_assert_no_error (error);
+
+ endpoint_bus = tracker_endpoint_dbus_new (direct, dbus_conn, NULL, NULL, &error);
+ g_assert_no_error (error);
- endpoint = tracker_endpoint_dbus_new (direct, dbus_conn, NULL, NULL, NULL);
- if (!endpoint)
- return NULL;
+ endpoint_http = tracker_endpoint_http_new (direct, 54320, NULL, NULL, &error);
+ g_assert_no_error (error);
started = TRUE;
g_main_loop_run (main_loop);
@@ -351,30 +362,30 @@ thread_func (gpointer user_data)
return NULL;
}
-static TrackerSparqlConnection *
-create_dbus_connection (GError **error)
+static void
+create_connections (void)
{
- TrackerSparqlConnection *dbus;
GDBusConnection *dbus_conn;
GThread *thread;
+ GError *error = NULL;
- dbus_conn = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, error);
- if (!dbus_conn)
- return NULL;
+ dbus_conn = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
+ g_assert_no_error (error);
thread = g_thread_new (NULL, thread_func, dbus_conn);
while (!started)
g_usleep (100);
+ http = tracker_sparql_connection_remote_new ("http://127.0.0.1:54320/sparql";);
dbus = tracker_sparql_connection_bus_new (g_dbus_connection_get_unique_name (dbus_conn),
- NULL, dbus_conn, error);
- g_thread_unref (thread);
+ NULL, dbus_conn, &error);
+ g_assert_no_error (error);
- return dbus;
+ g_thread_unref (thread);
}
-static void test_tracker_sparql_cursor_next_async_query (TrackerSparqlConnection *connection,
+static void test_tracker_sparql_cursor_next_async_query (TrackerSparqlConnection *conn,
guint query);
static void
@@ -382,8 +393,8 @@ test_tracker_sparql_cursor_next_async_cb (GObject *source,
GAsyncResult *result,
gpointer user_data)
{
- TrackerSparqlConnection *connection;
TrackerSparqlCursor *cursor;
+ TrackerSparqlConnection *conn;
GCancellable *cancellable;
GError *error = NULL;
gboolean success;
@@ -407,19 +418,20 @@ test_tracker_sparql_cursor_next_async_cb (GObject *source,
}
cursor = TRACKER_SPARQL_CURSOR (source);
+ conn = tracker_sparql_cursor_get_connection (cursor);
g_assert_true (cursor != NULL);
- connection = tracker_sparql_cursor_get_connection (cursor);
if (!success) {
query++;
next = 0;
if (query == 1 || query == 2) {
- test_tracker_sparql_cursor_next_async_query (connection,
- query);
+ test_tracker_sparql_cursor_next_async_query (conn, query);
} else if (query == 3) {
g_main_loop_quit (main_loop);
}
+
+ g_object_unref (cursor);
} else {
next++;
@@ -440,7 +452,7 @@ test_tracker_sparql_cursor_next_async_cb (GObject *source,
}
static void
-test_tracker_sparql_cursor_next_async_query (TrackerSparqlConnection *connection,
+test_tracker_sparql_cursor_next_async_query (TrackerSparqlConnection *conn,
guint query)
{
TrackerSparqlCursor *cursor;
@@ -453,7 +465,7 @@ test_tracker_sparql_cursor_next_async_query (TrackerSparqlConnection *connection
cancellable = g_cancellable_new ();
g_assert_true (cancellable != NULL);
- cursor = tracker_sparql_connection_query (connection,
+ cursor = tracker_sparql_connection_query (conn,
queries[query],
NULL,
&error);
@@ -470,8 +482,7 @@ static void
test_tracker_sparql_cursor_next_async (gpointer fixture,
gconstpointer user_data)
{
- TrackerSparqlConnection *connection;
- GError *error = NULL;
+ TrackerSparqlConnection *conn = (TrackerSparqlConnection *) user_data;
main_loop = g_main_loop_new (NULL, TRUE);
@@ -480,12 +491,7 @@ test_tracker_sparql_cursor_next_async (gpointer fixture,
* 2. Make sure we can cancel a cursor_next() call and start a new query (was failing)
* 3. Handle multiple async queries + async cursor_next() calls.
*/
-
- connection = create_local_connection (&error);
- g_assert_no_error (error);
- g_assert_true (connection != NULL);
-
- test_tracker_sparql_cursor_next_async_query (connection, 0);
+ test_tracker_sparql_cursor_next_async_query (conn, 0);
g_main_loop_run (main_loop);
}
@@ -493,15 +499,13 @@ static void
test_tracker_sparql_cursor_get_variable_name (gpointer fixture,
gconstpointer user_data)
{
- TrackerSparqlConnection *connection;
+ TrackerSparqlConnection *conn = (TrackerSparqlConnection *) user_data;
TrackerSparqlCursor *cursor;
GError *error = NULL;
- connection = create_local_connection (&error);
g_assert_no_error (error);
- g_assert_true (connection != NULL);
- cursor = tracker_sparql_connection_query (connection,
+ cursor = tracker_sparql_connection_query (conn,
"SELECT ?urn ?added ?label ?unbound { "
" ?urn nrl:added ?added ; "
" rdfs:label ?label . "
@@ -527,22 +531,19 @@ test_tracker_sparql_cursor_get_variable_name (gpointer fixture,
"unbound");
tracker_sparql_cursor_close (cursor);
- tracker_sparql_connection_close (connection);
}
static void
test_tracker_sparql_cursor_get_value_type (gpointer fixture,
gconstpointer user_data)
{
- TrackerSparqlConnection *connection;
+ TrackerSparqlConnection *conn = (TrackerSparqlConnection *) user_data;
TrackerSparqlCursor *cursor;
GError *error = NULL;
- connection = create_local_connection (&error);
g_assert_no_error (error);
- g_assert_true (connection != NULL);
- cursor = tracker_sparql_connection_query (connection,
+ cursor = tracker_sparql_connection_query (conn,
"SELECT ?urn ?added ?label ?unbound { "
" ?urn nrl:added ?added ; "
" rdfs:label ?label . "
@@ -568,7 +569,6 @@ test_tracker_sparql_cursor_get_value_type (gpointer fixture,
TRACKER_SPARQL_VALUE_TYPE_UNBOUND);
tracker_sparql_cursor_close (cursor);
- tracker_sparql_connection_close (connection);
}
typedef struct {
@@ -590,16 +590,18 @@ TestInfo tests[] = {
};
static void
-add_tests (void)
+add_tests (const gchar *conn_name,
+ TrackerSparqlConnection *conn)
{
guint i;
for (i = 0; i < G_N_ELEMENTS (tests); i++) {
gchar *test_name;
- test_name = g_strdup_printf ("/libtracker-sparql/cursor/%s", tests[i].name);
+ test_name = g_strdup_printf ("/libtracker-sparql/cursor/%s/%s",
+ conn_name, tests[i].name);
g_test_add (test_name,
- gpointer, NULL,
+ gpointer, conn,
insert_test_data,
(void (*) (gpointer *, gconstpointer)) tests[i].func,
delete_test_data);
@@ -612,9 +614,11 @@ main (gint argc, gchar **argv)
{
g_test_init (&argc, &argv, NULL);
- connection = create_dbus_connection (NULL);
+ create_connections ();
- add_tests ();
+ add_tests ("direct", direct);
+ add_tests ("dbus", dbus);
+ add_tests ("http", http);
return g_test_run ();
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
