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

[Renato Araujo Oliveira Filho]

Use '0' as value for recurrence count if this is unset.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

LGTM.

The relevant EDS logic is in calendar/libecal/e-cal-recur.c; e.g. e_cal_recur_obtain_enddate()
which reasons that an event recurs forever if neither COUNT nor UNTIL are set.

So it makes sense for QOrganizerRecurrenceRule::NoLimit to be translated to
icalrecurrencetype.count==0 instead of
icalrecurrencetype.count==ICAL_RECURRENCE_ARRAY_MAX.

review: Approve

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

72. By Renato Araujo Oliveira Filho on 2015-02-27

Trunk merged.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

Assuming Charles' Approve is enough for top-approve too.

=== modified file 'organizer/qorganizer-eds-engine.cpp'
--- organizer/qorganizer-eds-engine.cpp	2014-11-21 13:32:42 +0000
+++ organizer/qorganizer-eds-engine.cpp	2015-02-27 19:40:58 +0000
@@ -2016,7 +2016,7 @@
                 break;
             case QOrganizerRecurrenceRule::NoLimit:
             default:
-                rule->count = ICAL_RECURRENCE_ARRAY_MAX;
+                rule->count = 0;
             }
 
             QSet<int> positions = qRule.positions();

=== modified file 'tests/unittest/recurrence-test.cpp'
--- tests/unittest/recurrence-test.cpp	2014-11-21 13:32:42 +0000
+++ tests/unittest/recurrence-test.cpp	2015-02-27 19:40:58 +0000
@@ -539,6 +539,99 @@
         }
 #endif
     }
+
+    void testCreateWeeklyEventWithoutEndDate()
+    {
+        static QString displayLabelValue = QStringLiteral("testCreateWeeklyEventWithoutEndDate test");
+        static QString descriptionValue = QStringLiteral("testCreateWeeklyEventWithoutEndDate description");
+
+        QOrganizerEvent ev;
+        ev.setCollectionId(m_collection.id());
+        ev.setStartDateTime(QDateTime(QDate(2014, 03, 1), QTime(0,0,0), QTimeZone("America/Recife")));
+        ev.setEndDateTime(QDateTime(QDate(2014, 03, 1), QTime(0,30,0), QTimeZone("America/Recife")));
+        ev.setDisplayLabel(displayLabelValue);
+        ev.setDescription(descriptionValue);
+
+        QOrganizerRecurrenceRule rule;
+        rule.setFrequency(QOrganizerRecurrenceRule::Weekly);
+        QSet<Qt::DayOfWeek> dasyOfWeek;
+        dasyOfWeek << Qt::Monday
+                   << Qt::Tuesday
+                   << Qt::Wednesday
+                   << Qt::Thursday
+                   << Qt::Friday;
+
+        rule.setDaysOfWeek(dasyOfWeek);
+        ev.setRecurrenceRule(rule);
+
+        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);
+        QVERIFY(saveResult);
+        QCOMPARE(error, QtOrganizer::QOrganizerManager::NoError);
+
+        QOrganizerItemId parentId = items[0].id();
+        // check if the parent was saved correct
+        items = m_engine->items(QList<QOrganizerItemId>() << parentId,
+                                QOrganizerItemFetchHint(),
+                                &errorMap, &error);
+        QCOMPARE(items.size(), 1);
+        QOrganizerEvent result = items[0];
+        QCOMPARE(result.collectionId(), ev.collectionId());
+        QCOMPARE(result.startDateTime(), ev.startDateTime());
+        QCOMPARE(result.endDateTime(), ev.endDateTime());
+
+        QCOMPARE(result.displayLabel(), ev.displayLabel());
+        QCOMPARE(result.description(), ev.description());
+
+        QOrganizerRecurrenceRule savedRule = result.recurrenceRule();
+        QCOMPARE(savedRule.frequency(), rule.frequency());
+        QCOMPARE(savedRule.daysOfWeek(), rule.daysOfWeek());
+        QCOMPARE(savedRule.limitType(), QOrganizerRecurrenceRule::NoLimit);
+        QCOMPARE(savedRule.limitDate().isValid(), false);
+        QCOMPARE(savedRule.limitCount(), -1);
+
+        // edit event
+        dasyOfWeek.remove(Qt::Monday);
+        rule.setDaysOfWeek(dasyOfWeek);
+        result.setRecurrenceRule(rule);
+
+        items.clear();
+        items << result;
+        saveResult = m_engine->saveItems(&items,
+                                         QList<QtOrganizer::QOrganizerItemDetail::DetailType>(),
+                                         &errorMap,
+                                         &error);
+        QVERIFY(saveResult);
+        QCOMPARE(error, QtOrganizer::QOrganizerManager::NoError);
+
+        // check if the item was updated
+        items = m_engine->items(QList<QOrganizerItemId>() << parentId,
+                                QOrganizerItemFetchHint(),
+                                &errorMap, &error);
+        QCOMPARE(items.size(), 1);
+        result = items[0];
+
+        QCOMPARE(result.collectionId(), ev.collectionId());
+        QCOMPARE(result.startDateTime(), ev.startDateTime());
+        QCOMPARE(result.endDateTime(), ev.endDateTime());
+
+        QCOMPARE(result.displayLabel(), ev.displayLabel());
+        QCOMPARE(result.description(), ev.description());
+
+        savedRule = result.recurrenceRule();
+        QCOMPARE(savedRule.frequency(), rule.frequency());
+        QCOMPARE(savedRule.daysOfWeek(), rule.daysOfWeek());
+        QVERIFY(!savedRule.daysOfWeek().contains(Qt::Monday));
+        QCOMPARE(savedRule.limitType(), QOrganizerRecurrenceRule::NoLimit);
+        QCOMPARE(savedRule.limitDate().isValid(), false);
+        QCOMPARE(savedRule.limitCount(), -1);
+    }
 };
 
 QTEST_MAIN(RecurrenceTest)