functional-tests: Clean up directory

Python convention is to use `_` in file names, so they can be imported, and
prefix all test modules with `test_`.

All config files are now in `config/` subdir and all data files are now
in `data/` subdir.

43 files changed, 27 insertions, 26 deletions

diff --git a/tests/functional-tests/configuration.json.in b/tests/functional-tests/config/configuration.json.in
index c3f785e6e..c3f785e6e 100644
--- a/tests/functional-tests/configuration.json.in
+++ b/tests/functional-tests/config/configuration.json.in
diff --git a/tests/functional-tests/config/meson.build b/tests/functional-tests/config/meson.build
new file mode 100644
index 000000000..62c25266c
--- /dev/null
+++ b/tests/functional-tests/config/meson.build
@@ -0,0 +1,5 @@
+config_json = configure_file(
+  input: 'configuration.json.in',
+  output: 'configuration.json',
+  configuration: testconf
+)
diff --git a/tests/functional-tests/test-ontologies/add-class/91-test.ontology b/tests/functional-tests/data/ontologies/add-class/91-test.ontology
index 582cce0d3..582cce0d3 100644
--- a/tests/functional-tests/test-ontologies/add-class/91-test.ontology
+++ b/tests/functional-tests/data/ontologies/add-class/91-test.ontology
diff --git a/tests/functional-tests/test-ontologies/add-domainIndex/91-test.ontology b/tests/functional-tests/data/ontologies/add-domainIndex/91-test.ontology
index d11f79e06..d11f79e06 100644
--- a/tests/functional-tests/test-ontologies/add-domainIndex/91-test.ontology
+++ b/tests/functional-tests/data/ontologies/add-domainIndex/91-test.ontology
diff --git a/tests/functional-tests/test-ontologies/add-prop/91-test.ontology b/tests/functional-tests/data/ontologies/add-prop/91-test.ontology
index 07ee94571..07ee94571 100644
--- a/tests/functional-tests/test-ontologies/add-prop/91-test.ontology
+++ b/tests/functional-tests/data/ontologies/add-prop/91-test.ontology
diff --git a/tests/functional-tests/test-ontologies/basic-future/91-test.ontology b/tests/functional-tests/data/ontologies/basic-future/91-test.ontology
index fb15a14b5..fb15a14b5 100644
--- a/tests/functional-tests/test-ontologies/basic-future/91-test.ontology
+++ b/tests/functional-tests/data/ontologies/basic-future/91-test.ontology
diff --git a/tests/functional-tests/test-ontologies/basic/91-test.ontology b/tests/functional-tests/data/ontologies/basic/91-test.ontology
index e5143a3b1..e5143a3b1 100644
--- a/tests/functional-tests/test-ontologies/basic/91-test.ontology
+++ b/tests/functional-tests/data/ontologies/basic/91-test.ontology
diff --git a/tests/functional-tests/test-ontologies/cardinality/91-test.ontology b/tests/functional-tests/data/ontologies/cardinality/91-test.ontology
index b7e972e8e..b7e972e8e 100644
--- a/tests/functional-tests/test-ontologies/cardinality/91-test.ontology
+++ b/tests/functional-tests/data/ontologies/cardinality/91-test.ontology
diff --git a/tests/functional-tests/test-ontologies/indexed/91-test.ontology b/tests/functional-tests/data/ontologies/indexed/91-test.ontology
index f3db50629..f3db50629 100644
--- a/tests/functional-tests/test-ontologies/indexed/91-test.ontology
+++ b/tests/functional-tests/data/ontologies/indexed/91-test.ontology
diff --git a/tests/functional-tests/test-ontologies/notify/91-test.ontology b/tests/functional-tests/data/ontologies/notify/91-test.ontology
index 307b5a51f..307b5a51f 100644
--- a/tests/functional-tests/test-ontologies/notify/91-test.ontology
+++ b/tests/functional-tests/data/ontologies/notify/91-test.ontology
diff --git a/tests/functional-tests/test-ontologies/property-promotion/91-test.ontology b/tests/functional-tests/data/ontologies/property-promotion/91-test.ontology
index f0916736d..f0916736d 100644
--- a/tests/functional-tests/test-ontologies/property-promotion/91-test.ontology
+++ b/tests/functional-tests/data/ontologies/property-promotion/91-test.ontology
diff --git a/tests/functional-tests/test-ontologies/property-range-int-to-string/91-test.ontology b/tests/functional-tests/data/ontologies/property-range-int-to-string/91-test.ontology
index e45ba6657..e45ba6657 100644
--- a/tests/functional-tests/test-ontologies/property-range-int-to-string/91-test.ontology
+++ b/tests/functional-tests/data/ontologies/property-range-int-to-string/91-test.ontology
diff --git a/tests/functional-tests/test-ontologies/property-range-string-to-date/91-test.ontology b/tests/functional-tests/data/ontologies/property-range-string-to-date/91-test.ontology
index 6749f79d8..6749f79d8 100644
--- a/tests/functional-tests/test-ontologies/property-range-string-to-date/91-test.ontology
+++ b/tests/functional-tests/data/ontologies/property-range-string-to-date/91-test.ontology
diff --git a/tests/functional-tests/test-ontologies/simple-updated-with-errors/91-test.ontology b/tests/functional-tests/data/ontologies/simple-updated-with-errors/91-test.ontology
index e62f6981b..e62f6981b 100644
--- a/tests/functional-tests/test-ontologies/simple-updated-with-errors/91-test.ontology
+++ b/tests/functional-tests/data/ontologies/simple-updated-with-errors/91-test.ontology
diff --git a/tests/functional-tests/test-ontologies/simple-updated-with-errors/92-test.ontology b/tests/functional-tests/data/ontologies/simple-updated-with-errors/92-test.ontology
index 436a2cdf8..436a2cdf8 100644
--- a/tests/functional-tests/test-ontologies/simple-updated-with-errors/92-test.ontology
+++ b/tests/functional-tests/data/ontologies/simple-updated-with-errors/92-test.ontology
diff --git a/tests/functional-tests/test-ontologies/simple-updated/91-test.ontology b/tests/functional-tests/data/ontologies/simple-updated/91-test.ontology
index c63cf232d..c63cf232d 100644
--- a/tests/functional-tests/test-ontologies/simple-updated/91-test.ontology
+++ b/tests/functional-tests/data/ontologies/simple-updated/91-test.ontology
diff --git a/tests/functional-tests/test-ontologies/simple-updated/92-test.ontology b/tests/functional-tests/data/ontologies/simple-updated/92-test.ontology
index c1bfb549e..c1bfb549e 100644
--- a/tests/functional-tests/test-ontologies/simple-updated/92-test.ontology
+++ b/tests/functional-tests/data/ontologies/simple-updated/92-test.ontology
diff --git a/tests/functional-tests/test-ontologies/simple-with-errors/91-test.ontology b/tests/functional-tests/data/ontologies/simple-with-errors/91-test.ontology
index daabc6a6b..daabc6a6b 100644
--- a/tests/functional-tests/test-ontologies/simple-with-errors/91-test.ontology
+++ b/tests/functional-tests/data/ontologies/simple-with-errors/91-test.ontology
diff --git a/tests/functional-tests/test-ontologies/simple-with-errors/92-test.ontology b/tests/functional-tests/data/ontologies/simple-with-errors/92-test.ontology
index 942436435..942436435 100644
--- a/tests/functional-tests/test-ontologies/simple-with-errors/92-test.ontology
+++ b/tests/functional-tests/data/ontologies/simple-with-errors/92-test.ontology
diff --git a/tests/functional-tests/test-ontologies/simple/91-test.ontology b/tests/functional-tests/data/ontologies/simple/91-test.ontology
index 30b045ad6..30b045ad6 100644
--- a/tests/functional-tests/test-ontologies/simple/91-test.ontology
+++ b/tests/functional-tests/data/ontologies/simple/91-test.ontology
diff --git a/tests/functional-tests/test-ontologies/simple/92-test.ontology b/tests/functional-tests/data/ontologies/simple/92-test.ontology
index b554009af..b554009af 100644
--- a/tests/functional-tests/test-ontologies/simple/92-test.ontology
+++ b/tests/functional-tests/data/ontologies/simple/92-test.ontology
diff --git a/tests/functional-tests/test-ontologies/superclass-remove/91-test.ontology b/tests/functional-tests/data/ontologies/superclass-remove/91-test.ontology
index c884b39a3..c884b39a3 100644
--- a/tests/functional-tests/test-ontologies/superclass-remove/91-test.ontology
+++ b/tests/functional-tests/data/ontologies/superclass-remove/91-test.ontology
diff --git a/tests/functional-tests/test-data/test-movie.ttl b/tests/functional-tests/data/serialized/test-movie.ttl
index 8c787a6fc..8c787a6fc 100644
--- a/tests/functional-tests/test-data/test-movie.ttl
+++ b/tests/functional-tests/data/serialized/test-movie.ttl
diff --git a/tests/functional-tests/fixtures.py b/tests/functional-tests/fixtures.py
index 9a05ffe10..1cab229b8 100644
--- a/tests/functional-tests/fixtures.py
+++ b/tests/functional-tests/fixtures.py
@@ -311,7 +311,7 @@ class TrackerCommandLineTestCase(ut.TestCase):
             shutil.rmtree(dirpath, ignore_errors=True)
 
     def data_path(self, filename):
