Merge lp:~renatofilho/qtorganizer5-eds/fix-engine-crash into lp:qtorganizer5-eds

[Renato Araujo Oliveira Filho]

Only destroy request data in the requestDestroyed function.
Return the items in the requested order.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~renatofilho/qtorganizer5-eds/fix-engine-crash]

61. By Renato Araujo Oliveira Filho on 2014-05-21

Fixed collection update signal.
Avoid delete request while wait to finish.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/qtorganizer5-eds/fix-engine-crash]

62. By Renato Araujo Oliveira Filho <renato@ubuntu> on 2014-05-21

Try t fix faling test.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:62
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/145/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-utopic-amd64-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-utopic-armhf-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-utopic-i386-ci/3/console

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/qtorganizer5-eds/fix-engine-crash]

63. By Renato Araujo Oliveira Filho on 2014-05-22

Reduce the wait time during the test cleanup.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~renatofilho/qtorganizer5-eds/fix-engine-crash]

64. By Renato Araujo Oliveira Filho on 2014-05-24

WIP

65. By Renato Araujo Oliveira Filho <renato@ubuntu> on 2014-05-24

Make EDS tests more reliable.

66. By Renato Araujo Oliveira Filho on 2014-05-24

Test cancel operation.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:66
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/147/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-utopic-amd64-ci/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-utopic-armhf-ci/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-utopic-i386-ci/5/console

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/qtorganizer5-eds/fix-engine-crash]

67. By Renato Araujo Oliveira Filho on 2014-05-25

Added missing file.

68. By Renato Araujo Oliveira Filho on 2014-05-25

Removed unused functions.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/qtorganizer5-eds/fix-engine-crash]

69. By Renato Araujo Oliveira Filho on 2014-05-26

Fixed organizer plugin load during tests.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~renatofilho/qtorganizer5-eds/fix-engine-crash]

70. By Renato Araujo Oliveira Filho on 2014-05-27

Added test for select and unselect a collection.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:70
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/150/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-utopic-amd64-ci/8
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-utopic-armhf-ci/8/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-utopic-i386-ci/8

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~renatofilho/qtorganizer5-eds/fix-engine-crash]

71. By Renato Araujo Oliveira Filho on 2014-06-05

Removed commented code.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~renatofilho/qtorganizer5-eds/fix-engine-crash]

72. By Renato Araujo Oliveira Filho on 2014-06-10

Return the item in the the correct sort order.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-12-05 15:30:17 +0000
+++ CMakeLists.txt	2014-06-10 18:21:21 +0000
@@ -70,7 +70,7 @@
     set(EVOLUTION_SOURCE_SERVICE_NAME "org.gnome.evolution.dataserver.Sources2")
 endif()
 
-add_subdirectory(qorganizer)
+add_subdirectory(organizer)
 if(DBUS_RUNNER)
     if(EVOLUTION_CALENDAR_FACTORY)
         enable_testing()

=== modified file 'buildOnDevice.sh'
--- buildOnDevice.sh	2014-04-19 13:41:01 +0000
+++ buildOnDevice.sh	2014-06-10 18:21:21 +0000
@@ -72,9 +72,9 @@
     # same options as in debian/rules
     #QMAKE_OPTIONS="-recursive MALIIT_DEFAULT_PROFILE=ubuntu CONFIG+=\\\"debug nodoc enable-presage enable-hunspell enable-pinyin\\\""
     exec_with_ssh "mkdir -p $CODE_DIR/build"
-    exec_with_ssh "cd $CODE_DIR/build && cmake ../ -DCMAKE_BUILD_TYPE=Debug && make -j 4"
+    exec_with_ssh "cd $CODE_DIR/build && cmake ../ -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Debug && make -j 4"
     echo "Installing"
-    exec_with_ssh "cd $CODE_DIR/build && " $SUDO " make install"
+    exec_with_ssh "cd $CODE_DIR/build && " $SUDO " make install/fast"
 }
 
 run() {

=== modified file 'config.h.in'
--- config.h.in	2013-12-02 01:42:41 +0000
+++ config.h.in	2014-06-10 18:21:21 +0000
@@ -4,5 +4,6 @@
 #define TMP_DIR                     "@TMP_DIR@"
 #define EVOLUTION_CALENDAR_FACTORY  "@EVOLUTION_CALENDAR_FACTORY@"
 #define EVOLUTION_CALENDAR_SERVICE  "org.gnome.evolution.dataserver.Calendar4"
+#define QORGANIZER_DEV_PATH         "@CMAKE_BINARY_DIR@"
 
 #endif

=== renamed directory 'qorganizer' => 'organizer'
=== modified file 'organizer/qorganizer-eds-engine.cpp'
--- qorganizer/qorganizer-eds-engine.cpp	2014-05-08 16:45:14 +0000
+++ organizer/qorganizer-eds-engine.cpp	2014-06-10 18:21:21 +0000
@@ -90,17 +90,17 @@
     }
     connect(d->m_sourceRegistry, SIGNAL(sourceAdded(QString)), SLOT(onSourceAdded(QString)));
     connect(d->m_sourceRegistry, SIGNAL(sourceRemoved(QString)), SLOT(onSourceRemoved(QString)));
