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

[Renato Araujo Oliveira Filho]

Implemented remove item by id;

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:25
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/65/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-amd64-ci/52/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-armhf-ci/52/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-i386-ci/52/console

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

review: Needs Fixing (continuous-integration)

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

26. By Renato Araujo Oliveira Filho on 2014-01-04

Added missing files.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:26
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/67/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-amd64-ci/54/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-armhf-ci/54/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-i386-ci/54/console

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

review: Needs Fixing (continuous-integration)

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

27. By Renato Araujo Oliveira Filho on 2014-01-04

Make sure that the item remove signal is fired.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:27
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/68/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-amd64-ci/55/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-armhf-ci/55/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-trusty-i386-ci/55/console

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

review: Needs Fixing (continuous-integration)

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

28. By Renato Araujo Oliveira Filho on 2014-01-05

Used Qstring to represet collectionId.
The function QOrganizerCollectionId::fromString does not work if the plugin is not installed.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

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

29. By Renato Araujo Oliveira Filho on 2014-01-05

Emit the itemRemoved signal only once.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

=== modified file 'qorganizer/CMakeLists.txt'
--- qorganizer/CMakeLists.txt	2013-12-03 18:45:04 +0000
+++ qorganizer/CMakeLists.txt	2014-01-05 21:25:57 +0000
@@ -11,6 +11,7 @@
     qorganizer-eds-engineid.cpp
     qorganizer-eds-removecollectionrequestdata.cpp
     qorganizer-eds-removerequestdata.cpp
+    qorganizer-eds-removebyidrequestdata.cpp
     qorganizer-eds-requestdata.cpp
     qorganizer-eds-savecollectionrequestdata.cpp
     qorganizer-eds-saverequestdata.cpp
@@ -27,6 +28,7 @@
     qorganizer-eds-engineid.h
     qorganizer-eds-removecollectionrequestdata.h
     qorganizer-eds-removerequestdata.h
+    qorganizer-eds-removebyidrequestdata.h
     qorganizer-eds-requestdata.h
     qorganizer-eds-savecollectionrequestdata.h
     qorganizer-eds-saverequestdata.h

=== modified file 'qorganizer/qorganizer-eds-engine.cpp'
--- qorganizer/qorganizer-eds-engine.cpp	2013-12-11 15:23:52 +0000
+++ qorganizer/qorganizer-eds-engine.cpp	2014-01-05 21:25:57 +0000
@@ -24,6 +24,7 @@
 #include "qorganizer-eds-fetchbyidrequestdata.h"
 #include "qorganizer-eds-saverequestdata.h"
 #include "qorganizer-eds-removerequestdata.h"
+#include "qorganizer-eds-removebyidrequestdata.h"
 #include "qorganizer-eds-savecollectionrequestdata.h"
 #include "qorganizer-eds-removecollectionrequestdata.h"
 #include "qorganizer-eds-viewwatcher.h"
@@ -43,6 +44,7 @@
 #include <QtOrganizer/QOrganizerItemFetchByIdRequest>
 #include <QtOrganizer/QOrganizerItemSaveRequest>
 #include <QtOrganizer/QOrganizerItemRemoveRequest>
+#include <QtOrganizer/QOrganizerItemRemoveByIdRequest>
 #include <QtOrganizer/QOrganizerCollectionFetchRequest>
 #include <QtOrganizer/QOrganizerCollectionSaveRequest>
 #include <QtOrganizer/QOrganizerCollectionRemoveRequest>
@@ -457,7 +459,9 @@
             QOrganizerItem &item = items[i];
             const gchar *uid = static_cast<const gchar*>(g_slist_nth_data(uids, i));
 
-            item.setCollectionId(QOrganizerCollectionId::fromString(data->currentCollection()));
+            QOrganizerEDSCollectionEngineId *edsCollectionId = new QOrganizerEDSCollectionEngineId(data->currentCollection());
+            item.setCollectionId(QOrganizerCollectionId(edsCollectionId));
+
             QOrganizerEDSEngineId *eid = new QOrganizerEDSEngineId(data->currentCollection(),
                                                                    QString::fromUtf8(uid));
             item.setId(QOrganizerItemId(eid));
@@ -497,6 +501,44 @@
     return true;
 }
 
