Merge lp:~jamesh/thumbnailer/no-fallback-albumart into lp:thumbnailer

[James Henstridge]

When a thumbnail can not be loaded, return an error from the image provider rather than substituting in a fallback image. Users can detect the problem via the status property of the QML Image component and provide their own fallback handling.

Direct merge to trunk, to go through CI Train. Branch was reviewed at:

https://code.launchpad.net/~jamesh/thumbnailer/no-fallback-albumart/+merge/263216

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:99
http://jenkins.qa.ubuntu.com/job/thumbnailer-ci/232/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-vivid-amd64-ci/119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-vivid-armhf-ci/118
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-vivid-armhf-ci/118/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-vivid-i386-ci/114
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-xenial-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-xenial-armhf-ci/29
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-xenial-armhf-ci/29/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-xenial-i386-ci/28

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/thumbnailer-ci/232/rebuild

review: Approve (continuous-integration)

[Michi Henning (michihenning)]

Yes, please. Long overdue!

review: Approve

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2015-05-22 03:13:47 +0000
+++ data/CMakeLists.txt	2016-02-05 10:20:51 +0000
@@ -4,14 +4,6 @@
 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas OUTPUT_VARIABLE _glib_comple_schemas OUTPUT_STRIP_TRAILING_WHITESPACE)
 execute_process (COMMAND ${_glib_comple_schemas} ${CMAKE_CURRENT_SOURCE_DIR} --targetdir=${CMAKE_CURRENT_BINARY_DIR} OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-install(
-  FILES
-    album_missing.png
-    video_missing.png
-  DESTINATION
-    ${CMAKE_INSTALL_DATADIR}/thumbnailer/icons
-)
-
 configure_file(
   thumbnailer.in
   thumbnailer

=== removed file 'data/album_missing.png'
Binary files data/album_missing.png	2014-09-25 09:47:05 +0000 and data/album_missing.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'data/thumbnailer.in'
--- data/thumbnailer.in	2014-09-26 11:24:27 +0000
+++ data/thumbnailer.in	2016-02-05 10:20:51 +0000
@@ -1,6 +1,1 @@
-@CMAKE_INSTALL_PREFIX@/lib/x86_64-linux-gnu/thumbnailer/vs-thumb
-@CMAKE_INSTALL_PREFIX@/lib/i386-linux-gnu/thumbnailer/vs-thumb
-@CMAKE_INSTALL_PREFIX@/lib/powerpc-linux-gnu/thumbnailer/vs-thumb
-@CMAKE_INSTALL_PREFIX@/lib/powerpc64le-linux-gnu/thumbnailer/vs-thumb
-@CMAKE_INSTALL_PREFIX@/lib/arm-linux-gnueabihf/thumbnailer/vs-thumb
-@CMAKE_INSTALL_PREFIX@/lib/aarch64-linux-gnu/thumbnailer/vs-thumb
+@CMAKE_INSTALL_FULL_LIBDIR@/thumbnailer/vs-thumb

=== removed file 'data/video_missing.png'
Binary files data/video_missing.png	2014-09-25 09:47:05 +0000 and data/video_missing.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'debian/control'
--- debian/control	2015-12-21 07:07:46 +0000
+++ debian/control	2016-02-05 10:20:51 +0000
@@ -47,8 +47,8 @@
 Pre-Depends: ${misc:Pre-Depends},
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-Conflicts: libthumbnailer0
-Replaces: libthumbnailer0
+Conflicts: libthumbnailer0, thumbnailer-common
+Replaces: libthumbnailer0, thumbnailer-common
 Description: D-Bus service for out of process thumbnailing
  This package provides a D-Bus service that can provide thumbnails on
  behalf of another process.
@@ -73,7 +73,6 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libthumbnailer-qt1.0 (= ${binary:Version}),
-         thumbnailer-common (= ${source:Version}),
 Provides: ubuntu-thumbnailer-impl,
           ubuntu-thumbnailer-impl-0,
 Recommends: thumbnailer-service (= ${binary:Version}),
@@ -83,14 +82,6 @@
  This package provides image providers that allow access to the
  thumbnailer from Qt Quick 2 / QML applications.
 
-Package: thumbnailer-common
-Architecture: all
-Multi-Arch: foreign
-Depends: ${misc:Depends},
-Description: Common files for the thumbnailer service.
- This package provides common files for the thumbnailer service, such
- as default icons.
-
 Package: libthumbnailer-qt1.0
 Architecture: any
 Multi-Arch: same

=== removed file 'debian/thumbnailer-common.install'
--- debian/thumbnailer-common.install	2014-09-26 11:24:27 +0000
+++ debian/thumbnailer-common.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/share/thumbnailer/icons/*
-etc/apport/blacklist.d/thumbnailer

=== modified file 'debian/thumbnailer-service.install'
--- debian/thumbnailer-service.install	2015-08-06 05:08:47 +0000
+++ debian/thumbnailer-service.install	2016-02-05 10:20:51 +0000
@@ -1,3 +1,4 @@
+etc/apport/blacklist.d/thumbnailer
 usr/bin/thumbnailer-admin
 usr/lib/*/thumbnailer/thumbnailer-service
 usr/lib/*/thumbnailer/vs-thumb

=== modified file 'plugins/Ubuntu/Thumbnailer.0.1/albumartgenerator.cpp'
--- plugins/Ubuntu/Thumbnailer.0.1/albumartgenerator.cpp	2015-12-09 02:39:32 +0000
+++ plugins/Ubuntu/Thumbnailer.0.1/albumartgenerator.cpp	2016-02-05 10:20:51 +0000
@@ -24,13 +24,6 @@
 
 #include "thumbnailerimageresponse.h"
 
-namespace
-{
-
-const char DEFAULT_ALBUM_ART[] = "/usr/share/thumbnailer/icons/album_missing.png";
-
-}  // namespace
-
 namespace unity
 {
 
@@ -48,19 +41,18 @@
 
 QQuickImageResponse* AlbumArtGenerator::requestImageResponse(const QString& id, const QSize& requestedSize)
 {
-    QSize size = requestedSize;
     QUrlQuery query(id);
     if (!query.hasQueryItem(QStringLiteral("artist")) || !query.hasQueryItem(QStringLiteral("album")))
     {
         qWarning() << "AlbumArtGenerator::requestImageResponse(): Invalid albumart uri:" << id;
-        return new ThumbnailerImageResponse(requestedSize, DEFAULT_ALBUM_ART);
+        return new ThumbnailerImageResponse("Invalid albumart ID: " + id);
     }
 
     const QString artist = query.queryItemValue(QStringLiteral("artist"), QUrl::FullyDecoded);
     const QString album = query.queryItemValue(QStringLiteral("album"), QUrl::FullyDecoded);
 
-    auto request = thumbnailer->getAlbumArt(artist, album, size);
-    return new ThumbnailerImageResponse(size, DEFAULT_ALBUM_ART, request);
+    auto request = thumbnailer->getAlbumArt(artist, album, requestedSize);
+    return new ThumbnailerImageResponse(request);
 }
 
 }  // namespace qml

=== modified file 'plugins/Ubuntu/Thumbnailer.0.1/artistartgenerator.cpp'
--- plugins/Ubuntu/Thumbnailer.0.1/artistartgenerator.cpp	2015-11-04 07:16:12 +0000
+++ plugins/Ubuntu/Thumbnailer.0.1/artistartgenerator.cpp	2016-02-05 10:20:51 +0000
@@ -25,13 +25,6 @@
 
 #include "thumbnailerimageresponse.h"
 
-namespace
-{
-
-const char DEFAULT_ARTIST_ART[] = "/usr/share/thumbnailer/icons/album_missing.png";
-
-}  // namespace
-
 namespace unity
 {
 
@@ -49,19 +42,18 @@
 
 QQuickImageResponse* ArtistArtGenerator::requestImageResponse(const QString& id, const QSize& requestedSize)
 {
-    QSize size = requestedSize;
     QUrlQuery query(id);
     if (!query.hasQueryItem(QStringLiteral("artist")) || !query.hasQueryItem(QStringLiteral("album")))
     {
         qWarning() << "ArtistArtGenerator::requestImageResponse(): Invalid artistart uri:" << id;
-        return new ThumbnailerImageResponse(requestedSize, DEFAULT_ARTIST_ART);
+        return new ThumbnailerImageResponse("Invalid artistart ID: " + id);
     }
 
     const QString artist = query.queryItemValue(QStringLiteral("artist"), QUrl::FullyDecoded);
     const QString album = query.queryItemValue(QStringLiteral("album"), QUrl::FullyDecoded);
 
-    auto request = thumbnailer->getArtistArt(artist, album, size);
-    return new ThumbnailerImageResponse(size, DEFAULT_ARTIST_ART, request);
+    auto request = thumbnailer->getArtistArt(artist, album, requestedSize);
+    return new ThumbnailerImageResponse(request);
 }
 
 }  // namespace qml

=== modified file 'plugins/Ubuntu/Thumbnailer.0.1/thumbnailerimageresponse.cpp'
--- plugins/Ubuntu/Thumbnailer.0.1/thumbnailerimageresponse.cpp	2015-12-17 00:25:10 +0000
+++ plugins/Ubuntu/Thumbnailer.0.1/thumbnailerimageresponse.cpp	2016-02-05 10:20:51 +0000
@@ -31,21 +31,15 @@
 namespace qml
 {
 
-ThumbnailerImageResponse::ThumbnailerImageResponse(QSize const& requested_size,
-                                                   QString const& default_image,
-                                                   QSharedPointer<thumb_qt::Request> const& request)
-    : requested_size_(requested_size)
-    , request_(request)
-    , default_image_(default_image)
+ThumbnailerImageResponse::ThumbnailerImageResponse(QSharedPointer<thumb_qt::Request> const& request)
+    : request_(request)
 {
     Q_ASSERT(request);
     connect(request_.data(), &thumb_qt::Request::finished, this, &ThumbnailerImageResponse::requestFinished);
 }
 
-ThumbnailerImageResponse::ThumbnailerImageResponse(QSize const& requested_size,
-                                                   QString const& default_image)
-    : requested_size_(requested_size)
-    , default_image_(default_image)
+ThumbnailerImageResponse::ThumbnailerImageResponse(QString const& error_message)
+    : error_message_(error_message)
 {
     // Queue the signal emission so there is time for the caller to connect.
     QMetaObject::invokeMethod(this, "finished", Qt::QueuedConnection);
@@ -58,22 +52,22 @@
 
 QQuickTextureFactory* ThumbnailerImageResponse::textureFactory() const
 {
-    // TODO: Once we remove fallback image support, this test for request_ != nullptr
-    //       (here and elsewhere) needs to be removed because request_ is nullptr
-    //       only if the default image constructor above was called.
     if (request_ && request_->isValid())
     {
         return QQuickTextureFactory::textureFactoryForImage(request_->image());
     }
     else
     {
-        char const* env_default = getenv("THUMBNAILER_TEST_DEFAULT_IMAGE");
-        QImage aux;
-        aux.load(env_default ? QString(env_default) : default_image_);
-        return QQuickTextureFactory::textureFactoryForImage(aux);
+        qWarning() << "ThumbnailerImageResponse::textureFactory(): method called without valid request.";
+        return nullptr;
     }
 }
 
+QString ThumbnailerImageResponse::errorString() const
+{
+    return error_message_;
+}
+
 void ThumbnailerImageResponse::cancel()
 {
     if (request_ && !request_->isFinished() && !request_->isCancelled())
@@ -84,9 +78,9 @@
 
 void ThumbnailerImageResponse::requestFinished()
 {
-    if (!request_->isValid() && !request_->isCancelled())
+    if (!request_->isValid())
     {
-        qWarning() << "ThumbnailerImageResponse::dbusCallFinished(): D-Bus error: " << request_->errorMessage();
+        error_message_ = request_->errorMessage();
     }
     Q_EMIT finished();
 }

=== modified file 'plugins/Ubuntu/Thumbnailer.0.1/thumbnailerimageresponse.h'
--- plugins/Ubuntu/Thumbnailer.0.1/thumbnailerimageresponse.h	2015-09-30 10:08:20 +0000
+++ plugins/Ubuntu/Thumbnailer.0.1/thumbnailerimageresponse.h	2016-02-05 10:20:51 +0000
@@ -20,8 +20,6 @@
 
 #include <QQuickImageProvider>
 
-#include <memory>
-
 #include <unity/thumbnailer/qt/thumbnailer-qt.h>
 
 namespace unity
@@ -46,24 +44,20 @@
 public:
     Q_DISABLE_COPY(ThumbnailerImageResponse)
 
-    ThumbnailerImageResponse(QSize const& requested_size,
-                             QString const& default_image,
-                             QSharedPointer<unity::thumbnailer::qt::Request> const& request);
-    ThumbnailerImageResponse(QSize const& requested_size,
-                             QString const& default_image);
+    ThumbnailerImageResponse(QSharedPointer<unity::thumbnailer::qt::Request> const& request);
+    ThumbnailerImageResponse(QString const& error_message);
     ~ThumbnailerImageResponse();
 
     QQuickTextureFactory* textureFactory() const override;
+    QString errorString() const override;
     void cancel() override;
 
 private Q_SLOTS:
     void requestFinished();
 
 private:
-    QString id_;
-    QSize requested_size_;
     QSharedPointer<unity::thumbnailer::qt::Request> request_;
-    QString default_image_;
+    QString error_message_;
 };
 
 }  // namespace qml

=== modified file 'plugins/Ubuntu/Thumbnailer.0.1/thumbnailgenerator.cpp'
--- plugins/Ubuntu/Thumbnailer.0.1/thumbnailgenerator.cpp	2015-11-04 07:16:12 +0000
+++ plugins/Ubuntu/Thumbnailer.0.1/thumbnailgenerator.cpp	2016-02-05 10:20:51 +0000
@@ -19,36 +19,11 @@
 #include "thumbnailgenerator.h"
 
 #include <QDebug>
-#include <QMimeDatabase>
 #include <QUrl>
 
 #include <settings.h>
 #include "thumbnailerimageresponse.h"
 
-namespace
-{
-
-const char* DEFAULT_VIDEO_ART = "/usr/share/thumbnailer/icons/video_missing.png";
-const char* DEFAULT_ALBUM_ART = "/usr/share/thumbnailer/icons/album_missing.png";
-
-QString default_image_based_on_mime(QString const &id)
-{
-    QMimeDatabase db;
-    QMimeType mime = db.mimeTypeForFile(id);
-
-    if (mime.name().contains(QStringLiteral("audio")))
-    {
-        return DEFAULT_ALBUM_ART;
-    }
-    else if (mime.name().contains(QStringLiteral("video")))
-    {
-        return DEFAULT_VIDEO_ART;  // LCOV_EXCL_LINE  // Being lazy here: default art is about to go away.
-    }
-    return DEFAULT_ALBUM_ART;
-}
-
-}  // namespace
-
 namespace unity
 {
 
@@ -66,8 +41,6 @@
 
 QQuickImageResponse* ThumbnailGenerator::requestImageResponse(const QString& id, const QSize& requestedSize)
 {
-    QSize size = requestedSize;
-
     /* Allow appending a query string (e.g. ?something=timestamp)
      * to the id and then ignore it.
      * This is workaround to force reloading a thumbnail when it has
@@ -79,8 +52,8 @@
      * is the only way around the issue for now. */
     QString src_path = QUrl(id).path();
 
-    auto request = thumbnailer->getThumbnail(src_path, size);
-    return new ThumbnailerImageResponse(size, default_image_based_on_mime(id), request);
+    auto request = thumbnailer->getThumbnail(src_path, requestedSize);
+    return new ThumbnailerImageResponse(request);
 }
 
 }  // namespace qml

