[tracker-miners/sam/extract-tests-rename] functional-tests: Rename extractor tests to show file formats more clearly
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker-miners/sam/extract-tests-rename] functional-tests: Rename extractor tests to show file formats more clearly
- Date: Mon, 30 Sep 2019 23:17:31 +0000 (UTC)
commit 24e10e7ab9eeb4e2e4b03145b64ff0d98c1bc7cc
Author: Sam Thursfield <sam afuera me uk>
Date: Tue Oct 1 01:06:56 2019 +0200
functional-tests: Rename extractor tests to show file formats more clearly
Each filename now contains the file format that is being tested as the
first item. This should help developers when you want to see at a glance
which extractors are being tested by which test cases.
tests/functional-tests/410-extractor-decorator.py | 6 +--
tests/functional-tests/meson.build | 36 ++++++++---------
...> mp3-id3v2.3-empty-artist-album.expected.json} | 2 +-
...ong3.mp3 => mp3-id3v2.3-empty-artist-album.mp3} | Bin
...1.expected.json => mp3-id3v2.4-1.expected.json} | 26 ++++++-------
.../audio/{audio-test-1.mp3 => mp3-id3v2.4-1.mp3} | Bin
...2.expected.json => mp3-id3v2.4-2.expected.json} | 26 ++++++-------
.../audio/{audio-test-2.mp3 => mp3-id3v2.4-2.mp3} | Bin
...xtractor.expected.json => vorbis.expected.json} | 14 +++----
...{audio-test-vorbis-extractor.ogg => vorbis.ogg} | Bin
...n => gif-comment-extension-block.expected.json} | 9 +++--
...n-block.gif => gif-comment-extension-block.gif} | Bin
...cted.json => gif-corrupted-image.expected.json} | 4 +-
...corrupted-image.gif => gif-corrupted-image.gif} | Bin
...oaded-1.expected.json => gif-xmp.expected.json} | 13 +++++--
.../images/{xmp-loaded-1.gif => gif-xmp.gif} | Bin
...ge-1.expected.json => jpeg-basic.expected.json} | 17 ++++----
.../images/{test-image-1.jpg => jpeg-basic.jpg} | Bin
.../images/jpeg-iptc-tags.expected.json | 16 ++++++++
...ed.json => jpeg-iptcdata-records.expected.json} | 2 +-
...cdata-records.jpg => jpeg-iptcdata-records.jpg} | Bin
....json => jpeg-region-of-interest.expected.json} | 10 +++--
.../{roi.jpg => jpeg-region-of-interest.jpg} | Bin
...age-2.expected.json => png-basic.expected.json} | 2 +-
.../images/{test-image-2.png => png-basic.png} | Bin
...d.json => png-region-of-interest.expected.json} | 9 +++--
.../{roi2.png => png-region-of-interest.png} | Bin
.../images/{test-image-4.CR2 => raw-cr2.cr2} | Bin
...image-4.expected.json => raw-cr2.expected.json} | 15 ++++---
.../images/test-image-1-iptc-tags.expected.json | 12 ------
...ge-3.expected.json => tiff-basic.expected.json} | 4 +-
.../images/{test-image-3.tif => tiff-basic.tiff} | Bin
.../office/oasis-doc.expected.json | 14 +++----
.../office/office-doc.expected.json | 2 +-
.../office/ps-doc-atend.expected.json | 2 +-
.../office/ps-doc.expected.json | 2 +-
.../office/psgz-doc.expected.json | 2 +-
.../playlists/playlist-test-1.expected.json | 43 +++++++++++++--------
...deo-2.expected.json => mov-basic.expected.json} | 2 +-
.../video/{video-2.mov => mov-basic.mov} | Bin
...deo-1.expected.json => mp4-basic.expected.json} | 4 +-
.../video/{video-1.mp4 => mp4-basic.mp4} | Bin
....json => mp4-video-without-audio.expected.json} | 2 +-
.../{184505.mp4 => mp4-video-without-audio.mp4} | Bin
44 files changed, 156 insertions(+), 140 deletions(-)
---
diff --git a/tests/functional-tests/410-extractor-decorator.py
b/tests/functional-tests/410-extractor-decorator.py
index 351d5b079..67a76e796 100755
--- a/tests/functional-tests/410-extractor-decorator.py
+++ b/tests/functional-tests/410-extractor-decorator.py
@@ -27,13 +27,9 @@ import unittest as ut
import minertest
-CORRUPT_FILE = os.path.join(
- os.path.dirname(__file__), 'test-extraction-data', 'audio',
- 'audio-corrupt.mp3')
-
VALID_FILE = os.path.join(
os.path.dirname(__file__), 'test-extraction-data', 'audio',
- 'audio-test-1.mp3')
+ 'mp3-id3v2.4-1.mp3')
VALID_FILE_CLASS = 'http://www.tracker-project.org/temp/nmm#MusicPiece'
VALID_FILE_TITLE = 'Simply Juvenile'
diff --git a/tests/functional-tests/meson.build b/tests/functional-tests/meson.build
index 827e82a1e..aec96f4bd 100644
--- a/tests/functional-tests/meson.build
+++ b/tests/functional-tests/meson.build
@@ -25,9 +25,9 @@ config_json = configure_file(
)
extractor_tests = [
- 'audio/audio-test-1',
- 'audio/empty_albumi_song3',
- 'audio/audio-test-2',
+ 'audio/mp3-id3v2.4-1',
+ 'audio/mp3-id3v2.3-empty-artist-album',
+ 'audio/mp3-id3v2.4-2',
]
if get_option('unzip_ps_gz_files')
@@ -35,47 +35,47 @@ if get_option('unzip_ps_gz_files')
endif
if libvorbis.found()
- extractor_tests += 'audio/audio-test-vorbis-extractor'
+ extractor_tests += 'audio/vorbis'
endif
if libjpeg.found() and exempi.found() and libexif.found()
extractor_tests += [
- 'images/test-image-1',
- 'images/roi',
+ 'images/jpeg-basic',
+ 'images/jpeg-region-of-interest',
]
if libiptcdata.found()
extractor_tests += [
- 'images/test-image-1-iptc-tags',
- 'images/test-iptcdata-records',
+ 'images/jpeg-iptc-tags',
+ 'images/jpeg-iptcdata-records',
]
endif
endif
if libgif.found()
extractor_tests += [
- 'images/corrupted-image',
- 'images/comment-extension-block',
+ 'images/gif-comment-extension-block',
+ 'images/gif-corrupted-image',
]
if exempi.found()
- extractor_tests += 'images/xmp-loaded-1'
+ extractor_tests += 'images/gif-xmp'
endif
endif
if libpng.found()
extractor_tests += [
- 'images/roi2',
- 'images/test-image-2',
+ 'images/png-basic',
+ 'images/png-region-of-interest',
]
endif
if libtiff.found()
- extractor_tests += 'images/test-image-3'
+ extractor_tests += 'images/tiff-basic'
endif
if gexiv2.found()
- extractor_tests += 'images/test-image-4'
+ extractor_tests += 'images/raw-cr2'
endif
if totem_plparser.found()
@@ -124,9 +124,9 @@ detect_h264_codec_result = run_command(detect_h264_codec)
if detect_h264_codec_result.returncode() == 0
extractor_tests += [
- 'video/184505',
- 'video/video-1',
- 'video/video-2',
+ 'video/mov-basic',
+ 'video/mp4-basic',
+ 'video/mp4-video-without-audio',
]
else
# FIXME: it would be nicer to visibly mark the tests as 'skipped', but the Meson
diff --git a/tests/functional-tests/test-extraction-data/audio/empty_albumi_song3.expected.json
b/tests/functional-tests/test-extraction-data/audio/mp3-id3v2.3-empty-artist-album.expected.json
similarity index 79%
rename from tests/functional-tests/test-extraction-data/audio/empty_albumi_song3.expected.json
rename to tests/functional-tests/test-extraction-data/audio/mp3-id3v2.3-empty-artist-album.expected.json
index 26e7fb697..d36100dab 100644
--- a/tests/functional-tests/test-extraction-data/audio/empty_albumi_song3.expected.json
+++ b/tests/functional-tests/test-extraction-data/audio/mp3-id3v2.3-empty-artist-album.expected.json
@@ -1,6 +1,6 @@
{
"test": {
- "Filename": "empty_albumi_song3.mp3",
+ "Filename": "mp3-id3v2.3-empty-artist-album.mp3",
"Bugzilla": "NB#223536, NB#223148",
"Comment": "Mp3 with empty Artist and album. Made extractor crash."
},
diff --git a/tests/functional-tests/test-extraction-data/audio/empty_albumi_song3.mp3
b/tests/functional-tests/test-extraction-data/audio/mp3-id3v2.3-empty-artist-album.mp3
similarity index 100%
rename from tests/functional-tests/test-extraction-data/audio/empty_albumi_song3.mp3
rename to tests/functional-tests/test-extraction-data/audio/mp3-id3v2.3-empty-artist-album.mp3
diff --git a/tests/functional-tests/test-extraction-data/audio/audio-test-1.expected.json
b/tests/functional-tests/test-extraction-data/audio/mp3-id3v2.4-1.expected.json
similarity index 69%
rename from tests/functional-tests/test-extraction-data/audio/audio-test-1.expected.json
rename to tests/functional-tests/test-extraction-data/audio/mp3-id3v2.4-1.expected.json
index 118402228..81d40ec03 100644
--- a/tests/functional-tests/test-extraction-data/audio/audio-test-1.expected.json
+++ b/tests/functional-tests/test-extraction-data/audio/mp3-id3v2.4-1.expected.json
@@ -1,6 +1,6 @@
{
"test": {
- "Filename": "audio-test-1.mp3",
+ "Filename": "mp3-id3v2.4-1.mp3",
"Bugzilla": "",
"Comment": "Basic MP3 example"
},
@@ -19,27 +19,25 @@
"nmm:performer": {
"@type": "nmm:Artist",
"nmm:artistName": "AbBaby",
- "tracker:hasExternalReference": [
- {
- "@id": "urn:ExternalReference:https:%2F%2Fmusicbrainz.org%2Fdoc%2FArtist:234561",
- "@type": "tracker:ExternalReference",
- "tracker:referenceSource": "https://musicbrainz.org/doc/Artist";,
- "tracker:referenceIdentifier": "234561"
- }
- ]
+ "tracker:hasExternalReference": {
+ "@id": "tracker:ExternalReference:https:%2F%2Fmusicbrainz.org%2Fdoc%2FArtist",
+ "@type": "tracker:ExternalReference",
+ "tracker:referenceSource": "https://musicbrainz.org/doc/Artist";,
+ "tracker:referenceIdentifier": "234561"
+ }
},
"nmm:musicAlbum": {
"@type": "nmm:MusicAlbum",
"nie:title": "SinCos",
"tracker:hasExternalReference": [
{
- "@id": "urn:ExternalReference:https:%2F%2Fmusicbrainz.org%2Fdoc%2FRelease:345612",
+ "@id": "tracker:ExternalReference:https:%2F%2Fmusicbrainz.org%2Fdoc%2FRelease",
"@type": "tracker:ExternalReference",
"tracker:referenceSource": "https://musicbrainz.org/doc/Release";,
"tracker:referenceIdentifier": "345612"
},
{
- "@id": "urn:ExternalReference:https:%2F%2Fmusicbrainz.org%2Fdoc%2FRelease_Group:561234",
+ "@id": "tracker:ExternalReference:https:%2F%2Fmusicbrainz.org%2Fdoc%2FRelease_Group",
"@type": "tracker:ExternalReference",
"tracker:referenceSource": "https://musicbrainz.org/doc/Release_Group";,
"tracker:referenceIdentifier": "561234"
@@ -48,13 +46,13 @@
},
"tracker:hasExternalReference": [
{
- "@id": "urn:ExternalReference:https:%2F%2Fmusicbrainz.org%2Fdoc%2FRecording:456123",
+ "@id": "tracker:ExternalReference:https:%2F%2Fmusicbrainz.org%2Fdoc%2FRecording",
"@type": "tracker:ExternalReference",
"tracker:referenceSource": "https://musicbrainz.org/doc/Recording";,
"tracker:referenceIdentifier": "456123"
},
{
- "@id": "urn:ExternalReference:https:%2F%2Fmusicbrainz.org%2Fdoc%2FTrack:123456",
+ "@id": "tracker:ExternalReference:https:%2F%2Fmusicbrainz.org%2Fdoc%2FTrack",
"@type": "tracker:ExternalReference",
"tracker:referenceSource": "https://musicbrainz.org/doc/Track";,
"tracker:referenceIdentifier": "123456"
@@ -66,4 +64,4 @@
"nfo:hashValue": "111222"
}
}
-}
+}
\ No newline at end of file
diff --git a/tests/functional-tests/test-extraction-data/audio/audio-test-1.mp3
b/tests/functional-tests/test-extraction-data/audio/mp3-id3v2.4-1.mp3
similarity index 100%
rename from tests/functional-tests/test-extraction-data/audio/audio-test-1.mp3
rename to tests/functional-tests/test-extraction-data/audio/mp3-id3v2.4-1.mp3
diff --git a/tests/functional-tests/test-extraction-data/audio/audio-test-2.expected.json
b/tests/functional-tests/test-extraction-data/audio/mp3-id3v2.4-2.expected.json
similarity index 69%
rename from tests/functional-tests/test-extraction-data/audio/audio-test-2.expected.json
rename to tests/functional-tests/test-extraction-data/audio/mp3-id3v2.4-2.expected.json
index 1d5d4306b..93147a7da 100644
--- a/tests/functional-tests/test-extraction-data/audio/audio-test-2.expected.json
+++ b/tests/functional-tests/test-extraction-data/audio/mp3-id3v2.4-2.expected.json
@@ -1,6 +1,6 @@
{
"test": {
- "Filename": "audio-test-2.mp3",
+ "Filename": "mp3-id3v2.4-2.mp3",
"Bugzilla": "NB#177663",
"Comment": "Mp3 with id3v2 tags. Encoded wasn't extracted.\nBinary cut with dd of the original file."
},
@@ -17,26 +17,24 @@
"nmm:performer": {
"@type": "nmm:Artist",
"nmm:artistName": "Anna Abreu",
- "tracker:hasExternalReference": [
- {
- "@id": "urn:ExternalReference:https:%2F%2Fmusicbrainz.org%2Fdoc%2FArtist:234561",
- "@type": "tracker:ExternalReference",
- "tracker:referenceSource": "https://musicbrainz.org/doc/Artist";,
- "tracker:referenceIdentifier": "234561"
- }
- ]
+ "tracker:hasExternalReference": {
+ "@id": "tracker:ExternalReference:https:%2F%2Fmusicbrainz.org%2Fdoc%2FArtist",
+ "@type": "tracker:ExternalReference",
+ "tracker:referenceSource": "https://musicbrainz.org/doc/Artist";,
+ "tracker:referenceIdentifier": "234561"
+ }
},
"nmm:musicAlbum": {
"@type": "nmm:MusicAlbum",
"tracker:hasExternalReference": [
{
- "@id": "urn:ExternalReference:https:%2F%2Fmusicbrainz.org%2Fdoc%2FRelease:345612",
+ "@id": "tracker:ExternalReference:https:%2F%2Fmusicbrainz.org%2Fdoc%2FRelease",
"@type": "tracker:ExternalReference",
"tracker:referenceSource": "https://musicbrainz.org/doc/Release";,
"tracker:referenceIdentifier": "345612"
},
{
- "@id": "urn:ExternalReference:https:%2F%2Fmusicbrainz.org%2Fdoc%2FRelease_Group:561234",
+ "@id": "tracker:ExternalReference:https:%2F%2Fmusicbrainz.org%2Fdoc%2FRelease_Group",
"@type": "tracker:ExternalReference",
"tracker:referenceSource": "https://musicbrainz.org/doc/Release_Group";,
"tracker:referenceIdentifier": "561234"
@@ -45,13 +43,13 @@
},
"tracker:hasExternalReference": [
{
- "@id": "urn:ExternalReference:https:%2F%2Fmusicbrainz.org%2Fdoc%2FRecording:456123",
+ "@id": "tracker:ExternalReference:https:%2F%2Fmusicbrainz.org%2Fdoc%2FRecording",
"@type": "tracker:ExternalReference",
"tracker:referenceSource": "https://musicbrainz.org/doc/Recording";,
"tracker:referenceIdentifier": "456123"
},
{
- "@id": "urn:ExternalReference:https:%2F%2Fmusicbrainz.org%2Fdoc%2FTrack:123456",
+ "@id": "tracker:ExternalReference:https:%2F%2Fmusicbrainz.org%2Fdoc%2FTrack",
"@type": "tracker:ExternalReference",
"tracker:referenceSource": "https://musicbrainz.org/doc/Track";,
"tracker:referenceIdentifier": "123456"
@@ -63,4 +61,4 @@
"nfo:hashValue": "111222"
}
}
-}
+}
\ No newline at end of file
diff --git a/tests/functional-tests/test-extraction-data/audio/audio-test-2.mp3
b/tests/functional-tests/test-extraction-data/audio/mp3-id3v2.4-2.mp3
similarity index 100%
rename from tests/functional-tests/test-extraction-data/audio/audio-test-2.mp3
rename to tests/functional-tests/test-extraction-data/audio/mp3-id3v2.4-2.mp3
diff --git a/tests/functional-tests/test-extraction-data/audio/audio-test-vorbis-extractor.expected.json
b/tests/functional-tests/test-extraction-data/audio/vorbis.expected.json
similarity index 78%
rename from tests/functional-tests/test-extraction-data/audio/audio-test-vorbis-extractor.expected.json
rename to tests/functional-tests/test-extraction-data/audio/vorbis.expected.json
index c4d40a2b6..f5198ca4f 100644
--- a/tests/functional-tests/test-extraction-data/audio/audio-test-vorbis-extractor.expected.json
+++ b/tests/functional-tests/test-extraction-data/audio/vorbis.expected.json
@@ -1,6 +1,6 @@
{
"test": {
- "Filename": "audio-test-vorbis-extractor.ogg",
+ "Filename": "vorbis.ogg",
"Bugzilla": "",
"Comment": "Basic OGG example"
},
@@ -16,7 +16,7 @@
"@type": "nmm:Artist",
"nmm:artistName": "AbBaby",
"tracker:hasExternalReference": {
- "@id": "urn:ExternalReference:https:%2F%2Fmusicbrainz.org%2Fdoc%2FArtist:234561",
+ "@id": "tracker:ExternalReference:https:%2F%2Fmusicbrainz.org%2Fdoc%2FArtist",
"@type": "tracker:ExternalReference",
"tracker:referenceSource": "https://musicbrainz.org/doc/Artist";,
"tracker:referenceIdentifier": "234561"
@@ -27,13 +27,13 @@
"nie:title": "SinCos",
"tracker:hasExternalReference": [
{
- "@id": "urn:ExternalReference:https:%2F%2Fmusicbrainz.org%2Fdoc%2FRelease:345612",
+ "@id": "tracker:ExternalReference:https:%2F%2Fmusicbrainz.org%2Fdoc%2FRelease",
"@type": "tracker:ExternalReference",
"tracker:referenceSource": "https://musicbrainz.org/doc/Release";,
"tracker:referenceIdentifier": "345612"
},
{
- "@id": "urn:ExternalReference:https:%2F%2Fmusicbrainz.org%2Fdoc%2FRelease_Group:561234",
+ "@id": "tracker:ExternalReference:https:%2F%2Fmusicbrainz.org%2Fdoc%2FRelease_Group",
"@type": "tracker:ExternalReference",
"tracker:referenceSource": "https://musicbrainz.org/doc/Release_Group";,
"tracker:referenceIdentifier": "561234"
@@ -42,13 +42,13 @@
},
"tracker:hasExternalReference": [
{
- "@id": "urn:ExternalReference:https:%2F%2Fmusicbrainz.org%2Fdoc%2FRecording:456123",
+ "@id": "tracker:ExternalReference:https:%2F%2Fmusicbrainz.org%2Fdoc%2FRecording",
"@type": "tracker:ExternalReference",
"tracker:referenceSource": "https://musicbrainz.org/doc/Recording";,
"tracker:referenceIdentifier": "456123"
},
{
- "@id": "urn:ExternalReference:https:%2F%2Fmusicbrainz.org%2Fdoc%2FTrack:123456",
+ "@id": "tracker:ExternalReference:https:%2F%2Fmusicbrainz.org%2Fdoc%2FTrack",
"@type": "tracker:ExternalReference",
"tracker:referenceSource": "https://musicbrainz.org/doc/Track";,
"tracker:referenceIdentifier": "123456"
@@ -60,4 +60,4 @@
"nfo:hashValue": "111222"
}
}
-}
+}
\ No newline at end of file
diff --git a/tests/functional-tests/test-extraction-data/audio/audio-test-vorbis-extractor.ogg
b/tests/functional-tests/test-extraction-data/audio/vorbis.ogg
similarity index 100%
rename from tests/functional-tests/test-extraction-data/audio/audio-test-vorbis-extractor.ogg
rename to tests/functional-tests/test-extraction-data/audio/vorbis.ogg
diff --git a/tests/functional-tests/test-extraction-data/images/comment-extension-block.expected.json
b/tests/functional-tests/test-extraction-data/images/gif-comment-extension-block.expected.json
similarity index 70%
rename from tests/functional-tests/test-extraction-data/images/comment-extension-block.expected.json
rename to tests/functional-tests/test-extraction-data/images/gif-comment-extension-block.expected.json
index 188e320dd..885efdf1d 100644
--- a/tests/functional-tests/test-extraction-data/images/comment-extension-block.expected.json
+++ b/tests/functional-tests/test-extraction-data/images/gif-comment-extension-block.expected.json
@@ -1,13 +1,16 @@
{
"test": {
- "Filename": "comment-extension-block.gif",
+ "Filename": "gif-comment-extension-block.gif",
"Bugzilla": "GB#633118",
"Comment": "In GIF comments can come in a special block that needs to be handled manually"
},
"metadata": {
- "@type": [ "nfo:Image ", "nmm:Photo" ],
+ "@type": [
+ "nfo:Image ",
+ "nmm:Photo"
+ ],
"nfo:width": "600",
"nfo:height": "450",
"nie:comment": "GIF image format only supports comments in 7-bit ASCII encoding!"
}
-}
+}
\ No newline at end of file
diff --git a/tests/functional-tests/test-extraction-data/images/comment-extension-block.gif
b/tests/functional-tests/test-extraction-data/images/gif-comment-extension-block.gif
similarity index 100%
rename from tests/functional-tests/test-extraction-data/images/comment-extension-block.gif
rename to tests/functional-tests/test-extraction-data/images/gif-comment-extension-block.gif
diff --git a/tests/functional-tests/test-extraction-data/images/corrupted-image.expected.json
b/tests/functional-tests/test-extraction-data/images/gif-corrupted-image.expected.json
similarity index 80%
rename from tests/functional-tests/test-extraction-data/images/corrupted-image.expected.json
rename to tests/functional-tests/test-extraction-data/images/gif-corrupted-image.expected.json
index 782500743..b3d14f463 100644
--- a/tests/functional-tests/test-extraction-data/images/corrupted-image.expected.json
+++ b/tests/functional-tests/test-extraction-data/images/gif-corrupted-image.expected.json
@@ -1,6 +1,6 @@
{
"test": {
- "Filename": "corrupted-image.gif",
+ "Filename": "gif-corrupted-image.gif",
"Bugzilla": "NB#184882",
"Comment": "This image make the extractor crash",
"ExpectedFailure": true
@@ -8,4 +8,4 @@
"metadata": {
"@type": "nmm:Photo"
}
-}
+}
\ No newline at end of file
diff --git a/tests/functional-tests/test-extraction-data/images/corrupted-image.gif
b/tests/functional-tests/test-extraction-data/images/gif-corrupted-image.gif
similarity index 100%
rename from tests/functional-tests/test-extraction-data/images/corrupted-image.gif
rename to tests/functional-tests/test-extraction-data/images/gif-corrupted-image.gif
diff --git a/tests/functional-tests/test-extraction-data/images/xmp-loaded-1.expected.json
b/tests/functional-tests/test-extraction-data/images/gif-xmp.expected.json
similarity index 73%
rename from tests/functional-tests/test-extraction-data/images/xmp-loaded-1.expected.json
rename to tests/functional-tests/test-extraction-data/images/gif-xmp.expected.json
index d7c6342b5..9663f73ad 100644
--- a/tests/functional-tests/test-extraction-data/images/xmp-loaded-1.expected.json
+++ b/tests/functional-tests/test-extraction-data/images/gif-xmp.expected.json
@@ -1,13 +1,18 @@
{
"test": {
- "Filename": "xmp-loaded-1.gif",
+ "Filename": "gif-xmp.gif",
"Comment": "GIF with XMP metadata (injected with exiftool)"
},
"metadata": {
- "@type": [ "nfo:Image", "nmm:Photo" ],
+ "@type": [
+ "nfo:Image",
+ "nmm:Photo"
+ ],
"nie:description": "Test file for the tracker XMP extraction",
"nie:title": "A random GIF",
- "nao:hasTag": { "nao:prefLabel": "nice" },
+ "nao:hasTag": {
+ "nao:prefLabel": "nice"
+ },
"dc:identifier": "test-file-01-world-domination-path",
"dc:source": "http://www.fotonatura.org/revista/articulos/293/3/";,
"dc:language": "es_ES",
@@ -15,4 +20,4 @@
"nfo:width": "165",
"nfo:height": "66"
}
-}
+}
\ No newline at end of file
diff --git a/tests/functional-tests/test-extraction-data/images/xmp-loaded-1.gif
b/tests/functional-tests/test-extraction-data/images/gif-xmp.gif
similarity index 100%
rename from tests/functional-tests/test-extraction-data/images/xmp-loaded-1.gif
rename to tests/functional-tests/test-extraction-data/images/gif-xmp.gif
diff --git a/tests/functional-tests/test-extraction-data/images/test-image-1.expected.json
b/tests/functional-tests/test-extraction-data/images/jpeg-basic.expected.json
similarity index 62%
rename from tests/functional-tests/test-extraction-data/images/test-image-1.expected.json
rename to tests/functional-tests/test-extraction-data/images/jpeg-basic.expected.json
index a13ee20cf..5d10b3444 100644
--- a/tests/functional-tests/test-extraction-data/images/test-image-1.expected.json
+++ b/tests/functional-tests/test-extraction-data/images/jpeg-basic.expected.json
@@ -1,6 +1,6 @@
{
"test": {
- "Filename": "test-image-1.jpg",
+ "Filename": "jpeg-basic.jpg",
"Comment": "Basic jpeg example"
},
"metadata": {
@@ -11,14 +11,13 @@
"nmm:fnumber": "5.0",
"nmm:focalLength": "5.0",
"nie:comment": "This is a for tracker test",
- "slo:location":
- {
- "slo:postalAddress": {
- "nco:locality": "Tig",
- "nco:country": "Banglore"
- }
- },
+ "slo:location": {
+ "slo:postalAddress": {
+ "nco:locality": "Tig",
+ "nco:country": "Banglore"
+ }
+ },
"nfo:horizontalResolution": "20.0",
"nfo:verticalResolution": "20.0"
}
-}
+}
\ No newline at end of file
diff --git a/tests/functional-tests/test-extraction-data/images/test-image-1.jpg
b/tests/functional-tests/test-extraction-data/images/jpeg-basic.jpg
similarity index 100%
rename from tests/functional-tests/test-extraction-data/images/test-image-1.jpg
rename to tests/functional-tests/test-extraction-data/images/jpeg-basic.jpg
diff --git a/tests/functional-tests/test-extraction-data/images/jpeg-iptc-tags.expected.json
b/tests/functional-tests/test-extraction-data/images/jpeg-iptc-tags.expected.json
new file mode 100644
index 000000000..f36e5bf82
--- /dev/null
+++ b/tests/functional-tests/test-extraction-data/images/jpeg-iptc-tags.expected.json
@@ -0,0 +1,16 @@
+{
+ "test": {
+ "Filename": "jpeg-basic.jpg",
+ "Comment": "Basic jpeg example, ISO image tags checks"
+ },
+ "metadata": {
+ "nao:hasTag": [
+ {
+ "nao:prefLabel": "test"
+ },
+ {
+ "nao:prefLabel": "tracker"
+ }
+ ]
+ }
+}
\ No newline at end of file
diff --git a/tests/functional-tests/test-extraction-data/images/test-iptcdata-records.expected.json
b/tests/functional-tests/test-extraction-data/images/jpeg-iptcdata-records.expected.json
similarity index 81%
rename from tests/functional-tests/test-extraction-data/images/test-iptcdata-records.expected.json
rename to tests/functional-tests/test-extraction-data/images/jpeg-iptcdata-records.expected.json
index 6dd0144e6..7b6b4c1b5 100644
--- a/tests/functional-tests/test-extraction-data/images/test-iptcdata-records.expected.json
+++ b/tests/functional-tests/test-extraction-data/images/jpeg-iptcdata-records.expected.json
@@ -1,6 +1,6 @@
{
"test": {
- "Filename": "test-iptcdata-records.jpg",
+ "Filename": "jpeg-iptcdata-records.jpg",
"Bugzilla": "NB#244267",
"Comment": "Location information shouldn't be retrieved from the image"
},
diff --git a/tests/functional-tests/test-extraction-data/images/test-iptcdata-records.jpg
b/tests/functional-tests/test-extraction-data/images/jpeg-iptcdata-records.jpg
similarity index 100%
rename from tests/functional-tests/test-extraction-data/images/test-iptcdata-records.jpg
rename to tests/functional-tests/test-extraction-data/images/jpeg-iptcdata-records.jpg
diff --git a/tests/functional-tests/test-extraction-data/images/roi.expected.json
b/tests/functional-tests/test-extraction-data/images/jpeg-region-of-interest.expected.json
similarity index 61%
rename from tests/functional-tests/test-extraction-data/images/roi.expected.json
rename to tests/functional-tests/test-extraction-data/images/jpeg-region-of-interest.expected.json
index a7fd6b857..9348c7caa 100644
--- a/tests/functional-tests/test-extraction-data/images/roi.expected.json
+++ b/tests/functional-tests/test-extraction-data/images/jpeg-region-of-interest.expected.json
@@ -1,13 +1,15 @@
{
"test": {
- "Filename": "roi.jpg",
+ "Filename": "jpeg-region-of-interest.jpg",
"Comment": "JPG with regions of interest in the XMP"
},
-
"metadata": {
- "@type": ["nfo:Image", "nmm:Photo"],
+ "@type": [
+ "nfo:Image",
+ "nmm:Photo"
+ ],
"nfo:hasRegionOfInterest": "@URNUUID@",
"nfo:width": "128",
"nfo:height": "128"
}
-}
+}
\ No newline at end of file
diff --git a/tests/functional-tests/test-extraction-data/images/roi.jpg
b/tests/functional-tests/test-extraction-data/images/jpeg-region-of-interest.jpg
similarity index 100%
rename from tests/functional-tests/test-extraction-data/images/roi.jpg
rename to tests/functional-tests/test-extraction-data/images/jpeg-region-of-interest.jpg
diff --git a/tests/functional-tests/test-extraction-data/images/test-image-2.expected.json
b/tests/functional-tests/test-extraction-data/images/png-basic.expected.json
similarity index 82%
rename from tests/functional-tests/test-extraction-data/images/test-image-2.expected.json
rename to tests/functional-tests/test-extraction-data/images/png-basic.expected.json
index 067ef0719..2400934a3 100644
--- a/tests/functional-tests/test-extraction-data/images/test-image-2.expected.json
+++ b/tests/functional-tests/test-extraction-data/images/png-basic.expected.json
@@ -1,6 +1,6 @@
{
"test": {
- "Filename": "test-image-2.png",
+ "Filename": "png-basic.png",
"Bugzilla": "",
"Comment": "Basic png example"
},
diff --git a/tests/functional-tests/test-extraction-data/images/test-image-2.png
b/tests/functional-tests/test-extraction-data/images/png-basic.png
similarity index 100%
rename from tests/functional-tests/test-extraction-data/images/test-image-2.png
rename to tests/functional-tests/test-extraction-data/images/png-basic.png
diff --git a/tests/functional-tests/test-extraction-data/images/roi2.expected.json
b/tests/functional-tests/test-extraction-data/images/png-region-of-interest.expected.json
similarity index 64%
rename from tests/functional-tests/test-extraction-data/images/roi2.expected.json
rename to tests/functional-tests/test-extraction-data/images/png-region-of-interest.expected.json
index 954ab1269..43131ddbb 100644
--- a/tests/functional-tests/test-extraction-data/images/roi2.expected.json
+++ b/tests/functional-tests/test-extraction-data/images/png-region-of-interest.expected.json
@@ -1,13 +1,16 @@
{
"test": {
- "Filename": "roi2.png",
+ "Filename": "png-region-of-interest.png",
"Bugzilla": "",
"Comment": "PNG with regions of interest in the XMP"
},
"metadata": {
- "@type": [ "nfo:Image", "nmm:Photo"],
+ "@type": [
+ "nfo:Image",
+ "nmm:Photo"
+ ],
"nfo:hasRegionOfInterest": "@URNUUID@",
"nfo:width": "128",
"nfo:height": "128"
}
-}
+}
\ No newline at end of file
diff --git a/tests/functional-tests/test-extraction-data/images/roi2.png
b/tests/functional-tests/test-extraction-data/images/png-region-of-interest.png
similarity index 100%
rename from tests/functional-tests/test-extraction-data/images/roi2.png
rename to tests/functional-tests/test-extraction-data/images/png-region-of-interest.png
diff --git a/tests/functional-tests/test-extraction-data/images/test-image-4.CR2
b/tests/functional-tests/test-extraction-data/images/raw-cr2.cr2
similarity index 100%
rename from tests/functional-tests/test-extraction-data/images/test-image-4.CR2
rename to tests/functional-tests/test-extraction-data/images/raw-cr2.cr2
diff --git a/tests/functional-tests/test-extraction-data/images/test-image-4.expected.json
b/tests/functional-tests/test-extraction-data/images/raw-cr2.expected.json
similarity index 68%
rename from tests/functional-tests/test-extraction-data/images/test-image-4.expected.json
rename to tests/functional-tests/test-extraction-data/images/raw-cr2.expected.json
index 0d4051fde..b8b16dc0f 100644
--- a/tests/functional-tests/test-extraction-data/images/test-image-4.expected.json
+++ b/tests/functional-tests/test-extraction-data/images/raw-cr2.expected.json
@@ -1,17 +1,16 @@
{
"test": {
- "Filename": "test-image-4.CR2",
+ "Filename": "raw-cr2.cr2",
"Bugzilla": "",
"Comment": "Basic RAW example"
},
"metadata": {
"@type": "nmm:Photo",
- "nfo:equipment":
- {
- "nfo:manufacturer": "Canon",
- "nfo:model": "Canon EOS 70D",
- "@type": "nfo:Equipment"
- },
+ "nfo:equipment": {
+ "nfo:manufacturer": "Canon",
+ "nfo:model": "Canon EOS 70D",
+ "@type": "nfo:Equipment"
+ },
"nfo:width": "5472",
"nfo:height": "3648",
"nfo:orientation": "nfo:orientation-left",
@@ -22,4 +21,4 @@
"nmm:meteringMode": "nmm:metering-mode-pattern",
"nmm:whiteBalance": "nmm:white-balance-auto"
}
-}
+}
\ No newline at end of file
diff --git a/tests/functional-tests/test-extraction-data/images/test-image-3.expected.json
b/tests/functional-tests/test-extraction-data/images/tiff-basic.expected.json
similarity index 88%
rename from tests/functional-tests/test-extraction-data/images/test-image-3.expected.json
rename to tests/functional-tests/test-extraction-data/images/tiff-basic.expected.json
index fa79da1e2..e303ade24 100644
--- a/tests/functional-tests/test-extraction-data/images/test-image-3.expected.json
+++ b/tests/functional-tests/test-extraction-data/images/tiff-basic.expected.json
@@ -1,6 +1,6 @@
{
"test": {
- "Filename": "test-image-3.tif",
+ "Filename": "tiff-basic.tiff",
"Bugzilla": "",
"Comment": "Basic TIFF example"
},
@@ -13,4 +13,4 @@
"@id": "nfo:orientation-top"
}
}
-}
+}
\ No newline at end of file
diff --git a/tests/functional-tests/test-extraction-data/images/test-image-3.tif
b/tests/functional-tests/test-extraction-data/images/tiff-basic.tiff
similarity index 100%
rename from tests/functional-tests/test-extraction-data/images/test-image-3.tif
rename to tests/functional-tests/test-extraction-data/images/tiff-basic.tiff
diff --git a/tests/functional-tests/test-extraction-data/office/oasis-doc.expected.json
b/tests/functional-tests/test-extraction-data/office/oasis-doc.expected.json
index 93d736f76..4cf623fc5 100644
--- a/tests/functional-tests/test-extraction-data/office/oasis-doc.expected.json
+++ b/tests/functional-tests/test-extraction-data/office/oasis-doc.expected.json
@@ -4,11 +4,11 @@
"Comment": "LibreOffice document, taken from https://gitlab.gnome.org/GNOME/tracker/issues/109";
},
"metadata": {
- "@type" : "nfo:PaginatedTextDocument",
- "nfo:pageCount" : "1",
- "nie:contentCreated" : "2019-05-23T19:20:16.211562799",
- "nfo:wordCount" : "200",
- "nie:generator" : "LibreOffice/6.2.3.2$Linux_X86_64 LibreOffice_project/20$Build-2",
- "nie:plainTextContent" : "A wonderful serenity has taken possession of my entire soul, like these
sweet mornings of spring which I enjoy with my whole heart. I am alone, and feel the charm of existence in
this spot, which was created for the bliss of souls like Wandabuz. I am so happy, my dear friend, so
absorbissimmo in the exquisite sense of mere tranquil existence, that I neglect my talents. I should be
incapable of drawing a single stroke at the present moment; and yet I feel that I never was a greater artist
than now. When, while the lovely valley teems with vapour around me, and the meridian sun strikes the upper
surface of the impenetrable foliage of my trees, and but a few stray gleams steal into the inner sanctuary, I
throw myself down among the tall grass by the trickling stream; and, as I lie close to the earth, a thousand
unknown plants are noticed by me: when I hear the buzz of the little world among the stalks, and grow
familiar with the countless indes
cribable
forms of the insectodoits and flies, then I feel the presence of the Almighty, who formed us in his own
image, and the breath."
+ "@type": "nfo:PaginatedTextDocument",
+ "nfo:pageCount": "1",
+ "nie:contentCreated": "2019-05-23T19:20:16.211562799",
+ "nfo:wordCount": "200",
+ "nie:generator": "LibreOffice/6.2.3.2$Linux_X86_64 LibreOffice_project/20$Build-2",
+ "nie:plainTextContent": "A wonderful serenity has taken possession of my entire soul, like these
sweet mornings of spring which I enjoy with my whole heart. I am alone, and feel the charm of existence in
this spot, which was created for the bliss of souls like Wandabuz. I am so happy, my dear friend, so
absorbissimmo in the exquisite sense of mere tranquil existence, that I neglect my talents. I should be
incapable of drawing a single stroke at the present moment; and yet I feel that I never was a greater artist
than now. When, while the lovely valley teems with vapour around me, and the meridian sun strikes the upper
surface of the impenetrable foliage of my trees, and but a few stray gleams steal into the inner sanctuary, I
throw myself down among the tall grass by the trickling stream; and, as I lie close to the earth, a thousand
unknown plants are noticed by me: when I hear the buzz of the little world among the stalks, and grow
familiar with the countless indesc
ribable
forms of the insectodoits and flies, then I feel the presence of the Almighty, who formed us in his own
image, and the breath."
}
-}
+}
\ No newline at end of file
diff --git a/tests/functional-tests/test-extraction-data/office/office-doc.expected.json
b/tests/functional-tests/test-extraction-data/office/office-doc.expected.json
index bafb4165d..0dd13868b 100644
--- a/tests/functional-tests/test-extraction-data/office/office-doc.expected.json
+++ b/tests/functional-tests/test-extraction-data/office/office-doc.expected.json
@@ -15,4 +15,4 @@
}
]
}
-}
+}
\ No newline at end of file
diff --git a/tests/functional-tests/test-extraction-data/office/ps-doc-atend.expected.json
b/tests/functional-tests/test-extraction-data/office/ps-doc-atend.expected.json
index 20ce67b17..b43a3cd4b 100644
--- a/tests/functional-tests/test-extraction-data/office/ps-doc-atend.expected.json
+++ b/tests/functional-tests/test-extraction-data/office/ps-doc-atend.expected.json
@@ -12,4 +12,4 @@
},
"@type": "nfo:PaginatedTextDocument"
}
-}
+}
\ No newline at end of file
diff --git a/tests/functional-tests/test-extraction-data/office/ps-doc.expected.json
b/tests/functional-tests/test-extraction-data/office/ps-doc.expected.json
index dd4a092bb..2144c0051 100644
--- a/tests/functional-tests/test-extraction-data/office/ps-doc.expected.json
+++ b/tests/functional-tests/test-extraction-data/office/ps-doc.expected.json
@@ -12,4 +12,4 @@
},
"@type": "nfo:PaginatedTextDocument"
}
-}
+}
\ No newline at end of file
diff --git a/tests/functional-tests/test-extraction-data/office/psgz-doc.expected.json
b/tests/functional-tests/test-extraction-data/office/psgz-doc.expected.json
index 07b6dd5f9..3d17e3396 100644
--- a/tests/functional-tests/test-extraction-data/office/psgz-doc.expected.json
+++ b/tests/functional-tests/test-extraction-data/office/psgz-doc.expected.json
@@ -12,4 +12,4 @@
},
"@type": "nfo:PaginatedTextDocument"
}
-}
+}
\ No newline at end of file
diff --git a/tests/functional-tests/test-extraction-data/playlists/playlist-test-1.expected.json
b/tests/functional-tests/test-extraction-data/playlists/playlist-test-1.expected.json
index 34c8fc486..5fe906b1f 100644
--- a/tests/functional-tests/test-extraction-data/playlists/playlist-test-1.expected.json
+++ b/tests/functional-tests/test-extraction-data/playlists/playlist-test-1.expected.json
@@ -1,18 +1,27 @@
{
- "test": {
- "Filename": "playlist-test-1.m3u",
- "Comment": "Regular m3u playlist file"
- },
-
- "metadata": {
- "@type": "nmm:Playlist",
- "nfo:entryCounter": "5",
- "nfo:hasMediaFileListEntry": [
- { "nfo:entryUrl": "http://www.apnaradio.com/live/ApnaRadio.mp3"; },
- { "nfo:entryUrl": "http://live.apnaradio.com:6464"; },
- { "nfo:entryUrl": "http://live.apnaradio.com:2424"; },
- { "nfo:entryUrl": "http://www.apnaradio.com/live/MaintenanceE.mp3"; },
- { "nfo:entryUrl": "http://www.apnaradio.com/live/MaintenanceP.mp3"; }
- ]
- }
-}
+ "test": {
+ "Filename": "playlist-test-1.m3u",
+ "Comment": "Regular m3u playlist file"
+ },
+ "metadata": {
+ "@type": "nmm:Playlist",
+ "nfo:entryCounter": "5",
+ "nfo:hasMediaFileListEntry": [
+ {
+ "nfo:entryUrl": "http://www.apnaradio.com/live/ApnaRadio.mp3";
+ },
+ {
+ "nfo:entryUrl": "http://live.apnaradio.com:6464";
+ },
+ {
+ "nfo:entryUrl": "http://live.apnaradio.com:2424";
+ },
+ {
+ "nfo:entryUrl": "http://www.apnaradio.com/live/MaintenanceE.mp3";
+ },
+ {
+ "nfo:entryUrl": "http://www.apnaradio.com/live/MaintenanceP.mp3";
+ }
+ ]
+ }
+}
\ No newline at end of file
diff --git a/tests/functional-tests/test-extraction-data/video/video-2.expected.json
b/tests/functional-tests/test-extraction-data/video/mov-basic.expected.json
similarity index 86%
rename from tests/functional-tests/test-extraction-data/video/video-2.expected.json
rename to tests/functional-tests/test-extraction-data/video/mov-basic.expected.json
index 2ff393ec8..7269fc34b 100644
--- a/tests/functional-tests/test-extraction-data/video/video-2.expected.json
+++ b/tests/functional-tests/test-extraction-data/video/mov-basic.expected.json
@@ -1,6 +1,6 @@
{
"test": {
- "Filename": "video-2.mov",
+ "Filename": "mov-basic.mov",
"Bugzilla": "NB#181112",
"Comment": "Produces a Critical in Gstreamer freeing a component."
},
diff --git a/tests/functional-tests/test-extraction-data/video/video-2.mov
b/tests/functional-tests/test-extraction-data/video/mov-basic.mov
similarity index 100%
rename from tests/functional-tests/test-extraction-data/video/video-2.mov
rename to tests/functional-tests/test-extraction-data/video/mov-basic.mov
diff --git a/tests/functional-tests/test-extraction-data/video/video-1.expected.json
b/tests/functional-tests/test-extraction-data/video/mp4-basic.expected.json
similarity index 85%
rename from tests/functional-tests/test-extraction-data/video/video-1.expected.json
rename to tests/functional-tests/test-extraction-data/video/mp4-basic.expected.json
index 8b30ed256..cca271959 100644
--- a/tests/functional-tests/test-extraction-data/video/video-1.expected.json
+++ b/tests/functional-tests/test-extraction-data/video/mp4-basic.expected.json
@@ -1,6 +1,6 @@
{
"test": {
- "Filename": "video-1.mp4",
+ "Filename": "mp4-basic.mp4",
"Comment": "Just one standard mp4"
},
"metadata": {
@@ -9,4 +9,4 @@
"nfo:height": "240",
"nfo:width": "320"
}
-}
+}
\ No newline at end of file
diff --git a/tests/functional-tests/test-extraction-data/video/video-1.mp4
b/tests/functional-tests/test-extraction-data/video/mp4-basic.mp4
similarity index 100%
rename from tests/functional-tests/test-extraction-data/video/video-1.mp4
rename to tests/functional-tests/test-extraction-data/video/mp4-basic.mp4
diff --git a/tests/functional-tests/test-extraction-data/video/184505.expected.json
b/tests/functional-tests/test-extraction-data/video/mp4-video-without-audio.expected.json
similarity index 84%
rename from tests/functional-tests/test-extraction-data/video/184505.expected.json
rename to tests/functional-tests/test-extraction-data/video/mp4-video-without-audio.expected.json
index 8cde524f0..7aa8834d7 100644
--- a/tests/functional-tests/test-extraction-data/video/184505.expected.json
+++ b/tests/functional-tests/test-extraction-data/video/mp4-video-without-audio.expected.json
@@ -1,6 +1,6 @@
{
"test": {
- "Filename": "184505.mp4",
+ "Filename": "mp4-video-without-audio.mp4",
"Bugzilla": "NB#184505",
"Comment": "Video without audio stream. Seems to be clasified as Audio."
},
diff --git a/tests/functional-tests/test-extraction-data/video/184505.mp4
b/tests/functional-tests/test-extraction-data/video/mp4-video-without-audio.mp4
similarity index 100%
rename from tests/functional-tests/test-extraction-data/video/184505.mp4
rename to tests/functional-tests/test-extraction-data/video/mp4-video-without-audio.mp4
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