+void QOrganizerEDSEngine::removeItemsByIdAsync(QOrganizerItemRemoveByIdRequest *req)
+{
+    qDebug() << Q_FUNC_INFO;
+    if (req->itemIds().count() == 0) {
+        QOrganizerManagerEngine::updateItemRemoveByIdRequest(req,
+                                                             QOrganizerManager::NoError,
+                                                             QMap<int, QOrganizerManager::Error>(),
+                                                             QOrganizerAbstractRequest::FinishedState);
+        return;
+    }
+
+    RemoveByIdRequestData *data = new RemoveByIdRequestData(this, req);
+    removeItemsByIdAsyncStart(data);
+}
+
+void QOrganizerEDSEngine::removeItemsByIdAsyncStart(RemoveByIdRequestData *data)
+{
+    qDebug() << Q_FUNC_INFO;
+    QString collectionId = data->next();
+    for(; !collectionId.isNull(); collectionId = data->next()) {
+        EClient *client = data->parent()->d->m_sourceRegistry->client(collectionId);
+        data->setClient(client);
+        g_object_unref(client);
+        GSList *ids = data->compIds();
+        GError *gError = 0;
+        e_cal_client_remove_objects_sync(data->client(), ids, E_CAL_OBJ_MOD_ALL, 0, 0);
+        QCoreApplication::processEvents();
+        if (gError) {
+            qWarning() << "Fail to remove Items" << gError->message;
+            g_error_free(gError);
+            gError = 0;
+        }
+        data->commit();
+    }
+    data->finish();
+    delete data;
+}
+
 void QOrganizerEDSEngine::removeItemsAsync(QOrganizerItemRemoveRequest *req)
 {
     qDebug() << Q_FUNC_INFO;
@@ -746,6 +788,9 @@
         case QOrganizerAbstractRequest::ItemRemoveRequest:
             removeItemsAsync(qobject_cast<QOrganizerItemRemoveRequest*>(req));
             break;
+        case QOrganizerAbstractRequest::ItemRemoveByIdRequest:
+            removeItemsByIdAsync(qobject_cast<QOrganizerItemRemoveByIdRequest*>(req));
+            break;
         case QOrganizerAbstractRequest::CollectionSaveRequest:
             saveCollectionAsync(qobject_cast<QOrganizerCollectionSaveRequest*>(req));
             break;
@@ -2019,5 +2064,3 @@
 
     return comps;
 }
-
-

=== modified file 'qorganizer/qorganizer-eds-engine.h'
--- qorganizer/qorganizer-eds-engine.h	2013-12-06 16:24:23 +0000
+++ qorganizer/qorganizer-eds-engine.h	2014-01-05 21:25:57 +0000
@@ -40,6 +40,7 @@
 class FetchByIdRequestData;
 class SaveRequestData;
 class RemoveRequestData;
+class RemoveByIdRequestData;
 class SaveCollectionRequestData;
 class RemoveCollectionRequestData;
 class ViewWatcher;
@@ -207,6 +208,9 @@
     static void saveItemsAsyncCreated(GObject *source_object, GAsyncResult *res, SaveRequestData *data);
     static void saveItemsAsyncModified(GObject *source_object, GAsyncResult *res, SaveRequestData *data);
 
+    void removeItemsByIdAsync(QtOrganizer::QOrganizerItemRemoveByIdRequest *req);
+    static void removeItemsByIdAsyncStart(RemoveByIdRequestData *data);
+
     void removeItemsAsync(QtOrganizer::QOrganizerItemRemoveRequest *req);
     static void removeItemsAsyncStart(RemoveRequestData *data);
 

=== modified file 'qorganizer/qorganizer-eds-enginedata.h'
--- qorganizer/qorganizer-eds-enginedata.h	2013-12-01 17:29:50 +0000
+++ qorganizer/qorganizer-eds-enginedata.h	2014-01-05 21:25:57 +0000
@@ -41,8 +41,9 @@
     template<class K>
     void emitSharedSignals(K* cs)
     {
-        Q_FOREACH(QtOrganizer::QOrganizerManagerEngine* engine, m_sharedEngines)
+        Q_FOREACH(QtOrganizer::QOrganizerManagerEngine* engine, m_sharedEngines) {
             cs->emitSignals(engine);
+        }
     }
 
     ViewWatcher* watch(const QString &collectionId);

