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

[Zsombor Egri]

Alarm services regression fix.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1420
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1485/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1553
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/212/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/215
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/215/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/212
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1384
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1551
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1551/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18389

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

review: Needs Fixing (continuous-integration)

[Christian Dywan (kalikiana)]

Looks to make sense (after a very long look, that is :-D)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp'
--- modules/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp	2014-11-19 14:32:29 +0000
+++ modules/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp	2015-02-26 15:11:20 +0000
@@ -369,6 +369,13 @@
     }
 }
 
+void AlarmDataAdapter::copyData(const UCAlarm &other)
+{
+    AlarmDataAdapter *pOther = static_cast<AlarmDataAdapter*>(AlarmDataAdapter::get(&other));
+    setData(pOther->data());
+}
+
+
 /*-----------------------------------------------------------------------------
  * Adaptation layer for Alarms.
  */
@@ -508,18 +515,16 @@
         return;
     }
     QJsonArray data;
-    UCAlarm alarm;
-    AlarmDataAdapter *pAlarm = static_cast<AlarmDataAdapter*>(UCAlarmPrivate::get(&alarm));
     for(int i = 0; i < alarmList.count(); i++) {
         // create an UCAlarm and set its event to ease conversions
-        pAlarm->setData(alarmList[i]);
+        const UCAlarm *alarm = alarmList[i];
         QJsonObject object;
-        object["message"] = alarm.message();
-        object["date"] = alarm.date().toString();
-        object["sound"] = alarm.sound().toString();
-        object["type"] = QJsonValue(alarm.type());
-        object["days"] = QJsonValue(alarm.daysOfWeek());
-        object["enabled"] = QJsonValue(alarm.enabled());
+        object["message"] = alarm->message();
+        object["date"] = alarm->date().toString();
+        object["sound"] = alarm->sound().toString();
+        object["type"] = QJsonValue(alarm->type());
+        object["days"] = QJsonValue(alarm->daysOfWeek());
+        object["enabled"] = QJsonValue(alarm->enabled());
         data.append(object);
 
     }
@@ -640,11 +645,10 @@
     return alarmList.count();
 }
 
-void AlarmsAdapter::getAlarmAt(const UCAlarm &alarm, int index) const
+UCAlarm *AlarmsAdapter::getAlarmAt(int index) const
 {
     Q_ASSERT(index >= 0 && index < alarmList.count());
-    AlarmDataAdapter *pAlarm = static_cast<AlarmDataAdapter*>(UCAlarmPrivate::get(&alarm));
-    pAlarm->setData(alarmList[index]);
+    return const_cast<UCAlarm*>(alarmList[index]);
 }
 
 bool AlarmsAdapter::findAlarm(const UCAlarm &alarm, const QVariant &cookie) const
@@ -693,7 +697,7 @@
     adjustAlarmOccurrence(*pAlarm);
 
     // insert and get the index
-    int index = alarmList.insert(pAlarm->data());
+    int index = alarmList.insert(alarm);
     Q_EMIT q_ptr->alarmInsertStarted(index);
     Q_EMIT q_ptr->alarmInsertFinished();
 }
@@ -717,7 +721,7 @@
     AlarmDataAdapter *pAlarm = static_cast<AlarmDataAdapter*>(UCAlarmPrivate::get(&alarm));
     pAlarm->setData(event);
     adjustAlarmOccurrence(*pAlarm);
-    int newIndex = alarmList.update(index, pAlarm->data());
+    int newIndex = alarmList.update(index, alarm);
     if (newIndex == index) {
         Q_EMIT q_ptr->alarmUpdated(index);
     } else {
@@ -774,7 +778,7 @@
         AlarmDataAdapter *pAlarm = static_cast<AlarmDataAdapter*>(UCAlarmPrivate::get(&alarm));
         pAlarm->setData(event);
         adjustAlarmOccurrence(*pAlarm);
-        alarmList.insert(pAlarm->data());
+        alarmList.insert(alarm);
     }
 
     completed = true;

