[tracker/wip/carlosg/shuffle-dirs: 6/15] tests: Rename libtracker-fts tests directory to fts

[Carlos Garnacho <carlosg src gnome org>]

commit 6b9cd24095c7007bbf0a89c46340b23699b25a0f
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sun Apr 3 12:35:22 2022 +0200

    tests: Rename libtracker-fts tests directory to fts
    
    This does not refer to static libraries anymore, generalize the
    testsuite name. While at it, drop the unnecessary libtracker-data
    dependency.

 tests/{libtracker-fts => fts}/.gitignore                | 0
 tests/{libtracker-fts => fts}/data.ontology             | 0
 tests/{libtracker-fts => fts}/fts3aa-1.out              | 0
 tests/{libtracker-fts => fts}/fts3aa-1.rq               | 0
 tests/{libtracker-fts => fts}/fts3aa-2.out              | 0
 tests/{libtracker-fts => fts}/fts3aa-2.rq               | 0
 tests/{libtracker-fts => fts}/fts3aa-3.out              | 0
 tests/{libtracker-fts => fts}/fts3aa-3.rq               | 0
 tests/{libtracker-fts => fts}/fts3aa-data.rq            | 0
 tests/{libtracker-fts => fts}/fts3ae-1.out              | 0
 tests/{libtracker-fts => fts}/fts3ae-1.rq               | 0
 tests/{libtracker-fts => fts}/fts3ae-data.rq            | 0
 tests/{libtracker-fts => fts}/functions/offsets-1.out   | 0
 tests/{libtracker-fts => fts}/functions/offsets-1.rq    | 0
 tests/{libtracker-fts => fts}/functions/offsets-2.out   | 0
 tests/{libtracker-fts => fts}/functions/offsets-2.rq    | 0
 tests/{libtracker-fts => fts}/functions/offsets-3.out   | 0
 tests/{libtracker-fts => fts}/functions/offsets-3.rq    | 0
 tests/{libtracker-fts => fts}/functions/offsets-data.rq | 0
 tests/{libtracker-fts => fts}/functions/rank-1.out      | 0
 tests/{libtracker-fts => fts}/functions/rank-1.rq       | 0
 tests/{libtracker-fts => fts}/functions/rank-2.out      | 0
 tests/{libtracker-fts => fts}/functions/rank-2.rq       | 0
 tests/{libtracker-fts => fts}/functions/rank-data.rq    | 0
 tests/{libtracker-fts => fts}/functions/snippet-1.out   | 0
 tests/{libtracker-fts => fts}/functions/snippet-1.rq    | 0
 tests/{libtracker-fts => fts}/functions/snippet-2.out   | 0
 tests/{libtracker-fts => fts}/functions/snippet-2.rq    | 0
 tests/{libtracker-fts => fts}/functions/snippet-3.out   | 0
 tests/{libtracker-fts => fts}/functions/snippet-3.rq    | 0
 tests/{libtracker-fts => fts}/functions/snippet-4.out   | 0
 tests/{libtracker-fts => fts}/functions/snippet-4.rq    | 0
 tests/{libtracker-fts => fts}/functions/snippet-5.out   | 0
 tests/{libtracker-fts => fts}/functions/snippet-5.rq    | 0
 tests/{libtracker-fts => fts}/functions/snippet-data.rq | 0
 tests/{libtracker-fts => fts}/input/fts3input-1.out     | 0
 tests/{libtracker-fts => fts}/input/fts3input-1.rq      | 0
 tests/{libtracker-fts => fts}/input/fts3input-2.out     | 0
 tests/{libtracker-fts => fts}/input/fts3input-2.rq      | 0
 tests/{libtracker-fts => fts}/input/fts3input-3.out     | 0
 tests/{libtracker-fts => fts}/input/fts3input-3.rq      | 0
 tests/{libtracker-fts => fts}/input/fts3input-data.rq   | 0
 tests/{libtracker-fts => fts}/limits/fts3limits-1.out   | 0
 tests/{libtracker-fts => fts}/limits/fts3limits-1.rq    | 0
 tests/{libtracker-fts => fts}/limits/fts3limits-2.out   | 0
 tests/{libtracker-fts => fts}/limits/fts3limits-2.rq    | 0
 tests/{libtracker-fts => fts}/limits/fts3limits-3.out   | 0
 tests/{libtracker-fts => fts}/limits/fts3limits-3.rq    | 0
 tests/{libtracker-fts => fts}/limits/fts3limits-4.out   | 0
 tests/{libtracker-fts => fts}/limits/fts3limits-4.rq    | 0
 tests/{libtracker-fts => fts}/limits/fts3limits-data.rq | 0
 tests/{libtracker-fts => fts}/meson.build               | 2 +-
 tests/{libtracker-fts => fts}/prefix/fts3prefix-1.out   | 0
 tests/{libtracker-fts => fts}/prefix/fts3prefix-1.rq    | 0
 tests/{libtracker-fts => fts}/prefix/fts3prefix-2.out   | 0
 tests/{libtracker-fts => fts}/prefix/fts3prefix-2.rq    | 0
 tests/{libtracker-fts => fts}/prefix/fts3prefix-3.out   | 0
 tests/{libtracker-fts => fts}/prefix/fts3prefix-3.rq    | 0
 tests/{libtracker-fts => fts}/prefix/fts3prefix-data.rq | 0
 tests/{libtracker-fts => fts}/tracker-fts-test.c        | 9 +++------
 tests/meson.build                                       | 2 +-
 61 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/tests/libtracker-fts/.gitignore b/tests/fts/.gitignore
