Merge lp:~phablet-team/qtubuntu-media/mediascanner-dependency-removal into lp:qtubuntu-media

[Jim Hodapp]

* Get rid of the unnecessary dependency on libmediascanner.
* Update mock service interface with changes from media-hub.

* Get rid of the unnecessary dependency on libmediascanner.
* Update mock service interface with changes from media-hub.

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM

review: Approve

[lp:~phablet-team/qtubuntu-media/mediascanner-dependency-removal]

90. By Jim Hodapp on 2015-10-19

Remove more related to no longer used mediascanner functionality.

=== modified file 'debian/control'
--- debian/control	2015-09-03 08:23:32 +0000
+++ debian/control	2015-10-19 16:20:14 +0000
@@ -19,15 +19,6 @@
                qtbase5-dev,
                qtdeclarative5-dev,
                qtmultimedia5-dev,
-               libmediascanner-2.0-dev,
-# Since we need mediascanner2.0 to start while building this package, we
-# add it as a build-dep.
-               mediascanner2.0,
-# Since we need media-hub to start while building this package, we
-# add it as a build-dep.
-               media-hub,
-               libmedia-hub-common4,
-               libmedia-hub-client4,
 Standards-Version: 3.9.4
 # If you don't have commit rights to lp:qtubuntu-media but need to upload
 # packaging changes, just go ahead.  The developers will notice and sync
@@ -43,8 +34,7 @@
 Provides: mediaplayerplugin-aal
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         qtvideonode-plugin,
-         libmediascanner-2.0-3
+         qtvideonode-plugin
 Description: QtMultimedia plugin for AAL+
  Video and audio playback plugin that interfaces Qt with
  the hybris media backend on Android.

=== modified file 'src/aal/aal.pro'
--- src/aal/aal.pro	2015-07-07 20:55:29 +0000
+++ src/aal/aal.pro	2015-10-19 16:20:14 +0000
@@ -9,12 +9,10 @@
 target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
 INSTALLS = target
 
-INCLUDEPATH += /usr/include/hybris /usr/include/libqtubuntu-media-signals \
-               /usr/include/mediascanner-2.0
+INCLUDEPATH += /usr/include/hybris /usr/include/libqtubuntu-media-signals
 LIBS += \
     -lhybris-common -lubuntu_application_api -lmedia -lqtubuntu-media-signals \
-    -lmedia-hub-client \
-    -lmediascanner-2.0
+    -lmedia-hub-client
 
 OTHER_FILES += aalmediaplayer.json
 

=== modified file 'src/aal/aalmediaplayerservice.cpp'
--- src/aal/aalmediaplayerservice.cpp	2015-08-18 15:49:35 +0000
+++ src/aal/aalmediaplayerservice.cpp	2015-10-19 16:20:14 +0000
@@ -16,7 +16,6 @@
 
 #include "aalmediaplayercontrol.h"
 #include "aalmediaplayerservice.h"
-#include "aalmetadatareadercontrol.h"
 #include "aalmediaplaylistcontrol.h"
 #include "aalmediaplaylistprovider.h"
 #include "aalutility.h"

=== modified file 'src/aal/aalmediaplayerserviceplugin.cpp'
--- src/aal/aalmediaplayerserviceplugin.cpp	2015-07-16 20:36:44 +0000
+++ src/aal/aalmediaplayerserviceplugin.cpp	2015-10-19 16:20:14 +0000
@@ -16,7 +16,6 @@
 
 #include "aalmediaplayerserviceplugin.h"
 #include "aalmediaplayerservice.h"
-#include "aalmetadatareadercontrol.h"
 
 #include <QDebug>
 