=== modified file 'tests/image-provider/image-provider_test.cpp'
--- tests/image-provider/image-provider_test.cpp	2015-12-23 03:04:01 +0000
+++ tests/image-provider/image-provider_test.cpp	2016-02-05 10:20:51 +0000
@@ -99,6 +99,7 @@
     ASSERT_EQ("", response->errorString());
 
     unique_ptr<QQuickTextureFactory> factory(response->textureFactory());
+    ASSERT_NE(nullptr, factory.get());
     QImage image = factory->image();
 
     EXPECT_EQ(128, image.width());
@@ -118,6 +119,87 @@
         provider.requestImageResponse(filename, QSize(128, 128)));
     response->cancel();
     wait(response.get());
+    EXPECT_EQ("Request cancelled", response->errorString());
+}
+
+TEST_F(ProviderTest, thumbnail_missing)
+{
+    const char* filename = TESTDATADIR "/no-such-file.jpg";
+
+    ThumbnailGenerator provider(thumbnailer_);
+    unique_ptr<QQuickImageResponse> response(
+        provider.requestImageResponse(filename, QSize(128, 128)));
+    wait(response.get());
+    string error = response->errorString().toStdString();
+    EXPECT_NE(string::npos, error.find("No such file or directory")) << error;
+}
+
+TEST_F(ProviderTest, albumart)
+{
+    const char* id = "artist=metallica&album=load";
+
+    AlbumArtGenerator provider(thumbnailer_);
+    unique_ptr<QQuickImageResponse> response(
+        provider.requestImageResponse(id, QSize(128, 128)));
+    wait(response.get());
+    EXPECT_EQ("", response->errorString());
+
+    unique_ptr<QQuickTextureFactory> factory(response->textureFactory());
+    ASSERT_NE(nullptr, factory.get());
+    QImage image = factory->image();
+
+    EXPECT_EQ(48, image.width());
+    EXPECT_EQ(48, image.height());
+    EXPECT_EQ(QColor("#C80000").rgb(), image.pixel(0, 0));
+    EXPECT_EQ(QColor("#00D200").rgb(), image.pixel(47, 0));
+    EXPECT_EQ(QColor("#0000DC").rgb(), image.pixel(0, 47));
+    EXPECT_EQ(QColor("#646E78").rgb(), image.pixel(47, 47));
+}
+
+TEST_F(ProviderTest, albumart_missing)
+{
+    const char* id = "artist=no-such-artist&album=no-such-album";
+
+    AlbumArtGenerator provider(thumbnailer_);
+    unique_ptr<QQuickImageResponse> response(
+        provider.requestImageResponse(id, QSize(128, 128)));
+    wait(response.get());
+    string error = response->errorString().toStdString();
+    EXPECT_NE(string::npos, error.find("could not get thumbnail for album")) << error;
+}
+
+TEST_F(ProviderTest, artistart)
+{
+    const char* id = "artist=beck&album=odelay";
+
+    ArtistArtGenerator provider(thumbnailer_);
+    unique_ptr<QQuickImageResponse> response(
+        provider.requestImageResponse(id, QSize(128, 128)));
+    wait(response.get());
+    EXPECT_EQ("", response->errorString());
+
+    unique_ptr<QQuickTextureFactory> factory(response->textureFactory());
+    ASSERT_NE(nullptr, factory.get());
+    QImage image = factory->image();
+
+    EXPECT_EQ(128, image.width());
+    EXPECT_EQ(96, image.height());
+    EXPECT_EQ(QColor("#FE0000").rgb(), image.pixel(0, 0));
+    EXPECT_EQ(QColor("#FFFF00").rgb(), image.pixel(127, 0));
+    EXPECT_EQ(QColor("#0000FE").rgb(), image.pixel(0, 95));
+    EXPECT_EQ(QColor("#00FF01").rgb(), image.pixel(127, 95));
+}
+
+TEST_F(ProviderTest, artistart_missing)
+{
+    const char* id = "artist=no-such-artist&album=no-such-album";
+
+    ArtistArtGenerator provider(thumbnailer_);
+    unique_ptr<QQuickImageResponse> response(
+        provider.requestImageResponse(id, QSize(128, 128)));
+    wait(response.get());
+    string error = response->errorString().toStdString();
+    EXPECT_NE(string::npos, error.find("could not get thumbnail for artist")) << error;
 }
 
 int main(int argc, char **argv)