+    connect(d->m_sourceRegistry, SIGNAL(sourceUpdated(QString)), SLOT(onSourceUpdated(QString)));
     d->m_sourceRegistry->load();
 }
 
 QOrganizerEDSEngine::~QOrganizerEDSEngine()
 {
-    QList<QOrganizerAbstractRequest*> reqs = m_runningRequests.keys();
-    Q_FOREACH(QOrganizerAbstractRequest *req, reqs) {
-        req->cancel();
+    while(m_runningRequests.count()) {
+        QOrganizerAbstractRequest *req = m_runningRequests.keys().first();
+        QOrganizerEDSEngine::requestDestroyed(req);
     }
 
-    Q_ASSERT(m_runningRequests.count() == 0);
     d->m_sharedEngines.remove(this);
     if (!d->m_refCount.deref()) {
         delete d;
@@ -811,9 +811,11 @@
     startRequest(req);
     waitForRequestFinished(req, 0);
 
-    *error = req->error();
+    if (error) {
+        *error = req->error();
+    }
 
-    if (*error == QOrganizerManager::NoError) {
+    if (req->error() == QOrganizerManager::NoError) {
         return req->collections();
     } else {
         return QList<QOrganizerCollection>();
@@ -941,8 +943,11 @@
     startRequest(req);
     waitForRequestFinished(req, 0);
 
-    *error = req->error();
-    return(*error == QOrganizerManager::NoError);
+    if (error) {
+        *error = req->error();
+    }
+
+    return(req->error() == QOrganizerManager::NoError);
 }
 
 void QOrganizerEDSEngine::removeCollectionAsync(QtOrganizer::QOrganizerCollectionRemoveRequest *req)
@@ -1008,12 +1013,7 @@
 
 void QOrganizerEDSEngine::releaseRequestData(RequestData *data)
 {
-    if (data->cancelled()) {
-        // if request was cancelled data will be destroyed later
-        data->continueCancel();
-    } else {
-        delete data;
-    }
+    data->deleteLater();
 }
 
 void QOrganizerEDSEngine::requestDestroyed(QOrganizerAbstractRequest* req)
@@ -1021,7 +1021,7 @@
     RequestData *data = m_runningRequests.take(req);
     if (data) {
         data->cancel();
-        delete data;
+        data->deleteLater();
     }
 }
 
@@ -1073,10 +1073,10 @@
 
 bool QOrganizerEDSEngine::cancelRequest(QOrganizerAbstractRequest* req)
 {
-    RequestData *data = m_runningRequests.take(req);
+    RequestData *data = m_runningRequests.value(req);
     if (data) {
         data->cancel();
-        delete data;
+        data->deleteLater();
         return true;
     }
     return false;
@@ -1087,10 +1087,11 @@
     Q_ASSERT(req);
     Q_UNUSED(msecs);
 
-    QPointer<QOrganizerAbstractRequest> r(req);
-
-    while(r && (r->state() == QOrganizerAbstractRequest::ActiveState)) {
-        QCoreApplication::processEvents();
+    RequestData *data = m_runningRequests.value(req);
+    if (data) {
+        data->wait();
+        // We can delete the operation already finished
+        data->deleteLater();
     }
 
     return true;
@@ -1186,11 +1187,18 @@
 void QOrganizerEDSEngine::onSourceAdded(const QString &collectionId)
 {
     d->watch(collectionId);
+    Q_EMIT collectionsAdded(QList<QOrganizerCollectionId>() << QOrganizerCollectionId::fromString(collectionId));
 }
 
 void QOrganizerEDSEngine::onSourceRemoved(const QString &collectionId)
 {
     d->unWatch(collectionId);
+    Q_EMIT collectionsRemoved(QList<QOrganizerCollectionId>() << QOrganizerCollectionId::fromString(collectionId));
+}
+
+void QOrganizerEDSEngine::onSourceUpdated(const QString &collectionId)
+{
+    Q_EMIT collectionsChanged(QList<QOrganizerCollectionId>() << QOrganizerCollectionId::fromString(collectionId));
 }
 
 void QOrganizerEDSEngine::onViewChanged(QOrganizerItemChangeSet *change)

=== modified file 'organizer/qorganizer-eds-engine.h'
--- qorganizer/qorganizer-eds-engine.h	2014-04-18 03:16:33 +0000
+++ organizer/qorganizer-eds-engine.h	2014-06-10 18:21:21 +0000
@@ -128,6 +128,7 @@
 protected Q_SLOTS:
     void onSourceAdded(const QString &collectionId);
     void onSourceRemoved(const QString &collectionId);
+    void onSourceUpdated(const QString &collectionId);
     void onViewChanged(QtOrganizer::QOrganizerItemChangeSet *change);
 
 protected:
@@ -247,5 +248,9 @@
     friend class FetchOcurrenceData;
 };
 
+using namespace QtOrganizer;
+Q_DECLARE_METATYPE(QList<QOrganizerCollectionId>)
+Q_DECLARE_METATYPE(QList<QOrganizerItemId>)
+
 #endif
 

=== modified file 'organizer/qorganizer-eds-fetchbyidrequestdata.cpp'
--- qorganizer/qorganizer-eds-fetchbyidrequestdata.cpp	2013-12-03 20:01:45 +0000
+++ organizer/qorganizer-eds-fetchbyidrequestdata.cpp	2014-06-10 18:21:21 +0000
@@ -65,13 +65,15 @@
     return (m_current >= ids.count());
 }
 
-void FetchByIdRequestData::finish(QOrganizerManager::Error error)
+void FetchByIdRequestData::finish(QOrganizerManager::Error error,
+                                  QOrganizerAbstractRequest::State state)
 {
     QOrganizerManagerEngine::updateItemFetchByIdRequest(request<QOrganizerItemFetchByIdRequest>(),
                                                         m_results,
                                                         error,
                                                         m_errors,
-                                                        QOrganizerAbstractRequest::FinishedState);
+                                                        state);
+    RequestData::finish(error, state);
 }
 
 int FetchByIdRequestData::appendResult(const QOrganizerItem &result)

=== modified file 'organizer/qorganizer-eds-fetchbyidrequestdata.h'
--- qorganizer/qorganizer-eds-fetchbyidrequestdata.h	2013-12-03 20:01:45 +0000
+++ organizer/qorganizer-eds-fetchbyidrequestdata.h	2014-06-10 18:21:21 +0000
@@ -34,7 +34,8 @@
     QString currentCollectionId() const;
     bool end() const;
 
-    void finish(QtOrganizer::QOrganizerManager::Error error = QtOrganizer::QOrganizerManager::NoError);
+    void finish(QtOrganizer::QOrganizerManager::Error error = QtOrganizer::QOrganizerManager::NoError,
+                QtOrganizer::QOrganizerAbstractRequest::State state = QtOrganizer::QOrganizerAbstractRequest::FinishedState);
     int appendResult(const QtOrganizer::QOrganizerItem &result);
 
 private:

=== modified file 'organizer/qorganizer-eds-fetchocurrencedata.cpp'
--- qorganizer/qorganizer-eds-fetchocurrencedata.cpp	2014-02-25 18:43:06 +0000
+++ organizer/qorganizer-eds-fetchocurrencedata.cpp	2014-06-10 18:21:21 +0000
@@ -62,7 +62,8 @@
     return endDate.toTime_t();
 }
 
-void FetchOcurrenceData::finish(QOrganizerManager::Error error)
+void FetchOcurrenceData::finish(QOrganizerManager::Error error,
+                                QtOrganizer::QOrganizerAbstractRequest::State state)
 {
     QList<QtOrganizer::QOrganizerItem> results;
 
@@ -76,7 +77,9 @@
     QOrganizerManagerEngine::updateItemOccurrenceFetchRequest(request<QOrganizerItemOccurrenceFetchRequest>(),
                                                               results,
                                                               error,
-                                                              QOrganizerAbstractRequest::FinishedState);
+                                                              state);
+
+    RequestData::finish(error, state);
 }
 
 void FetchOcurrenceData::appendResult(icalcomponent *comp)