=== removed file 'src/aal/aalmetadatareadercontrol.cpp'
--- src/aal/aalmetadatareadercontrol.cpp	2015-02-18 16:41:04 +0000
+++ src/aal/aalmetadatareadercontrol.cpp	1970-01-01 00:00:00 +0000
@@ -1,148 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "aalmetadatareadercontrol.h"
-
-#include <mediascanner/MediaFile.hh>
-#include <mediascanner/MediaStore.hh>
-
-#include <QDate>
-#include <QDateTime>
-#include <QDebug>
-#include <QMediaMetaData>
-#include <QSize>
-
-using namespace mediascanner;
-
-AalMetaDataReaderControl::AalMetaDataReaderControl(QObject *parent)
-    : QMetaDataReaderControl(parent),
-      m_available(false)
-{
-}
-
-bool AalMetaDataReaderControl::isMetaDataAvailable() const
-{
-    return m_available;
-}
-
-QVariant AalMetaDataReaderControl::metaData(const QString &key) const
-{
-    qDebug() << Q_FUNC_INFO;
-    return m_metadata.value(key);
-}
-
-QStringList AalMetaDataReaderControl::availableMetaData() const
-{
-    return m_metadata.keys();
-}
-
-void AalMetaDataReaderControl::onMediaChanged(const QMediaContent &media)
-{
-    qDebug() << Q_FUNC_INFO;
-    m_mediaContent = media;
-    updateMetaData();
-}
-
-void AalMetaDataReaderControl::onUpdateMetaData()
-{
-    qDebug() << Q_FUNC_INFO;
-    if (m_mediaContent.isNull())
-        return;
-
-    updateMetaData();
-}
-
-void AalMetaDataReaderControl::updateMetaData()
-{
-    qDebug() << Q_FUNC_INFO;
-    if (m_mediaContent.isNull())
-    {
-        qWarning() << "Not updating metadata since the source has not been set.";
-        return;
-    }
-
-    m_metadata.clear();
-
-    bool isVideo = false, isAudio = false, isImage = false;
-    try {
-        MediaStore store(MS_READ_ONLY);
-        qDebug() << "Doing a mediascanner lookup of file: " << m_mediaContent.canonicalUrl().toString(QUrl::RemoveScheme);
-        MediaFile mf = store.lookup(m_mediaContent.canonicalUrl().toString(QUrl::RemoveScheme).toStdString());
-
-        isVideo = (mf.getType() == VideoMedia);
-        isAudio = (mf.getType() == AudioMedia);
-        isImage = (mf.getType() == ImageMedia);
-
-        m_metadata.insert(QMediaMetaData::Title, QString(mf.getTitle().c_str()));
-        m_metadata.insert(QMediaMetaData::Author, QStringList(QString(mf.getAuthor().c_str())));
-        {
-            QString format = "yyyy-MM-ddThh:mm:ss";
-            QDateTime datetime = QDateTime::fromString(QString(mf.getDate().c_str()), format);
-            m_metadata.insert(QMediaMetaData::Date, datetime.date());
-        }
-        m_metadata.insert(QMediaMetaData::Genre, QStringList(QString(mf.getGenre().c_str())));
-        m_metadata.insert(QMediaMetaData::Duration, static_cast<qint64>(mf.getDuration()));
-
-        // Metadata specific to video goes here:
-        if (isVideo)
-        {
-            m_metadata.insert(QMediaMetaData::Resolution, QSize(mf.getWidth(), mf.getHeight()));
-        }
-
-        // Metadata specific to audio/music goes here:
-        if (isAudio)
-        {
-            m_metadata.insert(QMediaMetaData::AlbumTitle, QString(mf.getAlbum().c_str()));
-            m_metadata.insert(QMediaMetaData::AlbumArtist, QString(mf.getAlbumArtist().c_str()));
-            m_metadata.insert(QMediaMetaData::CoverArtUrlSmall, QUrl(mf.getArtUri().c_str()));
-            m_metadata.insert(QMediaMetaData::CoverArtUrlLarge, QUrl(mf.getArtUri().c_str()));
-            m_metadata.insert(QMediaMetaData::TrackNumber, mf.getTrackNumber());
-        }
-
-        // Metadata specific to images goes here:
-        if (isImage)
-        {
-            if (m_metadata.value(QMediaMetaData::Resolution).value<QSize>().isEmpty())
-                m_metadata.insert(QMediaMetaData::Resolution, QSize(mf.getWidth(), mf.getHeight()));
-
-            m_metadata.insert(QMediaMetaData::GPSLatitude, mf.getLatitude());
-            m_metadata.insert(QMediaMetaData::GPSLongitude, mf.getLongitude());
-        }
-
-        qDebug() << "-----------------------------------------------------";
-        qDebug() << "Media type: " << ((isVideo) ? "video" : "audio");
-        qDebug() << "Media title: " << mf.getTitle().c_str();
-        qDebug() << "Media author: " << mf.getAuthor().c_str();
-        qDebug() << "Media date: " << mf.getDate().c_str();
-        qDebug() << "Media genre: " << mf.getGenre().c_str();
-        qDebug() << "Media duration: " << mf.getDuration();
-        qDebug() << "Media height: " << mf.getHeight();
-        qDebug() << "Media width: " << mf.getWidth();
-        qDebug() << "Latitude: " << mf.getLatitude();
-        qDebug() << "Longitude: " << mf.getLongitude();
-        qDebug() << "-----------------------------------------------------";
-    } catch (std::runtime_error &e) {
-        qWarning() << "Caught runtime exception from mediascanner: " << e.what();
-    }
-
-    bool previousAvailable = m_available;
-    m_available = !m_metadata.isEmpty();
-
-    if (m_available != previousAvailable)
-        Q_EMIT metaDataAvailableChanged(m_available);
-
-    Q_EMIT metaDataChanged();
-}