similarity index 100%
rename from tests/libtracker-fts/.gitignore
rename to tests/fts/.gitignore
diff --git a/tests/libtracker-fts/data.ontology b/tests/fts/data.ontology
similarity index 100%
rename from tests/libtracker-fts/data.ontology
rename to tests/fts/data.ontology
diff --git a/tests/libtracker-fts/fts3aa-1.out b/tests/fts/fts3aa-1.out
similarity index 100%
rename from tests/libtracker-fts/fts3aa-1.out
rename to tests/fts/fts3aa-1.out
diff --git a/tests/libtracker-fts/fts3aa-1.rq b/tests/fts/fts3aa-1.rq
similarity index 100%
rename from tests/libtracker-fts/fts3aa-1.rq
rename to tests/fts/fts3aa-1.rq
diff --git a/tests/libtracker-fts/fts3aa-2.out b/tests/fts/fts3aa-2.out
similarity index 100%
rename from tests/libtracker-fts/fts3aa-2.out
rename to tests/fts/fts3aa-2.out
diff --git a/tests/libtracker-fts/fts3aa-2.rq b/tests/fts/fts3aa-2.rq
similarity index 100%
rename from tests/libtracker-fts/fts3aa-2.rq
rename to tests/fts/fts3aa-2.rq
diff --git a/tests/libtracker-fts/fts3aa-3.out b/tests/fts/fts3aa-3.out
similarity index 100%
rename from tests/libtracker-fts/fts3aa-3.out
rename to tests/fts/fts3aa-3.out
diff --git a/tests/libtracker-fts/fts3aa-3.rq b/tests/fts/fts3aa-3.rq
similarity index 100%
rename from tests/libtracker-fts/fts3aa-3.rq
rename to tests/fts/fts3aa-3.rq
diff --git a/tests/libtracker-fts/fts3aa-data.rq b/tests/fts/fts3aa-data.rq
similarity index 100%
rename from tests/libtracker-fts/fts3aa-data.rq
rename to tests/fts/fts3aa-data.rq
diff --git a/tests/libtracker-fts/fts3ae-1.out b/tests/fts/fts3ae-1.out
similarity index 100%
rename from tests/libtracker-fts/fts3ae-1.out
rename to tests/fts/fts3ae-1.out
diff --git a/tests/libtracker-fts/fts3ae-1.rq b/tests/fts/fts3ae-1.rq
similarity index 100%
rename from tests/libtracker-fts/fts3ae-1.rq
rename to tests/fts/fts3ae-1.rq
diff --git a/tests/libtracker-fts/fts3ae-data.rq b/tests/fts/fts3ae-data.rq
similarity index 100%
rename from tests/libtracker-fts/fts3ae-data.rq
rename to tests/fts/fts3ae-data.rq
diff --git a/tests/libtracker-fts/functions/offsets-1.out b/tests/fts/functions/offsets-1.out
similarity index 100%
rename from tests/libtracker-fts/functions/offsets-1.out
rename to tests/fts/functions/offsets-1.out
diff --git a/tests/libtracker-fts/functions/offsets-1.rq b/tests/fts/functions/offsets-1.rq
similarity index 100%
rename from tests/libtracker-fts/functions/offsets-1.rq
rename to tests/fts/functions/offsets-1.rq
diff --git a/tests/libtracker-fts/functions/offsets-2.out b/tests/fts/functions/offsets-2.out
similarity index 100%
rename from tests/libtracker-fts/functions/offsets-2.out
rename to tests/fts/functions/offsets-2.out
diff --git a/tests/libtracker-fts/functions/offsets-2.rq b/tests/fts/functions/offsets-2.rq
similarity index 100%
rename from tests/libtracker-fts/functions/offsets-2.rq
rename to tests/fts/functions/offsets-2.rq
diff --git a/tests/libtracker-fts/functions/offsets-3.out b/tests/fts/functions/offsets-3.out
similarity index 100%
rename from tests/libtracker-fts/functions/offsets-3.out
rename to tests/fts/functions/offsets-3.out
diff --git a/tests/libtracker-fts/functions/offsets-3.rq b/tests/fts/functions/offsets-3.rq
similarity index 100%
rename from tests/libtracker-fts/functions/offsets-3.rq
rename to tests/fts/functions/offsets-3.rq
diff --git a/tests/libtracker-fts/functions/offsets-data.rq b/tests/fts/functions/offsets-data.rq
similarity index 100%
rename from tests/libtracker-fts/functions/offsets-data.rq
rename to tests/fts/functions/offsets-data.rq
diff --git a/tests/libtracker-fts/functions/rank-1.out b/tests/fts/functions/rank-1.out
similarity index 100%
rename from tests/libtracker-fts/functions/rank-1.out
rename to tests/fts/functions/rank-1.out
diff --git a/tests/libtracker-fts/functions/rank-1.rq b/tests/fts/functions/rank-1.rq
similarity index 100%
rename from tests/libtracker-fts/functions/rank-1.rq
rename to tests/fts/functions/rank-1.rq
diff --git a/tests/libtracker-fts/functions/rank-2.out b/tests/fts/functions/rank-2.out
similarity index 100%
rename from tests/libtracker-fts/functions/rank-2.out
rename to tests/fts/functions/rank-2.out
diff --git a/tests/libtracker-fts/functions/rank-2.rq b/tests/fts/functions/rank-2.rq
similarity index 100%
rename from tests/libtracker-fts/functions/rank-2.rq
rename to tests/fts/functions/rank-2.rq
diff --git a/tests/libtracker-fts/functions/rank-data.rq b/tests/fts/functions/rank-data.rq
similarity index 100%
rename from tests/libtracker-fts/functions/rank-data.rq
rename to tests/fts/functions/rank-data.rq
diff --git a/tests/libtracker-fts/functions/snippet-1.out b/tests/fts/functions/snippet-1.out
similarity index 100%
rename from tests/libtracker-fts/functions/snippet-1.out
rename to tests/fts/functions/snippet-1.out
diff --git a/tests/libtracker-fts/functions/snippet-1.rq b/tests/fts/functions/snippet-1.rq
similarity index 100%
rename from tests/libtracker-fts/functions/snippet-1.rq
rename to tests/fts/functions/snippet-1.rq
diff --git a/tests/libtracker-fts/functions/snippet-2.out b/tests/fts/functions/snippet-2.out
similarity index 100%
rename from tests/libtracker-fts/functions/snippet-2.out
rename to tests/fts/functions/snippet-2.out
diff --git a/tests/libtracker-fts/functions/snippet-2.rq b/tests/fts/functions/snippet-2.rq
similarity index 100%
rename from tests/libtracker-fts/functions/snippet-2.rq
rename to tests/fts/functions/snippet-2.rq
diff --git a/tests/libtracker-fts/functions/snippet-3.out b/tests/fts/functions/snippet-3.out
similarity index 100%
rename from tests/libtracker-fts/functions/snippet-3.out
rename to tests/fts/functions/snippet-3.out
diff --git a/tests/libtracker-fts/functions/snippet-3.rq b/tests/fts/functions/snippet-3.rq
similarity index 100%
rename from tests/libtracker-fts/functions/snippet-3.rq
rename to tests/fts/functions/snippet-3.rq
diff --git a/tests/libtracker-fts/functions/snippet-4.out b/tests/fts/functions/snippet-4.out
similarity index 100%
rename from tests/libtracker-fts/functions/snippet-4.out
rename to tests/fts/functions/snippet-4.out
diff --git a/tests/libtracker-fts/functions/snippet-4.rq b/tests/fts/functions/snippet-4.rq
similarity index 100%
rename from tests/libtracker-fts/functions/snippet-4.rq
rename to tests/fts/functions/snippet-4.rq
diff --git a/tests/libtracker-fts/functions/snippet-5.out b/tests/fts/functions/snippet-5.out
similarity index 100%
rename from tests/libtracker-fts/functions/snippet-5.out
rename to tests/fts/functions/snippet-5.out
diff --git a/tests/libtracker-fts/functions/snippet-5.rq b/tests/fts/functions/snippet-5.rq
similarity index 100%
rename from tests/libtracker-fts/functions/snippet-5.rq
rename to tests/fts/functions/snippet-5.rq
diff --git a/tests/libtracker-fts/functions/snippet-data.rq b/tests/fts/functions/snippet-data.rq
similarity index 100%
rename from tests/libtracker-fts/functions/snippet-data.rq
rename to tests/fts/functions/snippet-data.rq
diff --git a/tests/libtracker-fts/input/fts3input-1.out b/tests/fts/input/fts3input-1.out
similarity index 100%
rename from tests/libtracker-fts/input/fts3input-1.out
rename to tests/fts/input/fts3input-1.out
diff --git a/tests/libtracker-fts/input/fts3input-1.rq b/tests/fts/input/fts3input-1.rq
similarity index 100%
rename from tests/libtracker-fts/input/fts3input-1.rq
rename to tests/fts/input/fts3input-1.rq
diff --git a/tests/libtracker-fts/input/fts3input-2.out b/tests/fts/input/fts3input-2.out
similarity index 100%
rename from tests/libtracker-fts/input/fts3input-2.out
rename to tests/fts/input/fts3input-2.out
diff --git a/tests/libtracker-fts/input/fts3input-2.rq b/tests/fts/input/fts3input-2.rq
similarity index 100%
rename from tests/libtracker-fts/input/fts3input-2.rq
rename to tests/fts/input/fts3input-2.rq
diff --git a/tests/libtracker-fts/input/fts3input-3.out b/tests/fts/input/fts3input-3.out
similarity index 100%
rename from tests/libtracker-fts/input/fts3input-3.out
rename to tests/fts/input/fts3input-3.out
diff --git a/tests/libtracker-fts/input/fts3input-3.rq b/tests/fts/input/fts3input-3.rq
similarity index 100%
rename from tests/libtracker-fts/input/fts3input-3.rq
rename to tests/fts/input/fts3input-3.rq
diff --git a/tests/libtracker-fts/input/fts3input-data.rq b/tests/fts/input/fts3input-data.rq
similarity index 100%
rename from tests/libtracker-fts/input/fts3input-data.rq
rename to tests/fts/input/fts3input-data.rq
diff --git a/tests/libtracker-fts/limits/fts3limits-1.out b/tests/fts/limits/fts3limits-1.out
similarity index 100%
rename from tests/libtracker-fts/limits/fts3limits-1.out
rename to tests/fts/limits/fts3limits-1.out
diff --git a/tests/libtracker-fts/limits/fts3limits-1.rq b/tests/fts/limits/fts3limits-1.rq
similarity index 100%
rename from tests/libtracker-fts/limits/fts3limits-1.rq
rename to tests/fts/limits/fts3limits-1.rq
diff --git a/tests/libtracker-fts/limits/fts3limits-2.out b/tests/fts/limits/fts3limits-2.out
similarity index 100%
rename from tests/libtracker-fts/limits/fts3limits-2.out
rename to tests/fts/limits/fts3limits-2.out
diff --git a/tests/libtracker-fts/limits/fts3limits-2.rq b/tests/fts/limits/fts3limits-2.rq
similarity index 100%
rename from tests/libtracker-fts/limits/fts3limits-2.rq
rename to tests/fts/limits/fts3limits-2.rq
diff --git a/tests/libtracker-fts/limits/fts3limits-3.out b/tests/fts/limits/fts3limits-3.out
similarity index 100%
rename from tests/libtracker-fts/limits/fts3limits-3.out
rename to tests/fts/limits/fts3limits-3.out
diff --git a/tests/libtracker-fts/limits/fts3limits-3.rq b/tests/fts/limits/fts3limits-3.rq
similarity index 100%
rename from tests/libtracker-fts/limits/fts3limits-3.rq
rename to tests/fts/limits/fts3limits-3.rq
diff --git a/tests/libtracker-fts/limits/fts3limits-4.out b/tests/fts/limits/fts3limits-4.out
similarity index 100%
rename from tests/libtracker-fts/limits/fts3limits-4.out
rename to tests/fts/limits/fts3limits-4.out
diff --git a/tests/libtracker-fts/limits/fts3limits-4.rq b/tests/fts/limits/fts3limits-4.rq
similarity index 100%
rename from tests/libtracker-fts/limits/fts3limits-4.rq
rename to tests/fts/limits/fts3limits-4.rq
diff --git a/tests/libtracker-fts/limits/fts3limits-data.rq b/tests/fts/limits/fts3limits-data.rq
similarity index 100%
rename from tests/libtracker-fts/limits/fts3limits-data.rq
rename to tests/fts/limits/fts3limits-data.rq
diff --git a/tests/libtracker-fts/meson.build b/tests/fts/meson.build
similarity index 61%
rename from tests/libtracker-fts/meson.build
rename to tests/fts/meson.build
index 4682b1a4c..39106eecc 100644
--- a/tests/libtracker-fts/meson.build
+++ b/tests/fts/meson.build
@@ -1,6 +1,6 @@
 fts_test = executable('tracker-fts-test',
   'tracker-fts-test.c',
-  dependencies: [tracker_common_dep, tracker_sparql_dep, tracker_data_dep, tracker_testcommon_dep],
+  dependencies: [tracker_sparql_dep, tracker_testcommon_dep],
   c_args: test_c_args
 )
 
