Merge lp:~xavi-garcia-mena/mediascanner2/ms-dbus-wal into lp:mediascanner2

[Xavi Garcia]

Modified to use the d-bus interface when MediaStore is created in Read Only mode.

Modified to use the d-bus interface when MediaStore is created in Read Only mode.

[Jussi Pakkanen (jpakkane)]

Looking quite nice. However one thing that is a bit concerning is that the tests duplicate a lot of code in the dbus and non-dbus cases. Would it be possible to consolidate these so that every test is run with common code. So something along the lines of this:

void testImplementation(MediaStore &writer, MediaStore &queryer) {
  // First set up
  writer.insert(whatevs);

  // Then query
  ASSERT_EQ(queryer.query("..."), result);
}

And then have the actual dbus and non-dbus test cases just do basically this:

void testWithoutDbus() {
  MediaStore local(READWRITE);

  testImplementation(local, local);
}

void testWithDbus() {
  MediaStore writer(READWRITE);
  MediaStore queryer(READONLY);

  testImplementation(writer, queryer);
}

review: Needs Fixing

[lp:~xavi-garcia-mena/mediascanner2/ms-dbus-wal]

300. By Xavi Garcia on 2015-02-12

Modifed media store tests to avoid duplicating code

301. By Xavi Garcia on 2015-02-13

Removed Unity-api dependency, as it was not needed

302. By Xavi Garcia on 2015-02-16

Added libqtdbustest to test the d-bus connection

[Jussi Pakkanen (jpakkane)]

Looks fine. Just a few niggles:

- the new variables have an underscore after their names, whereas the naming convention elsewere is not to have underscores
- when printing the text about error messages, please also print the URL of the bug in question
- in brokenfiles you wrap everything in a try/catch that just prints a generic error, why is this, AFAICR gtest will automatically fail any test that throws and prints the exception's error messag

I think we need to start talking to Jamie about the dbus/apparmor bits that this thing needs (also in music-app).

review: Needs Fixing

[lp:~xavi-garcia-mena/mediascanner2/ms-dbus-wal]

303. By Xavi Garcia on 2015-02-16

Erased final _ for member variables

[Xavi Garcia (xavi-garcia-mena)]

Hey Jussi,

what file do you mean when you say?
*when printing the text about error messages, please also print the URL of
the bug in question*

What do you mean to print the URL of the bug? When an exception is thrown?

I've erased the try... catch, as it was part of a test I did and changed
(but obviously forgot to erase the try..catch)

Thanks,

Xavi

On Mon, Feb 16, 2015 at 2:40 PM, Jussi Pakkanen <
<email address hidden>> wrote:

> Review: Needs Fixing
>
> Looks fine. Just a few niggles:
>
> - the new variables have an underscore after their names, whereas the
> naming convention elsewere is not to have underscores
> - when printing the text about error messages, please also print the URL
> of the bug in question
> - in brokenfiles you wrap everything in a try/catch that just prints a
> generic error, why is this, AFAICR gtest will automatically fail any test
> that throws and prints the exception's error messag
>
> I think we need to start talking to Jamie about the dbus/apparmor bits
> that this thing needs (also in music-app).
> --
>
> https://code.launchpad.net/~xavi-garcia-mena/mediascanner2/ms-dbus-wal/+merge/249346
> You are the owner of lp:~xavi-garcia-mena/mediascanner2/ms-dbus-wal.
>

[lp:~xavi-garcia-mena/mediascanner2/ms-dbus-wal]

304. By Xavi Garcia on 2015-02-16

Added bug link in error message and remove unnecessary try...catch in unit test

[Jussi Pakkanen (jpakkane)]

Now we need to do the AppArmor bits and for that we need Jamie's help, so I subscribed him.

What we are trying to do here is the following:

Currently users of Mediascanner (media scopes and music-app) have read-only access to Mediascanner's media storage dir ~/.cache/mediascanner-2.0. This MR changes it so that they no longer may access the file directly, instead they call a small dbus server binary instead.

This means that we need the following Apparmor changes:

- remove read access from existing users
- grant them access to the dbus server instead
- create new daemon that is allowed to own the service name and has r/w access to the media directory

Does this seem like a suitable approach, security-wise?

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:304
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~xavi-garcia-mena/mediascanner2/ms-dbus-wal/+merge/249346/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mediascanner2-ci/188/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-amd64-ci/25/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-armhf-ci/25/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-i386-ci/25/console

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

review: Needs Fixing (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:304
https://jenkins.canonical.com/unity-api-1/job/lp-mediascanner2-ci/3/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/50/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/56/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-mediascanner2-ci/3/rebuild

review: Needs Fixing (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:304
https://jenkins.canonical.com/unity-api-1/job/lp-mediascanner2-ci/4/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/227/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/235/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-mediascanner2-ci/4/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

304. By Xavi Garcia on 2015-02-16

Added bug link in error message and remove unnecessary try...catch in unit test

303. By Xavi Garcia on 2015-02-16

Erased final _ for member variables

302. By Xavi Garcia on 2015-02-16

Added libqtdbustest to test the d-bus connection

301. By Xavi Garcia on 2015-02-13

Removed Unity-api dependency, as it was not needed

300. By Xavi Garcia on 2015-02-12

Modifed media store tests to avoid duplicating code

299. By Xavi Garcia on 2015-02-11

Using DBus for read only mode

=== modified file 'debian/control'
--- debian/control	2014-10-09 08:48:05 +0000
+++ debian/control	2015-02-16 14:24:40 +0000
@@ -18,6 +18,7 @@
                libgdk-pixbuf2.0-dev,
                libgtest-dev,
                libproperties-cpp-dev,
+               libqtdbustest1-dev,
                libsqlite3-dev (>= 3.8.5),
                libudisks2-dev,
                qt5-default,
 
=== modified file 'src/daemon/CMakeLists.txt'
--- src/daemon/CMakeLists.txt	2014-10-09 08:48:05 +0000
+++ src/daemon/CMakeLists.txt	2015-02-16 14:24:40 +0000
@@ -9,6 +9,7 @@
   SubtreeWatcher.cc
   Scanner.cc
   ../mediascanner/utils.cc
+  $<TARGET_OBJECTS:mediascanner-dbus-static>
 )
 
 target_link_libraries(scannerstuff ${GST_LIBRARIES} ${EXIF_LDFLAGS} ${UDISKS_LDFLAGS}
 
=== modified file 'src/mediascanner/CMakeLists.txt'
--- src/mediascanner/CMakeLists.txt	2014-08-22 14:33:27 +0000
+++ src/mediascanner/CMakeLists.txt	2015-02-16 14:24:40 +0000
@@ -1,3 +1,18 @@
+pkg_check_modules(DBUSCPP dbus-cpp REQUIRED)
+
+add_library(
+  mediascanner-dbus-static OBJECT
+  d-bus/dbus-codec.cc
+  d-bus/service-stub.cc
+)
+
+set_target_properties(
+  mediascanner-dbus-static
+  PROPERTIES
+    LINK_FLAGS "-Wl,--export-all-symbols"
+    COMPILE_FLAGS -fPIC
+)
+
 add_library(mediascanner SHARED
   MediaFile.cc
   MediaFileBuilder.cc
@@ -9,6 +24,7 @@
   utils.cc
   mozilla/fts3_porter.c
   mozilla/Normalize.c
+  $<TARGET_OBJECTS:mediascanner-dbus-static>
 )
 
 set(symbol_map "${CMAKE_CURRENT_SOURCE_DIR}/mediascanner-2.0.map")
@@ -16,8 +32,10 @@
     LINK_FLAGS "${ldflags} -Wl,--version-script,${symbol_map}")
 set_target_properties(mediascanner PROPERTIES LINK_DEPENDS ${symbol_map})
 
-add_definitions(${MEDIASCANNER_CFLAGS})
-target_link_libraries(mediascanner ${MEDIASCANNER_LIBRARIES})
+add_definitions(${DBUSCPP_CFLAGS} ${MEDIASCANNER_CFLAGS})
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src)
+target_link_libraries(mediascanner ${MEDIASCANNER_LIBRARIES} ${DBUSCPP_LDFLAGS})
 
 set_target_properties(mediascanner PROPERTIES
   OUTPUT_NAME "mediascanner-2.0"
 
=== modified file 'src/mediascanner/MediaStore.cc'
--- src/mediascanner/MediaStore.cc	2015-01-28 09:41:26 +0000
+++ src/mediascanner/MediaStore.cc	2015-02-16 14:24:40 +0000
@@ -39,6 +39,7 @@
 #include "Filter.hh"
 #include "internal/sqliteutils.hh"
 #include "internal/utils.hh"
+#include "d-bus/service-stub.hh"
 
 using namespace std;
 
@@ -54,6 +55,11 @@
     // http://sqlite.com/faq.html#q6
     std::mutex dbMutex;
 
+    OpenType access_mode;
+
+    std::unique_ptr<mediascanner::dbus::ServiceStub> media_store_dbus;
+
+    MediaStorePrivate(OpenType access);
     void insert(const MediaFile &m) const;
     void remove(const std::string &fname) const;
     void insert_broken_file(const std::string &fname, const std::string &etag) const;
@@ -121,7 +127,7 @@
         **   (<hit count> / <global hit count>) * <column weight>
         **
         ** aPhraseinfo[] points to the start of the data for phrase iPhrase. So
-        ** the hit count and global hit counts for each column are found in 
+        ** the hit count and global hit counts for each column are found in
         ** aPhraseinfo[iCol*3] and aPhraseinfo[iCol*3+1], respectively.
         */
         const int32_t *aPhraseinfo = &aMatchinfo[2 + iPhrase*nCol*3];
@@ -287,6 +293,13 @@
     execute_sql(db, deleteCmd);
 }
 