=== modified file 'organizer/qorganizer-eds-fetchocurrencedata.h'
--- qorganizer/qorganizer-eds-fetchocurrencedata.h	2014-02-25 18:43:06 +0000
+++ organizer/qorganizer-eds-fetchocurrencedata.h	2014-06-10 18:21:21 +0000
@@ -32,7 +32,8 @@
     time_t startDate() const;
     time_t endDate() const;
 
-    void finish(QtOrganizer::QOrganizerManager::Error error = QtOrganizer::QOrganizerManager::NoError);
+    void finish(QtOrganizer::QOrganizerManager::Error error = QtOrganizer::QOrganizerManager::NoError,
+                QtOrganizer::QOrganizerAbstractRequest::State state = QtOrganizer::QOrganizerAbstractRequest::FinishedState);
     void appendResult(icalcomponent *comp);
 
 private:

=== modified file 'organizer/qorganizer-eds-fetchrequestdata.cpp'
--- qorganizer/qorganizer-eds-fetchrequestdata.cpp	2014-04-14 18:43:25 +0000
+++ organizer/qorganizer-eds-fetchrequestdata.cpp	2014-06-10 18:21:21 +0000
@@ -97,13 +97,15 @@
     return (endDate.isValid() && startDate.isValid());
 }
 
-void FetchRequestData::finish(QOrganizerManager::Error error)
+void FetchRequestData::finish(QOrganizerManager::Error error,
+                              QOrganizerAbstractRequest::State state)
 {
     QOrganizerManagerEngine::updateItemFetchRequest(request<QOrganizerItemFetchRequest>(),
                                                     m_results,
                                                     error,
-                                                    QOrganizerAbstractRequest::FinishedState);
+                                                    state);
     // TODO: emit changeset???
+    RequestData::finish(error, state);
 }
 
 void FetchRequestData::appendResult(icalcomponent *comp)
@@ -117,7 +119,7 @@
     QOrganizerItemFetchRequest *req = request<QOrganizerItemFetchRequest>();
     Q_FOREACH(const QOrganizerItem &item, results) {
         if (QOrganizerManagerEngine::testFilter(req->filter(), item)) {
-            m_results << item;
+            QOrganizerManagerEngine::addSorted(&m_results, item, req->sorting());
             count++;
         }
     }

=== modified file 'organizer/qorganizer-eds-fetchrequestdata.h'
--- qorganizer/qorganizer-eds-fetchrequestdata.h	2014-02-25 17:12:32 +0000
+++ organizer/qorganizer-eds-fetchrequestdata.h	2014-06-10 18:21:21 +0000
@@ -36,7 +36,8 @@
     time_t endDate() const;
     bool hasDateInterval() const;
 
-    void finish(QtOrganizer::QOrganizerManager::Error error = QtOrganizer::QOrganizerManager::NoError);
+    void finish(QtOrganizer::QOrganizerManager::Error error = QtOrganizer::QOrganizerManager::NoError,
+                QtOrganizer::QOrganizerAbstractRequest::State state = QtOrganizer::QOrganizerAbstractRequest::FinishedState);
     void appendResult(icalcomponent *comp);
     int appendResults(QList<QtOrganizer::QOrganizerItem> results);
     QString dateFilter();

=== modified file 'organizer/qorganizer-eds-removebyidrequestdata.cpp'
--- qorganizer/qorganizer-eds-removebyidrequestdata.cpp	2014-04-18 03:16:33 +0000
+++ organizer/qorganizer-eds-removebyidrequestdata.cpp	2014-06-10 18:21:21 +0000
@@ -46,15 +46,18 @@
 {
 }
 
-void RemoveByIdRequestData::finish(QtOrganizer::QOrganizerManager::Error error)
+void RemoveByIdRequestData::finish(QtOrganizer::QOrganizerManager::Error error,
+                                   QtOrganizer::QOrganizerAbstractRequest::State state)
 {
     e_client_refresh_sync(m_client, 0, 0);
     QOrganizerManagerEngine::updateItemRemoveByIdRequest(request<QOrganizerItemRemoveByIdRequest>(),
                                                          error,
                                                          QMap<int, QOrganizerManager::Error>(),
-                                                         QOrganizerAbstractRequest::FinishedState);
+                                                         state);
     //The signal will be fired by the view watcher. Check ViewWatcher::onObjectsRemoved
     //emitChangeset(&m_changeSet);
+
+    RequestData::finish(error, state);
 }
 
 GSList *RemoveByIdRequestData::compIds() const

=== modified file 'organizer/qorganizer-eds-removebyidrequestdata.h'
--- qorganizer/qorganizer-eds-removebyidrequestdata.h	2014-01-05 18:18:32 +0000
+++ organizer/qorganizer-eds-removebyidrequestdata.h	2014-06-10 18:21:21 +0000
@@ -31,7 +31,8 @@
 
     QString collectionId() const;
 
-    void finish(QtOrganizer::QOrganizerManager::Error error = QtOrganizer::QOrganizerManager::NoError);
+    void finish(QtOrganizer::QOrganizerManager::Error error = QtOrganizer::QOrganizerManager::NoError,
+                QtOrganizer::QOrganizerAbstractRequest::State state = QtOrganizer::QOrganizerAbstractRequest::FinishedState);
 
     GSList *compIds() const;
 

=== modified file 'organizer/qorganizer-eds-removecollectionrequestdata.cpp'
--- qorganizer/qorganizer-eds-removecollectionrequestdata.cpp	2013-12-03 01:23:34 +0000
+++ organizer/qorganizer-eds-removecollectionrequestdata.cpp	2014-06-10 18:21:21 +0000
@@ -39,21 +39,16 @@
 {
 }
 
-void RemoveCollectionRequestData::finish(QtOrganizer::QOrganizerManager::Error error)
+void RemoveCollectionRequestData::finish(QOrganizerManager::Error error,
+                                         QOrganizerAbstractRequest::State state)
 {
     QOrganizerManagerEngine::updateCollectionRemoveRequest(request<QOrganizerCollectionRemoveRequest>(),
                                                            error,
                                                            m_errorMap,
-                                                           QOrganizerAbstractRequest::FinishedState);
-
-    QList<QOrganizerCollectionId> removedIds = m_pendingCollections;
-    Q_FOREACH(int index, m_errorMap.keys()) {
-        removedIds.removeAt(index);
-    }
-
-    QOrganizerCollectionChangeSet cs;
-    cs.insertRemovedCollections(removedIds);
-    emitChangeset(&cs);
+                                                           state);
+
+    // changes will be fired by source-registry
+    RequestData::finish(error, state);
 }
 
 void RemoveCollectionRequestData::commit(QtOrganizer::QOrganizerManager::Error error)