=== modified file 'modules/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h'
--- modules/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h	2014-10-13 10:11:43 +0000
+++ modules/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h	2015-02-26 15:11:20 +0000
@@ -69,6 +69,7 @@
         return event;
     }
     void setData(const QOrganizerTodo &data);
+    void copyData(const UCAlarm &other);
 
 protected:
     QOrganizerTodo event;
@@ -87,6 +88,7 @@
 
     void clear()
     {
+        qDeleteAll(data);
         data.clear();
         idHash.clear();
     }
@@ -94,24 +96,36 @@
     {
         return data.count();
     }
-    const QOrganizerTodo operator[](int index) const
+    const UCAlarm *operator[](int index) const
     {
         QPair<QDateTime, QOrganizerItemId> key = data.keys()[index];
         return data.value(key);
     }
     // update event at index, returns the new event index
-    int update(int index, const QOrganizerTodo &alarm)
+    int update(int index, const UCAlarm &alarm)
     {
-        removeAt(index);
-        return insert(alarm);
+        // take alarm from previous index, update its data and insert it again
+        UCAlarm *oldAlarm = takeAt(index);
+        // copy the other alarm data
+        AlarmDataAdapter *pAlarm = static_cast<AlarmDataAdapter*>(AlarmDataAdapter::get(oldAlarm));
+        pAlarm->copyData(alarm);
+        // and insert it back
+        QDateTime dt = oldAlarm->date();
+        QOrganizerItemId id = oldAlarm->cookie().value<QOrganizerItemId>();
+        idHash.insert(id, dt);
+        data.insert(QPair<QDateTime, QOrganizerItemId>(dt, id), oldAlarm);
+        return indexOf(id);
     }
     // insert an alarm event into the list
-    int insert(const QOrganizerTodo &alarm)
+    int insert(const UCAlarm &alarm)
     {
-        QDateTime dt = AlarmUtils::normalizeDate(alarm.startDateTime());
-        idHash.insert(alarm.id(), dt);
-        data.insert(QPair<QDateTime, QOrganizerItemId>(dt, alarm.id()), alarm);
-        return indexOf(alarm.id());
+        QDateTime dt = alarm.date();
+        QOrganizerItemId id = alarm.cookie().value<QOrganizerItemId>();
+        idHash.insert(id, dt);
+        UCAlarm *newAlarm = new UCAlarm;
+        static_cast<AlarmDataAdapter*>(AlarmDataAdapter::get(newAlarm))->copyData(alarm);
+        data.insert(QPair<QDateTime, QOrganizerItemId>(dt, id), newAlarm);
+        return indexOf(id);
     }
     // returns the index of the alarm matching the id, -1 on error
     int indexOf(const QOrganizerItemId &id)
@@ -123,14 +137,21 @@
     // remove alarm at index
     void removeAt(int index)
     {
+        UCAlarm *alarm = takeAt(index);
+        delete alarm;
+    }
+    // removes alarm data at index and returns the alarm pointer
+    UCAlarm *takeAt(int index)
+    {
         QPair<QDateTime, QOrganizerItemId> key = data.keys()[index];
-        data.remove(key);
+        UCAlarm *alarm = data.take(key);
         idHash.remove(key.second);
+        return alarm;
     }
 
 private:
     // ordered map by occurrence date + event id, ascending
-    QMap< QPair<QDateTime, QOrganizerItemId>, QOrganizerTodo> data;
+    QMap< QPair<QDateTime, QOrganizerItemId>, UCAlarm*> data;
     // alarms ordered based on even id
     QHash<QOrganizerItemId, QDateTime> idHash;
 };
@@ -158,7 +179,7 @@
 
     void init();
     int alarmCount();
-    void getAlarmAt(const UCAlarm &alarm, int index) const;
+    UCAlarm *getAlarmAt(int index) const;
     bool findAlarm(const UCAlarm &alarm, const QVariant &cookie) const;
     void adjustAlarmOccurrence(AlarmDataAdapter &alarm);
 

