[tracker-miners: 11/11] Merge branch 'sam/extract-jsonld' into 'master'

[Sam Thursfield <sthursfield src gnome org>]

commit d7eb882ed8ff8547a09f1d46e2563e61cd46e55b
Merge: ca90142bc 7a79c9f98
Author: Sam Thursfield <sam afuera me uk>
Date:   Mon Jul 16 20:16:19 2018 +0000

    Merge branch 'sam/extract-jsonld' into 'master'
    
    Rewrite tracker-extract functional tests to use JSON-LD
    
    See merge request GNOME/tracker-miners!3

 configure.ac                                       |   2 +-
 docs/manpages/tracker-extract.1                    |   2 +-
 meson.build                                        |   4 +-
 src/libtracker-extract/tracker-resource-helpers.c  |   2 +-
 src/libtracker-miners-common/tracker-enums.h       |   6 +
 src/tracker-extract/tracker-extract-gif.c          |   2 +-
 src/tracker-extract/tracker-extract.c              |  20 +-
 src/tracker-extract/tracker-main.c                 |   2 +-
 tests/functional-tests/400-extractor-metadata.py   | 166 +++++++-------
 tests/functional-tests/common/utils/extractor.py   | 246 +--------------------
 tests/functional-tests/meson.build                 |  31 ++-
 tests/functional-tests/test-extraction-data/README |  66 +++---
 .../audio/Jazz_Audio_OPLs0.expected                |  11 -
 .../audio/Jazz_Audio_OPLs0.pya                     | Bin 198963 -> 0 bytes
 .../test-extraction-data/audio/Makefile.am         |   8 +-
 .../audio/audio-test-1.expected                    |  17 --
 .../audio/audio-test-1.expected.json               |  20 ++
 .../audio/audio-test-2.expected                    |  16 --
 .../audio/audio-test-2.expected.json               |  18 ++
 .../audio/empty_albumi_song3.expected              |   9 -
 .../audio/empty_albumi_song3.expected.json         |  11 +
 .../test-extraction-data/images/Makefile.am        |  14 +-
 .../images/comment-extension-block.expected        |  11 -
 .../images/comment-extension-block.expected.json   |  13 ++
 .../images/corrupted-image.expected                |   7 -
 .../images/corrupted-image.expected.json           |  11 +
 .../test-extraction-data/images/roi.expected       |  11 -
 .../test-extraction-data/images/roi.expected.json  |  13 ++
 .../test-extraction-data/images/roi2.expected      |  12 -
 .../test-extraction-data/images/roi2.expected.json |  13 ++
 .../images/test-image-1.expected                   |  18 --
 .../images/test-image-1.expected.json              |  29 +++
 .../images/test-image-2.expected                   |   9 -
 .../images/test-image-2.expected.json              |  12 +
 .../images/test-image-3.expected                   |  11 -
 .../images/test-image-3.expected.json              |  16 ++
 .../images/test-image-4.expected                   |  17 --
 .../images/test-image-4.expected.json              |  26 +++
 .../images/test-iptcdata-records.expected          |   8 -
 .../images/test-iptcdata-records.expected.json     |  11 +
 .../images/xmp-loaded-1.expected                   |  19 --
 .../images/xmp-loaded-1.expected.json              |  18 ++
 .../test-extraction-data/office/Makefile.am        |   6 +-
 .../office/office-doc.expected                     |  10 -
 .../office/office-doc.expected.json                |  18 ++
 .../test-extraction-data/office/pdf-doc.expected   |   7 -
 .../office/pdf-doc.expected.json                   |  10 +
 .../office/powerpoint.expected                     |   9 -
 .../office/powerpoint.expected.json                |  12 +
 .../test-extraction-data/playlists/Makefile.am     |   2 +-
 .../playlists/playlist-test-1.expected             |  13 --
 .../playlists/playlist-test-1.expected.json        |  18 ++
 .../test-extraction-data/video/184505.expected     |  10 -
 .../video/184505.expected.json                     |  13 ++
 .../test-extraction-data/video/Makefile.am         |   4 +-
 .../test-extraction-data/video/video-1.expected    |   9 -
 .../video/video-1.expected.json                    |  12 +
 .../test-extraction-data/video/video-2.expected    |   9 -
 .../video/video-2.expected.json                    |  12 +
 59 files changed, 499 insertions(+), 633 deletions(-)
---