=== modified file 'organizer/qorganizer-eds-removecollectionrequestdata.h'
--- qorganizer/qorganizer-eds-removecollectionrequestdata.h	2013-12-03 01:23:34 +0000
+++ organizer/qorganizer-eds-removecollectionrequestdata.h	2014-06-10 18:21:21 +0000
@@ -29,7 +29,8 @@
     RemoveCollectionRequestData(QOrganizerEDSEngine *engine, QtOrganizer::QOrganizerAbstractRequest *req);
     ~RemoveCollectionRequestData();
 
-    void finish(QtOrganizer::QOrganizerManager::Error error = QtOrganizer::QOrganizerManager::NoError);
+    void finish(QtOrganizer::QOrganizerManager::Error error = QtOrganizer::QOrganizerManager::NoError,
+                QtOrganizer::QOrganizerAbstractRequest::State state = QtOrganizer::QOrganizerAbstractRequest::FinishedState);
 
     ESource* begin();
     void commit(QtOrganizer::QOrganizerManager::Error error = QtOrganizer::QOrganizerManager::NoError);

=== modified file 'organizer/qorganizer-eds-removerequestdata.cpp'
--- qorganizer/qorganizer-eds-removerequestdata.cpp	2014-04-18 03:16:33 +0000
+++ organizer/qorganizer-eds-removerequestdata.cpp	2014-06-10 18:21:21 +0000
@@ -65,16 +65,18 @@
     return ids;
 }
 
-void RemoveRequestData::finish(QtOrganizer::QOrganizerManager::Error error)
+void RemoveRequestData::finish(QOrganizerManager::Error error,
+                               QOrganizerAbstractRequest::State state)
 {
     e_client_refresh_sync(m_client, 0, 0);
     QOrganizerManagerEngine::updateItemRemoveRequest(request<QOrganizerItemRemoveRequest>(),
                                                      error,
                                                      QMap<int, QOrganizerManager::Error>(),
-                                                     QOrganizerAbstractRequest::FinishedState);
+                                                     state);
 
     //The signal will be fired by the view watcher. Check ViewWatcher::onObjectsRemoved
     //emitChangeset(&m_changeSet);
+    RequestData::finish(error, state);
 }
 
 GSList *RemoveRequestData::compIds() const

=== modified file 'organizer/qorganizer-eds-removerequestdata.h'
--- qorganizer/qorganizer-eds-removerequestdata.h	2013-12-31 15:42:33 +0000
+++ organizer/qorganizer-eds-removerequestdata.h	2014-06-10 18:21:21 +0000
@@ -32,7 +32,8 @@
     QList<QtOrganizer::QOrganizerCollectionId> pendingCollections() const;
     QtOrganizer::QOrganizerCollectionId collectionId() const;
 
-    void finish(QtOrganizer::QOrganizerManager::Error error = QtOrganizer::QOrganizerManager::NoError);
+    void finish(QtOrganizer::QOrganizerManager::Error error = QtOrganizer::QOrganizerManager::NoError,
+                QtOrganizer::QOrganizerAbstractRequest::State state = QtOrganizer::QOrganizerAbstractRequest::FinishedState);
 
     GSList *compIds() const;
 

=== modified file 'organizer/qorganizer-eds-requestdata.cpp'
--- qorganizer/qorganizer-eds-requestdata.cpp	2014-04-18 20:30:59 +0000
+++ organizer/qorganizer-eds-requestdata.cpp	2014-06-10 18:21:21 +0000
@@ -18,6 +18,9 @@
 
 #include "qorganizer-eds-requestdata.h"
 
+#include <QtCore/QDebug>
+#include <QtCore/QCoreApplication>
+
 #include <QtOrganizer/QOrganizerAbstractRequest>
 #include <QtOrganizer/QOrganizerManagerEngine>
 
@@ -25,9 +28,9 @@
 
 RequestData::RequestData(QOrganizerEDSEngine *engine, QtOrganizer::QOrganizerAbstractRequest *req)
     : m_parent(engine),
-      m_req(req),
       m_client(0),
