Merge lp:~renatofilho/qtorganizer5-eds/fix-signal-order into lp:~ubuntu-sdk-team/qtorganizer5-eds/trunk

[Renato Araujo Oliveira Filho]

Avoid emit signal item removed before query finish.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~renatofilho/qtorganizer5-eds/fix-signal-order]

14. By Renato Araujo Oliveira Filho on 2013-09-16

Removed use of extra variable to store the removed ids.

15. By Renato Araujo Oliveira Filho on 2013-09-16

Created unit test for check the order that the signal is fired.

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'qorganizer/qorganizer-eds-removerequestdata.cpp'
--- qorganizer/qorganizer-eds-removerequestdata.cpp	2013-09-04 01:33:06 +0000
+++ qorganizer/qorganizer-eds-removerequestdata.cpp	2013-09-16 18:53:18 +0000
@@ -72,6 +72,7 @@
                                                      QMap<int, QOrganizerManager::Error>(),
                                                      QOrganizerAbstractRequest::FinishedState);
 
+    m_changeSet.emitSignals(m_parent);
 }
 
 GSList *RemoveRequestData::compIds() const
@@ -88,7 +89,6 @@
                                                      QOrganizerAbstractRequest::ActiveState);
 
     m_changeSet.insertRemovedItems(m_currentIds);
-    m_changeSet.emitSignals(m_parent);
     m_currentCollectionId = QOrganizerCollectionId();
     clear();
 }

=== modified file 'qorganizer/qorganizer-eds-saverequestdata.cpp'
--- qorganizer/qorganizer-eds-saverequestdata.cpp	2013-08-14 21:23:01 +0000
+++ qorganizer/qorganizer-eds-saverequestdata.cpp	2013-09-16 18:53:18 +0000
@@ -38,14 +38,12 @@
 
 void SaveRequestData::finish(QtOrganizer::QOrganizerManager::Error error)
 {
-
     QOrganizerManagerEngine::updateItemSaveRequest(request<QOrganizerItemSaveRequest>(),
                                                    m_result,
                                                    error,
                                                    QMap<int, QOrganizerManager::Error>(),
                                                    QOrganizerAbstractRequest::FinishedState);
     Q_FOREACH(QOrganizerItem item, m_result) {
-        qDebug() << "Item Added" << item.id();
         m_changeSet.insertAddedItem(item.id());
     }
     m_changeSet.emitSignals(m_parent);

=== modified file 'tests/unittest/event-test.cpp'
--- tests/unittest/event-test.cpp	2013-09-07 23:37:27 +0000
+++ tests/unittest/event-test.cpp	2013-09-16 18:53:18 +0000
@@ -37,8 +37,25 @@
     static const QString collectionTypePropertyName;
     static const QString taskListTypeName;
 
+    QDateTime m_itemRemovedTime;
+    QDateTime m_requestFinishedTime;
+
 private Q_SLOTS:
-    void testCreateEventWithReminder()
+    //helper
+    void itemRemoved()
+    {
+        m_itemRemovedTime = QDateTime::currentDateTime();
+    }
+
+    void requestFinished(QOrganizerAbstractRequest::State state)
+    {
+        if (state == QOrganizerAbstractRequest::FinishedState) {
+            m_requestFinishedTime  = QDateTime::currentDateTime();
+        }
+    }
+
+    // test functions
+    void xtestCreateEventWithReminder()
     {
         static QString displayLabelValue = QStringLiteral("Todo test");
         static QString descriptionValue = QStringLiteral("Todo description");
@@ -125,6 +142,57 @@
         QCOMPARE(vReminder2.dataUrl(), vReminder.dataUrl());
         QCOMPARE(vReminder2.message(), vReminder.message());
     }
+
+    void testRemoveEvent()
+    {
+        static QString displayLabelValue = QStringLiteral("event to be removed");
+        static QString descriptionValue = QStringLiteral("removable event");
+
+        QOrganizerEDSEngine *engine = QOrganizerEDSEngine::createEDSEngine(QMap<QString, QString>());
+
+        QOrganizerCollection collection;
+        QtOrganizer::QOrganizerManager::Error error;
+        collection.setMetaData(QOrganizerCollection::KeyName, defaultTaskCollectionName + "_TODELETE");
+        collection.setExtendedMetaData(collectionTypePropertyName, taskListTypeName);
+        QVERIFY(engine->saveCollection(&collection, &error));
+
+        QOrganizerTodo todo;
+        todo.setCollectionId(collection.id());
+        todo.setStartDateTime(QDateTime(QDate(2013, 9, 3), QTime(0,30,0)));
+        todo.setDisplayLabel(displayLabelValue);
+        todo.setDescription(descriptionValue);
+
+        QMap<int, QtOrganizer::QOrganizerManager::Error> errorMap;
+        QList<QOrganizerItem> items;
+        items << todo;
+        bool saveResult = engine->saveItems(&items,
+                                            QList<QtOrganizer::QOrganizerItemDetail::DetailType>(),
+                                            &errorMap,
+                                            &error);
+        QVERIFY(saveResult);
+        QCOMPARE(error, QOrganizerManager::NoError);
+        QVERIFY(errorMap.isEmpty());
+        QVERIFY(!items[0].id().isNull());
+
+        QTest::qSleep(1000);
+
+        m_itemRemovedTime = QDateTime();
+        m_requestFinishedTime = QDateTime();
+
+        QOrganizerItemRemoveRequest req;
+        connect(&req, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)),
+                this, SLOT(requestFinished(QOrganizerAbstractRequest::State)));
+        connect(engine, SIGNAL(itemsRemoved(QList<QOrganizerItemId>)),
+                this, SLOT(itemRemoved()));
+        req.setItem(items[0]);
+        engine->startRequest(&req);
+        engine->waitForRequestFinished(&req, -1);
+
+        // check if the signal item removed was fired after the request finish
+        QVERIFY(!m_itemRemovedTime.isValid());
+        QVERIFY(m_requestFinishedTime.isValid());
+        QVERIFY(m_requestFinishedTime > m_itemRemovedTime);
+    }
 };
 
 const QString EventTest::defaultCollectionName = QStringLiteral("TEST_EVENT_COLLECTION");