+void activateWalMode(sqlite3 *db) {
+    string activateWalCmd(R"(
+PRAGMA journal_mode = WAL;
+)");
+    execute_sql(db, activateWalCmd);
+}
+
 void createTables(sqlite3 *db) {
     string schema(R"(
 CREATE TABLE schemaVersion (version INTEGER);
@@ -338,7 +351,7 @@
     type INTEGER   -- 0=Audio, 1=Video
 );
 
-CREATE VIRTUAL TABLE media_fts 
+CREATE VIRTUAL TABLE media_fts
 USING fts4(content='media', title, artist, album, tokenize=mozporter);
 
 CREATE TRIGGER media_bu BEFORE UPDATE ON media BEGIN
@@ -394,43 +407,51 @@
 
 MediaStore::MediaStore(const std::string &filename, OpenType access, const std::string &retireprefix) {
     int sqliteFlags = access == MS_READ_WRITE ? SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE : SQLITE_OPEN_READONLY;
-    p = new MediaStorePrivate();
+    p = new MediaStorePrivate(access);
+    if(access != MS_READ_WRITE) {
+        return;
+    }
     if(sqlite3_open_v2(filename.c_str(), &p->db, sqliteFlags, nullptr) != SQLITE_OK) {
         throw runtime_error(sqlite3_errmsg(p->db));
     }
     register_tokenizer(p->db);
     register_functions(p->db);
     int detectedSchemaVersion = getSchemaVersion(p->db);
-    if(access == MS_READ_WRITE) {
-        if(detectedSchemaVersion != schemaVersion) {
-            deleteTables(p->db);
-            createTables(p->db);
-        }
-        if(!retireprefix.empty())
-            archiveItems(retireprefix);
-    } else {
-        if(detectedSchemaVersion != schemaVersion) {
-            std::string msg("Tried to open a db with schema version ");
-            msg += std::to_string(detectedSchemaVersion);
-            msg += ", while supported version is ";
-            msg += std::to_string(schemaVersion) + ".";
-            throw runtime_error(msg);
-        }
+    activateWalMode(p->db);
+    if(detectedSchemaVersion != schemaVersion) {
+        deleteTables(p->db);
+        createTables(p->db);
     }
+    if(!retireprefix.empty())
+        archiveItems(retireprefix);
 }
 
 MediaStore::~MediaStore() {
-    sqlite3_close(p->db);
+    if(p->db) {
+        sqlite3_close(p->db);
+    }
     delete p;
 }
 
+MediaStorePrivate::MediaStorePrivate(OpenType access) : db(nullptr), access_mode(access), media_store_dbus(nullptr) {
+    if(access_mode != MS_READ_WRITE) {
+        media_store_dbus.reset(new dbus::ServiceStub());
+    }
+}
+
 size_t MediaStorePrivate::size() const {
+    if(access_mode != MS_READ_WRITE) {
+        throw runtime_error("MediaStorePrivate::size() is not available in read only mode");
+    }
     Statement count(db, "SELECT COUNT(*) FROM media");
     count.step();
     return count.getInt(0);
 }
 
 void MediaStorePrivate::insert(const MediaFile &m) const {
+    if(access_mode != MS_READ_WRITE) {
+        throw runtime_error("MediaStorePrivate::insert() is not available in read only mode");
+    }
     Statement query(db, "INSERT OR REPLACE INTO media (filename, content_type, etag, title, date, artist, album, album_artist, genre, disc_number, track_number, duration, width, height, latitude, longitude, has_thumbnail, type)  VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
     query.bind(1, m.getFileName());
     query.bind(2, m.getContentType());
@@ -466,12 +487,18 @@
 }
 
 void MediaStorePrivate::remove(const string &fname) const {
+    if(access_mode != MS_READ_WRITE) {
+        throw runtime_error("MediaStorePrivate::remove() is not available in read only mode");
+    }
     Statement del(db, "DELETE FROM media WHERE filename = ?");
     del.bind(1, fname);
     del.step();
 }
 
 void MediaStorePrivate::insert_broken_file(const std::string &fname, const std::string &etag) const {
+    if(access_mode != MS_READ_WRITE) {
+        throw runtime_error("MediaStorePrivate::insert_broken_file() is not available in read only mode");
+    }
     Statement del(db, "INSERT OR REPLACE INTO broken_files (filename, etag) VALUES (?, ?)");
     del.bind(1, fname);
     del.bind(2, etag);
@@ -479,12 +506,18 @@
 }
 
 void MediaStorePrivate::remove_broken_file(const std::string &fname) const {
+    if(access_mode != MS_READ_WRITE) {
+        throw runtime_error("MediaStorePrivate::remove_broken_file() is not available in read only mode");
+    }
     Statement del(db, "DELETE FROM broken_files WHERE filename = ?");
     del.bind(1, fname);
     del.step();
 }
 
 bool MediaStorePrivate::is_broken_file(const std::string &fname, const std::string &etag) const {
+    if(access_mode != MS_READ_WRITE) {
+        throw runtime_error("MediaStorePrivate::is_broken_file() is not available in read only mode");
+    }
     Statement query(db, "SELECT * FROM broken_files WHERE filename = ? AND etag = ?");
     query.bind(1, fname);
     query.bind(2, etag);
@@ -521,6 +554,9 @@
 }
 
 MediaFile MediaStorePrivate::lookup(const std::string &filename) const {
+    if(access_mode != MS_READ_WRITE) {
+        return media_store_dbus->lookup(filename);
+    }
     Statement query(db, R"(
 SELECT filename, content_type, etag, title, date, artist, album, album_artist, genre, disc_number, track_number, duration, width, height, latitude, longitude, has_thumbnail, type
   FROM media
@@ -534,6 +570,9 @@
 }
 
 vector<MediaFile> MediaStorePrivate::query(const std::string &core_term, MediaType type, const Filter &filter) const {
+    if(access_mode != MS_READ_WRITE) {
+        return media_store_dbus->query(core_term, type, filter);
+    }
     string qs(R"(
 SELECT filename, content_type, etag, title, date, artist, album, album_artist, genre, disc_number, track_number, duration, width, height, latitude, longitude, has_thumbnail, type
   FROM media
@@ -603,6 +642,9 @@
 }
 
 vector<Album> MediaStorePrivate::queryAlbums(const std::string &core_term, const Filter &filter) const {
+    if(access_mode != MS_READ_WRITE) {
+        return media_store_dbus->queryAlbums(core_term, filter);
+    }
     string qs(R"(
 SELECT album, album_artist, first(date) as date, first(genre) as genre, first(filename) as filename, first(has_thumbnail) as has_thumbnail FROM media
 WHERE type = ? AND album <> ''
@@ -638,6 +680,9 @@
 }
 
 vector<string> MediaStorePrivate::queryArtists(const string &q, const Filter &filter) const {
+    if(access_mode != MS_READ_WRITE) {
+        return media_store_dbus->queryArtists(q, filter);
+    }
     string qs(R"(
 SELECT artist FROM media
 WHERE type = ? AND artist <> ''
@@ -677,6 +722,9 @@
 }
 
 vector<MediaFile> MediaStorePrivate::getAlbumSongs(const Album& album) const {
+    if(access_mode != MS_READ_WRITE) {
+        return media_store_dbus->getAlbumSongs(album);
+    }
     Statement query(db, R"(
 SELECT filename, content_type, etag, title, date, artist, album, album_artist, genre, disc_number, track_number, duration, width, height, latitude, longitude, type FROM media
 WHERE album = ? AND album_artist = ? AND type = ?
@@ -689,6 +737,9 @@
 }
 
 std::string MediaStorePrivate::getETag(const std::string &filename) const {
+    if(access_mode != MS_READ_WRITE) {
+        return media_store_dbus->getETag(filename);
+    }
     Statement query(db, R"(
 SELECT etag FROM media WHERE filename = ?
 )");
@@ -701,6 +752,9 @@
 }
 
 std::vector<MediaFile> MediaStorePrivate::listSongs(const Filter &filter) const {
+    if(access_mode != MS_READ_WRITE) {
+        return media_store_dbus->listSongs(filter);
+    }
     std::string qs(R"(
 SELECT filename, content_type, etag, title, date, artist, album, album_artist, genre, disc_number, track_number, duration, width, height, latitude, longitude, has_thumbnail, type
   FROM media
@@ -744,6 +798,9 @@
 }
 
 std::vector<Album> MediaStorePrivate::listAlbums(const Filter &filter) const {
+    if(access_mode != MS_READ_WRITE) {
+        return media_store_dbus->listAlbums(filter);
+    }
     std::string qs(R"(
 SELECT album, album_artist, first(date) as date, first(genre) as genre, first(filename) as filename, first(has_thumbnail) as has_thumbnail FROM media
   WHERE type = ?
@@ -781,6 +838,9 @@
 }
 
 vector<std::string> MediaStorePrivate::listArtists(const Filter &filter) const {
+    if(access_mode != MS_READ_WRITE) {
+        return media_store_dbus->listArtists(filter);
+    }
     string qs(R"(
 SELECT artist FROM media
   WHERE type = ?
@@ -810,6 +870,9 @@
 }
 
 vector<std::string> MediaStorePrivate::listAlbumArtists(const Filter &filter) const {
+    if(access_mode != MS_READ_WRITE) {
+        return media_store_dbus->listAlbumArtists(filter);
+    }
     string qs(R"(
 SELECT album_artist FROM media
   WHERE type = ?
@@ -839,6 +902,9 @@
 }
 
 vector<std::string> MediaStorePrivate::listGenres(const Filter &filter) const {
+    if(access_mode != MS_READ_WRITE) {
+        return media_store_dbus->listGenres(filter);
+    }
     Statement query(db, R"(
 SELECT genre FROM media
   WHERE type = ?
@@ -858,6 +924,9 @@
 }
 
 void MediaStorePrivate::pruneDeleted() {
+    if(access_mode != MS_READ_WRITE) {
+        throw runtime_error("MediaStorePrivate::pruneDeleted() is not available in read only mode");
+    }
     std::map<std::string, bool> path_cache;
     vector<string> deleted;
     Statement query(db, "SELECT filename FROM media");
@@ -877,6 +946,9 @@
 }
 
 void MediaStorePrivate::archiveItems(const std::string &prefix) {
+    if(access_mode != MS_READ_WRITE) {
+        throw runtime_error("MediaStorePrivate::archiveItems() is not available in read only mode");
+    }
     const char *templ = R"(BEGIN TRANSACTION;
 INSERT INTO media_attic SELECT * FROM media WHERE filename LIKE %s;
 DELETE FROM media WHERE filename LIKE %s;
@@ -894,6 +966,9 @@
 }
 
 void MediaStorePrivate::restoreItems(const std::string &prefix) {
+    if(access_mode != MS_READ_WRITE) {
+        throw runtime_error("MediaStorePrivate::restoreItems() is not available in read only mode");
+    }
     const char *templ = R"(BEGIN TRANSACTION;
 INSERT INTO media SELECT * FROM media_attic WHERE filename LIKE %s;
 DELETE FROM media_attic WHERE filename LIKE %s;
 
=== modified file 'src/mediascanner/MediaStore.hh'
--- src/mediascanner/MediaStore.hh	2014-08-25 12:51:22 +0000
+++ src/mediascanner/MediaStore.hh	2015-02-16 14:24:40 +0000
@@ -23,6 +23,13 @@
 #include "MediaStoreBase.hh"
 #include<vector>
 #include<string>
+#include<memory>
+
+namespace core {
+namespace dbus {
+class Bus;
+}
+}
 
 namespace mediascanner {
 
@@ -34,7 +41,8 @@
 class MediaStore final : public virtual MediaStoreBase {
 private:
     MediaStorePrivate *p;
-
+//    MediaStore(std::shared_ptr<core::dbus::Bus> testing_dbus){};
+//    friend class MediaStoreTest;
 public:
     MediaStore(OpenType access, const std::string &retireprefix="");
     MediaStore(const std::string &filename, OpenType access, const std::string &retireprefix="");
 
=== added directory 'src/mediascanner/d-bus'
=== renamed file 'src/ms-dbus/dbus-codec.cc' => 'src/mediascanner/d-bus/dbus-codec.cc'
=== renamed file 'src/ms-dbus/dbus-codec.hh' => 'src/mediascanner/d-bus/dbus-codec.hh'
=== renamed file 'src/ms-dbus/dbus-interface.hh' => 'src/mediascanner/d-bus/dbus-interface.hh'
=== renamed file 'src/ms-dbus/service-stub.cc' => 'src/mediascanner/d-bus/service-stub.cc'
--- src/ms-dbus/service-stub.cc	2014-08-21 03:55:40 +0000
+++ src/mediascanner/d-bus/service-stub.cc	2015-02-16 14:24:40 +0000
@@ -43,6 +43,12 @@
                   core::dbus::types::ObjectPath(core::dbus::traits::Service<MediaStoreService>::object_path()))}) {
 }
 
+ServiceStub::ServiceStub()
+    : core::dbus::Stub<MediaStoreService>(std::make_shared<core::dbus::Bus>(core::dbus::WellKnownBus::session)),
+      p(new Private{access_service()->object_for_path(
+                  core::dbus::types::ObjectPath(core::dbus::traits::Service<MediaStoreService>::object_path()))}) {
+}
+
 ServiceStub::~ServiceStub() {
 }
 
 
=== renamed file 'src/ms-dbus/service-stub.hh' => 'src/mediascanner/d-bus/service-stub.hh'
--- src/ms-dbus/service-stub.hh	2014-08-21 03:55:40 +0000
+++ src/mediascanner/d-bus/service-stub.hh	2015-02-16 14:24:40 +0000
@@ -40,6 +40,7 @@
 class ServiceStub : public core::dbus::Stub<MediaStoreService>, public virtual MediaStoreBase {
 public:
     explicit ServiceStub(core::dbus::Bus::Ptr bus);
+    explicit ServiceStub();
     virtual ~ServiceStub();
 
     virtual MediaFile lookup(const std::string &filename) const override;
 
=== renamed file 'src/ms-dbus/service.hh' => 'src/mediascanner/d-bus/service.hh'
=== modified file 'src/mediascanner/mediascanner-2.0.map'
--- src/mediascanner/mediascanner-2.0.map	2014-06-24 11:10:39 +0000
+++ src/mediascanner/mediascanner-2.0.map	2015-02-16 14:24:40 +0000
@@ -11,11 +11,41 @@
         mediascanner::MediaStoreBase::*;
         mediascanner::Filter::*;
 
-        typeinfo?for?mediascanner::*;
-        typeinfo?name?for?mediascanner::*;
-        VTT?for?mediascanner::*;
-        virtual?thunk?to?mediascanner::*;
-        vtable?for?mediascanner::*;
+        typeinfo?for?mediascanner::MediaFile*;
+        typeinfo?name?for?mediascanner::MediaFile*;
+        VTT?for?mediascanner::MediaFile*;
+        virtual?thunk?to?mediascanner::MediaFile*;
+        vtable?for?mediascanner::MediaFile*;
+
+        typeinfo?for?mediascanner::Album*;
+        typeinfo?name?for?mediascanner::Album*;
+        VTT?for?mediascanner::Album*;
+        virtual?thunk?to?mediascanner::Album*;
+        vtable?for?mediascanner::Album*;
+
+        typeinfo?for?mediascanner::MediaFileBuilder*;
+        typeinfo?name?for?mediascanner::MediaFileBuilder*;
+        VTT?for?mediascanner::MediaFileBuilder*;
+        virtual?thunk?to?mediascanner::MediaFileBuilder*;
+        vtable?for?mediascanner::MediaFileBuilder*;
+
+        typeinfo?for?mediascanner::MediaStore*;
+        typeinfo?name?for?mediascanner::MediaStore*;
+        VTT?for?mediascanner::MediaStore*;
+        virtual?thunk?to?mediascanner::MediaStore*;
+        vtable?for?mediascanner::MediaStore*;
+
+        typeinfo?for?mediascanner::MediaStoreBase*;
+        typeinfo?name?for?mediascanner::MediaStoreBase*;
+        VTT?for?mediascanner::MediaStoreBase*;
+        virtual?thunk?to?mediascanner::MediaStoreBase*;
+        vtable?for?mediascanner::MediaStoreBase*;
+
+        typeinfo?for?mediascanner::Filter*;
+        typeinfo?name?for?mediascanner::Filter*;
+        VTT?for?mediascanner::Filter*;
+        virtual?thunk?to?mediascanner::Filter*;
+        vtable?for?mediascanner::Filter*;
     };
 
 local:
 
=== modified file 'src/ms-dbus/CMakeLists.txt'
--- src/ms-dbus/CMakeLists.txt	2014-05-29 07:29:58 +0000
+++ src/ms-dbus/CMakeLists.txt	2015-02-16 14:24:40 +0000
@@ -2,9 +2,7 @@
 add_definitions(${MEDIASCANNER_CFLAGS} ${DBUSCPP_CFLAGS} ${APPARMOR_CFLAGS})
 
 add_library(ms-dbus STATIC
-  dbus-codec.cc
   service-skeleton.cc
-  service-stub.cc
 )
 
 target_link_libraries(ms-dbus
@@ -16,6 +14,7 @@
 
 add_executable(mediascanner-dbus
   main.cc
+  $<TARGET_OBJECTS:mediascanner-dbus-static>
 )
 target_link_libraries(mediascanner-dbus ms-dbus)
 set_target_properties(mediascanner-dbus
 
=== modified file 'src/ms-dbus/main.cc'
--- src/ms-dbus/main.cc	2014-05-20 09:01:59 +0000
+++ src/ms-dbus/main.cc	2015-02-16 14:24:40 +0000
@@ -27,10 +27,10 @@
 using namespace mediascanner;
 
 int main(int , char **) {
-    auto bus = std::make_shared<core::dbus::Bus>(core::dbus::WellKnownBus::session);
+    auto bus = std::make_shared<core::dbus::Bus>(getenv("DBUS_SESSION_BUS_ADDRESS"));
     bus->install_executor(core::dbus::asio::make_executor(bus));
 
-    auto store = std::make_shared<MediaStore>(MS_READ_ONLY);
+    auto store = std::make_shared<MediaStore>(MS_READ_WRITE);
 
     dbus::ServiceSkeleton service(bus, store);
     service.run();
 
=== modified file 'src/ms-dbus/service-skeleton.cc'
--- src/ms-dbus/service-skeleton.cc	2014-08-21 03:55:40 +0000
+++ src/ms-dbus/service-skeleton.cc	2015-02-16 14:24:40 +0000
@@ -12,8 +12,8 @@
 #include <mediascanner/MediaFile.hh>
 #include <mediascanner/MediaStore.hh>
 
-#include "dbus-interface.hh"
-#include "dbus-codec.hh"
+#include <mediascanner/d-bus/dbus-interface.hh>
+#include <mediascanner/d-bus/dbus-codec.hh>
 
 using core::dbus::Message;
 
 
=== modified file 'src/ms-dbus/service-skeleton.hh'
--- src/ms-dbus/service-skeleton.hh	2014-05-22 09:26:44 +0000
+++ src/ms-dbus/service-skeleton.hh	2015-02-16 14:24:40 +0000
@@ -24,7 +24,7 @@
 #include <core/dbus/bus.h>
 #include <core/dbus/skeleton.h>
 
-#include "service.hh"
+#include "mediascanner/d-bus/service.hh"
 
 namespace mediascanner {
 
 
=== modified file 'src/qml/Ubuntu/MediaScanner/MediaStoreWrapper.cc'
--- src/qml/Ubuntu/MediaScanner/MediaStoreWrapper.cc	2014-08-21 03:55:40 +0000
+++ src/qml/Ubuntu/MediaScanner/MediaStoreWrapper.cc	2015-02-16 14:24:40 +0000
@@ -28,7 +28,7 @@
 #include <core/dbus/asio/executor.h>
 #include <mediascanner/Filter.hh>
 #include <mediascanner/MediaStore.hh>
-#include <ms-dbus/service-stub.hh>
+#include <mediascanner/d-bus/service-stub.hh>
 
 using namespace mediascanner::qml;
 
 
=== modified file 'test/CMakeLists.txt'
--- test/CMakeLists.txt	2014-06-24 11:23:31 +0000
+++ test/CMakeLists.txt	2015-02-16 14:24:40 +0000
@@ -2,6 +2,9 @@
     set(GTEST_ROOT /usr/src/gtest)
 endif()
 
+set(SOURCE_BINARY_DIR "${CMAKE_BINARY_DIR}/src")
+add_definitions(-DMS_DBUS_BINARY="${SOURCE_BINARY_DIR}/ms-dbus/mediascanner-dbus-2.0")
+
 set(GTEST_SRC_DIR "${GTEST_ROOT}/src")
 set(GTEST_INCLUDE_DIR ${GTEST_ROOT})
 
@@ -9,6 +12,9 @@
 ${GTEST_SRC_DIR}/gtest-all.cc
 )
 
+pkg_check_modules(QTDBUSTEST REQUIRED libqtdbustest-1 REQUIRED)
+include_directories(${QTDBUSTEST_INCLUDE_DIRS})
+
 set_target_properties(gtest PROPERTIES INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIR})
 target_link_libraries(gtest ${CMAKE_THREAD_LIBS_INIT})
 
@@ -25,10 +31,14 @@
 
 add_executable(basic basic.cc)
 target_link_libraries(basic mediascanner scannerstuff gtest)
-add_test(basic basic)
+#add_test(basic basic)
 
-add_executable(test_mediastore test_mediastore.cc ../src/mediascanner/utils.cc)
-target_link_libraries(test_mediastore mediascanner gtest)
+add_executable(test_mediastore
+               test_mediastore.cc
+               ../src/mediascanner/utils.cc
+               utils/DBusTest.cpp)
+qt5_use_modules(test_mediastore Core DBus)
+target_link_libraries(test_mediastore mediascanner gtest ${QTDBUSTEST_LDFLAGS})
 add_test(test_mediastore test_mediastore)
 
 add_executable(test_metadataextractor test_metadataextractor.cc)
@@ -43,11 +53,11 @@
 target_link_libraries(test_mfbuilder gtest mediascanner)
 add_test(test_mfbuilder test_mfbuilder)
 
-add_executable(test_dbus test_dbus.cc)
+add_executable(test_dbus test_dbus.cc $<TARGET_OBJECTS:mediascanner-dbus-static>)
 target_link_libraries(test_dbus gtest mediascanner ms-dbus)
 add_test(test_dbus test_dbus)
 
-add_executable(test_qml test_qml.cc)
+add_executable(test_qml test_qml.cc $<TARGET_OBJECTS:mediascanner-dbus-static>)
 qt5_use_modules(test_qml QuickTest)
 target_link_libraries(test_qml mediascanner ${DBUSCPP_LDFLAGS})
 add_test(test_qml test_qml -input ${CMAKE_CURRENT_SOURCE_DIR}/qml -import ${CMAKE_BINARY_DIR}/src/qml)
 
=== modified file 'test/test_dbus.cc'
--- test/test_dbus.cc	2014-09-03 07:00:02 +0000
+++ test/test_dbus.cc	2015-02-16 14:24:40 +0000
@@ -7,7 +7,7 @@
 #include <mediascanner/MediaFile.hh>
 #include <mediascanner/MediaFileBuilder.hh>
 #include <mediascanner/Filter.hh>
-#include <ms-dbus/dbus-codec.hh>
+#include <mediascanner/d-bus/dbus-codec.hh>
 
 class MediaStoreDBusTests : public ::testing::Test {
 protected:
 
=== modified file 'test/test_mediastore.cc'
--- test/test_mediastore.cc	2014-09-02 10:43:05 +0000
+++ test/test_mediastore.cc	2015-02-16 14:24:40 +0000
@@ -29,33 +29,27 @@
 #include<string>
 #include <gtest/gtest.h>
 
+#include <core/dbus/fixture.h>
+
+#include <QProcess>
+#include <QProcessEnvironment>
+#include <QCoreApplication>
+
+#include "test_config.h"
+#include "utils/DBusTest.h"
+
 using namespace std;
 using namespace mediascanner;
 
-class MediaStoreTest : public ::testing::Test {
- protected:
-  MediaStoreTest() {
-  }
-
-  virtual ~MediaStoreTest() {
-  }
-
-  virtual void SetUp() {
-  }
-
-  virtual void TearDown() {
-  }
-};
-
-TEST_F(MediaStoreTest, init) {
+TEST(MediaStoreTest, init) {
     MediaStore store(":memory:", MS_READ_WRITE);
 }
-TEST_F(MediaStoreTest, mediafile_uri) {
+TEST(MediaStoreTest, mediafile_uri) {
     MediaFile media = MediaFileBuilder("/path/to/file.ogg");
     EXPECT_EQ(media.getUri(), "file:///path/to/file.ogg");
 }
 
-TEST_F(MediaStoreTest, equality) {
+TEST(MediaStoreTest, equality) {
     MediaFile audio1 = MediaFileBuilder("a")
         .setContentType("type")
         .setETag("etag")
@@ -136,7 +130,7 @@
     EXPECT_NE(video1, image1);
 }
 
-TEST_F(MediaStoreTest, lookup) {
+TEST(MediaStoreTest, lookup) {
     MediaFile audio = MediaFileBuilder("/aaa")
         .setContentType("type")
         .setETag("etag")
@@ -155,9 +149,11 @@
 
     EXPECT_EQ(store.lookup("/aaa"), audio);
     EXPECT_THROW(store.lookup("not found"), std::runtime_error);
+
+    store.remove(audio.getFileName());
 }
 
-TEST_F(MediaStoreTest, roundtrip) {
+TEST(MediaStoreTest, roundtrip) {
     MediaFile audio = MediaFileBuilder("/aaa")
         .setContentType("type")
         .setETag("etag")
@@ -208,41 +204,75 @@
     result = store.query("bbb", ImageMedia, filter);
     ASSERT_EQ(1, result.size());
     EXPECT_EQ(image, result[0]);
+
+    store.remove(audio.getFileName());
+    store.remove(video.getFileName());
+    store.remove(image.getFileName());
 }
 
-TEST_F(MediaStoreTest, query_by_album) {
-    MediaFile audio = MediaFileBuilder("/path/foo.ogg")
-        .setType(AudioMedia)
-        .setTitle("title")
-        .setAuthor("artist")
-        .setAlbum("album")
-        .setAlbumArtist("albumartist");
-    MediaStore store(":memory:", MS_READ_WRITE);
-    store.insert(audio);
-
+void check_query_by_album(MediaStore const &store, MediaFile const &audio) {
     Filter filter;
     vector<MediaFile> result = store.query("album", AudioMedia, filter);
     ASSERT_EQ(result.size(), 1);
     EXPECT_EQ(result[0], audio);
 }
 
-TEST_F(MediaStoreTest, query_by_artist) {
+TEST(MediaStoreTest, query_by_album) {
     MediaFile audio = MediaFileBuilder("/path/foo.ogg")
         .setType(AudioMedia)
         .setTitle("title")
         .setAuthor("artist")
         .setAlbum("album")
         .setAlbumArtist("albumartist");
-    MediaStore store(":memory:", MS_READ_WRITE);
+    MediaStore store(TEST_DIR "/mediastore.db", MS_READ_WRITE);
     store.insert(audio);
 
+    check_query_by_album(store, audio);
+
+    // test read only
+    MediaStore store2(TEST_DIR "/mediastore.db", MS_READ_ONLY);
+    check_query_by_album(store2, audio);
+
+    store.remove(audio.getFileName());
+
+}
+
+void check_query_by_artist(MediaStore const &store, MediaFile const &audio) {
     Filter filter;
     vector<MediaFile> result = store.query("artist", AudioMedia, filter);
     ASSERT_EQ(result.size(), 1);
     EXPECT_EQ(result[0], audio);
- }
-
-TEST_F(MediaStoreTest, query_ranking) {
+}
+
+TEST(MediaStoreTest, query_by_artist) {
+    MediaFile audio = MediaFileBuilder("/path/foo.ogg")
+        .setType(AudioMedia)
+        .setTitle("title")
+        .setAuthor("artist")
+        .setAlbum("album")
+        .setAlbumArtist("albumartist");
+    MediaStore store(TEST_DIR "/mediastore.db", MS_READ_WRITE);
+    store.insert(audio);
+
+    check_query_by_artist(store, audio);
+
+    MediaStore store_ro(TEST_DIR "/mediastore.db", MS_READ_ONLY);
+    check_query_by_artist(store_ro, audio);
+
+    store.remove(audio.getFileName());
+}
+
+void check_query_ranking(MediaStore const &store, std::vector<MediaFile> const &files) {
+    Filter filter;
+    vector<MediaFile> result = store.query("aaa", AudioMedia, filter);
+    ASSERT_EQ(result.size(), 4);
+    EXPECT_EQ(result[0], files[4]); // Term appears in title, artist and album
+    EXPECT_EQ(result[1], files[1]); // title has highest weighting
+    EXPECT_EQ(result[2], files[3]); // then album
+    EXPECT_EQ(result[3], files[2]); // then artist
+}
+
+TEST(MediaStoreTest, query_ranking) {
     MediaFile audio1 = MediaFileBuilder("/path/foo1.ogg")
         .setType(AudioMedia)
         .setTitle("title")
@@ -274,47 +304,38 @@
         .setAlbum("album aaa")
         .setAlbumArtist("albumartist");
 
-    MediaStore store(":memory:", MS_READ_WRITE);
+    MediaStore store(TEST_DIR "/mediastore.db", MS_READ_WRITE);
+
+    std::vector<MediaFile> files;
     store.insert(audio1);
+    files.push_back(audio1);
+
     store.insert(audio2);
+    files.push_back(audio2);
+
     store.insert(audio3);
+    files.push_back(audio3);
+
     store.insert(audio4);
+    files.push_back(audio4);
+
     store.insert(audio5);
-
-    Filter filter;
-    vector<MediaFile> result = store.query("aaa", AudioMedia, filter);
-    ASSERT_EQ(result.size(), 4);
-    EXPECT_EQ(result[0], audio5); // Term appears in title, artist and album
-    EXPECT_EQ(result[1], audio2); // title has highest weighting
-    EXPECT_EQ(result[2], audio4); // then album
-    EXPECT_EQ(result[3], audio3); // then artist
+    files.push_back(audio5);
+
+    check_query_ranking(store, files);
+
+    MediaStore store_ro(TEST_DIR "/mediastore.db", MS_READ_ONLY);
+    check_query_ranking(store_ro, files);
+
+    for(auto item: files) {
+        store.remove(item.getFileName());
+    }
 }
 
-TEST_F(MediaStoreTest, query_limit) {
-    MediaFile audio1 = MediaFileBuilder("/path/foo5.ogg")
-        .setType(AudioMedia)
-        .setTitle("title aaa")
-        .setAuthor("artist aaa")
-        .setAlbum("album aaa")
-        .setAlbumArtist("albumartist");
-    MediaFile audio2 = MediaFileBuilder("/path/foo2.ogg")
-        .setType(AudioMedia)
-        .setTitle("title aaa")
-        .setAuthor("artist")
-        .setAlbum("album")
-        .setAlbumArtist("albumartist");
-    MediaFile audio3 = MediaFileBuilder("/path/foo4.ogg")
-        .setType(AudioMedia)
-        .setTitle("title")
-        .setAuthor("artist")
-        .setAlbum("album aaa")
-        .setAlbumArtist("albumartist");
-
-    MediaStore store(":memory:", MS_READ_WRITE);
-    store.insert(audio1);
-    store.insert(audio2);
-    store.insert(audio3);
-
+void check_query_limit(MediaStore const &store,
+                       MediaFile const &audio1,
+                       MediaFile const &audio2,
+                       MediaFile const &) {
     Filter filter;
     filter.setLimit(2);
     vector<MediaFile> result = store.query("aaa", AudioMedia, filter);
@@ -323,24 +344,42 @@
     EXPECT_EQ(result[1], audio2); // title has highest weighting
 }
 
-TEST_F(MediaStoreTest, query_short) {
+TEST(MediaStoreTest, query_limit) {
     MediaFile audio1 = MediaFileBuilder("/path/foo5.ogg")
         .setType(AudioMedia)
-        .setTitle("title xyz")
-        .setAuthor("artist")
-        .setAlbum("album")
+        .setTitle("title aaa")
+        .setAuthor("artist aaa")
+        .setAlbum("album aaa")
         .setAlbumArtist("albumartist");
     MediaFile audio2 = MediaFileBuilder("/path/foo2.ogg")
         .setType(AudioMedia)
-        .setTitle("title xzy")
+        .setTitle("title aaa")
         .setAuthor("artist")
         .setAlbum("album")
         .setAlbumArtist("albumartist");
+    MediaFile audio3 = MediaFileBuilder("/path/foo4.ogg")
+        .setType(AudioMedia)
+        .setTitle("title")
+        .setAuthor("artist")
+        .setAlbum("album aaa")
+        .setAlbumArtist("albumartist");
 
-    MediaStore store(":memory:", MS_READ_WRITE);
+    MediaStore store(TEST_DIR "/mediastore.db", MS_READ_WRITE);
     store.insert(audio1);
     store.insert(audio2);
-
+    store.insert(audio3);
+
+    check_query_limit(store, audio1, audio2, audio3);
+
+    MediaStore store_ro(TEST_DIR "/mediastore.db", MS_READ_ONLY);
+    check_query_limit(store_ro, audio1, audio2, audio3);
+
+    store.remove(audio1.getFileName());
+    store.remove(audio2.getFileName());
+    store.remove(audio3.getFileName());
+}
+
+void check_query_short(MediaStore const &store, MediaFile const &, MediaFile const &) {
     Filter filter;
     vector<MediaFile> result = store.query("x", AudioMedia, filter);
     EXPECT_EQ(result.size(), 2);
@@ -348,31 +387,34 @@
     EXPECT_EQ(result.size(), 1);
 }
 
-TEST_F(MediaStoreTest, query_empty) {
+TEST(MediaStoreTest, query_short) {
     MediaFile audio1 = MediaFileBuilder("/path/foo5.ogg")
         .setType(AudioMedia)
-        .setTitle("title aaa")
-        .setAuthor("artist aaa")
-        .setAlbum("album aaa")
+        .setTitle("title xyz")
+        .setAuthor("artist")
+        .setAlbum("album")
         .setAlbumArtist("albumartist");
     MediaFile audio2 = MediaFileBuilder("/path/foo2.ogg")
         .setType(AudioMedia)
-        .setTitle("title aaa")
+        .setTitle("title xzy")
         .setAuthor("artist")
         .setAlbum("album")
         .setAlbumArtist("albumartist");
-    MediaFile audio3 = MediaFileBuilder("/path/foo4.ogg")
-        .setType(AudioMedia)
-        .setTitle("title")
-        .setAuthor("artist")
-        .setAlbum("album aaa")
-        .setAlbumArtist("albumartist");
 
-    MediaStore store(":memory:", MS_READ_WRITE);
+    MediaStore store(TEST_DIR "/mediastore.db", MS_READ_WRITE);
     store.insert(audio1);
     store.insert(audio2);
-    store.insert(audio3);
-
+
+    check_query_short(store, audio1, audio2);
+
+    MediaStore store_ro(TEST_DIR "/mediastore.db", MS_READ_ONLY);
+    check_query_short(store_ro, audio1, audio2);
+
+    store.remove(audio1.getFileName());
+    store.remove(audio2.getFileName());
+}
+
+void check_query_empty(MediaStore const &store) {
     // An empty query should return some results
     Filter filter;
     filter.setLimit(2);
@@ -380,91 +422,140 @@
     ASSERT_EQ(result.size(), 2);
 }
 
-TEST_F(MediaStoreTest, query_order) {
-    MediaFile audio1 = MediaFileBuilder("/path/foo1.ogg")
+TEST(MediaStoreTest, query_empty) {
+    MediaFile audio1 = MediaFileBuilder("/path/foo5.ogg")
         .setType(AudioMedia)
-        .setTitle("foo")
-        .setDate("2010-01-01")
-        .setAuthor("artist")
-        .setAlbum("album");
+        .setTitle("title aaa")
+        .setAuthor("artist aaa")
+        .setAlbum("album aaa")
+        .setAlbumArtist("albumartist");
     MediaFile audio2 = MediaFileBuilder("/path/foo2.ogg")
         .setType(AudioMedia)
-        .setTitle("foo foo")
-        .setDate("2010-01-03")
+        .setTitle("title aaa")
         .setAuthor("artist")
-        .setAlbum("album");
-    MediaFile audio3 = MediaFileBuilder("/path/foo3.ogg")
+        .setAlbum("album")
+        .setAlbumArtist("albumartist");
+    MediaFile audio3 = MediaFileBuilder("/path/foo4.ogg")
         .setType(AudioMedia)
-        .setTitle("foo foo foo")
-        .setDate("2010-01-02")
+        .setTitle("title")
         .setAuthor("artist")
-        .setAlbum("album");
+        .setAlbum("album aaa")
+        .setAlbumArtist("albumartist");
 
-    MediaStore store(":memory:", MS_READ_WRITE);
+    MediaStore store(TEST_DIR "/mediastore.db", MS_READ_WRITE);
     store.insert(audio1);
     store.insert(audio2);
     store.insert(audio3);
 
+    check_query_empty(store);
+
+    MediaStore store_ro(TEST_DIR "/mediastore.db", MS_READ_ONLY);
+    check_query_empty(store_ro);
+
+    store.remove(audio1.getFileName());
+    store.remove(audio2.getFileName());
+    store.remove(audio3.getFileName());
+}
+
+void check_query_order(MediaStore const &store,
+                       std::string const &name1,
+                       std::string const &name2,
+                       std::string const &name3) {
     Filter filter;
     // Default sort order is by rank
     vector<MediaFile> result = store.query("foo", AudioMedia, filter);
     ASSERT_EQ(3, result.size());
-    EXPECT_EQ("/path/foo3.ogg", result[0].getFileName());
-    EXPECT_EQ("/path/foo2.ogg", result[1].getFileName());
-    EXPECT_EQ("/path/foo1.ogg", result[2].getFileName());
+    EXPECT_EQ(name3, result[0].getFileName());
+    EXPECT_EQ(name2, result[1].getFileName());
+    EXPECT_EQ(name1, result[2].getFileName());
 
     // Sorting by rank (same as default)
     filter.setOrder(MediaOrder::Rank);
     result = store.query("foo", AudioMedia, filter);
     ASSERT_EQ(3, result.size());
-    EXPECT_EQ("/path/foo3.ogg", result[0].getFileName());
-    EXPECT_EQ("/path/foo2.ogg", result[1].getFileName());
-    EXPECT_EQ("/path/foo1.ogg", result[2].getFileName());
+    EXPECT_EQ(name3, result[0].getFileName());
+    EXPECT_EQ(name2, result[1].getFileName());
+    EXPECT_EQ(name1, result[2].getFileName());
 
     // Sorting by rank, reversed
     filter.setReverse(true);
     result = store.query("foo", AudioMedia, filter);
     ASSERT_EQ(3, result.size());
-    EXPECT_EQ("/path/foo1.ogg", result[0].getFileName());
-    EXPECT_EQ("/path/foo2.ogg", result[1].getFileName());
-    EXPECT_EQ("/path/foo3.ogg", result[2].getFileName());
+    EXPECT_EQ(name1, result[0].getFileName());
+    EXPECT_EQ(name2, result[1].getFileName());
+    EXPECT_EQ(name3, result[2].getFileName());
 
     // Sorting by title
     filter.setReverse(false);
     filter.setOrder(MediaOrder::Title);
     result = store.query("foo", AudioMedia, filter);
     ASSERT_EQ(3, result.size());
-    EXPECT_EQ("/path/foo1.ogg", result[0].getFileName());
-    EXPECT_EQ("/path/foo2.ogg", result[1].getFileName());
-    EXPECT_EQ("/path/foo3.ogg", result[2].getFileName());
+    EXPECT_EQ(name1, result[0].getFileName());
+    EXPECT_EQ(name2, result[1].getFileName());
+    EXPECT_EQ(name3, result[2].getFileName());
 
     // Sorting by title, reversed
     filter.setReverse(true);
     result = store.query("foo", AudioMedia, filter);
     ASSERT_EQ(3, result.size());
-    EXPECT_EQ("/path/foo3.ogg", result[0].getFileName());
-    EXPECT_EQ("/path/foo2.ogg", result[1].getFileName());
-    EXPECT_EQ("/path/foo1.ogg", result[2].getFileName());
+    EXPECT_EQ(name3, result[0].getFileName());
+    EXPECT_EQ(name2, result[1].getFileName());
+    EXPECT_EQ(name1, result[2].getFileName());
 
     // Sorting by date
     filter.setReverse(false);
     filter.setOrder(MediaOrder::Date);
     result = store.query("foo", AudioMedia, filter);
     ASSERT_EQ(3, result.size());
-    EXPECT_EQ("/path/foo1.ogg", result[0].getFileName());
-    EXPECT_EQ("/path/foo3.ogg", result[1].getFileName());
-    EXPECT_EQ("/path/foo2.ogg", result[2].getFileName());
+    EXPECT_EQ(name1, result[0].getFileName());
+    EXPECT_EQ(name3, result[1].getFileName());
+    EXPECT_EQ(name2, result[2].getFileName());
 
     // Sorting by date, reversed
     filter.setReverse(true);
     result = store.query("foo", AudioMedia, filter);
     ASSERT_EQ(3, result.size());
-    EXPECT_EQ("/path/foo2.ogg", result[0].getFileName());
-    EXPECT_EQ("/path/foo3.ogg", result[1].getFileName());
-    EXPECT_EQ("/path/foo1.ogg", result[2].getFileName());
-}
-
-TEST_F(MediaStoreTest, unmount) {
+    EXPECT_EQ(name2, result[0].getFileName());
+    EXPECT_EQ(name3, result[1].getFileName());
+    EXPECT_EQ(name1, result[2].getFileName());
+}
+
+TEST(MediaStoreTest, query_order) {
+    MediaFile audio1 = MediaFileBuilder("/path/foo1.ogg")
+        .setType(AudioMedia)
+        .setTitle("foo")
+        .setDate("2010-01-01")
+        .setAuthor("artist")
+        .setAlbum("album");
+    MediaFile audio2 = MediaFileBuilder("/path/foo2.ogg")
+        .setType(AudioMedia)
+        .setTitle("foo foo")
+        .setDate("2010-01-03")
+        .setAuthor("artist")
+        .setAlbum("album");
+    MediaFile audio3 = MediaFileBuilder("/path/foo3.ogg")
+        .setType(AudioMedia)
+        .setTitle("foo foo foo")
+        .setDate("2010-01-02")
+        .setAuthor("artist")
+        .setAlbum("album");
+
+    MediaStore store(TEST_DIR "/mediastore.db", MS_READ_WRITE);
+    store.insert(audio1);
+    store.insert(audio2);
+    store.insert(audio3);
+
+    check_query_order(store, "/path/foo1.ogg", "/path/foo2.ogg", "/path/foo3.ogg");
+
+    MediaStore store_ro(TEST_DIR "/mediastore.db", MS_READ_ONLY);
+    check_query_order(store_ro, "/path/foo1.ogg", "/path/foo2.ogg", "/path/foo3.ogg");
+
+    store.remove(audio1.getFileName());
+    store.remove(audio2.getFileName());
+    store.remove(audio3.getFileName());
+}
+
+TEST(MediaStoreTest, unmount) {
     MediaFile audio1 = MediaFileBuilder("/media/username/dir/fname.ogg")
         .setType(AudioMedia)
         .setTitle("bbb bbb");
@@ -488,7 +579,7 @@
     ASSERT_EQ(result.size(), 2);
 }
 
-TEST_F(MediaStoreTest, utils) {
+TEST(MediaStoreTest, utils) {
     string source("_a.b(c)[d]{e}f.mp3");
     string correct = {" a b c  d  e f"};
     string result = filenameToTitle(source);
@@ -499,54 +590,7 @@
     EXPECT_EQ(sqlQuote(unquoted), quoted);
 }
 
-TEST_F(MediaStoreTest, queryAlbums) {
-    MediaFile audio1 = MediaFileBuilder("/home/username/Music/track1.ogg")
-        .setType(AudioMedia)
-        .setTitle("TitleOne")
-        .setAuthor("ArtistOne")
-        .setAlbum("AlbumOne")
-        .setAlbumArtist("Various Artists")
-        .setDate("2000-01-01")
-        .setDiscNumber(1)
-        .setTrackNumber(1)
-        .setGenre("GenreOne");
-    MediaFile audio2 = MediaFileBuilder("/home/username/Music/track2.ogg")
-        .setType(AudioMedia)
-        .setTitle("TitleTwo")
-        .setAuthor("ArtistTwo")
-        .setAlbum("AlbumOne")
-        .setAlbumArtist("Various Artists")
-        .setDate("2000-01-01")
-        .setDiscNumber(1)
-        .setTrackNumber(2)
-        .setGenre("GenreOne");
-    MediaFile audio3 = MediaFileBuilder("/home/username/Music/track3.ogg")
-        .setType(AudioMedia)
-        .setTitle("TitleThree")
-        .setAuthor("ArtistThree")
-        .setAlbum("AlbumOne")
-        .setAlbumArtist("Various Artists")
-        .setDate("2000-01-01")
-        .setDiscNumber(2)
-        .setTrackNumber(1)
-        .setGenre("GenreOne");
-    MediaFile audio4 = MediaFileBuilder("/home/username/Music/fname.ogg")
-        .setType(AudioMedia)
-        .setTitle("TitleFour")
-        .setAuthor("ArtistFour")
-        .setAlbum("AlbumTwo")
-        .setAlbumArtist("ArtistFour")
-        .setDate("2014-06-01")
-        .setTrackNumber(1)
-        .setGenre("GenreTwo")
-        .setHasThumbnail(true);
-
-    MediaStore store(":memory:", MS_READ_WRITE);
-    store.insert(audio1);
-    store.insert(audio2);
-    store.insert(audio3);
-    store.insert(audio4);
-
+void check_query_albums(MediaStore const &store) {
     // Query a track title
     Filter filter;
     vector<Album> albums = store.queryAlbums("TitleOne", filter);
@@ -573,45 +617,66 @@
     EXPECT_EQ(albums[0].getArtist(), "Various Artists");
 }
 
-TEST_F(MediaStoreTest, queryAlbums_limit) {
+TEST(MediaStoreTest, queryAlbums) {
     MediaFile audio1 = MediaFileBuilder("/home/username/Music/track1.ogg")
         .setType(AudioMedia)
         .setTitle("TitleOne")
         .setAuthor("ArtistOne")
         .setAlbum("AlbumOne")
         .setAlbumArtist("Various Artists")
+        .setDate("2000-01-01")
         .setDiscNumber(1)
-        .setTrackNumber(1);
+        .setTrackNumber(1)
+        .setGenre("GenreOne");
     MediaFile audio2 = MediaFileBuilder("/home/username/Music/track2.ogg")
         .setType(AudioMedia)
         .setTitle("TitleTwo")
         .setAuthor("ArtistTwo")
         .setAlbum("AlbumOne")
         .setAlbumArtist("Various Artists")
+        .setDate("2000-01-01")
         .setDiscNumber(1)
-        .setTrackNumber(2);
+        .setTrackNumber(2)
+        .setGenre("GenreOne");
     MediaFile audio3 = MediaFileBuilder("/home/username/Music/track3.ogg")
         .setType(AudioMedia)
         .setTitle("TitleThree")
         .setAuthor("ArtistThree")
         .setAlbum("AlbumOne")
         .setAlbumArtist("Various Artists")
+        .setDate("2000-01-01")
         .setDiscNumber(2)
-        .setTrackNumber(1);
+        .setTrackNumber(1)
+        .setGenre("GenreOne");
     MediaFile audio4 = MediaFileBuilder("/home/username/Music/fname.ogg")
         .setType(AudioMedia)
         .setTitle("TitleFour")
         .setAuthor("ArtistFour")
         .setAlbum("AlbumTwo")
         .setAlbumArtist("ArtistFour")
-        .setTrackNumber(1);
+        .setDate("2014-06-01")
+        .setTrackNumber(1)
+        .setGenre("GenreTwo")
+        .setHasThumbnail(true);
 
-    MediaStore store(":memory:", MS_READ_WRITE);
+    MediaStore store(TEST_DIR "/mediastore.db", MS_READ_WRITE);
     store.insert(audio1);
     store.insert(audio2);
     store.insert(audio3);
     store.insert(audio4);
 
+    check_query_albums(store);
+
+    MediaStore store_ro(TEST_DIR "/mediastore.db", MS_READ_ONLY);
+    check_query_albums(store_ro);
+
+    store.remove(audio1.getFileName());
+    store.remove(audio2.getFileName());
+    store.remove(audio3.getFileName());
+    store.remove(audio4.getFileName());
+}
+
+void check_query_albums_limit(MediaStore const &store) {
     Filter filter;
     vector<Album> albums = store.queryAlbums("Artist", filter);
     EXPECT_EQ(2, albums.size());
@@ -620,7 +685,7 @@
     EXPECT_EQ(1, albums.size());
 }
 
-TEST_F(MediaStoreTest, queryAlbums_empty) {
+TEST(MediaStoreTest, queryAlbums_limit) {
     MediaFile audio1 = MediaFileBuilder("/home/username/Music/track1.ogg")
         .setType(AudioMedia)
         .setTitle("TitleOne")
@@ -653,12 +718,24 @@
         .setAlbumArtist("ArtistFour")
         .setTrackNumber(1);
 
-    MediaStore store(":memory:", MS_READ_WRITE);
+    MediaStore store(TEST_DIR "/mediastore.db", MS_READ_WRITE);
     store.insert(audio1);
     store.insert(audio2);
     store.insert(audio3);
     store.insert(audio4);
 
+    check_query_albums_limit(store);
+
+    MediaStore store_ro(TEST_DIR "/mediastore.db", MS_READ_ONLY);
+    check_query_albums_limit(store_ro);
+
+    store.remove(audio1.getFileName());
+    store.remove(audio2.getFileName());
+    store.remove(audio3.getFileName());
+    store.remove(audio4.getFileName());
+}
+
+void check_query_albums_empty(MediaStore const &store) {
     Filter filter;
     vector<Album> albums = store.queryAlbums("", filter);
     EXPECT_EQ(2, albums.size());
@@ -667,7 +744,89 @@
     EXPECT_EQ(1, albums.size());
 }
 
-TEST_F(MediaStoreTest, queryAlbums_order) {
+TEST(MediaStoreTest, queryAlbums_empty) {
+    MediaFile audio1 = MediaFileBuilder("/home/username/Music/track1.ogg")
+        .setType(AudioMedia)
+        .setTitle("TitleOne")
+        .setAuthor("ArtistOne")
+        .setAlbum("AlbumOne")
+        .setAlbumArtist("Various Artists")
+        .setDiscNumber(1)
+        .setTrackNumber(1);
+    MediaFile audio2 = MediaFileBuilder("/home/username/Music/track2.ogg")
+        .setType(AudioMedia)
+        .setTitle("TitleTwo")
+        .setAuthor("ArtistTwo")
+        .setAlbum("AlbumOne")
+        .setAlbumArtist("Various Artists")
+        .setDiscNumber(1)
+        .setTrackNumber(2);
+    MediaFile audio3 = MediaFileBuilder("/home/username/Music/track3.ogg")
+        .setType(AudioMedia)
+        .setTitle("TitleThree")
+        .setAuthor("ArtistThree")
+        .setAlbum("AlbumOne")
+        .setAlbumArtist("Various Artists")
+        .setDiscNumber(2)
+        .setTrackNumber(1);
+    MediaFile audio4 = MediaFileBuilder("/home/username/Music/fname.ogg")
+        .setType(AudioMedia)
+        .setTitle("TitleFour")
+        .setAuthor("ArtistFour")
+        .setAlbum("AlbumTwo")
+        .setAlbumArtist("ArtistFour")
+        .setTrackNumber(1);
+
+    MediaStore store(TEST_DIR "/mediastore.db", MS_READ_WRITE);
+    store.insert(audio1);
+    store.insert(audio2);
+    store.insert(audio3);
+    store.insert(audio4);
+
+    check_query_albums_empty(store);
+
+    MediaStore store_ro(TEST_DIR "/mediastore.db", MS_READ_ONLY);
+    check_query_albums_empty(store_ro);
+
+    store.remove(audio1.getFileName());
+    store.remove(audio2.getFileName());
+    store.remove(audio3.getFileName());
+    store.remove(audio4.getFileName());
+}
+
+void check_query_albums_order(MediaStore const &store) {
+    // Default sort
+    Filter filter;
+    vector<Album> albums = store.queryAlbums("foo", filter);
+    ASSERT_EQ(3, albums.size());
+    EXPECT_EQ("foo", albums[0].getTitle());
+    EXPECT_EQ("foo foo", albums[1].getTitle());
+    EXPECT_EQ("foo foo foo", albums[2].getTitle());
+
+    // Sort by title (same as default)
+    filter.setOrder(MediaOrder::Title);
+    albums = store.queryAlbums("foo", filter);
+    ASSERT_EQ(3, albums.size());
+    EXPECT_EQ("foo", albums[0].getTitle());
+    EXPECT_EQ("foo foo", albums[1].getTitle());
+    EXPECT_EQ("foo foo foo", albums[2].getTitle());
+
+    // Sort by title, reversed
+    filter.setReverse(true);
+    albums = store.queryAlbums("foo", filter);
+    ASSERT_EQ(3, albums.size());
+    EXPECT_EQ("foo foo foo", albums[0].getTitle());
+    EXPECT_EQ("foo foo", albums[1].getTitle());
+    EXPECT_EQ("foo", albums[2].getTitle());
+
+    // Other orders are not supported
+    filter.setOrder(MediaOrder::Rank);
+    EXPECT_THROW(store.queryAlbums("foo", filter), std::runtime_error);
+    filter.setOrder(MediaOrder::Date);
+    EXPECT_THROW(store.queryAlbums("foo", filter), std::runtime_error);
+}
+
+TEST(MediaStoreTest, queryAlbums_order) {
     MediaFile audio1 = MediaFileBuilder("/path/foo1.ogg")
         .setType(AudioMedia)
         .setTitle("title")
@@ -687,81 +846,22 @@
         .setAuthor("artist")
         .setAlbum("foo foo foo");
 
-    MediaStore store(":memory:", MS_READ_WRITE);
+    MediaStore store(TEST_DIR "/mediastore.db", MS_READ_WRITE);
     store.insert(audio1);
     store.insert(audio2);
     store.insert(audio3);
 
-    // Default sort
-    Filter filter;
-    vector<Album> albums = store.queryAlbums("foo", filter);
-    ASSERT_EQ(3, albums.size());
-    EXPECT_EQ("foo", albums[0].getTitle());
-    EXPECT_EQ("foo foo", albums[1].getTitle());
-    EXPECT_EQ("foo foo foo", albums[2].getTitle());
-
-    // Sort by title (same as default)
-    filter.setOrder(MediaOrder::Title);
-    albums = store.queryAlbums("foo", filter);
-    ASSERT_EQ(3, albums.size());
-    EXPECT_EQ("foo", albums[0].getTitle());
-    EXPECT_EQ("foo foo", albums[1].getTitle());
-    EXPECT_EQ("foo foo foo", albums[2].getTitle());
-
-    // Sort by title, reversed
-    filter.setReverse(true);
-    albums = store.queryAlbums("foo", filter);
-    ASSERT_EQ(3, albums.size());
-    EXPECT_EQ("foo foo foo", albums[0].getTitle());
-    EXPECT_EQ("foo foo", albums[1].getTitle());
-    EXPECT_EQ("foo", albums[2].getTitle());
-
-    // Other orders are not supported
-    filter.setOrder(MediaOrder::Rank);
-    EXPECT_THROW(store.queryAlbums("foo", filter), std::runtime_error);
-    filter.setOrder(MediaOrder::Date);
-    EXPECT_THROW(store.queryAlbums("foo", filter), std::runtime_error);
+    check_query_albums_order(store);
+
+    MediaStore store_ro(TEST_DIR "/mediastore.db", MS_READ_ONLY);
+    check_query_albums_order(store_ro);
+
+    store.remove(audio1.getFileName());
+    store.remove(audio2.getFileName());
+    store.remove(audio3.getFileName());
 }
 
-TEST_F(MediaStoreTest, queryArtists) {
-    MediaFile audio1 = MediaFileBuilder("/home/username/Music/track1.ogg")
-        .setType(AudioMedia)
-        .setTitle("TitleOne")
-        .setAuthor("ArtistOne")
-        .setAlbum("AlbumOne")
-        .setAlbumArtist("Various Artists")
-        .setDiscNumber(1)
-        .setTrackNumber(1);
-    MediaFile audio2 = MediaFileBuilder("/home/username/Music/track2.ogg")
-        .setType(AudioMedia)
-        .setTitle("TitleTwo")
-        .setAuthor("ArtistTwo")
-        .setAlbum("AlbumOne")
-        .setAlbumArtist("Various Artists")
-        .setDiscNumber(1)
-        .setTrackNumber(2);
-    MediaFile audio3 = MediaFileBuilder("/home/username/Music/track3.ogg")
-        .setType(AudioMedia)
-        .setTitle("TitleThree")
-        .setAuthor("ArtistThree")
-        .setAlbum("AlbumOne")
-        .setAlbumArtist("Various Artists")
-        .setDiscNumber(2)
-        .setTrackNumber(1);
-    MediaFile audio4 = MediaFileBuilder("/home/username/Music/fname.ogg")
-        .setType(AudioMedia)
-        .setTitle("TitleFour")
-        .setAuthor("ArtistFour")
-        .setAlbum("AlbumTwo")
-        .setAlbumArtist("ArtistFour")
-        .setTrackNumber(1);
-
-    MediaStore store(":memory:", MS_READ_WRITE);
-    store.insert(audio1);
-    store.insert(audio2);
-    store.insert(audio3);
-    store.insert(audio4);
-
+void check_query_artists(MediaStore const &store) {
     // Query a track title
     Filter filter;
     vector<string> artists = store.queryArtists("TitleOne", filter);
@@ -779,7 +879,7 @@
     EXPECT_EQ(artists[0], "ArtistTwo");
 }
 
-TEST_F(MediaStoreTest, queryArtists_limit) {
+TEST(MediaStoreTest, queryArtists) {
     MediaFile audio1 = MediaFileBuilder("/home/username/Music/track1.ogg")
         .setType(AudioMedia)
         .setTitle("TitleOne")
@@ -796,11 +896,40 @@
         .setAlbumArtist("Various Artists")
         .setDiscNumber(1)
         .setTrackNumber(2);
+    MediaFile audio3 = MediaFileBuilder("/home/username/Music/track3.ogg")
+        .setType(AudioMedia)
+        .setTitle("TitleThree")
+        .setAuthor("ArtistThree")
+        .setAlbum("AlbumOne")
+        .setAlbumArtist("Various Artists")
+        .setDiscNumber(2)
+        .setTrackNumber(1);
+    MediaFile audio4 = MediaFileBuilder("/home/username/Music/fname.ogg")
+        .setType(AudioMedia)
+        .setTitle("TitleFour")
+        .setAuthor("ArtistFour")
+        .setAlbum("AlbumTwo")
+        .setAlbumArtist("ArtistFour")
+        .setTrackNumber(1);
 
-    MediaStore store(":memory:", MS_READ_WRITE);
+    MediaStore store(TEST_DIR "/mediastore.db", MS_READ_WRITE);
     store.insert(audio1);
     store.insert(audio2);
-
+    store.insert(audio3);
+    store.insert(audio4);
+
+    check_query_artists(store);
+
+    MediaStore store_ro(TEST_DIR "/mediastore.db", MS_READ_ONLY);
+    check_query_artists(store_ro);
+
+    store.remove(audio1.getFileName());
+    store.remove(audio2.getFileName());
+    store.remove(audio3.getFileName());
+    store.remove(audio4.getFileName());
+}
+
+void check_query_artists_limit(MediaStore const &store) {
     Filter filter;
     vector<string> artists = store.queryArtists("Artist", filter);
     EXPECT_EQ(2, artists.size());
@@ -809,7 +938,7 @@
     EXPECT_EQ(1, artists.size());
 }
 
-TEST_F(MediaStoreTest, queryArtists_empty) {
+TEST(MediaStoreTest, queryArtists_limit) {
     MediaFile audio1 = MediaFileBuilder("/home/username/Music/track1.ogg")
         .setType(AudioMedia)
         .setTitle("TitleOne")
@@ -827,10 +956,20 @@
         .setDiscNumber(1)
         .setTrackNumber(2);
 
-    MediaStore store(":memory:", MS_READ_WRITE);
+    MediaStore store(TEST_DIR "/mediastore.db", MS_READ_WRITE);
     store.insert(audio1);
     store.insert(audio2);
 
+    check_query_artists_limit(store);
+
+    MediaStore store_ro(TEST_DIR "/mediastore.db", MS_READ_ONLY);
+    check_query_artists_limit(store_ro);
+
+    store.remove(audio1.getFileName());
+    store.remove(audio2.getFileName());
+}
+
+void check_query_artists_empty(MediaStore const &store) {
     Filter filter;
     vector<string> artists = store.queryArtists("", filter);
     EXPECT_EQ(2, artists.size());
@@ -839,7 +978,70 @@
     EXPECT_EQ(1, artists.size());
 }
 
-TEST_F(MediaStoreTest, queryArtists_order) {
+TEST(MediaStoreTest, queryArtists_empty) {
+    MediaFile audio1 = MediaFileBuilder("/home/username/Music/track1.ogg")
+        .setType(AudioMedia)
+        .setTitle("TitleOne")
+        .setAuthor("ArtistOne")
+        .setAlbum("AlbumOne")
+        .setAlbumArtist("Various Artists")
+        .setDiscNumber(1)
+        .setTrackNumber(1);
+    MediaFile audio2 = MediaFileBuilder("/home/username/Music/track2.ogg")
+        .setType(AudioMedia)
+        .setTitle("TitleTwo")
+        .setAuthor("ArtistTwo")
+        .setAlbum("AlbumOne")
+        .setAlbumArtist("Various Artists")
+        .setDiscNumber(1)
+        .setTrackNumber(2);
+
+    MediaStore store(TEST_DIR "/mediastore.db", MS_READ_WRITE);
+    store.insert(audio1);
+    store.insert(audio2);
+
+    check_query_artists_empty(store);
+
+    MediaStore store_ro(TEST_DIR "/mediastore.db", MS_READ_ONLY);
+    check_query_artists_empty(store_ro);
+
+    store.remove(audio1.getFileName());
+    store.remove(audio2.getFileName());
+}
+
+void check_query_artists_order(MediaStore const &store) {
+    // Default sort
+    Filter filter;
+    vector<std::string> artists = store.queryArtists("foo", filter);
+    ASSERT_EQ(3, artists.size());
+    EXPECT_EQ("foo", artists[0]);
+    EXPECT_EQ("foo foo", artists[1]);
+    EXPECT_EQ("foo foo foo", artists[2]);
+
+    // Sort by title (same as default)
+    filter.setOrder(MediaOrder::Title);
+    artists = store.queryArtists("foo", filter);
+    ASSERT_EQ(3, artists.size());
+    EXPECT_EQ("foo", artists[0]);
+    EXPECT_EQ("foo foo", artists[1]);
+    EXPECT_EQ("foo foo foo", artists[2]);
+
+    // Sort by title, reversed
+    filter.setReverse(true);
+    artists = store.queryArtists("foo", filter);
+    ASSERT_EQ(3, artists.size());
+    EXPECT_EQ("foo foo foo", artists[0]);
+    EXPECT_EQ("foo foo", artists[1]);
+    EXPECT_EQ("foo", artists[2]);
+
+    // Other orders are not supported
+    filter.setOrder(MediaOrder::Rank);
+    EXPECT_THROW(store.queryArtists("foo", filter), std::runtime_error);
+    filter.setOrder(MediaOrder::Date);
+    EXPECT_THROW(store.queryArtists("foo", filter), std::runtime_error);
+}
+
+TEST(MediaStoreTest, queryArtists_order) {
     MediaFile audio1 = MediaFileBuilder("/path/foo1.ogg")
         .setType(AudioMedia)
         .setTitle("title")
@@ -859,73 +1061,22 @@
         .setAuthor("foo foo foo")
         .setAlbum("album");
 
-    MediaStore store(":memory:", MS_READ_WRITE);
+    MediaStore store(TEST_DIR "/mediastore.db", MS_READ_WRITE);
     store.insert(audio1);
     store.insert(audio2);
     store.insert(audio3);
 
-    // Default sort
-    Filter filter;
-    vector<std::string> artists = store.queryArtists("foo", filter);
-    ASSERT_EQ(3, artists.size());
-    EXPECT_EQ("foo", artists[0]);
-    EXPECT_EQ("foo foo", artists[1]);
-    EXPECT_EQ("foo foo foo", artists[2]);
-
-    // Sort by title (same as default)
-    filter.setOrder(MediaOrder::Title);
-    artists = store.queryArtists("foo", filter);
-    ASSERT_EQ(3, artists.size());
-    EXPECT_EQ("foo", artists[0]);
-    EXPECT_EQ("foo foo", artists[1]);
-    EXPECT_EQ("foo foo foo", artists[2]);
-
-    // Sort by title, reversed
-    filter.setReverse(true);
-    artists = store.queryArtists("foo", filter);
-    ASSERT_EQ(3, artists.size());
-    EXPECT_EQ("foo foo foo", artists[0]);
-    EXPECT_EQ("foo foo", artists[1]);
-    EXPECT_EQ("foo", artists[2]);
-
-    // Other orders are not supported
-    filter.setOrder(MediaOrder::Rank);
-    EXPECT_THROW(store.queryArtists("foo", filter), std::runtime_error);
-    filter.setOrder(MediaOrder::Date);
-    EXPECT_THROW(store.queryArtists("foo", filter), std::runtime_error);
+    check_query_artists_order(store);
+
+    MediaStore store_ro(TEST_DIR "/mediastore.db", MS_READ_ONLY);
+    check_query_artists_order(store_ro);
+
+    store.remove(audio1.getFileName());
+    store.remove(audio2.getFileName());
+    store.remove(audio3.getFileName());
 }
 
-TEST_F(MediaStoreTest, getAlbumSongs) {
-    MediaFile audio1 = MediaFileBuilder("/home/username/Music/track1.ogg")
-        .setType(AudioMedia)
-        .setTitle("TitleOne")
-        .setAuthor("ArtistOne")
-        .setAlbum("AlbumOne")
-        .setAlbumArtist("Various Artists")
-        .setDiscNumber(1)
-        .setTrackNumber(1);
-    MediaFile audio2 = MediaFileBuilder("/home/username/Music/track2.ogg")
-        .setType(AudioMedia)
-        .setTitle("TitleTwo")
-        .setAuthor("ArtistTwo")
-        .setAlbum("AlbumOne")
-        .setAlbumArtist("Various Artists")
-        .setDiscNumber(1)
-        .setTrackNumber(2);
-    MediaFile audio3 = MediaFileBuilder("/home/username/Music/track3.ogg")
-        .setType(AudioMedia)
-        .setTitle("TitleThree")
-        .setAuthor("ArtistThree")
-        .setAlbum("AlbumOne")
-        .setAlbumArtist("Various Artists")
-        .setDiscNumber(2)
-        .setTrackNumber(1);
-
-    MediaStore store(":memory:", MS_READ_WRITE);
-    store.insert(audio1);
-    store.insert(audio2);
-    store.insert(audio3);
-
+void check_album_songs(MediaStore const &store) {
     vector<MediaFile> tracks = store.getAlbumSongs(
         Album("AlbumOne", "Various Artists"));
     ASSERT_EQ(tracks.size(), 3);
@@ -934,20 +1085,69 @@
     EXPECT_EQ(tracks[2].getTitle(), "TitleThree");
 }
 
-TEST_F(MediaStoreTest, getETag) {
+TEST(MediaStoreTest, getAlbumSongs) {
+    MediaFile audio1 = MediaFileBuilder("/home/username/Music/track1.ogg")
+        .setType(AudioMedia)
+        .setTitle("TitleOne")
+        .setAuthor("ArtistOne")
+        .setAlbum("AlbumOne")
+        .setAlbumArtist("Various Artists")
+        .setDiscNumber(1)
+        .setTrackNumber(1);
+    MediaFile audio2 = MediaFileBuilder("/home/username/Music/track2.ogg")
+        .setType(AudioMedia)
+        .setTitle("TitleTwo")
+        .setAuthor("ArtistTwo")
+        .setAlbum("AlbumOne")
+        .setAlbumArtist("Various Artists")
+        .setDiscNumber(1)
+        .setTrackNumber(2);
+    MediaFile audio3 = MediaFileBuilder("/home/username/Music/track3.ogg")
+        .setType(AudioMedia)
+        .setTitle("TitleThree")
+        .setAuthor("ArtistThree")
+        .setAlbum("AlbumOne")
+        .setAlbumArtist("Various Artists")
+        .setDiscNumber(2)
+        .setTrackNumber(1);
+
+    MediaStore store(TEST_DIR "/mediastore.db", MS_READ_WRITE);
+    store.insert(audio1);
+    store.insert(audio2);
+    store.insert(audio3);
+
+    check_album_songs(store);
+
+    MediaStore store_ro(TEST_DIR "/mediastore.db", MS_READ_ONLY);
+    check_album_songs(store_ro);
+
+    store.remove(audio1.getFileName());
+    store.remove(audio2.getFileName());
+    store.remove(audio3.getFileName());
+}
+
+void check_get_etag(MediaStore const &store) {
+    EXPECT_EQ(store.getETag("/path/file.ogg"), "etag");
+    EXPECT_EQ(store.getETag("/something-else.mp3"), "");
+}
+
+TEST(MediaStoreTest, getETag) {
     MediaFile file = MediaFileBuilder("/path/file.ogg")
         .setETag("etag")
         .setType(AudioMedia);
 
-    MediaStore store(":memory:", MS_READ_WRITE);
+    MediaStore store(TEST_DIR "/mediastore.db", MS_READ_WRITE);
     store.insert(file);
 
-    EXPECT_EQ(store.getETag("/path/file.ogg"), "etag");
-    EXPECT_EQ(store.getETag("/something-else.mp3"), "");
+    check_get_etag(store);
+
+    MediaStore store_ro(TEST_DIR "/mediastore.db", MS_READ_ONLY);
+    check_get_etag(store_ro);
+
+    store.remove(file.getFileName());
 }
 
-
-TEST_F(MediaStoreTest, constraints) {
+TEST(MediaStoreTest, constraints) {
     MediaFile file = MediaFileBuilder("no_slash_at_beginning.ogg")
         .setETag("etag")
         .setType(AudioMedia);
@@ -959,52 +1159,7 @@
     ASSERT_THROW(store.insert(file2), std::runtime_error);
 }
 
-TEST_F(MediaStoreTest, listSongs) {
-    MediaFile audio1 = MediaFileBuilder("/home/username/Music/track1.ogg")
-        .setType(AudioMedia)
-        .setTitle("TitleOne")
-        .setAuthor("ArtistOne")
-        .setAlbum("AlbumOne")
-        .setTrackNumber(1);
-    MediaFile audio2 = MediaFileBuilder("/home/username/Music/track2.ogg")
-        .setType(AudioMedia)
-        .setTitle("TitleTwo")
-        .setAuthor("ArtistOne")
-        .setAlbum("AlbumOne")
-        .setTrackNumber(2);
-    MediaFile audio3 = MediaFileBuilder("/home/username/Music/track3.ogg")
-        .setType(AudioMedia)
-        .setTitle("TitleThree")
-        .setAuthor("ArtistOne")
-        .setAlbum("AlbumTwo");
-    MediaFile audio4 = MediaFileBuilder("/home/username/Music/track4.ogg")
-        .setType(AudioMedia)
-        .setTitle("TitleFour")
-        .setAuthor("ArtistTwo")
-        .setAlbum("AlbumThree");
-    MediaFile audio5 = MediaFileBuilder("/home/username/Music/track5.ogg")
-        .setType(AudioMedia)
-        .setTitle("TitleFive")
-        .setAuthor("ArtistOne")
-        .setAlbum("AlbumFour")
-        .setAlbumArtist("Various Artists")
-        .setTrackNumber(1);
-    MediaFile audio6 = MediaFileBuilder("/home/username/Music/track6.ogg")
-        .setType(AudioMedia)
-        .setTitle("TitleSix")
-        .setAuthor("ArtistTwo")
-        .setAlbum("AlbumFour")
-        .setAlbumArtist("Various Artists")
-        .setTrackNumber(2);
-
-    MediaStore store(":memory:", MS_READ_WRITE);
-    store.insert(audio1);
-    store.insert(audio2);
-    store.insert(audio3);
-    store.insert(audio4);
-    store.insert(audio5);
-    store.insert(audio6);
-
+void check_list_songs(MediaStore const &store) {
     Filter filter;
     vector<MediaFile> tracks = store.listSongs(filter);
     ASSERT_EQ(6, tracks.size());
@@ -1060,31 +1215,37 @@
     EXPECT_EQ(3, tracks.size());
 }
 
-TEST_F(MediaStoreTest, listAlbums) {
+TEST(MediaStoreTest, listSongs) {
     MediaFile audio1 = MediaFileBuilder("/home/username/Music/track1.ogg")
         .setType(AudioMedia)
         .setTitle("TitleOne")
         .setAuthor("ArtistOne")
         .setAlbum("AlbumOne")
         .setTrackNumber(1);
-    MediaFile audio2 = MediaFileBuilder("/home/username/Music/track3.ogg")
+    MediaFile audio2 = MediaFileBuilder("/home/username/Music/track2.ogg")
+        .setType(AudioMedia)
+        .setTitle("TitleTwo")
+        .setAuthor("ArtistOne")
+        .setAlbum("AlbumOne")
+        .setTrackNumber(2);
+    MediaFile audio3 = MediaFileBuilder("/home/username/Music/track3.ogg")
         .setType(AudioMedia)
         .setTitle("TitleThree")
         .setAuthor("ArtistOne")
         .setAlbum("AlbumTwo");
-    MediaFile audio3 = MediaFileBuilder("/home/username/Music/track4.ogg")
+    MediaFile audio4 = MediaFileBuilder("/home/username/Music/track4.ogg")
         .setType(AudioMedia)
         .setTitle("TitleFour")
         .setAuthor("ArtistTwo")
         .setAlbum("AlbumThree");
-    MediaFile audio4 = MediaFileBuilder("/home/username/Music/track5.ogg")
+    MediaFile audio5 = MediaFileBuilder("/home/username/Music/track5.ogg")
         .setType(AudioMedia)
         .setTitle("TitleFive")
         .setAuthor("ArtistOne")
         .setAlbum("AlbumFour")
         .setAlbumArtist("Various Artists")
         .setTrackNumber(1);
-    MediaFile audio5 = MediaFileBuilder("/home/username/Music/track6.ogg")
+    MediaFile audio6 = MediaFileBuilder("/home/username/Music/track6.ogg")
         .setType(AudioMedia)
         .setTitle("TitleSix")
         .setAuthor("ArtistTwo")
@@ -1092,44 +1253,59 @@
         .setAlbumArtist("Various Artists")
         .setTrackNumber(2);
 
-    MediaStore store(":memory:", MS_READ_WRITE);
+    MediaStore store(TEST_DIR "/mediastore.db", MS_READ_WRITE);
     store.insert(audio1);
     store.insert(audio2);
     store.insert(audio3);
     store.insert(audio4);
     store.insert(audio5);
-
+    store.insert(audio6);
+
+    check_list_songs(store);
+
+    MediaStore store_ro(TEST_DIR "/mediastore.db", MS_READ_ONLY);
+    check_list_songs(store_ro);
+
+    store.remove(audio1.getFileName());
+    store.remove(audio2.getFileName());
+    store.remove(audio3.getFileName());
+    store.remove(audio4.getFileName());
+    store.remove(audio5.getFileName());
+    store.remove(audio6.getFileName());
+}
+
+void check_list_albums(MediaStore const &store) {
     Filter filter;
-    vector<Album> albums = store.listAlbums(filter);
-    ASSERT_EQ(4, albums.size());
-    EXPECT_EQ("AlbumOne", albums[0].getTitle());
-
-    // test limit
-    filter.setLimit(2);
-    albums = store.listAlbums(filter);
-    EXPECT_EQ(2, albums.size());
-    filter.setLimit(-1);
-
-    // Songs by artist
-    filter.setArtist("ArtistOne");
-    albums = store.listAlbums(filter);
-    EXPECT_EQ(3, albums.size());
-
-    // Songs by album artist
-    filter.clear();
-    filter.setAlbumArtist("ArtistOne");
-    albums = store.listAlbums(filter);
-    EXPECT_EQ(2, albums.size());
-
-    // Combination
-    filter.clear();
-    filter.setArtist("ArtistOne");
-    filter.setAlbumArtist("Various Artists");
-    albums = store.listAlbums(filter);
-    EXPECT_EQ(1, albums.size());
+        vector<Album> albums = store.listAlbums(filter);
+        ASSERT_EQ(4, albums.size());
+        EXPECT_EQ("AlbumOne", albums[0].getTitle());
+
+        // test limit
+        filter.setLimit(2);
+        albums = store.listAlbums(filter);
+        EXPECT_EQ(2, albums.size());
+        filter.setLimit(-1);
+
+        // Songs by artist
+        filter.setArtist("ArtistOne");
+        albums = store.listAlbums(filter);
+        EXPECT_EQ(3, albums.size());
+
+        // Songs by album artist
+        filter.clear();
+        filter.setAlbumArtist("ArtistOne");
+        albums = store.listAlbums(filter);
+        EXPECT_EQ(2, albums.size());
+
+        // Combination
+        filter.clear();
+        filter.setArtist("ArtistOne");
+        filter.setAlbumArtist("Various Artists");
+        albums = store.listAlbums(filter);
+        EXPECT_EQ(1, albums.size());
 }
 
-TEST_F(MediaStoreTest, listArtists) {
+TEST(MediaStoreTest, listAlbums) {
     MediaFile audio1 = MediaFileBuilder("/home/username/Music/track1.ogg")
         .setType(AudioMedia)
         .setTitle("TitleOne")
@@ -1161,13 +1337,26 @@
         .setAlbumArtist("Various Artists")
         .setTrackNumber(2);
 
-    MediaStore store(":memory:", MS_READ_WRITE);
+    MediaStore store(TEST_DIR "/mediastore.db", MS_READ_WRITE);
     store.insert(audio1);
     store.insert(audio2);
     store.insert(audio3);
     store.insert(audio4);
     store.insert(audio5);
 
+    check_list_albums(store);
+
+    MediaStore store_ro(TEST_DIR "/mediastore.db", MS_READ_ONLY);
+    check_list_albums(store_ro);
+
+    store.remove(audio1.getFileName());
+    store.remove(audio2.getFileName());
+    store.remove(audio3.getFileName());
+    store.remove(audio4.getFileName());
+    store.remove(audio5.getFileName());
+}
+
+void check_list_artists(MediaStore const &store) {
     Filter filter;
     vector<string> artists = store.listArtists(filter);
     ASSERT_EQ(2, artists.size());
@@ -1188,7 +1377,58 @@
     EXPECT_EQ("Various Artists", artists[2]);
 }
 
-TEST_F(MediaStoreTest, brokenFiles) {
+TEST(MediaStoreTest, listArtists) {
+    MediaFile audio1 = MediaFileBuilder("/home/username/Music/track1.ogg")
+        .setType(AudioMedia)
+        .setTitle("TitleOne")
+        .setAuthor("ArtistOne")
+        .setAlbum("AlbumOne")
+        .setTrackNumber(1);
+    MediaFile audio2 = MediaFileBuilder("/home/username/Music/track3.ogg")
+        .setType(AudioMedia)
+        .setTitle("TitleThree")
+        .setAuthor("ArtistOne")
+        .setAlbum("AlbumTwo");
+    MediaFile audio3 = MediaFileBuilder("/home/username/Music/track4.ogg")
+        .setType(AudioMedia)
+        .setTitle("TitleFour")
+        .setAuthor("ArtistTwo")
+        .setAlbum("AlbumThree");
+    MediaFile audio4 = MediaFileBuilder("/home/username/Music/track5.ogg")
+        .setType(AudioMedia)
+        .setTitle("TitleFive")
+        .setAuthor("ArtistOne")
+        .setAlbum("AlbumFour")
+        .setAlbumArtist("Various Artists")
+        .setTrackNumber(1);
+    MediaFile audio5 = MediaFileBuilder("/home/username/Music/track6.ogg")
+        .setType(AudioMedia)
+        .setTitle("TitleSix")
+        .setAuthor("ArtistTwo")
+        .setAlbum("AlbumFour")
+        .setAlbumArtist("Various Artists")
+        .setTrackNumber(2);
+
+    MediaStore store(TEST_DIR "/mediastore.db", MS_READ_WRITE);
+    store.insert(audio1);
+    store.insert(audio2);
+    store.insert(audio3);
+    store.insert(audio4);
+    store.insert(audio5);
+
+    check_list_artists(store);
+
+    MediaStore store_ro(TEST_DIR "/mediastore.db", MS_READ_ONLY);
+    check_list_artists(store_ro);
+
+    store.remove(audio1.getFileName());
+    store.remove(audio2.getFileName());
+    store.remove(audio3.getFileName());
+    store.remove(audio4.getFileName());
+    store.remove(audio5.getFileName());
+}
+
+TEST(MediaStoreTest, brokenFiles) {
     MediaStore store(":memory:", MS_READ_WRITE);
     std::string file = "/foo/bar/baz.mp3";
     std::string other_file = "/foo/bar/abc.mp3";
@@ -1214,6 +1454,12 @@
 }
 
 int main(int argc, char **argv) {
+    QCoreApplication app(argc, argv);
+
+    MediaScannerTestUtils::DBusTest test;
+    test.SetUp();
     ::testing::InitGoogleTest(&argc, argv);
-    return RUN_ALL_TESTS();
+    auto ret_code=RUN_ALL_TESTS();
+    std::cout << "WE'LL SEE NOW SOME ERRORS WHEN DESTROYING THE D-BUS INTERNALS. This is due bug: https://bugs.launchpad.net/dbus-cpp/+bug/1422304" << std::endl;
+    return ret_code;
 }
 
=== added directory 'test/utils'
=== added file 'test/utils/DBusTest.cpp'
--- test/utils/DBusTest.cpp	1970-01-01 00:00:00 +0000
+++ test/utils/DBusTest.cpp	2015-02-16 14:24:40 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include "DBusTest.h"
+#include "test_config.h"
+
+#include <QtTest/QSignalSpy>
+#include <libqtdbustest/QProcessDBusService.h>
+#include <QtDBus/QtDBus>
+
+using namespace MediaScannerTestUtils;
+using namespace QtDBusTest;
+
+DBusTest::DBusTest() {
+    qputenv("MEDIASCANNER_CACHEDIR", TEST_DIR);
+    DBusServicePtr dBusService(
+            new QProcessDBusService("com.canonical.MediaScanner2",
+                    QDBusConnection::SessionBus, MS_DBUS_BINARY,
+                    QStringList()));
+    dbus.registerService(dBusService);
+}
+
+DBusTest::~DBusTest() {
+}
+
+void DBusTest::SetUp() {
+    dbus.startServices();
+}
+
+void DBusTest::TearDown() {
+}
+
+const QDBusConnection & DBusTest::systemConnection() const {
+    return dbus.systemConnection();
+}
 
=== added file 'test/utils/DBusTest.h'
--- test/utils/DBusTest.h	1970-01-01 00:00:00 +0000
+++ test/utils/DBusTest.h	2015-02-16 14:24:40 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <QtCore/QCoreApplication>
+#include <QtCore/QProcess>
+
+#include <QtDBus/QtDBus>
+
+#include <libqtdbustest/DBusTestRunner.h>
+
+#ifndef USERMETRICS_TESTUTILS_TESTCOMMON_H_
+#define USERMETRICS_TESTUTILS_TESTCOMMON_H_
+
+namespace MediaScannerTestUtils {
+
+class DBusTest {
+public:
+    DBusTest();
+
+    virtual ~DBusTest();
+
+    virtual void SetUp();
+
+    virtual void TearDown();
+
+    QtDBusTest::DBusTestRunner dbus;
+
+    virtual const QDBusConnection & systemConnection() const;
+};
+
+}
+#endif // USERMETRICS_TESTUTILS_TESTCOMMON_H_