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

[Renato Araujo Oliveira Filho]

Make sure that recurrence-id contains the event timezone.

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

104. By Renato Araujo Oliveira Filho on 2016-05-06

Removed debug message.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

LGTM.

review: Approve

[Arthur Mello (artmello)]

lgtm

review: Approve

=== modified file 'organizer/qorganizer-eds-engine.cpp'
--- organizer/qorganizer-eds-engine.cpp	2016-04-20 23:47:22 +0000
+++ organizer/qorganizer-eds-engine.cpp	2016-05-06 14:32:01 +0000
@@ -2444,7 +2444,6 @@
                                   QOrganizerItem *item,
                                   QOrganizerEDSCollectionEngineId *edsCollectionId)
 {
-
     ECalComponentId *id = e_cal_component_get_id(comp);
     QOrganizerEDSEngineId *edsParentId = 0;
     QOrganizerEDSEngineId *edsId;
@@ -2738,11 +2737,17 @@
 
         if (!rId.isEmpty()) {
             ECalComponentRange recur_id;
-            struct icaltimetype tt = icaltime_from_string(rId.toUtf8().data());
+
+            // use component tz on recurrence id
+            ECalComponentDateTime dt;
+            e_cal_component_get_dtstart(comp, &dt);
+            dt.value = g_new(icaltimetype, 1);
+            *dt.value = icaltime_from_string(rId.toUtf8().data());
 
             recur_id.type = E_CAL_COMPONENT_RANGE_SINGLE;
-            recur_id.datetime.value = &tt;
+            recur_id.datetime = dt;
             e_cal_component_set_recurid(comp, &recur_id);
+            e_cal_component_free_datetime(&dt);
         }
     }
 }

=== modified file 'tests/unittest/eds-base-test.cpp'
--- tests/unittest/eds-base-test.cpp	2016-01-12 13:10:01 +0000
+++ tests/unittest/eds-base-test.cpp	2016-05-06 14:32:01 +0000
@@ -77,7 +77,6 @@
 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) {
@@ -90,7 +89,7 @@
         calendar.reset(e_source_registry_ref_default_calendar(sourceRegistry.data()));
     } else {
         calendar.reset(e_source_registry_ref_source(sourceRegistry.data(),
-                                                    collectionId.toString().toUtf8().data()));
+                                                    collectionId.toString().split(":").last().toUtf8().data()));
     }
     GScopedPointer<EClient> client(E_CAL_CLIENT_CONNECT_SYNC(calendar.data(),
                                                              E_CAL_CLIENT_SOURCE_TYPE_EVENTS,
@@ -103,8 +102,20 @@
     }
 
     icalcomponent *obj = 0;
+    QString uid = id.toString().split("/").last();
+    QString ruid;
+
+    // recurrence id
+    if (uid.contains("#")) {
+        QStringList ids = uid.split("#");
+        uid = ids[0];
+        ruid = ids[1];
+    }
+
     e_cal_client_get_object_sync(reinterpret_cast<ECalClient*>(client.data()),
-                                 uid.toUtf8().data(), 0, &obj, 0, &error);
+                                 uid.toUtf8().data(),
+                                 ruid.toUtf8().data(),
+                                 &obj, 0, &error);
     if (error) {
         qWarning() << "Fail to retrieve object:" << error->message;
         g_error_free(error);

=== modified file 'tests/unittest/recurrence-test.cpp'
--- tests/unittest/recurrence-test.cpp	2016-01-15 14:55:49 +0000
+++ tests/unittest/recurrence-test.cpp	2016-05-06 14:32:01 +0000
@@ -305,6 +305,78 @@
         QCOMPARE(items[0].displayLabel(), QStringLiteral("Updated item 2"));
     }
 