=== added file 'qorganizer/qorganizer-eds-removebyidrequestdata.cpp'
--- qorganizer/qorganizer-eds-removebyidrequestdata.cpp	1970-01-01 00:00:00 +0000
+++ qorganizer/qorganizer-eds-removebyidrequestdata.cpp	2014-01-05 21:25:57 +0000
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This file is part of ubuntu-pim-service.
+ *
+ * contact-service-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * contact-service-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "qorganizer-eds-removebyidrequestdata.h"
+#include "qorganizer-eds-engineid.h"
+#include "qorganizer-eds-enginedata.h"
+
+#include <QtOrganizer/QOrganizerManagerEngine>
+#include <QtOrganizer/QOrganizerItemRemoveByIdRequest>
+
+using namespace QtOrganizer;
+
+RemoveByIdRequestData::RemoveByIdRequestData(QOrganizerEDSEngine *engine, QtOrganizer::QOrganizerAbstractRequest *req)
+    : RequestData(engine, req),
+      m_sessionStaterd(0),
+      m_currentCompIds(0)
+{
+    Q_FOREACH(const QOrganizerItemId &id, request<QOrganizerItemRemoveByIdRequest>()->itemIds()) {
+        QString strId = id.toString();
+        QString collectionId;
+        if (strId.contains("/")) {
+            collectionId = strId.split("/").first();
+            QSet<QOrganizerItemId> ids = m_pending.value(collectionId);
+            ids << id;
+            m_pending.insert(collectionId, ids);
+        }
+    }
+}
+
+RemoveByIdRequestData::~RemoveByIdRequestData()
+{
+}
+
+void RemoveByIdRequestData::finish(QtOrganizer::QOrganizerManager::Error error)
+{
+    QOrganizerManagerEngine::updateItemRemoveByIdRequest(request<QOrganizerItemRemoveByIdRequest>(),
+                                                         error,
+                                                         QMap<int, QOrganizerManager::Error>(),
+                                                         QOrganizerAbstractRequest::FinishedState);
+    //The signal will be fired by the view watcher. Check ViewWatcher::onObjectsRemoved
+    //emitChangeset(&m_changeSet);
+}
+
+GSList *RemoveByIdRequestData::compIds() const
+{
+    return m_currentCompIds;
+}
+
+void RemoveByIdRequestData::commit()
+{
+    Q_ASSERT(m_sessionStaterd);
+    QOrganizerManagerEngine::updateItemRemoveByIdRequest(request<QOrganizerItemRemoveByIdRequest>(),
+                                                         QtOrganizer::QOrganizerManager::NoError,
+                                                         QMap<int, QOrganizerManager::Error>(),
+                                                         QOrganizerAbstractRequest::ActiveState);
+    reset();
+}
+
+GSList *RemoveByIdRequestData::parseIds(QSet<QOrganizerItemId> iids)
+{
+    GSList *ids = 0;
+    Q_FOREACH(const QOrganizerItemId &iid, iids) {
+        ECalComponentId *id = g_new0(ECalComponentId, 1);
+        id->uid = g_strdup(QOrganizerEDSEngineId::toComponentId(iid).toUtf8().data());
+        id->rid = NULL;
+        ids = g_slist_append(ids, id);
+    }
+
+    return ids;
+}
+
+QString RemoveByIdRequestData::next()
+{
+    Q_ASSERT(!m_sessionStaterd);
+
+    if (m_pending.count() > 0) {
+        m_sessionStaterd = true;
+        m_currentCollectionId = m_pending.keys().first();
+        m_currentIds = m_pending[m_currentCollectionId];
+        m_currentCompIds = parseIds(m_currentIds);
+        m_pending.remove(m_currentCollectionId);
+        return m_currentCollectionId;
+    }
+    return QString(QString::null);
+}
+
+
+void RemoveByIdRequestData::reset()
+{
+    m_currentIds.clear();
+    m_currentCollectionId = QString(QString::null);
+    if (m_currentCompIds) {
+        g_slist_free_full(m_currentCompIds, (GDestroyNotify)e_cal_component_free_id);
+        m_currentCompIds = 0;
+    }
+    m_sessionStaterd = false;
+}
+
+void RemoveByIdRequestData::cancel()
+{
+    Q_ASSERT(m_sessionStaterd);
+    RequestData::cancel();
+    clear();
+}
+
+void RemoveByIdRequestData::clear()
+{
+    reset();
+    m_pending.clear();
+    setClient(0);
+}
+
+QString RemoveByIdRequestData::collectionId() const
+{
+    return m_currentCollectionId;
+}

