Merge lp:~charlesk/indicator-datetime/lp-1411171-strengthen-recurrence-rule-test into lp:indicator-datetime/15.04

[Charles Kerr]

Fix bug that misidentified repeating alarms as one-time alarms, causing them to be disabled after triggering.

=== Change Description

Fix bug that misidentified repeating alarms as one-time alarms, causing them to be disabled after triggering.

RTM MP @ https://code.launchpad.net/~charlesk/indicator-datetime/lp-1411171-strengthen-recurrence-rule-test/+merge/246633

=== MP Checklist

> Are there any related MPs required for this MP to build/function as expected? Please list.

No prerequisites

> Is your branch in sync with latest trunk? (e.g. bzr pull lp:trunk -> no changes)

Yes

> Did the code build without warnings?

Yes

> Did the tests run successfully?

Yes

> Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

> If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

N/A

> What device (or emulator) has your component test plan been executed successfully on?

Krillin 198

> What manual tests are relevant for this MP?

indicator-datetime/disable-one-time-alarms-after-notification

> Did you include a link to the MR Review Checklist Template to make your reviewer's life easier?

https://wiki.ubuntu.com/Process/Merges/Checklists/indicator-datetime

[dobey (dobey)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:394
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/290/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-vivid-amd64-ci/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-vivid-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-vivid-armhf-ci/4/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/290/rebuild

review: Needs Fixing (continuous-integration)

[lp:~charlesk/indicator-datetime/lp-1411171-strengthen-recurrence-rule-test]

395. By Charles Kerr on 2015-01-22

bump to re-run CI. clumsy, but jenkins' rebuild button isn't working

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:395
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/294/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-vivid-amd64-ci/8/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-vivid-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-vivid-armhf-ci/8/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/294/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:395
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/295/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-vivid-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-vivid-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-vivid-armhf-ci/9/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/295/rebuild

review: Approve (continuous-integration)

[Antti Kaijanmäki (kaijanmaki)]

LGTM.

review: Approve

=== modified file 'src/engine-eds.cpp'
--- src/engine-eds.cpp	2014-12-08 02:52:50 +0000
+++ src/engine-eds.cpp	2015-01-22 05:53:44 +0000
@@ -534,8 +534,11 @@
         icalcomponent * icc = nullptr;
         if (e_cal_client_get_object_finish (E_CAL_CLIENT(client), result, &icc, nullptr))
         {
-            struct icaltimetype itt = icalcomponent_get_recurrenceid(icc);
-            if (icaltime_is_null_time(itt))
+            auto rrule_property = icalcomponent_get_first_property (icc, ICAL_RRULE_PROPERTY); // transfer none
+            auto rdate_property = icalcomponent_get_first_property (icc, ICAL_RDATE_PROPERTY); // transfer none
+            const bool is_nonrepeating = (rrule_property == nullptr) && (rdate_property == nullptr);
+
+            if (is_nonrepeating)
             {
                 g_debug("'%s' appears to be a one-time alarm... adding 'disabled' tag.",
                         icalcomponent_as_ical_string(icc));

=== modified file 'src/main.cpp'
--- src/main.cpp	2014-12-08 02:52:50 +0000
+++ src/main.cpp	2015-01-22 05:53:44 +0000
@@ -46,6 +46,7 @@
 
 using namespace unity::indicator::datetime;
 
+
 namespace
 {
     std::shared_ptr<Engine> create_engine()

=== modified file 'tests/manual'
--- tests/manual	2014-12-08 02:52:50 +0000
+++ tests/manual	2015-01-22 05:53:44 +0000
@@ -56,6 +56,12 @@
 		<dd>Confirm that the alarm notification is shown</dd>
 		<dd>Confirm that the alarm's sound is played while the alarm notification is present</dd>
 		<dd>Confirm that the one-time alarm is disabled after the notification is shown. NOTE: due to a refresh bug in clock-app you may need to refresh its alarms page (by swapping back to the main page, then the alarm page again, this is tracked in #1362341) in order to see the alarm change from enabled to disabled.</dd>
+	<dt>Create and save an upcoming repeating alarm in ubuntu-clock-app</dt>
+		<dd>Confirm that the alarm icon appears next to the current time in unity's indicator display</dd>
+	<dt>Wait until the alarm time is reached</dt>
+		<dd>Confirm that the alarm notification is shown</dd>
+		<dd>Confirm that the alarm's sound is played while the alarm notification is present</dd>
+		<dd>Confirm that the repeating alarm is not disabled after the notification is shown. NOTE: due to a refresh bug in clock-app you may need to refresh its alarms page (by swapping back to the main page, then the alarm page again, this is tracked in #1362341) in order to see the alarm change from enabled to disabled.</dd>
 </dl>
 
 Test-case indicator-datetime/calendar-event-notification