-        test_data = pathlib.Path(__file__).parent.joinpath('test-data')
+        test_data = pathlib.Path(__file__).parent.joinpath('data')
         return test_data.joinpath(filename)
 
     def run_cli(self, command):
diff --git a/tests/functional-tests/meson.build b/tests/functional-tests/meson.build
index 84350a36c..74f22baf4 100644
--- a/tests/functional-tests/meson.build
+++ b/tests/functional-tests/meson.build
@@ -6,7 +6,7 @@ endif
 
 testconf = configuration_data()
 
-config_json_full_path = join_paths(meson.current_build_dir(), 'configuration.json')
+config_json_full_path = join_paths(meson.current_build_dir(), 'config', 'configuration.json')
 
 testconf.set('TEST_CLI_DIR', tracker_uninstalled_cli_dir)
 testconf.set('TEST_ONTOLOGIES_DIR', tracker_uninstalled_nepomuk_ontologies_dir)
@@ -15,28 +15,24 @@ testconf.set('TEST_PORTAL_FLATPAK_INFO', source_root / 'tests' / 'flatpak-info')
 testconf.set('TRACKER_VERSION', meson.project_version())
 testconf.set('TEST_TAP_ENABLED', get_option('tests_tap_protocol').to_string())
 
-config_json = configure_file(
-  input: 'configuration.json.in',
-  output: 'configuration.json',
-  configuration: testconf
-)
+subdir('config')
 
 functional_tests = [
-  'insertion',
-  'query',
-  'fts-functions',
-  'sparql-bugs',
-  'group-concat',
-  'coalesce',
-  'distance',
-  'graph',
-  'concurrent-query',
-  'notifier',
-  'collation',
-  'ontology-changes',
-  'ontology-rollback',
-  'cli',
-  'portal',
+  'test_cli',
+  'test_coalesce',
+  'test_collation',
+  'test_concurrent_query',
+  'test_distance',
+  'test_fts_functions',
+  'test_graph',
+  'test_group_concat',
+  'test_insertion',
+  'test_notifier',
+  'test_ontology_changes',
+  'test_ontology_rollback',
+  'test_portal',
+  'test_query',
+  'test_sparql_bugs',
 ]
 
 test_env = environment()