=== added file 'qorganizer/qorganizer-eds-removebyidrequestdata.h'
--- qorganizer/qorganizer-eds-removebyidrequestdata.h	1970-01-01 00:00:00 +0000
+++ qorganizer/qorganizer-eds-removebyidrequestdata.h	2014-01-05 21:25:57 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This file is part of ubuntu-pim-service.
+ *
+ * contact-service-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * contact-service-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __QORGANIZER_EDS_REMOVEBYIDQUESTDATA_H__
+#define __QORGANIZER_EDS_REMOVEBYIDQUESTDATA_H__
+
+#include "qorganizer-eds-requestdata.h"
+
+#include <glib.h>
+
+class RemoveByIdRequestData : public RequestData
+{
+public:
+    RemoveByIdRequestData(QOrganizerEDSEngine *engine, QtOrganizer::QOrganizerAbstractRequest *req);
+    ~RemoveByIdRequestData();
+
+    QString collectionId() const;
+
+    void finish(QtOrganizer::QOrganizerManager::Error error = QtOrganizer::QOrganizerManager::NoError);
+
+    GSList *compIds() const;
+
+    QString next();
+    void commit();
+    virtual void cancel();
+
+private:
+    QHash<QString, QSet<QtOrganizer::QOrganizerItemId> > m_pending;
+    QSet<QtOrganizer::QOrganizerItemId> m_currentIds;
+    QString m_currentCollectionId;
+
+    bool m_sessionStaterd;
+    GSList *m_currentCompIds;
+
+    void reset();
+    void clear();
+    GSList *parseIds(QSet<QtOrganizer::QOrganizerItemId> iids);
+};
+
+#endif

=== modified file 'qorganizer/qorganizer-eds-removerequestdata.cpp'
--- qorganizer/qorganizer-eds-removerequestdata.cpp	2013-12-11 13:16:50 +0000
+++ qorganizer/qorganizer-eds-removerequestdata.cpp	2014-01-05 21:25:57 +0000
@@ -74,7 +74,8 @@
                                                      QMap<int, QOrganizerManager::Error>(),
                                                      QOrganizerAbstractRequest::FinishedState);
 
-    emitChangeset(&m_changeSet);
+    //The signal will be fired by the view watcher. Check ViewWatcher::onObjectsRemoved
+    //emitChangeset(&m_changeSet);
 }
 
 GSList *RemoveRequestData::compIds() const
@@ -89,10 +90,7 @@
                                                      QtOrganizer::QOrganizerManager::NoError,
                                                      QMap<int, QOrganizerManager::Error>(),
                                                      QOrganizerAbstractRequest::ActiveState);
-
-    m_changeSet.insertRemovedItems(m_currentIds);
-    m_currentCollectionId = QOrganizerCollectionId();
-    clear();
+    reset();
 }
 
 QOrganizerCollectionId RemoveRequestData::next()
@@ -116,12 +114,11 @@
     clear();
 }
 
-void RemoveRequestData::clear()
+void RemoveRequestData::reset()
 {
-    m_changeSet.clearAll();
+    m_currentCollectionId = QOrganizerCollectionId();
     m_currentIds.clear();
 
-    setClient(0);
     if (m_currentCompIds) {
         g_slist_free_full(m_currentCompIds, (GDestroyNotify)e_cal_component_free_id);
         m_currentCompIds = 0;
@@ -129,6 +126,12 @@
     m_sessionStaterd = false;
 }
 
+void RemoveRequestData::clear()
+{
+    reset();
+    setClient(0);
+}
+
 QOrganizerCollectionId RemoveRequestData::collectionId() const
 {
     return m_currentCollectionId;

=== modified file 'qorganizer/qorganizer-eds-removerequestdata.h'
--- qorganizer/qorganizer-eds-removerequestdata.h	2013-12-01 21:48:44 +0000
+++ qorganizer/qorganizer-eds-removerequestdata.h	2014-01-05 21:25:57 +0000
@@ -50,6 +50,7 @@
     QtOrganizer::QOrganizerCollectionId m_currentCollectionId;
 
     void clear();
+    void reset();
     GSList* takeItemsIds(QtOrganizer::QOrganizerCollectionId collectionId);
 };
 

=== modified file 'tests/unittest/event-test.cpp'
--- tests/unittest/event-test.cpp	2013-12-11 13:16:50 +0000
+++ tests/unittest/event-test.cpp	2014-01-05 21:25:57 +0000
@@ -37,17 +37,22 @@
     static const QString defaultTaskCollectionName;
     static const QString collectionTypePropertyName;
     static const QString taskListTypeName;
+    static int signalIndex;
 
     QDateTime m_itemRemovedTime;
     QDateTime m_requestFinishedTime;
     QOrganizerEDSEngine *m_engine;
     QOrganizerCollection m_collection;
 
+
 private Q_SLOTS:
     void init()
     {
         EDSBaseTest::init(0);
 
+        signalIndex = 0;
+        m_itemRemovedTime = QDateTime();
+        m_requestFinishedTime = QDateTime();
         m_engine = QOrganizerEDSEngine::createEDSEngine(QMap<QString, QString>());
 
         QtOrganizer::QOrganizerManager::Error error;
@@ -69,12 +74,16 @@
     void itemRemoved()
     {
         m_itemRemovedTime = QDateTime::currentDateTime();
+        // avoid both signals to be fired at the same time
+        QTest::qSleep(100);
     }
 
     void requestFinished(QOrganizerAbstractRequest::State state)
     {
         if (state == QOrganizerAbstractRequest::FinishedState) {
-            m_requestFinishedTime  = QDateTime::currentDateTime();
+            m_requestFinishedTime = QDateTime::currentDateTime();
+            // avoid both signals to be fired at the same time
+            QTest::qSleep(100);
         }
     }
 
@@ -177,15 +186,13 @@
                                             &error);
         QVERIFY(saveResult);
         QCOMPARE(error, QOrganizerManager::NoError);
+        QCOMPARE(items.size(), 1);
         QVERIFY(errorMap.isEmpty());
         QVERIFY(!items[0].id().isNull());
 
         // append new item to be removed after the test
         appendToRemove(items[0].id());
 
-        m_itemRemovedTime = QDateTime();
-        m_requestFinishedTime = QDateTime();
-
         QOrganizerItemRemoveRequest req;
         connect(&req, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)),
                 this, SLOT(requestFinished(QOrganizerAbstractRequest::State)));