=== removed file 'src/aal/aalmetadatareadercontrol.h'
--- src/aal/aalmetadatareadercontrol.h	2015-02-18 16:41:04 +0000
+++ src/aal/aalmetadatareadercontrol.h	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef AALMETADATAREADERCONTROL_H
-#define AALMETADATAREADERCONTROL_H
-
-#include <QMetaDataReaderControl>
-#include <qmediacontent.h>
-
-class tst_MetaDataReaderControl;
-
-QT_BEGIN_NAMESPACE
-
-class AalMetaDataReaderControl : public QMetaDataReaderControl
-{
-    Q_OBJECT
-
-    // For unit testing purposes
-    friend class tst_MetaDataReaderControl;
-
-public:
-    explicit AalMetaDataReaderControl(QObject *parent = 0);
-
-    /**
-     * @brief Returns whether there is any metadata available to read for the given media source.
-     */
-    bool isMetaDataAvailable() const Q_DECL_OVERRIDE;
-
-    /**
-     * @brief Returns a metadata value given a metadata key name. See QMediaMetaData for a list of keys.
-     * @return Returns a QVariant with the metadata value.
-     */
-    QVariant metaData(const QString &key) const Q_DECL_OVERRIDE;
-    /**
-     * @brief Returns a list of key names for which metadata values are available.
-     * @return Returns a QStringList of key names.
-     */
-    QStringList availableMetaData() const Q_DECL_OVERRIDE;
-
-public Q_SLOTS:
-    void onMediaChanged(const QMediaContent &media);
-    /**
-     * @brief Updates the internal metadata metadata store from the mediascanner for the given media source.
-     **/
-    void onUpdateMetaData();
-
-private:
-    void updateMetaData();
-
-    QMediaContent m_mediaContent;
-    bool m_available;
-    QVariantMap m_metadata;
-};
-
-QT_END_NAMESPACE
-
-#endif // AALMETADATAREADERCONTROL_H

=== modified file 'tests/unit/service.cpp'
--- tests/unit/service.cpp	2015-06-08 19:15:43 +0000
+++ tests/unit/service.cpp	2015-10-19 16:20:14 +0000
@@ -54,6 +54,10 @@
     return 0;
 }
 
+void TestService::set_current_player(Player::PlayerKey)
+{
+}
+
 void TestService::pause_other_sessions(Player::PlayerKey)
 {
 }

=== modified file 'tests/unit/service.h'
--- tests/unit/service.h	2015-06-08 19:15:43 +0000
+++ tests/unit/service.h	2015-10-19 16:20:14 +0000
@@ -50,6 +50,7 @@
     virtual void destroy_session(const std::string& uuid, const Player::Configuration&);
     virtual std::shared_ptr<Player> create_fixed_session(const std::string& name, const Player::Configuration&);
     virtual std::shared_ptr<Player> resume_session(Player::PlayerKey);
+    virtual void set_current_player(Player::PlayerKey);
     virtual void pause_other_sessions(Player::PlayerKey);
 };
 }