=== modified file 'modules/Ubuntu/Components/plugin/alarmmanager_p.cpp'
--- modules/Ubuntu/Components/plugin/alarmmanager_p.cpp	2014-10-10 10:27:35 +0000
+++ modules/Ubuntu/Components/plugin/alarmmanager_p.cpp	2015-02-26 15:11:20 +0000
@@ -23,7 +23,6 @@
 
 AlarmManagerPrivate::AlarmManagerPrivate(AlarmManager *qq)
     : q_ptr(qq)
-    , alarmHolder(0)
     , completed(false)
 {
 }
@@ -50,7 +49,6 @@
     static AlarmManager instance;
     if (!instance.d_ptr->completed) {
         instance.d_ptr->init();
-        instance.d_ptr->alarmHolder = new UCAlarm(&instance);
     }
     return instance;
 }
@@ -65,18 +63,19 @@
     return d_ptr->alarmCount();
 }
 
-UCAlarm *AlarmManager::alarmAt(int index) const
+UCAlarm *AlarmManager::alarmAt(int index)
 {
-    d_ptr->getAlarmAt(*d_ptr->alarmHolder, index);
-    return d_ptr->alarmHolder;
+    return d_ptr->getAlarmAt(index);
 }
 
+// the function returns an un-cached alarm for testing purposes
 UCAlarm *AlarmManager::findAlarm(const QVariant &cookie) const
 {
-    if (!d_ptr->findAlarm(*d_ptr->alarmHolder, cookie)) {
+    static UCAlarm alarm;
+    if (!d_ptr->findAlarm(alarm, cookie)) {
         return 0;
-    };
-    return d_ptr->alarmHolder;
+    }
+    return &alarm;
 }
 
 bool AlarmManager::verifyChange(UCAlarm *alarm, Change change, const QVariant &newData)

=== modified file 'modules/Ubuntu/Components/plugin/alarmmanager_p.h'
--- modules/Ubuntu/Components/plugin/alarmmanager_p.h	2014-10-13 10:53:48 +0000
+++ modules/Ubuntu/Components/plugin/alarmmanager_p.h	2015-02-26 15:11:20 +0000
@@ -98,7 +98,7 @@
 
     bool fetchAlarms();
     int alarmCount();
-    UCAlarm *alarmAt(int index) const;
+    UCAlarm *alarmAt(int index);
     UCAlarm *findAlarm(const QVariant &cookie) const;
 
     bool verifyChange(UCAlarm *alarm, Change change, const QVariant &newData);

=== modified file 'modules/Ubuntu/Components/plugin/alarmmanager_p_p.h'
--- modules/Ubuntu/Components/plugin/alarmmanager_p_p.h	2014-10-10 10:27:35 +0000
+++ modules/Ubuntu/Components/plugin/alarmmanager_p_p.h	2015-02-26 15:11:20 +0000
@@ -40,14 +40,12 @@
     }
 
     AlarmManager *q_ptr;
-    // used by alarmAt() and findAlarm() methods
-    UCAlarm *alarmHolder;
     bool completed:1;
 
     virtual void init() = 0;
     virtual bool fetchAlarms() = 0;
     virtual int alarmCount() = 0;
-    virtual void getAlarmAt(const UCAlarm &alarm, int index) const = 0;
+    virtual UCAlarm *getAlarmAt(int index) const = 0;
     virtual bool findAlarm(const UCAlarm &alarm, const QVariant &cookie) const = 0;
 
     // function to verify whether the given alarm property has a given value set

=== modified file 'modules/Ubuntu/Components/plugin/ucalarm.cpp'
--- modules/Ubuntu/Components/plugin/ucalarm.cpp	2014-11-20 06:36:45 +0000
+++ modules/Ubuntu/Components/plugin/ucalarm.cpp	2015-02-26 15:11:20 +0000
@@ -278,6 +278,8 @@
  * The \l reset function clears the properties of the alarm bringing them to the
  * default values. In this way the same alarm component can be used to save several
  * alarms at the same time.