=== modified file 'tests/qml/CMakeLists.txt'
--- tests/qml/CMakeLists.txt	2015-12-18 02:09:49 +0000
+++ tests/qml/CMakeLists.txt	2016-02-05 10:20:51 +0000
@@ -9,3 +9,7 @@
 )
 add_dependencies(qml_test thumbnailer-service thumbnailer-qml)
 add_test(qml ${CMAKE_SOURCE_DIR}/tools/run-xvfb.sh ./qml_test -import ${CMAKE_BINARY_DIR}/plugins)
+# Clear some environment variables that can interfere with the tests
+set_tests_properties(qml PROPERTIES
+  ENVIRONMENT "DBUS_SESSION_BUS_ADDRESS=;QT_QPA_PLATFORMTHEME="
+)

=== modified file 'tests/qml/Fixture.qml'
--- tests/qml/Fixture.qml	2015-12-12 00:25:57 +0000
+++ tests/qml/Fixture.qml	2016-02-05 10:20:51 +0000
@@ -69,16 +69,6 @@
                    encodeURIComponent(album));
     }
 
-    function loadBadAlbumUrl(artist) {
-        load("image://albumart/artist=" +
-                   encodeURIComponent(artist));
-    }
-
-    function loadBadArtistUrl(album) {
-        load("image://artistart/album=" +
-                   encodeURIComponent(album));
-    }
-
     function load(url) {
         // Have the image component load the image
         image.source = url;
@@ -109,6 +99,14 @@
         imageData = canvas.context.createImageData(dumpfile);
     }
 