-      m_canceling(false)
+      m_finished(false),
+      m_req(req)
 {
     QOrganizerManagerEngine::updateRequestState(req, QOrganizerAbstractRequest::ActiveState);
     m_cancellable = g_cancellable_new();
@@ -36,7 +39,6 @@
 
 RequestData::~RequestData()
 {
-    Q_ASSERT(m_req->state() != QOrganizerAbstractRequest::ActiveState);
     if (m_cancellable) {
         g_clear_object(&m_cancellable);
     }
@@ -44,14 +46,10 @@
     if (m_client) {
         g_clear_object(&m_client);
     }
-
-    m_parent->m_runningRequests.remove(m_req);
 }
 
 GCancellable* RequestData::cancellable() const
 {
-    g_cancellable_reset(m_cancellable);
-    //g_object_ref(m_cancellable);
     return m_cancellable;
 }
 
@@ -73,26 +71,74 @@
 
 void RequestData::cancel()
 {
-    m_canceling = true;
+    QMutexLocker locker(&m_canceling);
     if (m_cancellable) {
+        gulong id = g_cancellable_connect(m_cancellable,
+                                          (GCallback) RequestData::onCancelled,
+                                          this, NULL);
+        // wait the cancel
+        wait();
+
+        // cancel
         g_cancellable_cancel(m_cancellable);
-        m_parent->waitForRequestFinished(m_req, 0);
+
+        // done
+        g_cancellable_disconnect(m_cancellable, id);
         m_cancellable = 0;
     }
-    m_canceling = false;
-}
-
-bool RequestData::cancelled() const
-{
-    if (!m_req.isNull()) {
-        return m_canceling;
-    }
-    return false;
-}
-
-void RequestData::continueCancel()
-{
-    QOrganizerManagerEngine::updateRequestState(m_req, QOrganizerAbstractRequest::CanceledState);
+}
+
+void RequestData::wait()
+{
+    QMutexLocker locker(&m_waiting);
+    while(!m_finished) {
+        QCoreApplication::processEvents(QEventLoop::AllEvents, 100);
+    }
+}
+
+bool RequestData::isWaiting()
+{
+    bool result = true;
+    if (m_waiting.tryLock()) {
+        result = false;
+        m_waiting.unlock();
+    }
+    return result;
+}
+
+bool RequestData::isCanceling()
+{
+    bool result = true;
+    if (m_canceling.tryLock()) {
+        result = false;
+        m_canceling.unlock();
+    }
+    return result;
+}
+
+void RequestData::deleteLater()
+{
+    if (isWaiting() || isCanceling()) {
+        // still running
+        return;
+    }
+    m_parent->m_runningRequests.remove(m_req);
+    delete this;
+}
+
+void RequestData::finish(QOrganizerManager::Error error, QtOrganizer::QOrganizerAbstractRequest::State state)
+{
+    Q_UNUSED(error);
+    Q_UNUSED(state);
+    m_finished = true;
+}
+
+void RequestData::onCancelled(GCancellable *cancellable, RequestData *self)
+{
+    Q_UNUSED(cancellable);
+    if (self->m_req) {
+        self->finish(QOrganizerManager::UnspecifiedError, QOrganizerAbstractRequest::CanceledState);
+    }
 }
 
 void RequestData::setClient(EClient *client)

=== modified file 'organizer/qorganizer-eds-requestdata.h'
--- qorganizer/qorganizer-eds-requestdata.h	2014-04-18 19:55:27 +0000
+++ organizer/qorganizer-eds-requestdata.h	2014-06-10 18:21:21 +0000
@@ -24,6 +24,7 @@
 
 #include <QtCore/QPointer>
 #include <QtCore/QMutex>
+#include <QtCore/QEventLoop>
 
 #include <QtOrganizer/QOrganizerAbstractRequest>
 #include <QtOrganizer/QOrganizerManager>
@@ -33,16 +34,17 @@
 {
 public:
     RequestData(QOrganizerEDSEngine *engine, QtOrganizer::QOrganizerAbstractRequest *req);
-    virtual ~RequestData();
     GCancellable* cancellable() const;
     bool isLive() const;
     void setClient(EClient *client);
     ECalClient *client() const;
-    virtual void finish(QtOrganizer::QOrganizerManager::Error error = QtOrganizer::QOrganizerManager::NoError) = 0;
     QOrganizerEDSEngine *parent() const;
     virtual void cancel();
-    bool cancelled() const;
-    void continueCancel();
+    void deleteLater();
+    virtual void finish(QtOrganizer::QOrganizerManager::Error error, QtOrganizer::QOrganizerAbstractRequest::State state) = 0;
+    void wait();
+    bool isWaiting();
+    bool isCanceling();
 
     template<class T>
     T* request() const {
@@ -56,13 +58,19 @@
 
 protected:
     QOrganizerEDSEngine *m_parent;
+    EClient *m_client;
     QtOrganizer::QOrganizerItemChangeSet m_changeSet;
-    EClient *m_client;
-    bool m_canceling;
+    QMutex m_waiting;
+    QMutex m_canceling;
+    bool m_finished;
+
+    virtual ~RequestData();
 
 private:
     QPointer<QtOrganizer::QOrganizerAbstractRequest> m_req;
     GCancellable *m_cancellable;
+
+    static void onCancelled(GCancellable *cancellable, RequestData *self);
 };
 
 #endif

=== modified file 'organizer/qorganizer-eds-savecollectionrequestdata.cpp'
--- qorganizer/qorganizer-eds-savecollectionrequestdata.cpp	2014-03-21 18:04:50 +0000
+++ organizer/qorganizer-eds-savecollectionrequestdata.cpp	2014-06-10 18:21:21 +0000
@@ -50,16 +50,20 @@
     }
 }
 
-void SaveCollectionRequestData::finish(QtOrganizer::QOrganizerManager::Error error)
+void SaveCollectionRequestData::finish(QtOrganizer::QOrganizerManager::Error error,
+                                       QtOrganizer::QOrganizerAbstractRequest::State state)
 {
     QOrganizerManagerEngine::updateCollectionSaveRequest(request<QOrganizerCollectionSaveRequest>(),
                                                          m_results.values(),
                                                          error,
                                                          m_errorMap,
-                                                         QOrganizerAbstractRequest::FinishedState);
-
-    emitChangeset(&m_changeSet);
+                                                         state);
+
+
+    // changes will be fired by source-registry
     m_changeSet.clearAll();
+
+    RequestData::finish(error, state);
 }
 
 void SaveCollectionRequestData::commitSourceCreated()
@@ -181,11 +185,11 @@
 
             // update name
             QString name = collection.metaData(QOrganizerCollection::KeyName).toString();
-            e_source_set_display_name(source, name.toUtf8().data());
+            e_source_set_display_name(source, name.toUtf8().constData());
 
             // update color
             QString color = collection.metaData(QOrganizerCollection::KeyColor).toString();
-            e_source_selectable_set_color(E_SOURCE_SELECTABLE(extCalendar), color.toUtf8().data());
+            e_source_selectable_set_color(E_SOURCE_SELECTABLE(extCalendar), color.toUtf8().constData());
 
             // update selected
             bool selected = collection.extendedMetaData(COLLECTION_SELECTED_METADATA).toBool();

=== modified file 'organizer/qorganizer-eds-savecollectionrequestdata.h'
--- qorganizer/qorganizer-eds-savecollectionrequestdata.h	2014-03-21 18:04:50 +0000
+++ organizer/qorganizer-eds-savecollectionrequestdata.h	2014-06-10 18:21:21 +0000
@@ -28,7 +28,8 @@
                               QtOrganizer::QOrganizerAbstractRequest *req);
     ~SaveCollectionRequestData();
 
-    void finish(QtOrganizer::QOrganizerManager::Error error = QtOrganizer::QOrganizerManager::NoError);
+    void finish(QtOrganizer::QOrganizerManager::Error error = QtOrganizer::QOrganizerManager::NoError,
+                QtOrganizer::QOrganizerAbstractRequest::State state = QtOrganizer::QOrganizerAbstractRequest::FinishedState);
     bool isNew(int index) const;
     bool prepareToCreate();
     bool prepareToUpdate();
@@ -46,7 +47,7 @@
 
     QMap<int, QtOrganizer::QOrganizerManager::Error> m_errorMap;
     QMap<int, QtOrganizer::QOrganizerCollection> m_results;
-    QMap<int, ESource*> m_sources;    
+    QMap<int, ESource*> m_sources;
     QMap<int, ESource*> m_sourcesToCreate;
     QMap<int, ESource*> m_sourcesToUpdate;
     QtOrganizer::QOrganizerCollectionChangeSet m_changeSet;

=== modified file 'organizer/qorganizer-eds-saverequestdata.cpp'
--- qorganizer/qorganizer-eds-saverequestdata.cpp	2014-04-18 03:16:33 +0000
+++ organizer/qorganizer-eds-saverequestdata.cpp	2014-06-10 18:21:21 +0000
@@ -46,18 +46,17 @@
 {
 }
 