=== removed file 'tests/unit/setup_mediascanner.sh'
--- tests/unit/setup_mediascanner.sh	2015-06-08 19:15:43 +0000
+++ tests/unit/setup_mediascanner.sh	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-#!/bin/sh
-# Setup the mediascanner and copy test media into place
-
-set -e
-
-TESTFILE="testfile"
-DEST_PREFIX=$HOME
-
-if [ ! -d "$DEST_PREFIX/Videos" ]; then
-    echo "Creating directory $DEST_PREFIX/Videos"
-    mkdir -p $DEST_PREFIX/Videos
-fi
-
-if [ ! -d "$DEST_PREFIX/Music" ]; then
-    echo "Creating directory $DEST_PREFIX/Music"
-    mkdir -p $DEST_PREFIX/Music
-fi
-
-if [ ! -d "$DEST_PREFIX/Pictures" ]; then
-    echo "Creating directory $DEST_PREFIX/Pictures"
-    mkdir -p $DEST_PREFIX/Pictures
-fi
-
-if [ ! -f "$DEST_PREFIX/Videos/$TESTFILE.mp4" ]; then
-    echo "Copying video/$TESTFILE.mp4 to $DEST_PREFIX/Videos/$TESTFILE.mp4"
-    cp videos/$TESTFILE.mp4 $DEST_PREFIX/Videos/$TESTFILE.mp4
-fi
-
-if [ ! -f "$DEST_PREFIX/Music/$TESTFILE.ogg" ]; then
-    echo "Copying audio/$TESTFILE.ogg to $DEST_PREFIX/Music/$TESTFILE.ogg"
-    cp audio/$TESTFILE.ogg $DEST_PREFIX/Music/$TESTFILE.ogg
-fi
-
-if [ ! -f "$DEST_PREFIX/Pictures/$TESTFILE.jpg" ]; then
-    echo "Copying images/$TESTFILE.jpg to $DEST_PREFIX/Pictures/$TESTFILE.jpg"
-    cp images/$TESTFILE.jpg $DEST_PREFIX/Pictures/$TESTFILE.jpg
-fi
-
-status mediascanner-2.0
-if [ $? -ne 0 ]; then
-    echo "mediascanner-2.0 not running, starting"
-    start mediascanner-2.0
-else
-    echo "restarting mediascanner-2.0"
-    restart mediascanner-2.0
-fi

=== modified file 'tests/unit/tst_mediaplayerplugin.cpp'
--- tests/unit/tst_mediaplayerplugin.cpp	2015-07-10 17:21:59 +0000
+++ tests/unit/tst_mediaplayerplugin.cpp	2015-10-19 16:20:14 +0000
@@ -19,7 +19,6 @@
 #include "aalmediaplayerservice.h"
 #include "aalutility.h"
 #include "tst_mediaplayerplugin.h"
-#include "tst_metadatareadercontrol.h"
 #include "tst_mediaplaylistcontrol.h"
 
 #include <memory>
@@ -144,15 +143,5 @@
     QCoreApplication app(argc, argv);
     tst_MediaPlayerPlugin mpp;
     tst_MediaPlaylistControl mpc;
-    // FIXME: Disabled for now until we can get metadata from mediascanner without a file
-    // first needing to be indexed. This is required so that the metadata tests will work
-    // in the CI infrastructure.
-    //tst_MetaDataReaderControl mdrc;
-    //return (QTest::qExec(&mpp, argc, argv) && QTest::qExec(&mdrc, argc, argv));
-#if 0
-    return QTest::qExec(&mpc, argc, argv);
-    return QTest::qExec(&mpp, argc, argv);
-#else
-    return 0;
-#endif
+    return (QTest::qExec(&mpp, argc, argv) && QTest::qExec(&mpc, argc, argv));
 }

=== modified file 'tests/unit/tst_mediaplaylistcontrol.cpp'
--- tests/unit/tst_mediaplaylistcontrol.cpp	2015-06-08 19:16:35 +0000
+++ tests/unit/tst_mediaplaylistcontrol.cpp	2015-10-19 16:20:14 +0000
@@ -19,7 +19,6 @@
 #include "aalmediaplayerservice.h"
 #include "aalmediaplaylistcontrol.h"
 #include "tst_mediaplayerplugin.h"
-#include "tst_metadatareadercontrol.h"
 #include "tst_mediaplaylistcontrol.h"
 
 #include <QObject>