@@ -57,4 +53,4 @@ foreach test_name: functional_tests
     timeout: 30)
 endforeach
 
-subdir('ipc')
+subdir('test_ipc')
diff --git a/tests/functional-tests/cli.py b/tests/functional-tests/test_cli.py
index 1318e754e..050984a35 100644
--- a/tests/functional-tests/cli.py
+++ b/tests/functional-tests/test_cli.py
@@ -72,7 +72,7 @@ class TestCli(fixtures.TrackerCommandLineTestCase):
     def test_import(self):
         """Import a Turtle file into a Tracker database."""
 
-        testdata = str(self.data_path('test-movie.ttl'))
+        testdata = str(self.data_path('serialized/test-movie.ttl'))
 
         with self.tmpdir() as tmpdir:
             ontology_path = configuration.ontologies_dir()
diff --git a/tests/functional-tests/coalesce.py b/tests/functional-tests/test_coalesce.py
index f8961edf7..f8961edf7 100644
--- a/tests/functional-tests/coalesce.py
+++ b/tests/functional-tests/test_coalesce.py
diff --git a/tests/functional-tests/collation.py b/tests/functional-tests/test_collation.py
index 733d4243f..733d4243f 100644
--- a/tests/functional-tests/collation.py
+++ b/tests/functional-tests/test_collation.py
diff --git a/tests/functional-tests/concurrent-query.py b/tests/functional-tests/test_concurrent_query.py
index 1ef8d69bc..1ef8d69bc 100644
--- a/tests/functional-tests/concurrent-query.py
+++ b/tests/functional-tests/test_concurrent_query.py
diff --git a/tests/functional-tests/distance.py b/tests/functional-tests/test_distance.py
index 9ad6ddd6b..9ad6ddd6b 100644
--- a/tests/functional-tests/distance.py
+++ b/tests/functional-tests/test_distance.py
diff --git a/tests/functional-tests/fts-functions.py b/tests/functional-tests/test_fts_functions.py
index e1b33bc1c..e1b33bc1c 100644
--- a/tests/functional-tests/fts-functions.py
+++ b/tests/functional-tests/test_fts_functions.py
diff --git a/tests/functional-tests/graph.py b/tests/functional-tests/test_graph.py
index 1b93df467..1b93df467 100644
--- a/tests/functional-tests/graph.py
+++ b/tests/functional-tests/test_graph.py
diff --git a/tests/functional-tests/group-concat.py b/tests/functional-tests/test_group_concat.py
index 5e3f11d26..5e3f11d26 100644
--- a/tests/functional-tests/group-concat.py
+++ b/tests/functional-tests/test_group_concat.py
diff --git a/tests/functional-tests/insertion.py b/tests/functional-tests/test_insertion.py
index 769aec7ae..769aec7ae 100644
--- a/tests/functional-tests/insertion.py
+++ b/tests/functional-tests/test_insertion.py
diff --git a/tests/functional-tests/ipc/.gitignore b/tests/functional-tests/test_ipc/.gitignore
index 388cd774a..388cd774a 100644
--- a/tests/functional-tests/ipc/.gitignore
+++ b/tests/functional-tests/test_ipc/.gitignore
diff --git a/tests/functional-tests/ipc/meson.build b/tests/functional-tests/test_ipc/meson.build
index 4aaa334b8..4aaa334b8 100644
--- a/tests/functional-tests/ipc/meson.build
+++ b/tests/functional-tests/test_ipc/meson.build
diff --git a/tests/functional-tests/ipc/test-bus-query-cancellation.c b/tests/functional-tests/test_ipc/test-bus-query-cancellation.c
index 65997b06c..65997b06c 100644
--- a/tests/functional-tests/ipc/test-bus-query-cancellation.c
+++ b/tests/functional-tests/test_ipc/test-bus-query-cancellation.c
diff --git a/tests/functional-tests/notifier.py b/tests/functional-tests/test_notifier.py
index e98512458..e98512458 100644
--- a/tests/functional-tests/notifier.py
+++ b/tests/functional-tests/test_notifier.py
diff --git a/tests/functional-tests/ontology-changes.py b/tests/functional-tests/test_ontology_changes.py
index 83e236fb2..6ed01bfbf 100644
--- a/tests/functional-tests/ontology-changes.py
+++ b/tests/functional-tests/test_ontology_changes.py
@@ -71,7 +71,7 @@ class OntologyChangeTestTemplate (ut.TestCase):
         shutil.rmtree(self.tmpdir, ignore_errors=True)
 
     def ontology_path(self, param):