-void SaveRequestData::finish(QtOrganizer::QOrganizerManager::Error error)
+void SaveRequestData::finish(QtOrganizer::QOrganizerManager::Error error,
+                             QtOrganizer::QOrganizerAbstractRequest::State state)
 {
     e_client_refresh_sync(m_client, 0, 0);
     QOrganizerManagerEngine::updateItemSaveRequest(request<QOrganizerItemSaveRequest>(),
                                                    m_result,
                                                    error,
                                                    m_erros,
-                                                   QOrganizerAbstractRequest::FinishedState);
-    Q_FOREACH(const QOrganizerItem &item, m_result) {
-        m_changeSet.insertAddedItem(item.id());
-    }
-    emitChangeset(&m_changeSet);
+                                                   state);
+    // Change will be fired by the viewwatcher
+    RequestData::finish(error, state);
 }
 
 void SaveRequestData::appendResults(QList<QOrganizerItem> result)

=== modified file 'organizer/qorganizer-eds-saverequestdata.h'
--- qorganizer/qorganizer-eds-saverequestdata.h	2014-04-14 01:44:59 +0000
+++ organizer/qorganizer-eds-saverequestdata.h	2014-06-10 18:21:21 +0000
@@ -29,7 +29,8 @@
                     QtOrganizer::QOrganizerAbstractRequest *req);
     ~SaveRequestData();
 
-    void finish(QtOrganizer::QOrganizerManager::Error error = QtOrganizer::QOrganizerManager::NoError);
+    void finish(QtOrganizer::QOrganizerManager::Error error = QtOrganizer::QOrganizerManager::NoError,
+                QtOrganizer::QOrganizerAbstractRequest::State state = QtOrganizer::QOrganizerAbstractRequest::FinishedState);
 
 
     QString nextCollection();

=== modified file 'organizer/qorganizer-eds-source-registry.cpp'
--- qorganizer/qorganizer-eds-source-registry.cpp	2014-03-21 18:54:45 +0000
+++ organizer/qorganizer-eds-source-registry.cpp	2014-06-10 18:21:21 +0000
@@ -300,10 +300,6 @@
 void SourceRegistry::updateCollection(QOrganizerCollection *collection,
                                       ESource *source)
 {
-    //TODO get metadata (color, etc..)
-    collection->setMetaData(QOrganizerCollection::KeyName,
-                            QString::fromUtf8(e_source_get_display_name(source)));
-
     // name
     collection->setMetaData(QOrganizerCollection::KeyName,
                             QString::fromUtf8(e_source_get_display_name(source)));
@@ -328,4 +324,5 @@
     // selected
     bool selected = (e_source_selectable_get_selected(E_SOURCE_SELECTABLE(extCalendar)) == TRUE);
     collection->setExtendedMetaData(COLLECTION_SELECTED_METADATA, selected);
+
 }

=== modified file 'tests/unittest/CMakeLists.txt'
--- tests/unittest/CMakeLists.txt	2014-02-25 18:46:32 +0000
+++ tests/unittest/CMakeLists.txt	2014-06-10 18:21:21 +0000
@@ -21,16 +21,16 @@
     )
 
     add_test(${TESTNAME}
-             ${DBUS_RUNNER} --keep-env
-             --task ${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME} --task-name ${TESTNAME} --wait-until-complete --wait-for=org.gnome.evolution.dataserver.Calendar4
-             --task ${EVOLUTION_CALENDAR_FACTORY} --task-name "evolution" -r --wait-for=${EVOLUTION_SOURCE_SERVICE_NAME}
-             --task ${EVOLUTION_SOURCE_REGISTRY} --task-name "source-registry" --wait-for=org.gtk.vfs.Daemon -r
-             --task ${GVFSD} --task-name "gvfsd" -r)
+             ${CMAKE_CURRENT_SOURCE_DIR}/run-eds-test.sh ${DBUS_RUNNER} ${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME} ${TESTNAME}
+             ${EVOLUTION_CALENDAR_FACTORY} ${EVOLUTION_SOURCE_SERVICE_NAME}
+             ${EVOLUTION_SOURCE_REGISTRY}
+             ${GVFSD})
     update_test_properties(${TESTNAME})
 endmacro(declare_test testname)
 
 macro(update_test_properties TESTNAME)
     set(TEST_TMP_DIR "${TMP_DIR}/${TESTNAME}")
+    set(ENV_VARS_LIST "")
     list(APPEND ENV_VARS_LIST "QT_QPA_PLATFORM=minimal")
     list(APPEND ENV_VARS_LIST "HOME=${TEST_TMP_DIR}")
     list(APPEND ENV_VARS_LIST "XDG_RUNTIME_DIR=${TEST_TMP_DIR}")
@@ -74,3 +74,4 @@
 declare_test(event-test)
 declare_test(fetchitem-test)
 declare_test(recurrence-test)
+declare_test(cancel-operation-test)

=== added file 'tests/unittest/cancel-operation-test.cpp'
--- tests/unittest/cancel-operation-test.cpp	1970-01-01 00:00:00 +0000
+++ tests/unittest/cancel-operation-test.cpp	2014-06-10 18:21:21 +0000
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This file is part of qtorganizer5-eds.
+ *
+ * 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 <QObject>
+#include <QtTest>
+#include <QDebug>
+
+#include <QtOrganizer>
+
+#include "qorganizer-eds-engine.h"
+#include "eds-base-test.h"
+
+
+using namespace QtOrganizer;
+
+class CancelOperationTest : public QObject, public EDSBaseTest
+{
+    Q_OBJECT
+private:
+    static const QString defaultCollectionName;
+
+    QOrganizerEDSEngine *m_engine;
+    QOrganizerCollection m_collection;
+
+private Q_SLOTS:
+    void init()
+    {
+        EDSBaseTest::init();
+        m_engine = QOrganizerEDSEngine::createEDSEngine(QMap<QString, QString>());
+
+
+        QtOrganizer::QOrganizerManager::Error error;
+        m_collection = QOrganizerCollection();
+        m_collection.setMetaData(QOrganizerCollection::KeyName, defaultCollectionName);
+
+        bool saveResult = m_engine->saveCollection(&m_collection, &error);
+        QVERIFY(saveResult);
+        QCOMPARE(error, QtOrganizer::QOrganizerManager::NoError);
+
+    }
+
+    void cleanup()
+    {
+        delete m_engine;
+        m_engine = 0;
+        EDSBaseTest::cleanup();
+    }
+
+    void cancelOperationBeforeStart()
+    {
+        // initial collections
+        QList<QOrganizerCollection> collections = m_engine->collections(0);
+        int initialCollectionsCount = collections.count();
+
+        QOrganizerEvent event;
+        event.setStartDateTime(QDateTime::currentDateTime());
+        event.setDisplayLabel("displayLabelValue");
+        event.setDescription("descriptionValue");
+        event.setCollectionId(m_collection.id());
+
+        // Try cancel a create item operation
+        QSignalSpy createdItem(m_engine, SIGNAL(itemsAdded(QList<QOrganizerItemId>)));
+        QOrganizerItemSaveRequest req;
+        req.setItem(event);
+        m_engine->startRequest(&req);
+        QCOMPARE(req.state(), QOrganizerAbstractRequest::ActiveState);
+        m_engine->cancelRequest(&req);
+        QCOMPARE(req.state(), QOrganizerAbstractRequest::CanceledState);
+        QTRY_COMPARE(createdItem.count(), 0);
+
+        // check if collection was not create
+        collections = m_engine->collections(0);
+        QCOMPARE(collections.count(), initialCollectionsCount);
+    }
+
+};
+
+const QString CancelOperationTest::defaultCollectionName = QStringLiteral("CancelOperationTest COLLECTION");
+
+
+QTEST_MAIN(CancelOperationTest)
+
+#include "cancel-operation-test.moc"

