Merge lp:~charlesk/indicator-datetime/lp-1364949-honor-changes-to-alarm-sounds into lp:indicator-datetime/13.10

Proposed by Charles Kerr
Status: Merged
Approved by: Antti Kaijanmäki
Approved revision: 384
Merged at revision: 385
Proposed branch: lp:~charlesk/indicator-datetime/lp-1364949-honor-changes-to-alarm-sounds
Merge into: lp:indicator-datetime/13.10
Diff against target: 35 lines (+14/-0)
2 files modified
src/appointment.cpp (+1/-0)
tests/manual (+13/-0)
To merge this branch: bzr merge lp:~charlesk/indicator-datetime/lp-1364949-honor-changes-to-alarm-sounds
Reviewer Review Type Date Requested Status
Antti Kaijanmäki (community) Approve
Review via email: mp+237474@code.launchpad.net

Commit message

Fix appointment comparison function to include the audio_url field in its test.

Description of the change

1. Fix appointment comparison function to include the audio_url field in its test. Missing this is what prevented the core::Property's changed signals from being emitted -- Appointment's equality operator reported two appointments as the same even when they had different audio_url fields.

2. Added manual test based on Dave Morley's report in bug #1364949

To post a comment you must log in.
Revision history for this message
Antti Kaijanmäki (kaijanmaki) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/appointment.cpp'
2--- src/appointment.cpp 2014-04-15 14:50:07 +0000
3+++ src/appointment.cpp 2014-10-07 18:48:12 +0000
4@@ -32,6 +32,7 @@
5 return (color==that.color)
6 && (summary==that.summary)
7 && (url==that.url)
8+ && (audio_url==that.audio_url)
9 && (uid==that.uid)
10 && (has_alarms==that.has_alarms)
11 && (begin==that.begin)
12
13=== modified file 'tests/manual'
14--- tests/manual 2014-09-16 20:21:47 +0000
15+++ tests/manual 2014-10-07 18:48:12 +0000
16@@ -79,6 +79,19 @@
17 <dd>Sound should stop at the same time, rather than playing til the end of the file.</dd>
18 </dl>
19
20+Test-case indicator-datetime/change-alarm-sound
21+<dl>
22+ <dt>Open the clock app</dt>
23+ <dt>Swipe up from the bottom</dt>
24+ <dt>Click on the + symbol</dt>
25+ <dt>Save an alarm for a few minutes time leave everything on default settings</dt>
26+ <dt>Click on save</dt>
27+ <dt>Click on the alarm</dt>
28+ <dt>Change the sound of the alarm</dt>
29+ <dt>Click on save</dt>
30+ <dt>Let the alarm go off</dt>
31+ <dd>The newly-selected sound should play, rather than the previous sound.</dd>
32+</dl>
33
34 <strong>
35 If all actions produce the expected results listed, please <a href="results#add_result">submit</a> a 'passed' result.

Subscribers

People subscribed via source and target branches