-        return pathlib.Path(__file__).parent.joinpath('test-ontologies', param)
+        return pathlib.Path(__file__).parent.joinpath('data', 'ontologies', param)
 
     def template_test_ontology_change(self):
         self.set_ontology_dirs()
diff --git a/tests/functional-tests/ontology-rollback.py b/tests/functional-tests/test_ontology_rollback.py
index 51fda54aa..65ce59fe6 100644
--- a/tests/functional-tests/ontology-rollback.py
+++ b/tests/functional-tests/test_ontology_rollback.py
@@ -75,7 +75,7 @@ class OntologyRollbackTestTemplate (ut.TestCase):
         shutil.rmtree(self.tmpdir, ignore_errors=True)
 
     def ontology_path(self, param):
-        return pathlib.Path(__file__).parent.joinpath('test-ontologies', param)
+        return pathlib.Path(__file__).parent.joinpath('data', 'ontologies', param)
 
     def template_test_ontology_rollback(self):
         self.set_ontology_dirs()
diff --git a/tests/functional-tests/portal.py b/tests/functional-tests/test_portal.py
index 1cc0717bc..1cc0717bc 100644
--- a/tests/functional-tests/portal.py
+++ b/tests/functional-tests/test_portal.py
diff --git a/tests/functional-tests/query.py b/tests/functional-tests/test_query.py
index 18a29b6f1..18a29b6f1 100644
--- a/tests/functional-tests/query.py
+++ b/tests/functional-tests/test_query.py
diff --git a/tests/functional-tests/sparql-bugs.py b/tests/functional-tests/test_sparql_bugs.py
index bdd128f8c..bdd128f8c 100644
--- a/tests/functional-tests/sparql-bugs.py
+++ b/tests/functional-tests/test_sparql_bugs.py