diff --git a/tests/libtracker-fts/prefix/fts3prefix-1.out b/tests/fts/prefix/fts3prefix-1.out
similarity index 100%
rename from tests/libtracker-fts/prefix/fts3prefix-1.out
rename to tests/fts/prefix/fts3prefix-1.out
diff --git a/tests/libtracker-fts/prefix/fts3prefix-1.rq b/tests/fts/prefix/fts3prefix-1.rq
similarity index 100%
rename from tests/libtracker-fts/prefix/fts3prefix-1.rq
rename to tests/fts/prefix/fts3prefix-1.rq
diff --git a/tests/libtracker-fts/prefix/fts3prefix-2.out b/tests/fts/prefix/fts3prefix-2.out
similarity index 100%
rename from tests/libtracker-fts/prefix/fts3prefix-2.out
rename to tests/fts/prefix/fts3prefix-2.out
diff --git a/tests/libtracker-fts/prefix/fts3prefix-2.rq b/tests/fts/prefix/fts3prefix-2.rq
similarity index 100%
rename from tests/libtracker-fts/prefix/fts3prefix-2.rq
rename to tests/fts/prefix/fts3prefix-2.rq
diff --git a/tests/libtracker-fts/prefix/fts3prefix-3.out b/tests/fts/prefix/fts3prefix-3.out
similarity index 100%
rename from tests/libtracker-fts/prefix/fts3prefix-3.out
rename to tests/fts/prefix/fts3prefix-3.out
diff --git a/tests/libtracker-fts/prefix/fts3prefix-3.rq b/tests/fts/prefix/fts3prefix-3.rq
similarity index 100%
rename from tests/libtracker-fts/prefix/fts3prefix-3.rq
rename to tests/fts/prefix/fts3prefix-3.rq
diff --git a/tests/libtracker-fts/prefix/fts3prefix-data.rq b/tests/fts/prefix/fts3prefix-data.rq
similarity index 100%
rename from tests/libtracker-fts/prefix/fts3prefix-data.rq
rename to tests/fts/prefix/fts3prefix-data.rq
diff --git a/tests/libtracker-fts/tracker-fts-test.c b/tests/fts/tracker-fts-test.c
similarity index 95%
rename from tests/libtracker-fts/tracker-fts-test.c
rename to tests/fts/tracker-fts-test.c
index c0bca75ef..baffbc3b4 100644
--- a/tests/libtracker-fts/tracker-fts-test.c
+++ b/tests/fts/tracker-fts-test.c
@@ -17,15 +17,12 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#include "config.h"
-
 #include <string.h>
 
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <gio/gio.h>
 