+    function expectLoadError(url) {
+        image.source = url;
+        while (image.status === Image.Loading) {
+            statusSpy.wait();
+        }
+        compare(image.status, Image.Error);
+    }
+
     function pixel(x, y) {
         var pos = (imageData.width * y + x) * 4;
         var data = imageData.data;

=== modified file 'tests/qml/tst_albumart.qml'
--- tests/qml/tst_albumart.qml	2015-12-09 02:32:38 +0000
+++ tests/qml/tst_albumart.qml	2016-02-05 10:20:51 +0000
@@ -22,22 +22,21 @@
     }
 
     function test_artistart_not_found() {
-        loadArtistArt("beck2", "odelay")
-        compare(size.width, 96);
-        compare(size.height, 96);
+        expectLoadError("image://artistart/artist=beck2&album=odelay");
     }
 
     function test_albumart_not_found() {
-        loadAlbumArt("beck2", "odelay")
-        compare(size.width, 96);
-        compare(size.height, 96);
-    }
-
-    function test_bad_artist_art_url() {
-        loadBadArtistUrl("load")
-    }
-
-    function test_bad_album_art_url() {
-        loadBadAlbumUrl("metallica")
+        expectLoadError("image://albumart/artist=beck2&album=odelay");
+    }
+
+    function test_missing_parameter() {
+        expectLoadError("image://albumart/");
+        expectLoadError("image://albumart/foo");
+        expectLoadError("image://albumart/artist=X");
+        expectLoadError("image://albumart/album=Y");
+        expectLoadError("image://artistart/");
+        expectLoadError("image://artistart/foo");
+        expectLoadError("image://artistart/artist=X");
+        expectLoadError("image://artistart/album=Y");
     }
 }