=== modified file 'tests/unittest/collections-test.cpp'
--- tests/unittest/collections-test.cpp	2014-03-21 18:04:50 +0000
+++ tests/unittest/collections-test.cpp	2014-06-10 18:21:21 +0000
@@ -44,7 +44,7 @@
 private Q_SLOTS:
     void init()
     {
-        EDSBaseTest::init(0);
+        EDSBaseTest::init();
         m_engineWrite = QOrganizerEDSEngine::createEDSEngine(QMap<QString, QString>());
         m_engineRead = QOrganizerEDSEngine::createEDSEngine(QMap<QString, QString>());
     }
@@ -52,9 +52,10 @@
     void cleanup()
     {
         delete m_engineRead;
+        delete m_engineWrite;
         m_engineRead = 0;
-        EDSBaseTest::cleanup(m_engineWrite);
         m_engineWrite = 0;
+        EDSBaseTest::cleanup();
     }
 
     void testCreateCollection()
@@ -91,22 +92,35 @@
         QOrganizerCollection collection;
         QtOrganizer::QOrganizerManager::Error error;
         collection.setMetaData(QOrganizerCollection::KeyName, defaultCollectionName);
-        collection.setMetaData(QOrganizerCollection::KeyColor, "red");
+        collection.setMetaData(QOrganizerCollection::KeyColor, QStringLiteral("red"));
+        collection.setExtendedMetaData(QStringLiteral("collection-selected"), false);
 
         QVERIFY(m_engineWrite->saveCollection(&collection, &error));
         QCOMPARE(error, QOrganizerManager::NoError);
         QVERIFY(!collection.id().isNull());
 
+        // Check if the collection was stored correct
+        QOrganizerCollection newCollection = m_engineRead->collection(collection.id(), &error);
+        QCOMPARE(newCollection.metaData(QOrganizerCollection::KeyName).toString(), defaultCollectionName);
+        QCOMPARE(newCollection.metaData(QOrganizerCollection::KeyColor).toString(), QStringLiteral("red"));
+        QCOMPARE(newCollection.extendedMetaData(QStringLiteral("collection-selected")).toBool(), false);
+
+
         // update the collection
         QSignalSpy updateCollection(m_engineWrite, SIGNAL(collectionsChanged(QList<QOrganizerCollectionId>)));
         collection.setMetaData(QOrganizerCollection::KeyColor, "blue");
         collection.setExtendedMetaData("collection-selected", true);
         QVERIFY(m_engineWrite->saveCollection(&collection, &error));
         QCOMPARE(error, QOrganizerManager::NoError);
-        QTRY_COMPARE(updateCollection.count(), 1);
-
-        // Check if the collection was stored correct
-        QOrganizerCollection newCollection = m_engineRead->collection(collection.id(), &error);
+
+        QTRY_VERIFY(updateCollection.count() > 0);
+        QList<QVariant> args = updateCollection.takeFirst();
+        QCOMPARE(args.count(), 1);
+        QCOMPARE(args[0].value<QList<QOrganizerCollectionId> >().at(0).toString(), collection.id().toString());
+
+
+        // Check if the collection was updated correct
+        newCollection = m_engineRead->collection(collection.id(), &error);
         QCOMPARE(error, QOrganizerManager::NoError);
         QCOMPARE(newCollection.metaData(QOrganizerCollection::KeyName).toString(), defaultCollectionName);
         QCOMPARE(newCollection.metaData(QOrganizerCollection::KeyColor).toString(), QStringLiteral("blue"));

=== modified file 'tests/unittest/eds-base-test.cpp'
--- tests/unittest/eds-base-test.cpp	2013-12-11 13:16:50 +0000
+++ tests/unittest/eds-base-test.cpp	2014-06-10 18:21:21 +0000
@@ -29,71 +29,45 @@
 
 EDSBaseTest::EDSBaseTest()
 {
-    GError *error = 0;
-    m_sourceRegistry = e_source_registry_new_sync(0, &error);
-    if (error) {
-        qWarning() << "Fail to create sourge registry:" << error->message;
-        g_error_free(error);
-        Q_ASSERT(false);
-    }
+    qRegisterMetaType<QList<QOrganizerCollectionId> >();
+    qRegisterMetaType<QList<QOrganizerItemId> >();
+    QCoreApplication::addLibraryPath(QORGANIZER_DEV_PATH);
 }
 
 EDSBaseTest::~EDSBaseTest()
 {
-    g_object_unref(m_sourceRegistry);
-}
-
-void EDSBaseTest::init(QOrganizerEDSEngine *engine)
-{
-    cleanup(engine);
-    // wait to flush DBUS calls
-    QTest::qWait(1000);
-}
-
-void EDSBaseTest::cleanup(QOrganizerEDSEngine *engine)
-{
-    // remove all new items, remove item by item because they can have diff collections
-    Q_FOREACH(const QOrganizerItemId &id, m_newItems) {
-        QtOrganizer::QOrganizerManager::Error error;
-        QMap<int, QtOrganizer::QOrganizerManager::Error> errorMap;
-
-        engine->removeItems(QList<QOrganizerItemId>() << id,
-                            &errorMap,
-                            &error);
-    }
-    m_newItems.clear();
+}
+
+void EDSBaseTest::init()
+{
+}
+
+
+void EDSBaseTest::cleanup()
+{
+    static QStringList defaultSources;
+
+    if (defaultSources.isEmpty()) {
+        defaultSources << "qtorganizer:eds::birthdays"
+                       << "qtorganizer:eds::system-calendar"
+                       << "qtorganizer:eds::system-memo-list"
+                       << "qtorganizer:eds::system-task-list";
+    }
+    QOrganizerEDSEngine *engine = QOrganizerEDSEngine::createEDSEngine(QMap<QString, QString>());
+    Q_FOREACH(const QOrganizerCollection &col, engine->collections(0)) {
+        if (defaultSources.contains(col.id().toString())) {
+            continue;
+        }
+        QSignalSpy removeCollection(engine, SIGNAL(collectionsRemoved(QList<QOrganizerCollectionId>)));
+        QVERIFY(engine->removeCollection(col.id(), 0));
+        QTRY_COMPARE(removeCollection.count(), 1);
+
+        QList<QVariant> args = removeCollection.takeFirst();
+        QCOMPARE(args.count(), 1);
+        QCOMPARE(args[0].value<QList<QOrganizerCollectionId> >().at(0).toString(), col.id().toString());
+    }
+
     delete engine;
-
-    // remove all collections
-    GError *error;
-    gboolean status;
-    GList *sources = e_source_registry_list_sources(m_sourceRegistry, 0);
-
-    for(GList  *i = sources; i != 0; i = i->next) {
-        ESource *source = E_SOURCE(i->data);
-        error = 0;
-        status = true;
-        if (e_source_get_remote_deletable(source)) {
-            status = e_source_remote_delete_sync(source, 0, &error);
-            QTest::qWait(100);
-        } else if (e_source_get_removable(source)) {
-            status = e_source_remove_sync(source, 0, &error);
-            QTest::qWait(100);
-            // check if source was removed
-            const gchar *uid = e_source_get_uid(source);
-            Q_ASSERT(e_source_registry_ref_source(m_sourceRegistry, uid) == 0);
-        }
-        if (error) {
-            qWarning() << "Fail to remove source:" << error->message;
-            g_error_free(error);
-            Q_ASSERT(false);
-        }
-
-        Q_ASSERT(status);
-    }
-
-    g_list_free_full(sources, g_object_unref);
-    e_source_registry_debug_dump(m_sourceRegistry, 0);
 }
 
 void EDSBaseTest::appendToRemove(const QtOrganizer::QOrganizerItemId &id)