=== removed file 'tests/unit/tst_metadatareadercontrol.cpp'
--- tests/unit/tst_metadatareadercontrol.cpp	2015-06-08 19:15:43 +0000
+++ tests/unit/tst_metadatareadercontrol.cpp	1970-01-01 00:00:00 +0000
@@ -1,168 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "tst_metadatareadercontrol.h"
-#include "aalmetadatareadercontrol.h"
-
-#include <QMediaMetaData>
-#include <QObject>
-#include <QtTest/QtTest>
-
-using namespace core::ubuntu::media;
-
-void tst_MetaDataReaderControl::initTestCase()
-{
-    m_mdControlVideo = new AalMetaDataReaderControl(this);
-    m_mdControlAudio = new AalMetaDataReaderControl(this);
-    m_mdControlImage = new AalMetaDataReaderControl(this);
-
-    QVERIFY(m_mdControlVideo != nullptr);
-    QVERIFY(m_mdControlAudio != nullptr);
-    QVERIFY(m_mdControlImage != nullptr);
-
-    connect(this, SIGNAL(onMediaChanged(const QMediaContent&)), m_mdControlVideo, SLOT(onMediaChanged(const QMediaContent&)));
-    connect(this, SIGNAL(onMediaChanged(const QMediaContent&)), m_mdControlAudio, SLOT(onMediaChanged(const QMediaContent&)));
-    connect(this, SIGNAL(onMediaChanged(const QMediaContent&)), m_mdControlImage, SLOT(onMediaChanged(const QMediaContent&)));
-}
-
-void tst_MetaDataReaderControl::cleanupTestCase()
-{
-    delete m_mdControlImage;
-    delete m_mdControlAudio;
-    delete m_mdControlVideo;
-}
-
-// Adapted to have custom delta from qFuzzyCompare
-static inline bool fuzzyCompare(double p1, double p2)
-{
-    return (qAbs(p1 - p2) <= 0.00001 * qMin(qAbs(p1), qAbs(p2)));
-}
-
-void tst_MetaDataReaderControl::setVideoMediaResource()
-{
-    m_mediaResource = QMediaResource(QUrl("/home/phablet/Videos/testfile.mp4"));
-    m_media = QMediaContent(m_mediaResource);
-    // Signal to the AalMetaDataReaderControl instance that we are setting example media to extract metadata from
-    Q_EMIT onMediaChanged(m_media);
-}
-
-void tst_MetaDataReaderControl::setAudioMediaResource()
-{
-    m_mediaResource = QMediaResource(QUrl("/home/phablet/Music/testfile.ogg"));
-    m_media = QMediaContent(m_mediaResource);
-    // Signal to the AalMetaDataReaderControl instance that we are setting example media to extract metadata from
-    Q_EMIT onMediaChanged(m_media);
-}
-
-void tst_MetaDataReaderControl::setImageMediaResource()
-{
-    m_mediaResource = QMediaResource(QUrl("/home/phablet/Pictures/testfile.jpg"));
-    m_media = QMediaContent(m_mediaResource);
-    // Signal to the AalMetaDataReaderControl instance that we are setting example media to extract metadata from
-    Q_EMIT onMediaChanged(m_media);
-}
-
-void tst_MetaDataReaderControl::verifyResolution()
-{
-    setVideoMediaResource();
-    QSize resolutionSize = m_mdControlVideo->metaData(QMediaMetaData::Resolution).value<QSize>();
-    QCOMPARE(resolutionSize, QSize(320, 240));
-
-    setImageMediaResource();
-    resolutionSize = m_mdControlVideo->metaData(QMediaMetaData::Resolution).value<QSize>();
-    QCOMPARE(resolutionSize, QSize(2448, 3264));
-}
-
-void tst_MetaDataReaderControl::verifyDuration()
-{
-    setVideoMediaResource();
-    qint64 duration = m_mdControlVideo->metaData(QMediaMetaData::Duration).value<qint64>();
-    QCOMPARE(duration, 34);
-
-    setAudioMediaResource();
-    duration = m_mdControlVideo->metaData(QMediaMetaData::Duration).value<qint64>();
-    QCOMPARE(duration, 5);
-}
-
-void tst_MetaDataReaderControl::verifyTitle()
-{
-    setVideoMediaResource();
-    QString title = m_mdControlVideo->metaData(QMediaMetaData::Title).value<QString>();
-    QCOMPARE(title, QString("h264 title"));
-
-    setAudioMediaResource();
-    title = m_mdControlVideo->metaData(QMediaMetaData::Title).value<QString>();
-    QCOMPARE(title, QString("track1"));
-}
-
-void tst_MetaDataReaderControl::verifyAuthor()
-{
-    setVideoMediaResource();
-    QString author = m_mdControlVideo->metaData(QMediaMetaData::Author).value<QString>();
-    QCOMPARE(author, QString("Canonical"));
-}
-
-void tst_MetaDataReaderControl::verifyGenre()
-{
-    setVideoMediaResource();
-    QString genre = m_mdControlVideo->metaData(QMediaMetaData::Genre).value<QString>();
-    QCOMPARE(genre, QString("Trailer"));
-
-    setAudioMediaResource();
-    genre = m_mdControlAudio->metaData(QMediaMetaData::Genre).value<QString>();
-    QCOMPARE(genre, QString("Progressive Rock"));
-}
-
-void tst_MetaDataReaderControl::verifyDate()
-{
-    setAudioMediaResource();
-    QDate date = m_mdControlAudio->metaData(QMediaMetaData::Date).value<QDate>();
-    QCOMPARE(date, QDate(2013, 0, 0));
-
-    setImageMediaResource();
-    date = m_mdControlAudio->metaData(QMediaMetaData::Date).value<QDate>();
-    QCOMPARE(date, QDate(2015, 2, 10));
-}
-
-void tst_MetaDataReaderControl::verifyAlbumTitle()
-{
-    setAudioMediaResource();
-    QString title = m_mdControlAudio->metaData(QMediaMetaData::AlbumTitle).value<QString>();
-    QCOMPARE(title, QString("album1"));
-}
-
-void tst_MetaDataReaderControl::verifyAlbumArtist()
-{
-    setAudioMediaResource();
-    QString artist = m_mdControlAudio->metaData(QMediaMetaData::AlbumArtist).value<QString>();
-    QCOMPARE(artist, QString("artist1"));
-}
-
-void tst_MetaDataReaderControl::verifyLatitude()
-{
-    setImageMediaResource();
-    double latitude = m_mdControlImage->metaData(QMediaMetaData::GPSLatitude).value<double>();
-    qDebug() << "latitude: " << latitude;
-    QVERIFY(fuzzyCompare(latitude, 39.8566));
-}
-
-void tst_MetaDataReaderControl::verifyLongitude()
-{
-    setImageMediaResource();
-    double longitude = m_mdControlImage->metaData(QMediaMetaData::GPSLongitude).value<double>();
-    qDebug() << "longitude: " << longitude;
-    QVERIFY(fuzzyCompare(longitude, -86.1242));
-}