=== modified file 'tests/qml/tst_photo.qml'
--- tests/qml/tst_photo.qml	2015-12-12 00:25:57 +0000
+++ tests/qml/tst_photo.qml	2016-02-05 10:20:51 +0000
@@ -54,6 +54,6 @@
     }
 
     function test_no_such_photo() {
-        loadThumbnail("no_such_photo.jpg");
+        expectLoadError("image://thumbnailer/file:///no_such_photo.jpg");
     }
 }

=== modified file 'tests/testsetup.h.in'
--- tests/testsetup.h.in	2015-10-14 03:57:29 +0000
+++ tests/testsetup.h.in	2016-02-05 10:20:51 +0000
@@ -29,6 +29,5 @@
 
 #define THUMBNAILER_SERVICE "@CMAKE_BINARY_DIR@/src/service/thumbnailer-service"
 #define FAKE_ART_SERVER "@CMAKE_CURRENT_SOURCE_DIR@/server/server.py"
-#define THUMBNAILER_TEST_DEFAULT_IMAGE "@CMAKE_SOURCE_DIR@/data/album_missing.png"
 
 #define THUMBNAILER_ADMIN "@CMAKE_BINARY_DIR@/src/thumbnailer-admin/thumbnailer-admin"

=== modified file 'tests/utils/artserver.cpp'
--- tests/utils/artserver.cpp	2015-12-12 02:06:41 +0000
+++ tests/utils/artserver.cpp	2016-02-05 10:20:51 +0000
@@ -69,7 +69,6 @@
     }
     blocked_server_url_ = "http://127.0.0.1:" + std::to_string(addr.sin_port);
 