+ * \note Do not call reset function on an alarm event object when that was returned
+ * by the \l AlarmModel::get function, as that will reset the alarm cache data!
  */
 
 UCAlarm::UCAlarm(QObject *parent)

=== modified file 'modules/Ubuntu/Components/plugin/ucalarmmodel.cpp'
--- modules/Ubuntu/Components/plugin/ucalarmmodel.cpp	2014-11-20 13:26:50 +0000
+++ modules/Ubuntu/Components/plugin/ucalarmmodel.cpp	2015-02-26 15:11:20 +0000
@@ -205,8 +205,9 @@
  * }
  * \endcode
  *
- * \b Warning: The returned object is not guarantied to remain valid, it should
- * not be used in property bindings.
+ * \note The returned object is not guarantied to remain valid, it should not be
+ * used in property bindings. Also, \l {Alarm::reset}{reset()} should not be called
+ * either as the call will clear the alarm data from the cache.
  *
  * \sa Alarm
  */

=== modified file 'tests/resources/alarm/AlarmDays.qml'
--- tests/resources/alarm/AlarmDays.qml	2014-11-20 06:36:45 +0000
+++ tests/resources/alarm/AlarmDays.qml	2015-02-26 15:11:20 +0000
@@ -22,7 +22,7 @@
 Dialog {
     id:root
 
-    property var alarm
+    property string property
 
     title: "Choose days"
 
@@ -63,12 +63,12 @@
         Standard {
             text: day
             control: CheckBox {
-                checked: (alarm.daysOfWeek & flag) == flag
+                checked: caller && ((caller[property] & flag) == flag)
                 onCheckedChanged: {
                     if (checked) {
-                        alarm.daysOfWeek |= flag;
+                        caller[property] |= flag;
                     } else {
-                        alarm.daysOfWeek &= ~flag;
+                        caller[property] &= ~flag;
                     }
                 }
             }

=== modified file 'tests/resources/alarm/Alarms.qml'
--- tests/resources/alarm/Alarms.qml	2014-11-20 13:12:58 +0000
+++ tests/resources/alarm/Alarms.qml	2015-02-26 15:11:20 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2 // due to ListItem
 import Ubuntu.Components.ListItems 1.0
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Components.Pickers 1.0
@@ -25,24 +25,26 @@
     width: units.gu(40)
     height: units.gu(71)
     objectName: "mainView"
-    useDeprecatedToolbar: false
 
     AlarmModel{
         id: alarmModel
     }
 
     Alarm {
-        id: alarm
+        id: stockAlarm
         onStatusChanged: {
             print("operation " + operation + ", status= " + status + ", error=" + error);
             if (status !== Alarm.Ready)
                 return;
             if ((operation > Alarm.NoOperation) && (operation < Alarm.Reseting)) {
                 reset();
+                alarm = stockAlarm;
             }
         }
     }
 
+    property Alarm alarm: stockAlarm
+
     Page {
         title: "Alarm test"
         Column {
@@ -83,21 +85,17 @@
             Standard {
                 text: "Enabled"
                 control: Switch {
-                    id: enabled
+                    id: enabledSwitch
                     objectName: "alarm_enabled"
                     checked: alarm.enabled
-                    onCheckedChanged: {
-                        if (checked != alarm.enabled) {
-                            alarm.enabled = checked;
-                        }
-                    }
                 }
             }
             ItemSelector {
                 id: recurence
                 text: "Recurence"
                 model: ["OneTime", "Daily", "Weekly"]
-                selectedIndex: {
+                selectedIndex: setRecurence(alarm)
+                function setRecurence(alarm) {
                     if (alarm.type == Alarm.OneTime)
                         return 0;
                     else if (alarm.type == Alarm.Repeating) {
@@ -107,32 +105,18 @@
                             return 2;
                     }
                 }
-                onSelectedIndexChanged: {
-                    switch (selectedIndex) {
-                    case 0:
-                        alarm.type = Alarm.OneTime;
-                        break;
-                    case 1:
-                        alarm.type = Alarm.Repeating;
-                        alarm.daysOfWeek = Alarm.Daily;
-                        break;
-                    case 2:
-                        alarm.type = Alarm.Repeating;
-                        alarm.daysOfWeek = Alarm.AutoDetect;
-                        break;
-                    }
-                }
             }
 
             MultiValue {
                 id: days
                 text: "Occurrence"
-                values: getValues()
+                values: getValues(alarm)
                 visible: recurence.selectedIndex === 2
+                property int daysOfWeek: alarm.daysOfWeek
                 onClicked: {
-                    PopupUtils.open(Qt.resolvedUrl("AlarmDays.qml"), days, {"alarm": alarm});
+                    PopupUtils.open(Qt.resolvedUrl("AlarmDays.qml"), days, {property: "daysOfWeek"});
                 }
-                function getValues() {
+                function getValues(alarm) {
                     var v = [];
                     if (alarm.daysOfWeek & Alarm.Monday) v.push("Monday");
                     if (alarm.daysOfWeek & Alarm.Tuesday) v.push("Tuesday");
@@ -154,8 +138,22 @@
                         var date = new Date();
                         date.setTime(timeChooser.time.getTime());
                         date.setDate(dateChooser.date.getDate());
-                        print("DATE", date, dateChooser.date.toDateString())
                         alarm.date = date;
+                        alarm.enabled = enabledSwitch.checked;
+                        switch (recurence.selectedIndex) {
+                        case 0:
+                            alarm.type = Alarm.OneTime;
+                            alarm.daysOfWeek = Alarm.AutoDetect;
+                            break;
+                        case 1:
+                            alarm.type = Alarm.Repeating;
+                            alarm.daysOfWeek = Alarm.Daily;
+                            break;
+                        case 2:
+                            alarm.type = Alarm.Repeating;
+                            alarm.daysOfWeek = days.daysOfWeek;
+                            break;
+                        }
                         alarm.save();
                     }
                 }
@@ -165,6 +163,7 @@
                 control: Button {
                     text: "Reset"
                     onClicked: {
+                        alarm = stockAlarm;
                         alarm.reset();
                     }
                 }
@@ -177,14 +176,31 @@
                 height: units.gu(20)
                 clip: true
                 model: alarmModel
-                delegate: Standard {
-                    text: message + recurring(model) + "\n" + model.date
+                ListItemActions {
+                    id: leading
+                    actions: Action {
+                        iconName: "delete"
+                        onTriggered: {
+                            var data = alarmModel.get(value);
+                            data.cancel();
+                        }
+                    }
+                }
+                delegate: ListItem {
+                    Label {
+                        text: message + recurring(model) + "\n" + model.date
+                    }
                     function recurring(alarmData) {
                         return (alarmData.type === Alarm.Repeating) ? "[Repeating]" : "[Onetime]";
                     }
 
-                    removable: true
-                    control: Switch {
+                    leadingActions: leading
+
+                    Switch {
+                        anchors {
+                            verticalCenter: parent.verticalCenter
+                            right: parent.right
+                        }
                         checked: model.enabled
                         onCheckedChanged: {
                             if (checked != model.enabled) {
@@ -196,17 +212,13 @@
                             }
                         }
                     }
-                    onItemRemoved: {
-                        var data = alarmModel.get(index);
-                        data.cancel();
-                    }
                     onClicked: {
-                        var data = alarmModel.get(index);
-                        alarm.message = data.message;
-                        alarm.date = data.date;
-                        alarm.type = data.type;
-                        alarm.daysOfWeek = data.daysOfWeek;
-                        alarm.enabled = data.enabled;
+                        alarm = alarmModel.get(index);
+                        dateChooser.date = alarm.date;
+                        timeChooser.time = alarm.date;
+                        message.text = alarm.message;
+                        enabledSwitch.checked = alarm.enabled;
+                        recurence.selectedIndex = recurence.setRecurence(alarm);
                     }
 
                     Connections {

=== modified file 'tests/unit_x11/tst_components/tst_alarms.qml'
--- tests/unit_x11/tst_components/tst_alarms.qml	2014-10-13 12:03:37 +0000
+++ tests/unit_x11/tst_components/tst_alarms.qml	2015-02-26 15:11:20 +0000
@@ -21,8 +21,8 @@
 
 Item {
     id: root
-    width: 100
-    height: 100
+    width: units.gu(40)
+    height: units.gu(71)
 
     Alarm {
         id: testAlarm
@@ -36,6 +36,7 @@
         id: roleTest
         model: testModel
         delegate: Item {
+            height: units.gu(7)
             objectName: "roleItem"
             property var roleModel: model
             property bool roleEnabled: model.enabled
@@ -44,9 +45,15 @@
             property int roleType: type
             property int roleDaysOfWeek: daysOfWeek
             property url roleSound: sound
+
+            Label {
+                text: model.date + model.message + model.sound + model.type + model.daysOfWeek + model.enabled
+            }
         }
     }
 
+    property Alarm workAlarm: testAlarm
+
     UbuntuTestCase {
         id: testCase
         name: "AlarmAPI"
@@ -63,7 +70,8 @@
             modelSpy.signalName = "rowsRemoved";
             while (i < testModel.count) {
                 var alarm = testModel.get(i);
-                if (alarm.message === "test") {
+                // tests start with "test" string
+                if (alarm.message.search("test") == 0) {
                     alarm.cancel();
                     modelSpy.wait();
                     modelSpy.clear();
@@ -74,6 +82,10 @@
             }
         }
 
+        function normalizeDate(date) {
+            return new Date(date.getFullYear(), date.getMonth(), date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds(), 0);
+        }
+
         function initTestCase() {
             // AlarmModel initiates a fetch, wait till that one completes
             modelSpy.wait();
@@ -275,5 +287,50 @@
             verify(item.roleDaysOfWeek !== undefined, "daysOfWeek is defined");
             verify(item.roleSound !== undefined, "sound is defined");
         }
+
+        // guarding bug #1401883
+        // changed alarm data retrieved from model, when used in bindings, resets the
+        // model data
+        function test_model_role_binding_bug1401883_data() {
+            var dt1 = new Date();
+            dt1.setMinutes(dt1.getMinutes() + 2);
+            var dt2 = new Date(dt1);
+            dt2.setMinutes(dt2.getMinutes() + 2);
+            return [
+                {tag: "Message", role: "message", firstValue: "test", updatedValue: "test_other"},
+                {tag: "Enabled", role: "enabled", firstValue: true, updatedValue: false},
+                {tag: "Date", role: "date", firstValue: dt1, updatedValue: dt2},
+                {tag: "Type", role: "type", firstValue: Alarm.Daily, updatedValue: Alarm.OneTime},
+            ];
+        }
+        function test_model_role_binding_bug1401883(data) {
+            // create a new test alarm and make sure we set the mandatory fields
+            testAlarm.reset();
+            var dt = new Date();
+            dt.setMinutes(dt.getMinutes() + 1);
+            testAlarm.date = dt;
+            testAlarm.message = "test";
+
+            testAlarm[data.role] = data.firstValue;
+            modelSpy.signalName = "rowsInserted";
+            modelSpy.clear();
+            testAlarm.save();
+            modelSpy.wait();
+            waitForRendering(roleTest);
+
+            // change the date
+            var alarmData = testModel.get(0);
+            modelSpy.signalName = "dataChanged";
+            modelSpy.clear();
+            alarmData[data.role] = data.updatedValue;
+            alarmData.save();
+            modelSpy.wait(500);
+
+            if (data.role === "date") {
+                compare(normalizeDate(testModel.get(0).date), normalizeDate(data.updatedValue), "Date differs");
+            } else {
+                compare(testModel.get(0)[data.role], data.updatedValue, data.tag + " differs");
+            }
+        }
     }
 }