[tracker-miners/sam/extract-tests-fix: 2/2] tests: Fix vorbis/flac tests with GStreamer >= 1.17.0

[Sam Thursfield <sthursfield src gnome org>]

commit 767b65a15e8c338fa8e44b45309f3eb0efcbff42
Author: Sam Thursfield <sam afuera me uk>
Date:   Sat Jun 27 16:17:30 2020 +0200

    tests: Fix vorbis/flac tests with GStreamer >= 1.17.0
    
    The AcoustID tag is extracted starting with GStreamer 1.17.0, this
    enables a codepath which we previously weren't testing.

 tests/functional-tests/meson.build                       |  4 ++--
 .../audio/flac-musicbrainz.expected.json                 | 16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/tests/functional-tests/meson.build b/tests/functional-tests/meson.build
index a1fc08ebd..9efe8752e 100644
--- a/tests/functional-tests/meson.build
+++ b/tests/functional-tests/meson.build
@@ -38,9 +38,9 @@ extractor_tests = [
   'desktop/link-wikipedia-tracker'
 ]
 
-# Gstreamer 1.18 introduced support for some additionnals
+# Gstreamer 1.17/1.18 introduced support for some additional
 # MusicBrainz tags
-if gstreamer.found() and gstreamer.version() >= '1.18.0'
+if gstreamer.found() and gstreamer.version() >= '1.17.0'
   extractor_tests += 'audio/flac-musicbrainz'
   extractor_tests += 'audio/vorbis-musicbrainz'
 else
diff --git a/tests/functional-tests/test-extraction-data/audio/flac-musicbrainz.expected.json 
b/tests/functional-tests/test-extraction-data/audio/flac-musicbrainz.expected.json
index 303e9a7b2..5ad61ff13 100644
--- a/tests/functional-tests/test-extraction-data/audio/flac-musicbrainz.expected.json
+++ b/tests/functional-tests/test-extraction-data/audio/flac-musicbrainz.expected.json
@@ -12,7 +12,7 @@
         "nfo:genre": "Rock",
         "nfo:sampleRate": "44100",
         "nie:comment": "no comment",
-        "nie:contentCreated": "2020-01-01",
+        "nie:contentCreated": "2020-01-01T00:00:00+00:00",
         "nie:copyright": "none",
         "nie:title": "track title",
         "nmm:trackNumber": "12",
@@ -43,7 +43,7 @@
             ]
         },
         "nmm:musicAlbumDisc": {
-            "@id": "urn:album-disc:awesome%20album:my%20album%20artist:2020-01-01",
+            "@id": "urn:album-disc:awesome%20album:my%20album%20artist:2020-01-01:Disc1",
             "@type": "nmm:MusicAlbumDisc",
             "nmm:setNumber": 1
         },
@@ -73,10 +73,12 @@
                 "tracker:referenceIdentifier": "dfgj-432-iu7"
             }
         ],
-        "nfo:hasHash": {
-            "@type": "nfo:hasHash",
-            "nfo:hashAlgorithm": "chromaprint",
-            "nfo:hashValue": "123453215"
-        }
+        "nfo:hasHash": [
+            {
+                "@type": "nfo:hasHash",
+                "nfo:hashAlgorithm": "chromaprint",
+                "nfo:hashValue": "123453215"
+            }
+        ]
     }
 }