@@ -197,9 +204,71 @@
         m_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);
+        QTRY_VERIFY(m_requestFinishedTime.isValid());
+        QTRY_VERIFY(m_itemRemovedTime.isValid());
+        QVERIFY(m_itemRemovedTime > m_requestFinishedTime);
+    }
+
+    void testRemoveItemById()
+    {
+        static QString displayLabelValue = QStringLiteral("event to be removed");
+        static QString descriptionValue = QStringLiteral("removable event");
+
+        QOrganizerTodo todo;
+        todo.setCollectionId(m_collection.id());
+        todo.setStartDateTime(QDateTime(QDate(2013, 9, 3), QTime(0,30,0)));
+        todo.setDisplayLabel(displayLabelValue);
+        todo.setDescription(descriptionValue);
+
+        QtOrganizer::QOrganizerManager::Error error;
+        QMap<int, QtOrganizer::QOrganizerManager::Error> errorMap;
+        QList<QOrganizerItem> items;
+        items << todo;
+        bool saveResult = m_engine->saveItems(&items,
+                                            QList<QtOrganizer::QOrganizerItemDetail::DetailType>(),
+                                            &errorMap,
+                                            &error);
+        QVERIFY(saveResult);
+        QCOMPARE(error, QOrganizerManager::NoError);
+        QVERIFY(errorMap.isEmpty());
+        QOrganizerItemId id = items[0].id();
+        QVERIFY(!id.isNull());
+
+        // append new item to be removed after the test
+        appendToRemove(id);
+
+        QOrganizerItemRemoveByIdRequest req;
+
+        connect(&req, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)),
+                this, SLOT(requestFinished(QOrganizerAbstractRequest::State)));
+        connect(m_engine, SIGNAL(itemsRemoved(QList<QOrganizerItemId>)),
+                this, SLOT(itemRemoved()));
+        req.setItemId(id);
+
+        m_engine->startRequest(&req);
+        m_engine->waitForRequestFinished(&req, -1);
+
+        // check if the signal item removed was fired after the request finish
+        QTRY_VERIFY(m_requestFinishedTime.isValid());
+        QTRY_VERIFY(m_itemRemovedTime.isValid());
+        QVERIFY(m_itemRemovedTime > m_requestFinishedTime);
+
+        // check if item was removed
+        QOrganizerItemSortOrder sort;
+        QOrganizerItemFetchHint hint;
+        QOrganizerItemIdFilter filter;
+
+        QList<QOrganizerItemId> ids;
+        ids << id;
+        filter.setIds(ids);
+        items = m_engine->items(filter,
+                      QDateTime(),
+                      QDateTime(),
+                      10,
+                      sort,
+                      hint,
+                      &error);
+        QCOMPARE(items.count(), 0);
     }
 
     void testCreateMultipleItemsWithSameCollection()
@@ -325,7 +394,7 @@
 const QString EventTest::defaultTaskCollectionName = QStringLiteral("TEST_EVENT_COLLECTION TASK LIST");
 const QString EventTest::collectionTypePropertyName = QStringLiteral("collection-type");
 const QString EventTest::taskListTypeName = QStringLiteral("Task List");
-
+int EventTest::signalIndex = 0;
 
 QTEST_MAIN(EventTest)