Merge lp:~zsombi/ubuntu-ui-toolkit/alarm-sound-fix into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Alarm sounds lost during fetch fix.

[Nekhelesh Ramananthan (nik90)]

On testing this MP against https://bugs.launchpad.net/+branch/~nik90/ubuntu-clock-app/alarmtest, it works as expected. The alarm sound url is now properly retrieved while editing an alarm.

SideNote: I can now make install this MP on my utopic VM which has EDS as the alarm backend. No more it getting stuck during the make install process :D

review: Approve (testing)

[Cris Dywan (kalikiana)]

Looks sensible.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1182
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/736/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3117
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2446
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/568
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/568
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/568/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/568
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3154
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4361
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4361/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2028
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2716
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2716/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/736/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/324/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3147
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2475
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/268
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/268
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/268/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/268
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3177
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4392
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4392/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11131
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2048
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2746
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2746/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/327/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3152
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2480
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/271
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/271
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/271/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/271
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3182
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4397
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4397/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11137
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2053
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2751
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2751/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

  File "/usr/lib/python3/dist-packages/ubuntuuitoolkit/tests/custom_proxy_objects/test_date_picker.py", line 218, in test_pick_time
    self.time_picker.pick_time(self.time_to_pick)
  File "/usr/lib/python3/dist-packages/ubuntuuitoolkit/_custom_proxy_objects/pickers.py", line 141, in pick_time
    self.hours.wait_for(time.hour)
AssertionError: After 10.0 seconds test on DatePicker.hours failed: 12 != dbus.Int32(13, variant_level=1)

[Zsombor Egri (zsombi)]

> File "/usr/lib/python3/dist-
> packages/ubuntuuitoolkit/tests/custom_proxy_objects/test_date_picker.py", line
> 218, in test_pick_time
> self.time_picker.pick_time(self.time_to_pick)
> File "/usr/lib/python3/dist-
> packages/ubuntuuitoolkit/_custom_proxy_objects/pickers.py", line 141, in
> pick_time
> self.hours.wait_for(time.hour)
> AssertionError: After 10.0 seconds test on DatePicker.hours failed: 12 !=
> dbus.Int32(13, variant_level=1)

Looks like the AP tests we have for the DatePicker are not the most stable ones :/

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/330/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3191/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2508/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/274/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/274/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/274/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4436/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2779/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/337/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3325/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2603/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/281
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/281
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/281/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/281
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4572
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4572/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2877/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1182
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/785/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3380
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2651/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/617
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/617
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/617/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/617
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3307
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4627
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4627/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11307
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2142/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2928
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2928/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/785/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/plugin/alarmmanager_p.h'
--- modules/Ubuntu/Components/plugin/alarmmanager_p.h	2014-03-11 06:32:29 +0000
+++ modules/Ubuntu/Components/plugin/alarmmanager_p.h	2014-08-06 14:24:24 +0000
@@ -51,13 +51,14 @@
         , originalDate(other.originalDate)
         , date(other.date)
         , message(other.message)
+        , sound(other.sound)
         , type(other.type)
         , days(other.days)
         , enabled(other.enabled)
     {
     }
 
-    bool compare(const AlarmData &other)
+    bool compare(const AlarmData &other) const
     {
         // cookie, sound, and enabled do not count on alarm equality
         return date == other.date
@@ -66,7 +67,7 @@
                 && days == other.days;
     }
 
-    bool operator==(const AlarmData &other)
+    bool operator==(const AlarmData &other) const
     {
         return compare(other);
     }

=== modified file 'modules/Ubuntu/Components/plugin/ucalarm.cpp'
--- modules/Ubuntu/Components/plugin/ucalarm.cpp	2014-05-15 09:49:25 +0000
+++ modules/Ubuntu/Components/plugin/ucalarm.cpp	2014-08-06 14:24:24 +0000
@@ -343,6 +343,13 @@
 {
 }
 
+bool UCAlarm::operator==(const UCAlarm &that) const
+{
+    Q_D(const UCAlarm);
+    AlarmData const dataThat = UCAlarmPrivate::get(&that)->rawData;
+    return d->rawData == dataThat;
+}
+
 /*!
  * \qmlproperty bool Alarm::enabled
  * The property specifies whether the alarm is enabled or not. Disable dalarms

=== modified file 'modules/Ubuntu/Components/plugin/ucalarm.h'
--- modules/Ubuntu/Components/plugin/ucalarm.h	2013-09-18 10:13:04 +0000
+++ modules/Ubuntu/Components/plugin/ucalarm.h	2014-08-06 14:24:24 +0000
@@ -89,6 +89,8 @@
     UCAlarm(const QDateTime &dt, DaysOfWeek days = AutoDetect, const QString &message = QString(), QObject *parent = 0);
     ~UCAlarm();
 
+    bool operator==(const UCAlarm &that) const;
+
 public: // getter/setter
     bool enabled() const;
     void setEnabled(bool enabled);

=== modified file 'modules/Ubuntu/Components/plugin/ucalarm_p.h'
--- modules/Ubuntu/Components/plugin/ucalarm_p.h	2014-04-10 09:48:30 +0000
+++ modules/Ubuntu/Components/plugin/ucalarm_p.h	2014-08-06 14:24:24 +0000
@@ -31,8 +31,8 @@
     UCAlarmPrivate(UCAlarm *qq);
     ~UCAlarmPrivate();
 
-    static UCAlarmPrivate *get(UCAlarm *alarm) {
-        return alarm->d_func();
+    static UCAlarmPrivate *get(const UCAlarm *alarm) {
+        return const_cast<UCAlarm*>(alarm)->d_func();
     }
 
     void setDefaults();

=== modified file 'tests/unit/tst_alarms/tst_alarms.cpp'
--- tests/unit/tst_alarms/tst_alarms.cpp	2014-07-28 16:47:50 +0000
+++ tests/unit/tst_alarms/tst_alarms.cpp	2014-08-06 14:24:24 +0000
@@ -92,6 +92,18 @@
         return pAlarm1->rawData.compare(pAlarm2->rawData);
     }
 
+    bool findAlarm(const QString &message, UCAlarm &result)
+    {
+        QList<AlarmData> alarms = AlarmManager::instance().alarms();
+        Q_FOREACH(AlarmData i, alarms) {
+            if (i.message == message) {
+                UCAlarmPrivate::get(&result)->rawData = i;
+                return true;
+            }
+        }
+        return false;
+    }
+
 private Q_SLOTS:
 
     void initTestCase()
@@ -502,6 +514,18 @@
         alarm.setDate(QDateTime::currentDateTime().addSecs(3600));
         QCOMPARE((int)alarm.daysOfWeek(), dow);
     }
+
+    void test_sound_saving() {
+        UCAlarm alarm(QDateTime::currentDateTime().addSecs(60), "test_onetime_sound");
+        alarm.setSound(QUrl("file:///usr/share/sounds/ubuntu/ringtones/Celestial.ogg"));
+        alarm.save();
+        waitForRequest(&alarm);
+
+        UCAlarm saved;
+        QVERIFY(findAlarm("test_onetime_sound", saved));
+        QCOMPARE(alarm, saved);
+        QCOMPARE(alarm.sound().toString(), saved.sound().toString());
+    }
 };
 
 QTEST_MAIN(tst_UCAlarms)