libtracker-extract: Fix unit tests and return value for guarantee API

- Return FALSE when we don't add to the TrackerSparqlBuilder, TRUE otherwise
- Skip any unit tests when --enable-guarantee-metadata is not configured

1 files changed, 16 insertions, 9 deletions

diff --git a/tests/libtracker-extract/tracker-guarantee-test.c b/tests/libtracker-extract/tracker-guarantee-test.c
index 3495c552d..1212022cc 100644
--- a/tests/libtracker-extract/tracker-guarantee-test.c
+++ b/tests/libtracker-extract/tracker-guarantee-test.c
@@ -35,26 +35,19 @@ typedef struct {
 
 TestInfo title_tests [] = {
 	{ "normal-extraction", "file:///a/b/a_video_with_metadata.avi", "extracted title", "extracted title" },
-
-#ifdef GUARANTEE_METADATA
 	{ "empty-extraction", "file:///a/b/a_video_with_no_metadata.avi", NULL, "a video with no metadata" },
 	{ "underscore-separators", "file:///a/b/a_video_with_no_metadata.avi", "", "a video with no metadata" },
 	{ "dot-separators", "file:///a/b/a.video.with.no.metadata.avi", NULL, "a.video.with.no.metadata" },
 	{ "no-extension", "file:///a/b/a video without extension", NULL, "a video without extension" },
 	{ "hidden-files", "file:///a/b/.hidden_file", NULL, "hidden file" },
-#endif
 
 	{ NULL, NULL, NULL }
 };
 
 TestInfo date_tests [] = {
 	{ "date-normal", "file:///does/not/matter/here", NULL, "2011-10-10T12:13:14Z0300" },
-
-#ifdef GUARANTEE_METADATA
 	{ "date-is-null", NULL, NULL, NULL },
 	{ "date-is-empty-string", NULL, NULL, NULL },
-#endif
-
 	{ NULL, NULL, NULL }
 };
 
@@ -62,13 +55,16 @@ static void
 test_title (TestInfo      *info,
             gconstpointer  context)
 {
+#ifdef GUARANTEE_METADATA
 	gchar *sparql;
 	gchar *title_guaranteed;
+	gboolean title_retrieved;
 
 	tracker_sparql_builder_insert_open (info->builder, "test");
 	tracker_sparql_builder_subject_iri (info->builder, "test://resource");
+	title_retrieved = tracker_guarantee_title_from_file (info->builder, "nie:title", info->extracted, info->uri, &title_guaranteed);
+	g_assert_true (title_retrieved);
 
-	g_assert_true (tracker_guarantee_title_from_file (info->builder, "nie:title", info->extracted, info->uri, &title_guaranteed));
 	tracker_sparql_builder_insert_close (info->builder);
 
 	sparql = g_strdup_printf ("INSERT INTO <test> {\n<test://resource> nie:title \"%s\" .\n}\n", info->expected);
@@ -77,20 +73,31 @@ test_title (TestInfo      *info,
 
 	g_free (title_guaranteed);
 	g_free (sparql);
+#else  /* GUARANTEE_METADATA */
+	g_test_skip ("Not built with --enable-guarantee-metadata");
+#endif /* GUARANTEE_METADATA */
 }
 
 static void
 test_date (TestInfo      *info,
            gconstpointer  context)
 {
+#ifdef GUARANTEE_METADATA
+	gboolean date_retrieved;
+
 	tracker_sparql_builder_insert_open (info->builder, "test");
 	tracker_sparql_builder_subject_iri (info->builder, "test://resource");
 
-	g_assert_true (tracker_guarantee_date_from_file_mtime (info->builder, "test:mtime", info->extracted, info->uri));
+	date_retrieved = tracker_guarantee_date_from_file_mtime (info->builder, "test:mtime", info->extracted, info->uri);
+	g_assert_true (date_retrieved);
+
 	tracker_sparql_builder_insert_close (info->builder);
 
 	/* mtime can change in the file so we just check that the property is in the output */
 	g_assert_nonnull (g_strstr_len (tracker_sparql_builder_get_result (info->builder), -1, "test:mtime"));
+#else  /* GUARANTEE_METADATA */
+	g_test_skip ("Not built with --enable-guarantee-metadata");
+#endif /* GUARANTEE_METADATA */
 }
 
 static void