=== removed file 'tests/unit/tst_metadatareadercontrol.h'
--- tests/unit/tst_metadatareadercontrol.h	2015-06-08 19:15:43 +0000
+++ tests/unit/tst_metadatareadercontrol.h	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef TST_METADATAREADERCONTROL_H
-#define TST_METADATAREADERCONTROL_H
-
-#include <core/media/player.h>
-
-#include <memory>
-
-#include <QMediaContent>
-#include <QMediaResource>
-#include <QObject>
-
-class AalMetaDataReaderControl;
-class AalMediaPlayerService;
-class AalMediaPlayerControl;
-class QMediaControl;
-class QMediaPlayer;
-
-class tst_MetaDataReaderControl : public QObject
-{
-    Q_OBJECT
-
-    AalMetaDataReaderControl *m_mdControlVideo;
-    AalMetaDataReaderControl *m_mdControlAudio;
-    AalMetaDataReaderControl *m_mdControlImage;
-    QMediaResource m_mediaResource;
-    QMediaContent m_media;
-
-Q_SIGNALS:
-    void onMediaChanged(const QMediaContent &media);
-
-private Q_SLOTS:
-    // We want the setup to be run prior to every test case to
-    // ensure correct test isolation, see http://qt-project.org/doc/qt-5/qtest-overview.html.
-    void initTestCase();
-    void cleanupTestCase();
-
-    void verifyResolution();
-    void verifyDuration();
-    void verifyTitle();
-    void verifyAuthor();
-    void verifyGenre();
-
-    void verifyDate();
-    void verifyAlbumTitle();
-    void verifyAlbumArtist();
-
-    void verifyLatitude();
-    void verifyLongitude();
-
-private:
-    void setVideoMediaResource();
-    void setAudioMediaResource();
-    void setImageMediaResource();
-};
-
-#endif // TST_METADATAREADERCONTROL_H

=== modified file 'tests/unit/unit.pro'
--- tests/unit/unit.pro	2015-07-07 20:55:29 +0000
+++ tests/unit/unit.pro	2015-10-19 16:20:14 +0000
@@ -10,11 +10,9 @@
 INCLUDEPATH += ../../src/aal \
     /usr/include/qt5/QtMultimedia \
     /usr/include/hybris \
-    /usr/include/libqtubuntu-media-signals \
-    /usr/include/mediascanner-2.0
+    /usr/include/libqtubuntu-media-signals
 LIBS += \
-    -lqtubuntu-media-signals \
-    -lmediascanner-2.0
+    -lqtubuntu-media-signals
 
 HEADERS += \
     ../../src/aal/aalmediaplayercontrol.h \
@@ -43,6 +41,3 @@
     ../../src/aal/aalmediaplayerserviceplugin.cpp \
     ../../src/aal/aalvideorenderercontrol.cpp \
     ../../src/aal/aalutility.cpp
-
-# Installs required test media into place where the mediascanner will scan them
-system(cd $$PWD; echo $$PWD; ./setup_mediascanner.sh)