+    void testModifyReccurenceEventsWithTimeZone()
+    {
+        // Create event
+        static QString displayLabelValue = QStringLiteral("Daily modify test");
+        static QString descriptionValue = QStringLiteral("Daily modify description");
+
+        QOrganizerEvent ev;
+        ev.setCollectionId(m_collection.id());
+        ev.setStartDateTime(QDateTime(QDate(2013, 12, 2), QTime(0,0,0), QTimeZone("America/Recife")));
+        ev.setEndDateTime(QDateTime(QDate(2013, 12, 2), QTime(0,30,0), QTimeZone("America/Recife")));
+        ev.setDisplayLabel(displayLabelValue);
+        ev.setDescription(descriptionValue);
+
+        QOrganizerRecurrenceRule rule;
+        rule.setFrequency(QOrganizerRecurrenceRule::Daily);
+        rule.setLimit(QDate(2013, 12, 4));
+        ev.setRecurrenceRule(rule);
+
+        QSignalSpy itemsAdded(m_engine, SIGNAL(itemsAdded(QList<QOrganizerItemId>)));
+        QtOrganizer::QOrganizerManager::Error error;
+        QMap<int, QtOrganizer::QOrganizerManager::Error> errorMap;
+        QList<QOrganizerItem> items;
+        items << ev;
+        bool saveResult = m_engine->saveItems(&items,
+                                              QList<QtOrganizer::QOrganizerItemDetail::DetailType>(),
+                                              &errorMap,
+                                              &error);
+        QCOMPARE(saveResult, true);
+        QCOMPARE(errorMap.size(), 0);
+        QTRY_COMPARE(itemsAdded.count(), 1);
+
+        // query recent created item
+        QOrganizerItemCollectionFilter filter;
+        QOrganizerItemSortOrder sort;
+        QOrganizerItemFetchHint hint;
+        filter.setCollectionId(m_collection.id());
+        items = m_engine->items(filter,
+                                QDateTime(QDate(2013, 1, 1), QTime(0,0,0)),
+                                QDateTime(QDate(2015, 1, 1), QTime(0,0,0)),
+                                100,
+                                sort,
+                                hint,
+                                &error);
+        QCOMPARE(items.size(), 3);
+
+        // edit first item
+        QList<QOrganizerItem> updateItems;
+        QOrganizerItem updateItem = items[0];
+        QList<QtOrganizer::QOrganizerItemDetail::DetailType> mask;
+        updateItem.setDisplayLabel("Updated item 2");
+        updateItems << updateItem;
+
+        saveResult = m_engine->saveItems(&updateItems, mask, &errorMap, &error);
+        QCOMPARE(saveResult, true);
+        QCOMPARE(errorMap.size(), 0);
+        QCOMPARE(error, QOrganizerManager::NoError);
+
+        items = m_engine->items(filter,
+                                QDateTime(QDate(2013, 1, 1), QTime(0,0,0)),
+                                QDateTime(QDate(2015, 1, 1), QTime(0,0,0)),
+                                100,
+                                sort,
+                                hint,
+                                &error);
+
+        QCOMPARE(items.size(), 3);
+        QCOMPARE(items[0].displayLabel(), QStringLiteral("Updated item 2"));
+
+        QString vcard = getEventFromEvolution(items[0].id(), m_collection.id());
+        QVERIFY(vcard.contains("RECURRENCE-ID;TZID=/freeassociation.sourceforge.net/Tzfile/America/Recife:\r\n 20131202T000000\r\n"));
+    }
+
     void testQueryRecurrenceForAParentItem()
     {
          QOrganizerItem recurrenceEvent = createTestEvent();
@@ -527,17 +599,15 @@
 
         QCOMPARE(items.count(), 5);
 //FIXME
-#if 0
-        Q_FOREACH(const QOrganizerItem &i, items) {
-            QOrganizerEventOccurrence event = static_cast<QOrganizerEventOccurrence>(i);
-            qDebug() << i.displayLabel() << event.startDateTime().time() << i.description();
-            //if (event.startDateTime().date() <= changeItemDate) {
-            //    QCOMPARE(i.displayLabel(), newDisplayLabel);
-            //} else {
-            //    QCOMPARE(i.displayLabel(), item.displayLabel());
-            //}
-        }
-#endif
+//        Q_FOREACH(const QOrganizerItem &i, items) {
+//            QOrganizerEventOccurrence event = static_cast<QOrganizerEventOccurrence>(i);
+//            qDebug() << i.displayLabel() << event.startDateTime().time() << i.description();
+//            //if (event.startDateTime().date() <= changeItemDate) {
+//            //    QCOMPARE(i.displayLabel(), newDisplayLabel);
+//            //} else {
+//            //    QCOMPARE(i.displayLabel(), item.displayLabel());
+//            //}
+//        }
     }
 
     void testCreateWeeklyEventWithoutEndDate()