-#include <libtracker-data/tracker-data.h>
 #include <libtracker-sparql/tracker-sparql.h>
 
 typedef struct _TestInfo TestInfo;
@@ -68,7 +65,7 @@ test_sparql_query (gconstpointer test_data)
        test_info = test_data;
 
        /* initialization */
-       prefix = g_build_path (G_DIR_SEPARATOR_S, TOP_SRCDIR, "tests", "libtracker-fts", NULL);
+       prefix = g_build_path (G_DIR_SEPARATOR_S, TOP_SRCDIR, "tests", "fts", NULL);
        test_prefix = g_build_filename (prefix, test_info->test_name, NULL);
        ontology = g_file_new_for_path (prefix);
        g_free (prefix);
@@ -196,7 +193,7 @@ main (int argc, char **argv)
        for (i = 0; tests[i].test_name; i++) {
                gchar *testpath;
 
-               testpath = g_strconcat ("/libtracker-fts/", tests[i].test_name, NULL);
+               testpath = g_strconcat ("/fts/", tests[i].test_name, NULL);
                g_test_add_data_func (testpath, &tests[i], test_sparql_query);
                g_free (testpath);
        }
@@ -204,7 +201,7 @@ main (int argc, char **argv)
        /* run tests */
        result = g_test_run ();
 
-       path = g_build_filename (TOP_BUILDDIR, "tests", "libtracker-fts", "dconf", "user", NULL);
+       path = g_build_filename (TOP_BUILDDIR, "tests", "fts", "dconf", "user", NULL);
        g_unlink (path);
        g_free (path);
 
diff --git a/tests/meson.build b/tests/meson.build
index 3a543051b..11fb725cf 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -8,9 +8,9 @@ test_bus_conf_file = configure_file(
 subdir('common')
 
 subdir('gvdb')
+subdir('fts')
 subdir('libtracker-common')
 subdir('libtracker-data')
-subdir('libtracker-fts')
 subdir('libtracker-sparql')
 subdir('functional-tests')
 subdir('services')