-    setenv("THUMBNAILER_TEST_DEFAULT_IMAGE", THUMBNAILER_TEST_DEFAULT_IMAGE, true);
     update_env();
 }
 

=== modified file 'tests/utils/testutils.cpp'
--- tests/utils/testutils.cpp	2015-12-14 01:27:29 +0000
+++ tests/utils/testutils.cpp	2016-02-05 10:20:51 +0000
@@ -19,6 +19,7 @@
 #include "testutils.h"
 
 #include <QString>
+#include <ostream>
 
 using namespace std;
 
@@ -26,3 +27,13 @@
 {
     return stream << s.toUtf8().constData();
 }
+
+ostream& operator<<(ostream& stream, const char* s)
+{
+    return std::operator<<(stream, s);
+}
+
+void PrintTo(const QString& s, ostream* stream)
+{
+    *stream << s;
+}

=== modified file 'tests/utils/testutils.h'
--- tests/utils/testutils.h	2015-12-14 01:27:29 +0000
+++ tests/utils/testutils.h	2016-02-05 10:20:51 +0000
@@ -24,3 +24,7 @@
 
 // Helper for gtest to allow us to insert QString into a stream.
 std::ostream& operator<<(std::ostream& stream, const QString& s);
+// Needed because the QString version will take precedence over the std:: one
+std::ostream& operator<<(std::ostream& stream, const char* s);
+
+void PrintTo(const QString& s, std::ostream* stream);