[tracker/sam/functional-test-fixes] Always guarantee metadata

[Sam Thursfield <sthursfield src gnome org>]

commit 9ab954bea675d2e63c3924df32b4c38d9be09ab2
Author: Sam Thursfield <sam afuera me uk>
Date:   Mon Jul 21 21:57:17 2014 +0100

    Always guarantee metadata
    
    The --enable-guarantee-metadata flag is required for the functional tests to
    pass. I don't understand why this behaviour is conditional in the first place.
    Let make it always enabled and remove the flag.
    
    When merged, jhbuild should be updated to remove the flag too!

 configure.ac                                      |   18 -----------------
 src/libtracker-extract/tracker-guarantee.c        |   22 ---------------------
 tests/libtracker-extract/tracker-guarantee-test.c |   12 +----------
 3 files changed, 1 insertions(+), 51 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index aedafa0..5e08e6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2334,24 +2334,6 @@ fi
 
 AM_CONDITIONAL(HAVE_TOTEM_PL_PARSER, test "x$have_playlist" = "xyes")
 
-#####################################################################
-# Check for tracker-extract: Guarantee existence of certain metadata
-#####################################################################
-
-# Currently guarantees (for extraction):
-# - nie:title for music and video files
-# - nie:contentCreated for music, video and image files
-
-AC_ARG_ENABLE(guarantee-metadata,
-             AS_HELP_STRING([--enable-guarantee-metadata],
-                            [enable guaranteed existence of some metadata, e.g. nie:title from files 
[[default=no]]]),
-                            [enable_guarantee_metadata=yes],
-                            [enable_guarantee_metadata=no])
-
-if test "x$enable_guarantee_metadata" != "xno"; then
-  AC_DEFINE(GUARANTEE_METADATA, 1, [Guarantee existence of some metadata])
-fi
-
 ####################################################################
 # Check if we should use initctl or sysvinit
 ####################################################################
diff --git a/src/libtracker-extract/tracker-guarantee.c b/src/libtracker-extract/tracker-guarantee.c
index d7409e5..077342d 100644
--- a/src/libtracker-extract/tracker-guarantee.c
+++ b/src/libtracker-extract/tracker-guarantee.c
@@ -28,8 +28,6 @@
 
 #include "tracker-guarantee.h"
 
-#ifdef GUARANTEE_METADATA
-
 static gchar *
 get_title_from_file (const gchar *uri)
 {
@@ -68,8 +66,6 @@ get_date_from_file_mtime (const gchar *uri)
        return date;
 }
 
-#endif /* GUARANTEE_METADATA */
-
 /**
  * tracker_guarantee_title_from_file:
  * @metadata: the metadata object to insert the data into
@@ -98,7 +94,6 @@ tracker_guarantee_title_from_file (TrackerSparqlBuilder  *metadata,
                                    const gchar           *uri,
                                    gchar                **p_new_value)
 {
-#ifdef GUARANTEE_METADATA
        g_return_val_if_fail (metadata != NULL, FALSE);
        g_return_val_if_fail (key != NULL, FALSE);
        g_return_val_if_fail (uri != NULL, FALSE);
@@ -123,16 +118,6 @@ tracker_guarantee_title_from_file (TrackerSparqlBuilder  *metadata,
                        g_free (value);
                }
        }
-#else  /* GUARANTEE_METADATA */
-       if (current_value && *current_value != '\0') {
-               tracker_sparql_builder_predicate (metadata, key);
-               tracker_sparql_builder_object_unvalidated (metadata, current_value);
-
-               if (p_new_value != NULL) {
-                       *p_new_value = g_strdup (current_value);
-               }
-       }
-#endif /* GUARANTEE_METADATA */
 
        return TRUE;
 }
@@ -161,7 +146,6 @@ tracker_guarantee_date_from_file_mtime (TrackerSparqlBuilder *metadata,
                                         const gchar          *current_value,
                                         const gchar          *uri)
 {
-#ifdef GUARANTEE_METADATA
        g_return_val_if_fail (metadata != NULL, FALSE);
        g_return_val_if_fail (key != NULL, FALSE);
        g_return_val_if_fail (uri != NULL, FALSE);
@@ -177,12 +161,6 @@ tracker_guarantee_date_from_file_mtime (TrackerSparqlBuilder *metadata,
                tracker_sparql_builder_object_unvalidated (metadata, value);
                g_free (value);
        }
-#else  /* GUARANTEE_METADATA */
-       if (current_value && *current_value != '\0') {
-               tracker_sparql_builder_predicate (metadata, key);
-               tracker_sparql_builder_object_unvalidated (metadata, current_value);
-       }
-#endif /* GUARANTEE_METADATA */
 
        return TRUE;
 }
diff --git a/tests/libtracker-extract/tracker-guarantee-test.c 
b/tests/libtracker-extract/tracker-guarantee-test.c
index a146c28..284fbf0 100644
--- a/tests/libtracker-extract/tracker-guarantee-test.c
+++ b/tests/libtracker-extract/tracker-guarantee-test.c
@@ -30,13 +30,11 @@ typedef struct {
 TestCase test_cases_title [] = {
         { "file:///a/b/a_video_with_metadata.avi", "extracted title", "extracted title" },
 
-#ifdef GUARANTEE_METADATA 
         { "file:///a/b/a_video_with_no_metadata.avi", NULL, "a video with no metadata" },
         { "file:///a/b/a_video_with_no_metadata.avi", "", "a video with no metadata" },
         { "file:///a/b/a.video.with.no.metadata.avi", NULL, "a.video.with.no.metadata" },
         { "file:///a/b/a video without extension", NULL, "a video without extension" },
         { "file:///a/b/.hidden_file", NULL, "hidden file" },
-#endif
 
         { NULL, NULL, NULL}
 };
@@ -110,33 +108,25 @@ test_guarantee_title (void)
                                      test_cases_title[i].expected_title);
         }
 
-#ifdef GUARANTEE_METADATA        
         g_print ("%d test cases (guarantee metadata enabled) ", i);
-#else
-        g_print ("%d test cases (guarantee metadata disabled) ", i);
-#endif
 }
 
 static void
 test_guarantee_date (void)
 {
-#ifdef GUARANTEE_METADATA
         GFile *f;
         gchar *uri;
-#endif
 
         internal_test_date ("file:///does/not/matter/here", "2011-10-10T12:13:14Z0300");
 
-#ifdef GUARANTEE_METADATA        
         f = g_file_new_for_path (TOP_SRCDIR "/tests/libtracker-extract/guarantee-mtime-test.txt");
         uri = g_file_get_uri (f);
-        
+
         internal_test_date (uri, NULL);
         internal_test_date (uri, "");
 
         g_free (uri);
         g_object_unref (f);
-#endif
 }