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

[Renato Araujo Oliveira Filho]

Fixed parse from icalrecurrencetype to QtOrganizer::QOrganizerRecurrenceRule for weekly recurrence.

Are there any related MPs required for this MP to build/function as expected? NO

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes): YES

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator? YES

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/qtorganizer5-eds) on device or emulator? YES

If you changed the UI, was the change specified/approved by design? NO UI CHANGE

If you changed the packaging (debian), did you subscribe a core-dev to this MP? NO PACKAGE CHANGE

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

I tested this. I can now set a recurring alarm for Sunday but can't enable it (: No alarms can be enabled anymore with this fix. Without it I can correctly enable alarms

review: Needs Fixing

[Bill Filler (bfiller)]

Actually, this MR is fine. The one that is causing the problem is https://code.launchpad.net/~renatofilho/qtorganizer5-eds/fix-1284375/+merge/208197

review: Approve

=== modified file 'qorganizer/qorganizer-eds-engine.cpp'
--- qorganizer/qorganizer-eds-engine.cpp	2014-02-28 23:36:54 +0000
+++ qorganizer/qorganizer-eds-engine.cpp	2014-03-06 21:32:32 +0000
@@ -1147,15 +1147,27 @@
 
 void QOrganizerEDSEngine::parseWeekRecurrence(struct icalrecurrencetype *rule, QtOrganizer::QOrganizerRecurrenceRule *qRule)
 {
+    static QMap<icalrecurrencetype_weekday, Qt::DayOfWeek>  daysOfWeekMap;
+    if (daysOfWeekMap.isEmpty()) {
+        daysOfWeekMap.insert(ICAL_MONDAY_WEEKDAY, Qt::Monday);
+        daysOfWeekMap.insert(ICAL_THURSDAY_WEEKDAY, Qt::Thursday);
+        daysOfWeekMap.insert(ICAL_WEDNESDAY_WEEKDAY, Qt::Wednesday);
+        daysOfWeekMap.insert(ICAL_TUESDAY_WEEKDAY, Qt::Tuesday);
+        daysOfWeekMap.insert(ICAL_FRIDAY_WEEKDAY, Qt::Friday);
+        daysOfWeekMap.insert(ICAL_SATURDAY_WEEKDAY, Qt::Saturday);
+        daysOfWeekMap.insert(ICAL_SUNDAY_WEEKDAY, Qt::Sunday);
+    }
+
     qRule->setFrequency(QOrganizerRecurrenceRule::Weekly);
 
     QSet<Qt::DayOfWeek> daysOfWeek;
-    for (int d=0; d < Qt::Sunday; d++) {
+    for (int d=0; d <= Qt::Sunday; d++) {
         short day = rule->by_day[d];
         if (day != ICAL_RECURRENCE_ARRAY_MAX) {
-            daysOfWeek.insert(static_cast<Qt::DayOfWeek>(icalrecurrencetype_day_day_of_week(rule->by_day[d]) - 1));
+            daysOfWeek.insert(daysOfWeekMap[icalrecurrencetype_day_day_of_week(rule->by_day[d])]);
         }
     }
+
     qRule->setDaysOfWeek(daysOfWeek);
 }
 
 
=== modified file 'tests/unittest/recurrence-test.cpp'
--- tests/unittest/recurrence-test.cpp	2014-02-28 15:04:24 +0000
+++ tests/unittest/recurrence-test.cpp	2014-03-06 21:32:32 +0000
@@ -308,6 +308,89 @@
              QCOMPARE(time.startDateTime(), expectedDates[i]);
          }
     }
+
+    void testCreateSunTueWedThuFriSatEvents()
+    {
+        static QString displayLabelValue = QStringLiteral("testCreateSunTueWedThuFriSatEvents test");
+        static QString descriptionValue = QStringLiteral("testCreateSunTueWedThuFriSatEvents description");
+
+        QOrganizerEvent ev;
+        ev.setCollectionId(m_collection.id());
+        ev.setStartDateTime(QDateTime(QDate(2014, 03, 1), QTime(0,0,0)));
+        ev.setEndDateTime(QDateTime(QDate(2014, 03, 1), QTime(0,30,0)));
+        ev.setDisplayLabel(displayLabelValue);
+        ev.setDescription(descriptionValue);
+
+        QOrganizerRecurrenceRule rule;
+        rule.setFrequency(QOrganizerRecurrenceRule::Weekly);
+        QSet<Qt::DayOfWeek> dasyOfWeek;
+        dasyOfWeek << Qt::Sunday
+                   << Qt::Tuesday
+                   << Qt::Wednesday
+                   << Qt::Thursday
+                   << Qt::Friday
+                   << Qt::Saturday;
+
+        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);
+
+        // append new item to be removed after the test
+        QOrganizerItemId parentId = items[0].id();
+        appendToRemove(parentId);
+
+        QOrganizerItemSortOrder sort;
+        QOrganizerItemFetchHint hint;
+        QOrganizerItemFilter filter;
+
+        // check if the parent was saved correct
+        items = m_engine->items(QList<QOrganizerItemId>() << parentId, hint, &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());
+
+        items = m_engine->items(filter,
+                                QDateTime(QDate(2014, 03, 1), QTime(0,0,0)),
+                                QDateTime(QDate(2014, 03, 8), QTime(24,0,0)),
+                                100,
+                                sort,
+                                hint,
+                                &error);
+
+        QList<QDateTime> expectedDates;
+        expectedDates << QDateTime(QDate(2014, 03, 1), QTime(0,0,0))
+                      << QDateTime(QDate(2014, 03, 2), QTime(0,0,0))
+                      << QDateTime(QDate(2014, 03, 4), QTime(0,0,0))
+                      << QDateTime(QDate(2014, 03, 5), QTime(0,0,0))
+                      << QDateTime(QDate(2014, 03, 6), QTime(0,0,0))
+                      << QDateTime(QDate(2014, 03, 7), QTime(0,0,0));
+
+        QCOMPARE(items.count(), expectedDates.size());
+        for(int i=0, iMax=expectedDates.size(); i < iMax; i++) {
+            QOrganizerItemParent itemParent = items[i].detail(QOrganizerItemDetail::TypeParent);
+            QOrganizerEventTime time = items[i].detail(QOrganizerItemDetail::TypeEventTime);
+            QCOMPARE(itemParent.parentId(), parentId);
+            QCOMPARE(time.startDateTime(), expectedDates[i]);
+        }
+    }
 };
 
 const QString RecurrenceTest::defaultCollectionName = QStringLiteral("TEST_RECURRENCE_EVENT_COLLECTION");