Merge lp://staging/~xavi-garcia-mena/mediascanner2/ms-dbus-wal into lp://staging/mediascanner2
Proposed by
Xavi Garcia
Status: | Needs review |
---|---|
Proposed branch: | lp://staging/~xavi-garcia-mena/mediascanner2/ms-dbus-wal |
Merge into: | lp://staging/mediascanner2 |
Diff against target: |
2214 lines (+945/-453) 18 files modified
debian/control (+1/-0) src/daemon/CMakeLists.txt (+1/-0) src/mediascanner/CMakeLists.txt (+20/-2) src/mediascanner/MediaStore.cc (+94/-19) src/mediascanner/MediaStore.hh (+9/-1) src/mediascanner/d-bus/service-stub.cc (+6/-0) src/mediascanner/d-bus/service-stub.hh (+1/-0) src/mediascanner/mediascanner-2.0.map (+35/-5) src/ms-dbus/CMakeLists.txt (+1/-2) src/ms-dbus/main.cc (+2/-2) src/ms-dbus/service-skeleton.cc (+2/-2) src/ms-dbus/service-skeleton.hh (+1/-1) src/qml/Ubuntu/MediaScanner/MediaStoreWrapper.cc (+1/-1) test/CMakeLists.txt (+15/-5) test/test_dbus.cc (+1/-1) test/test_mediastore.cc (+658/-412) test/utils/DBusTest.cpp (+50/-0) test/utils/DBusTest.h (+47/-0) |
To merge this branch: | bzr merge lp://staging/~xavi-garcia-mena/mediascanner2/ms-dbus-wal |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
unity-api-1-bot | continuous-integration | Needs Fixing | |
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Jussi Pakkanen (community) | Needs Fixing | ||
Jamie Strandboge | Pending | ||
James Henstridge | Pending | ||
Review via email: mp+249346@code.staging.launchpad.net |
Commit message
Modified to use the d-bus interface when MediaStore is created in Read Only mode.
Description of the change
Modified to use the d-bus interface when MediaStore is created in Read Only mode.
To post a comment you must log in.
Unmerged revisions
- 304. By Xavi Garcia
-
Added bug link in error message and remove unnecessary try...catch in unit test
- 303. By Xavi Garcia
-
Erased final _ for member variables
- 302. By Xavi Garcia
-
Added libqtdbustest to test the d-bus connection
- 301. By Xavi Garcia
-
Removed Unity-api dependency, as it was not needed
- 300. By Xavi Garcia
-
Modifed media store tests to avoid duplicating code
- 299. By Xavi Garcia
-
Using DBus for read only mode
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 testImplementat ion(MediaStore &writer, MediaStore &queryer) { insert( whatevs) ;
// First set up
writer.
// Then query EQ(queryer. query(" ..."), result);
ASSERT_
}
And then have the actual dbus and non-dbus test cases just do basically this:
void testWithoutDbus() {
MediaStore local(READWRITE);
testImplement ation(local, local);
}
void testWithDbus() {
MediaStore writer(READWRITE);
MediaStore queryer(READONLY);
testImplement ation(writer, queryer);
}