Merge lp://staging/~pete-woods/unity-notifications/add-dbus-tests into lp://staging/unity-notifications

Proposed by Pete Woods
Status: Merged
Approved by: Charles Kerr
Approved revision: 231
Merged at revision: 225
Proposed branch: lp://staging/~pete-woods/unity-notifications/add-dbus-tests
Merge into: lp://staging/unity-notifications
Diff against target: 1346 lines (+676/-155)
29 files modified
CMakeLists.txt (+15/-7)
debian/control (+1/-0)
include/ActionModel.h (+2/-0)
include/DBusTypes.h (+69/-0)
include/NotificationClient.h (+4/-3)
include/NotificationModel.h (+1/-0)
include/NotificationServer.h (+16/-12)
src/ActionModel.cpp (+8/-0)
src/CMakeLists.txt (+36/-11)
src/DBusTypes.cpp (+120/-0)
src/NotificationClient.cpp (+8/-6)
src/NotificationClientPlugin.cpp (+1/-9)
src/NotificationModel.cpp (+19/-0)
src/NotificationPlugin.cpp (+2/-12)
src/NotificationServer.cpp (+53/-16)
src/org.freedesktop.Notifications.xml (+45/-0)
test/CMakeLists.txt (+33/-6)
test/notificationservertest.cpp (+146/-0)
tools/CMakeLists.txt (+53/-13)
tools/clientMainWindow.cpp (+3/-3)
tools/clientMainWindow.h (+3/-3)
tools/dbusclient.cpp (+7/-15)
tools/dbusserver.cpp (+18/-17)
tools/mainWindow.cpp (+2/-2)
tools/mainWindow.h (+3/-3)
tools/qmltest.cpp (+4/-13)
tools/serverMainWindow.cpp (+2/-2)
tools/serverMainWindow.h (+1/-1)
tools/viewer.cpp (+1/-1)
To merge this branch: bzr merge lp://staging/~pete-woods/unity-notifications/add-dbus-tests
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
Review via email: mp+260691@code.staging.launchpad.net

Commit message

Add end to end DBus tests and use XML introspection data

Description of the change

Add end to end DBus tests and use XML introspection data

To post a comment you must log in.
226. By Pete Woods

Remove debug statement

227. By Pete Woods

Add libqtdbustest dependency

Revision history for this message
Charles Kerr (charlesk) wrote :

Again, mostly LGTM.

I'm concerned about the arbitrary differences between this public bus spec and upstream's though. See inline comments esp. on org.freedesktop.Notifications.xml

review: Needs Information
Revision history for this message
Pete Woods (pete-woods) wrote :

Some responses :) GetServerInformation fix coming up..

228. By Pete Woods

Fix method argument order on GetServerInformation

229. By Pete Woods

Pass back full notification information to tests

230. By Pete Woods

Remove diff noise

231. By Pete Woods

Bit of refactoring to slim down the server tests

Revision history for this message
Charles Kerr (charlesk) :
review: Approve
232. By Pete Woods

Fix parallel build issues

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: