Merge lp:~renatofilho/qtorganizer5-eds/fix-1440878 into lp:qtorganizer5-eds

[Renato Araujo Oliveira Filho]

Save a trigger for reminders with with secondsBeforeStart equals 0.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:80
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/202/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-amd64-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-i386-ci/9/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/202/rebuild

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

Some inline comments below.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:83
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/203/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/10/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-i386-ci/10/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/203/rebuild

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

The code changes LGTM.

Approving in comments, feel free to top-approve for me once you've got the Jenkins issue sorted

review: Approve

[lp:~renatofilho/qtorganizer5-eds/fix-1440878]

85. By Renato Araujo Oliveira Filho on 2015-04-09

Removed test workaround.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:85
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/206/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/13/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-i386-ci/13

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/206/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'organizer/qorganizer-eds-engine.cpp'
--- organizer/qorganizer-eds-engine.cpp	2015-04-09 17:24:00 +0000
+++ organizer/qorganizer-eds-engine.cpp	2015-04-09 17:24:00 +0000
@@ -1798,11 +1798,17 @@
 
         ECalComponentAlarmTrigger trigger;
         e_cal_component_alarm_get_trigger(alarm, &trigger);
+        int relSecs = 0;
         if (trigger.type == E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START) {
-            aDetail->setSecondsBeforeStart(icaldurationtype_as_int(trigger.u.rel_duration) * -1);
-        } else {
-            aDetail->setSecondsBeforeStart(0);
+            relSecs = - icaldurationtype_as_int(trigger.u.rel_duration);
+            if (relSecs < 0) {
+                relSecs = 0;
+                qWarning() << "QOrganizer does not support triggers after event start";
+            }
+        } else if (trigger.type != E_CAL_COMPONENT_ALARM_TRIGGER_NONE) {
+            qWarning() << "QOrganizer only supports triggers relative to event start.";
         }
+        aDetail->setSecondsBeforeStart(relSecs);
 
         ECalComponentAlarmRepeat aRepeat;
         e_cal_component_alarm_get_repeat(alarm, &aRepeat);
@@ -2414,12 +2420,10 @@
                 break;
         }
 
-        if (reminder->secondsBeforeStart() > 0) {
-            ECalComponentAlarmTrigger trigger;
-            trigger.type = E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START;
-            trigger.u.rel_duration = icaldurationtype_from_int(- reminder->secondsBeforeStart());
-            e_cal_component_alarm_set_trigger(alarm, trigger);
-        }
+        ECalComponentAlarmTrigger trigger;
+        trigger.type = E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START;
+        trigger.u.rel_duration = icaldurationtype_from_int(- reminder->secondsBeforeStart());
+        e_cal_component_alarm_set_trigger(alarm, trigger);
 
         ECalComponentAlarmRepeat aRepeat;
         // TODO: check if this is really necessary

=== modified file 'tests/unittest/eds-base-test.cpp'
--- tests/unittest/eds-base-test.cpp	2015-03-24 17:56:44 +0000
+++ tests/unittest/eds-base-test.cpp	2015-04-09 17:24:00 +0000
@@ -27,6 +27,26 @@
 
 using namespace QtOrganizer;
 
+class GScopedPointerUnref
+{
+public:
+    static inline void cleanup(void *pointer)
+    {
+        if (pointer) {
+            g_clear_object(&pointer);
+        }
+    }
+};
+
+template<class KLASS>
+class GScopedPointer : public QScopedPointer<KLASS, GScopedPointerUnref>
+{
+public:
+    GScopedPointer(KLASS* obj = 0)
+        : QScopedPointer<KLASS, GScopedPointerUnref>(obj)
+    {}
+};
+
 EDSBaseTest::EDSBaseTest()
 {
     qRegisterMetaType<QList<QOrganizerCollectionId> >();
@@ -52,6 +72,47 @@
 {
 }
 
+QString EDSBaseTest::getEventFromEvolution(const QOrganizerItemId &id,
+                                           const QOrganizerCollectionId &collectionId)
+{
+    QString uid = id.toString().split("/").last();
+    GError *error = 0;
+    GScopedPointer<ESourceRegistry> sourceRegistry(e_source_registry_new_sync(0, &error));
+    if (error) {
+        qWarning() << "Fail to create source registry" << error->message;
+        g_error_free(error);
+        return QString();
+    }
+    GScopedPointer<ESource> calendar;
+    if (collectionId.isNull()) {
+        calendar.reset(e_source_registry_ref_default_calendar(sourceRegistry.data()));
+    } else {
+        calendar.reset(e_source_registry_ref_source(sourceRegistry.data(),
+                                                    collectionId.toString().toUtf8().data()));
+    }
+    GScopedPointer<EClient> client(e_cal_client_connect_sync(calendar.data(),
+                                                             E_CAL_CLIENT_SOURCE_TYPE_EVENTS,
+                                                             0,
+                                                             &error));
+    if (error) {
+        qWarning() << "Fail to connect to calendar" << error->message;
+        g_error_free(error);
+        return QString();
+    }
+
+    icalcomponent *obj = 0;
+    e_cal_client_get_object_sync(reinterpret_cast<ECalClient*>(client.data()),
+                                 uid.toUtf8().data(), 0, &obj, 0, &error);
+    if (error) {
+        qWarning() << "Fail to retrieve object:" << error->message;
+        g_error_free(error);
+    }
+
+    QString result = QString::fromUtf8(icalcomponent_as_ical_string(obj));
+    icalcomponent_free (obj);
+    return result;
+}
+
 QString EDSBaseTest::uniqueCollectionName() const
 {
     return QUuid::createUuid().toString();

=== modified file 'tests/unittest/eds-base-test.h'
--- tests/unittest/eds-base-test.h	2014-10-06 14:46:49 +0000
+++ tests/unittest/eds-base-test.h	2015-04-09 17:24:00 +0000
@@ -36,6 +36,9 @@
     virtual void init();
     virtual void cleanup();
 
+
+    QString getEventFromEvolution(const QtOrganizer::QOrganizerItemId &id,
+                                  const QtOrganizer::QOrganizerCollectionId &collectionId = QtOrganizer::QOrganizerCollectionId());
     QString uniqueCollectionName() const;
 };
 

=== modified file 'tests/unittest/event-test.cpp'
--- tests/unittest/event-test.cpp	2015-04-09 17:24:00 +0000
+++ tests/unittest/event-test.cpp	2015-04-09 17:24:00 +0000
@@ -47,7 +47,6 @@
     void initTestCase()
     {
         EDSBaseTest::init();
-        qDebug() << "INIT TEST CASE";
 
         m_engine = QOrganizerEDSEngine::createEDSEngine(QMap<QString, QString>());
 
@@ -61,8 +60,6 @@
         QVERIFY(saveResult);
         QCOMPARE(error, QtOrganizer::QOrganizerManager::NoError);
         QTRY_COMPARE(createdCollection.count(), 1);
-
-        qDebug() << "END TEST CASE";
     }
 
     void cleanupTestCase()
@@ -377,7 +374,6 @@
 
         QList<QOrganizerItemId> ids;
         ids << items[0].id();
-        qDebug() << "Check for item id:" << ids;
         items = m_engine->items(ids, hint, 0, 0);
         QCOMPARE(items.count(), 1);
         QOrganizerCollection collection = m_engine->defaultCollection(0);
@@ -819,10 +815,53 @@
         QCOMPARE(newAttendee.participationStatus(), attendee.participationStatus());
     }
 
+    // BUG: #1440878
+    void testReminderOnTime()
+    {
+        static QString displayLabelValue = QStringLiteral("event reminder");
+        static QString descriptionValue = QStringLiteral("event with reminder");
+
+        QOrganizerEvent event;
+        QOrganizerItemAudibleReminder aReminder;
+        event.setStartDateTime(QDateTime::currentDateTime());
+        event.setDisplayLabel(displayLabelValue);
+        event.setDescription(descriptionValue);
+        aReminder.setSecondsBeforeStart(0);
+        aReminder.setDataUrl(QString());
+        event.saveDetail(&aReminder);
+
+        QOrganizerEvent event2;
+        aReminder = QOrganizerItemAudibleReminder();
+        event2.setStartDateTime(QDateTime::currentDateTime().addDays(2));
+        event2.setDisplayLabel(displayLabelValue + "_2");
+        event2.setDescription(descriptionValue);
+        aReminder.setSecondsBeforeStart(60);
+        aReminder.setDataUrl(QString());
+        event2.saveDetail(&aReminder);
+
+        QtOrganizer::QOrganizerManager::Error error;
+        QMap<int, QtOrganizer::QOrganizerManager::Error> errorMap;
+        QList<QOrganizerItem> items;
+        QSignalSpy createdItem(m_engine, SIGNAL(itemsAdded(QList<QOrganizerItemId>)));
+        items << event << event2;
+        bool saveResult = m_engine->saveItems(&items,
+                                              QList<QtOrganizer::QOrganizerItemDetail::DetailType>(),
+                                              &errorMap,
+                                              &error);
+        QTRY_COMPARE(createdItem.count(), 1);
+        QVERIFY(saveResult);
+
+        QString vcard = getEventFromEvolution(items[0].id());
+        QVERIFY(vcard.contains("TRIGGER;VALUE=DURATION;RELATED=START:PT0S"));
+
+        vcard = getEventFromEvolution(items[1].id());
+        QVERIFY(vcard.contains("TRIGGER;VALUE=DURATION;RELATED=START:-PT1M"));
+    }
+
     void testExtendedProperties()
     {
-        static QString displayLabelValue = QStringLiteral("event with collection attendee");
-        static QString descriptionValue = QStringLiteral("event without collection");
+        static QString displayLabelValue = QStringLiteral("event with extended property");
+        static QString descriptionValue = QStringLiteral("event with extended property");
         QOrganizerItemId itemId;
         QDateTime currentTime = QDateTime::currentDateTime();
 

=== modified file 'tests/unittest/run-eds-test.sh'
--- tests/unittest/run-eds-test.sh	2015-04-09 17:24:00 +0000
+++ tests/unittest/run-eds-test.sh	2015-04-09 17:24:00 +0000
@@ -1,35 +1,51 @@
 #!/bin/sh
 
-#ARG1 - DBUS RUNNERN PATH
-#ARG2 - TEST EXECUTABLE FULL PATH
-#ARG3 - TEST NAME
-#ARG4 - EVOLUTION_CALENDAR_FACTORY FULL PATH
-#ARG5 - EVOLUTION_CALENDAR_FACTORY SERVICE NAME
-#ARG6 - EVOLUTION_SOURCE_REGISTRY FULL PATH
-
-
-export TEST_TMP_DIR=$(mktemp -d /tmp/$3_XXXX)
+echo ARG0=$0 # this script
+echo ARG1=$1 # full executable path of dbus-test-runner
+echo ARG2=$2 # full executable path of test app
+echo ARG3=$3 # test name
+echo ARG4=$4 # full executable path of evolution-calendar-factory
+echo ARG5=$5 # bus service name of calendar factory
+echo ARG6=$6 # full exectuable path of evolution-source-registry
+echo ARG7=$7 # full executable path of gvfs
+echo ARG8=$8 # config files
+
+# set up the tmpdir and tell the shell to purge it when we exit
+export TEST_TMP_DIR=$(mktemp -p "${TMPDIR:-/tmp}" -d $3-XXXXXXXXXX) || exit 1
+echo "running test '$3' in ${TEST_TMP_DIR}"
+
+# set up the environment variables
 export QT_QPA_PLATFORM=minimal
-export HOME=$TEST_TMP_DIR
-export XDG_RUNTIME_DIR=$TEST_TMP_DIR
-export XDG_CACHE_HOME=$TEST_TMP_DIR/.cache
-export XDG_CONFIG_HOME=$TEST_TMP_DIR/.config
-export XDG_DATA_HOME=$TEST_TMP_DIR/.local/share
-export XDG_DESKTOP_DIR=$TEST_TMP_DIR
-export XDG_DOCUMENTS_DIR=$TEST_TMP_DIR
-export XDG_DOWNLOAD_DIR=$TEST_TMP_DIR
-export XDG_MUSIC_DIR=$TEST_TMP_DIR
-export XDG_PICTURES_DIR=$TEST_TMP_DIR
-export XDG_PUBLICSHARE_DIR=$TEST_TMP_DIR
-export XDG_TEMPLATES_DIR=$TEST_TMP_DIR
-export XDG_VIDEOS_DIR=$TEST_TMP_DIR
+export HOME=${TEST_TMP_DIR}
+export XDG_RUNTIME_DIR=${TEST_TMP_DIR}
+export XDG_CACHE_HOME=${TEST_TMP_DIR}/.cache
+export XDG_CONFIG_HOME=${TEST_TMP_DIR}/.config
+export XDG_DATA_HOME=${TEST_TMP_DIR}/.local/share
+export XDG_DESKTOP_DIR=${TEST_TMP_DIR}
+export XDG_DOCUMENTS_DIR=${TEST_TMP_DIR}
+export XDG_DOWNLOAD_DIR=${TEST_TMP_DIR}
+export XDG_MUSIC_DIR=${TEST_TMP_DIR}
+export XDG_PICTURES_DIR=${TEST_TMP_DIR}
+export XDG_PUBLICSHARE_DIR=${TEST_TMP_DIR}
+export XDG_TEMPLATES_DIR=${TEST_TMP_DIR}
+export XDG_VIDEOS_DIR=${TEST_TMP_DIR}
 export QORGANIZER_EDS_DEBUG=On
-
-echo HOMEDIR=$HOME
-rm -rf $XDG_DATA_HOME
+export GIO_USE_VFS=local # needed to ensure GVFS shuts down cleanly after the test is over
+
+echo HOMEDIR=${HOME}
+rm -rf ${XDG_DATA_HOME}
+
+# run dbus-test-runner
 $1 --keep-env --max-wait=90 \
 --task $2 --task-name $3 --wait-until-complete --wait-for=org.gnome.evolution.dataserver.Calendar4 \
 --task $4 --task-name "evolution" --wait-until-complete -r
 #--task $6 --task-name "source-registry" --wait-for=org.gtk.vfs.Daemon -r \
 #--task $7 --task-name "gvfsd" -r
-return $?
+rv=$?
+
+# if the test passed, blow away the tmpdir
+if [ $rv -eq 0 ]; then
+    rm -rf $TEST_TMP_DIR
+fi
+
+return $rv