[tracker-miners/wip/carlosg/writeback-refactor: 12/12] tests: Drop writeback-image-details functional test

[Carlos Garnacho <carlosg src gnome org>]

commit f37bd394a1c23ea8ba97e590e315298772208bd4
Author: Carlos Garnacho <carlosg gnome org>
Date:   Wed May 20 22:30:33 2020 +0200

    tests: Drop writeback-image-details functional test
    
    This was actually testing that writeback didn't trigger tracker-miner-fs
    re-extraction. This is now moot (and actually desired, since writeback
    happens through direct calls)

 tests/functional-tests/meson.build                |  1 -
 tests/functional-tests/writeback-audio.py         |  6 ++--
 tests/functional-tests/writeback-image-details.py |  4 ---
 tests/functional-tests/writeback-images.py        | 34 ++++++-----------------
 4 files changed, 11 insertions(+), 34 deletions(-)
---
diff --git a/tests/functional-tests/meson.build b/tests/functional-tests/meson.build
index 8a996432c..8c542efbb 100644
--- a/tests/functional-tests/meson.build
+++ b/tests/functional-tests/meson.build
@@ -126,7 +126,6 @@ endif
 if libjpeg.found() and libgif.found() and libpng.found() and libtiff.found() and exempi.found() and 
libexif.found()
   functional_tests += [
     'writeback-images',
-    'writeback-image-details',
   ]
 endif
 
diff --git a/tests/functional-tests/writeback-audio.py b/tests/functional-tests/writeback-audio.py
index dd9b1fbc5..b5cc6df1b 100755
--- a/tests/functional-tests/writeback-audio.py
+++ b/tests/functional-tests/writeback-audio.py
@@ -33,9 +33,9 @@ class WritebackAudioTest(fixtures.TrackerWritebackTest):
         TEST_VALUE = prop.replace(":", "") + "test"
 
         self.writeback_data({
-            'http://www.w3.org/1999/02/22-rdf-syntax-ns#type': GLib.Variant('s', 
'http://tracker.api.gnome.org/ontology/v3/nfo#Audio'),
-            'http://tracker.api.gnome.org/ontology/v3/nie#isStoredAs': GLib.Variant('s', path.as_uri()),
-            'http://tracker.api.gnome.org/ontology/v3/nie#title': GLib.Variant('s', TEST_VALUE),
+            'rdf:type': GLib.Variant('s', 'nfo:Audio'),
+            'nie:isStoredAs': GLib.Variant('s', path.as_uri()),
+            'nie:title': GLib.Variant('s', TEST_VALUE),
         })
 
         self.wait_for_file_change(path, initial_mtime)
diff --git a/tests/functional-tests/writeback-image-details.py 
b/tests/functional-tests/writeback-image-details.py
index b182409f2..96c16b20e 100755
--- a/tests/functional-tests/writeback-image-details.py
+++ b/tests/functional-tests/writeback-image-details.py
@@ -107,8 +107,4 @@ class WritebackKeepDateTest (fixtures.TrackerWritebackTest):
 
 
 if __name__ == "__main__":
-    print("FIXME: This test is skipped as it currently fails. See: 
https://gitlab.gnome.org/GNOME/tracker-miners/issues/96";)
-    import sys
-    sys.exit(77)
-
     ut.main(verbosity=2)
diff --git a/tests/functional-tests/writeback-images.py b/tests/functional-tests/writeback-images.py
index d5f167e55..18344c907 100755
--- a/tests/functional-tests/writeback-images.py
+++ b/tests/functional-tests/writeback-images.py
@@ -54,8 +54,8 @@ class WritebackImagesTest(fixtures.TrackerWritebackTest):
 
         TEST_VALUE = prop.replace(":", "") + "test"
         self.writeback_data({
-            'http://www.w3.org/1999/02/22-rdf-syntax-ns#type': GLib.Variant('s', 
'http://tracker.api.gnome.org/ontology/v3/nfo#Image'),
-            'http://tracker.api.gnome.org/ontology/v3/nie#isStoredAs': GLib.Variant('s', path.as_uri()),
+            'rdf:type': GLib.Variant('s', 'nfo:Image'),
+            'nie:isStoredAs': GLib.Variant('s', path.as_uri()),
             prop: GLib.Variant('s', TEST_VALUE),
         })
 
@@ -93,16 +93,10 @@ class WritebackImagesTest(fixtures.TrackerWritebackTest):
     # JPEG test
 
     def test_001_jpeg_title(self):
-        self.__writeback_test(
-            "writeback-test-1.jpeg", "image/jpeg",
-            "http://tracker.api.gnome.org/ontology/v3/nie#title";,
-            "nie:title")
+        self.__writeback_test("writeback-test-1.jpeg", "image/jpeg", "nie:title")
 
     def test_002_jpeg_description(self):
-        self.__writeback_test(
-            "writeback-test-1.jpeg", "image/jpeg",
-            "http://tracker.api.gnome.org/ontology/v3/nie#description";,
-            "nie:description")
+        self.__writeback_test("writeback-test-1.jpeg", "image/jpeg", "nie:description")
 
     # def test_003_jpeg_keyword (self):
     #    #FILENAME = "test-writeback-monitored/writeback-test-1.jpeg"
@@ -116,16 +110,10 @@ class WritebackImagesTest(fixtures.TrackerWritebackTest):
     # TIFF tests
 
     def test_011_tiff_title(self):
-        self.__writeback_test(
-            "writeback-test-2.tif", "image/tiff",
-            "http://tracker.api.gnome.org/ontology/v3/nie#title";,
-            "nie:title")
+        self.__writeback_test("writeback-test-2.tif", "image/tiff", "nie:title")
 
     def test_012_tiff_description(self):
-        self.__writeback_test(
-            "writeback-test-2.tif", "image/tiff",
-            "http://tracker.api.gnome.org/ontology/v3/nie#description";,
-            "nie:description")
+        self.__writeback_test("writeback-test-2.tif", "image/tiff", "nie:description")
 
     # def test_013_tiff_keyword (self):
     #    FILENAME = "test-writeback-monitored/writeback-test-2.tif"
@@ -139,16 +127,10 @@ class WritebackImagesTest(fixtures.TrackerWritebackTest):
     # PNG tests
 
     def test_021_png_title(self):
-        self.__writeback_test(
-            "writeback-test-4.png", "image/png",
-            "http://tracker.api.gnome.org/ontology/v3/nie#title";,
-            "nie:title")
+        self.__writeback_test("writeback-test-4.png", "image/png", "nie:title")
 
     def test_022_png_description(self):
-        self.__writeback_test(
-            "writeback-test-4.png", "image/png",
-            "http://tracker.api.gnome.org/ontology/v3/nie#description";,
-            "nie:description")
+        self.__writeback_test("writeback-test-4.png", "image/png", "nie:description")
 
     # def test_023_png_keyword (self):
     #    FILENAME = "test-writeback-monitored/writeback-test-4.png"