Test & fix live query removals

2 files changed, 52 insertions, 1 deletions

diff --git a/common/entitystorage.cpp b/common/entitystorage.cpp
index 63017dd..5d4df9f 100644
--- a/common/entitystorage.cpp
+++ b/common/entitystorage.cpp
@@ -27,7 +27,8 @@ ResultSet EntityStorageBase::filteredSet(const ResultSet &resultSet, const std::
     std::function<bool(std::function<void(const Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr &, Akonadi2::Operation)>)> generator = [this, resultSetPtr, &transaction, filter, initialQuery](std::function<void(const Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr &, Akonadi2::Operation)> callback) -> bool {
         while (resultSetPtr->next()) {
             readEntity(transaction, resultSetPtr->id(), [this, filter, callback, initialQuery](const Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr &domainObject, Akonadi2::Operation operation) {
-                if (filter(domainObject)) {
+                //Always remove removals, they probably don't match due to non-available properties
+                if (filter(domainObject) || operation == Akonadi2::Operation_Removal) {
                     if (initialQuery) {
                         //We're not interested in removals during the initial query
                         if (operation != Akonadi2::Operation_Removal) {
diff --git a/tests/dummyresourcetest.cpp b/tests/dummyresourcetest.cpp
index 93a6a9c..731f013 100644
--- a/tests/dummyresourcetest.cpp
+++ b/tests/dummyresourcetest.cpp
@@ -225,6 +225,56 @@ private Q_SLOTS:
         }
     }
 
+    void testWriteModifyDeleteLive()
+    {
+
+        Akonadi2::Query query;
+        query.resources << "org.kde.dummy.instance1";
+        query.syncOnDemand = false;
+        query.processAll = true;
+        query.liveQuery = true;
+        query.propertyFilter.insert("uid", "testuid");
+
+
+        async::SyncListResult<Akonadi2::ApplicationDomain::Event::Ptr> result(Akonadi2::Store::load<Akonadi2::ApplicationDomain::Event>(query));
+        result.exec();
+
+        Akonadi2::ApplicationDomain::Event event;
+        event.setProperty("uid", "testuid");
+        QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid"));
+        event.setProperty("summary", "summaryValue");
+        Akonadi2::Store::create<Akonadi2::ApplicationDomain::Event>(event, "org.kde.dummy.instance1").exec().waitForFinished();
+
+        //Test create
+        Akonadi2::ApplicationDomain::Event event2;
+        {
+            QTRY_COMPARE(result.size(), 1);
+            auto value = result.first();
+            QCOMPARE(value->getProperty("uid").toByteArray(), QByteArray("testuid"));
+            QCOMPARE(value->getProperty("summary").toByteArray(), QByteArray("summaryValue"));
+            event2 = *value;
+        }
+
+        event2.setProperty("uid", "testuid");
+        event2.setProperty("summary", "summaryValue2");
+        Akonadi2::Store::modify<Akonadi2::ApplicationDomain::Event>(event2, "org.kde.dummy.instance1").exec().waitForFinished();
+
+        //Test modify
+        {
+            QTRY_COMPARE(result.size(), 1);
+            auto value = result.first();
+            QCOMPARE(value->getProperty("uid").toByteArray(), QByteArray("testuid"));
+            QCOMPARE(value->getProperty("summary").toByteArray(), QByteArray("summaryValue2"));
+        }
+
+        Akonadi2::Store::remove<Akonadi2::ApplicationDomain::Event>(event2, "org.kde.dummy.instance1").exec().waitForFinished();
+
+        //Test remove
+        {
+            QTRY_COMPARE(result.size(), 0);
+        }
+    }
+
 };
 
 QTEST_MAIN(DummyResourceTest)