=== modified file 'tests/unittest/eds-base-test.h'
--- tests/unittest/eds-base-test.h	2013-12-05 23:30:09 +0000
+++ tests/unittest/eds-base-test.h	2014-06-10 18:21:21 +0000
@@ -32,13 +32,12 @@
     ~EDSBaseTest();
 
 protected:
-    void init(QOrganizerEDSEngine *engine);
-    void cleanup(QOrganizerEDSEngine *engine);
+    void init();
+    void cleanup();
 
     void appendToRemove(const QtOrganizer::QOrganizerItemId &id);
 
 private:
-    ESourceRegistry *m_sourceRegistry;
     QList<QtOrganizer::QOrganizerItemId> m_newItems;
 };
 

=== modified file 'tests/unittest/event-test.cpp'
--- tests/unittest/event-test.cpp	2014-04-17 21:05:38 +0000
+++ tests/unittest/event-test.cpp	2014-06-10 18:21:21 +0000
@@ -48,7 +48,7 @@
 private Q_SLOTS:
     void init()
     {
-        EDSBaseTest::init(0);
+        EDSBaseTest::init();
 
         signalIndex = 0;
         m_itemRemovedTime = QDateTime();
@@ -67,7 +67,7 @@
 
     void cleanup()
     {
-        EDSBaseTest::cleanup(m_engine);
+        EDSBaseTest::cleanup();
     }
 
     //helper

=== modified file 'tests/unittest/fetchitem-test.cpp'
--- tests/unittest/fetchitem-test.cpp	2014-01-29 18:10:44 +0000
+++ tests/unittest/fetchitem-test.cpp	2014-06-10 18:21:21 +0000
@@ -42,7 +42,7 @@
 private Q_SLOTS:
     void initTestCase()
     {
-        EDSBaseTest::init(0);
+        EDSBaseTest::init();
         m_engine = QOrganizerEDSEngine::createEDSEngine(QMap<QString, QString>());
 
         // create test collection
@@ -87,9 +87,10 @@
     {
         m_collection = QOrganizerCollection();
         m_events.clear();
-
-        EDSBaseTest::cleanup(m_engine);
+        delete m_engine;
         m_engine = 0;
+
+        EDSBaseTest::cleanup();
     }
 
     void testFetchById()

=== modified file 'tests/unittest/recurrence-test.cpp'
--- tests/unittest/recurrence-test.cpp	2014-04-15 19:42:59 +0000
+++ tests/unittest/recurrence-test.cpp	2014-06-10 18:21:21 +0000
@@ -64,6 +64,9 @@
                                               QList<QtOrganizer::QOrganizerItemDetail::DetailType>(),
                                               &errorMap,
                                               &error);
+        if (!saveResult) {
+            qWarning() << "Fail to save items";
+        }
 
         Q_ASSERT(saveResult);
         Q_ASSERT(error == QtOrganizer::QOrganizerManager::NoError);
@@ -77,7 +80,7 @@
 private Q_SLOTS:
     void init()
     {
-        EDSBaseTest::init(0);
+        EDSBaseTest::init();
 
         m_engine = QOrganizerEDSEngine::createEDSEngine(QMap<QString, QString>());
 
@@ -92,7 +95,9 @@
 
     void cleanup()
     {
-        EDSBaseTest::cleanup(m_engine);
+        delete m_engine;
+        m_engine = 0;
+        EDSBaseTest::cleanup();
     }
 
     void testCreateWeeklyEvent()

=== added file 'tests/unittest/run-eds-test.sh'
--- tests/unittest/run-eds-test.sh	1970-01-01 00:00:00 +0000
+++ tests/unittest/run-eds-test.sh	2014-06-10 18:21:21 +0000
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+#ARG1 - DBUS RUNNERN PATH
+#ARG2 - TEST EXECUTABLE FULL PATH 
+#ARG3 - TEST NAME
+#ARG4 - EVOLUTION_CALENDAR_FACTORY FULL PATH
+#ARG5 - EVOLUTION_CALENDAR_FACTORY SERVICE NAME
+#ARG6 - EVOLUTION_SOURCE_REGISTRY FULL PATH
+
+rm -rf $XDG_DATA_HOME
+$1 --keep-env \
+--task $2 --task-name $3 --wait-until-complete --wait-for=org.gnome.evolution.dataserver.Calendar4 \
+--task $4 --task-name "evolution" -r --wait-for=$5 \
+--task $6 --task-name "source-registry" --wait-for=org.gtk.vfs.Daemon -r \
+--task $7 --task-name "gvfsd" -r
+return $?