6 files changed, 22 insertions, 34 deletions

diff --git a/tests/clientapitest.cpp b/tests/clientapitest.cpp
index 172232f..96982ca 100644
--- a/tests/clientapitest.cpp
+++ b/tests/clientapitest.cpp
@@ -58,7 +58,7 @@ public:
             }
             Trace() << "-------------------------.";
             for (const auto &res : results) {
-                qDebug() << "Parent filter " << query.propertyFilter.value("parent").toByteArray() << res->identifier() << res->getProperty("parent").toByteArray();
+                qDebug() << "Parent filter " << query.propertyFilter.value("parent").value.toByteArray() << res->identifier() << res->getProperty("parent").toByteArray();
                 auto parentProperty = res->getProperty("parent").toByteArray();
                 if ((!parent && parentProperty.isEmpty()) || (parent && parentProperty == parent->identifier()) || query.parentProperty.isEmpty()) {
                     qDebug() << "Found a hit" << res->identifier();
@@ -132,7 +132,7 @@ private slots:
         Sink::Store::create(res).exec().waitForFinished();
         {
             Sink::Query query;
-            query.propertyFilter.insert("type", "dummyresource");
+            query.propertyFilter.insert("type", Sink::Query::Comparator("dummyresource"));
             auto model = Sink::Store::loadModel<Sink::ApplicationDomain::SinkResource>(query);
             QTRY_COMPARE(model->rowCount(QModelIndex()), 1);
         }
@@ -140,7 +140,7 @@ private slots:
         Sink::Store::remove(res).exec().waitForFinished();
         {
             Sink::Query query;
-            query.propertyFilter.insert("type", "dummyresource");
+            query.propertyFilter.insert("type", Sink::Query::Comparator("dummyresource"));
             auto model = Sink::Store::loadModel<Sink::ApplicationDomain::SinkResource>(query);
             QTRY_VERIFY(model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
             QCOMPARE(model->rowCount(QModelIndex()), 0);
diff --git a/tests/dummyresourcebenchmark.cpp b/tests/dummyresourcebenchmark.cpp
index 1e71fc2..d5f98c3 100644
--- a/tests/dummyresourcebenchmark.cpp
+++ b/tests/dummyresourcebenchmark.cpp
@@ -157,7 +157,7 @@ private slots:
             Sink::Query query;
             query.resources << "org.kde.dummy.instance1";
 
-            query.propertyFilter.insert("uid", "testuid");
+            query.propertyFilter.insert("uid", Sink::Query::Comparator("testuid"));
             auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Event>(query);
             QTRY_COMPARE(model->rowCount(QModelIndex()), num);
         }
diff --git a/tests/dummyresourcetest.cpp b/tests/dummyresourcetest.cpp
index 33304e1..58df2da 100644
--- a/tests/dummyresourcetest.cpp
+++ b/tests/dummyresourcetest.cpp
@@ -12,6 +12,8 @@
 #include "pipeline.h"
 #include "log.h"
 
+using namespace Sink;
+
 /**
  * Test of complete system using the dummy resource.
  *
@@ -62,14 +64,12 @@ private slots:
         event.setProperty("summary", "summaryValue");
         Sink::Store::create<Sink::ApplicationDomain::Event>(event).exec().waitForFinished();
 
-        Sink::Query query;
-        query.resources << "org.kde.dummy.instance1";
+        const auto query = Query::ResourceFilter("org.kde.dummy.instance1") ;
 
         // Ensure all local data is processed
         Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
 
-        query.propertyFilter.insert("uid", "testuid");
-        auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Event>(query);
+        auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Event>(query + Query::PropertyFilter("uid", "testuid"));
         QTRY_COMPARE(model->rowCount(QModelIndex()), 1);
         auto value = model->index(0, 0, QModelIndex()).data(Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::Event::Ptr>();
         QCOMPARE(value->getProperty("uid").toByteArray(), QByteArray("testuid"));
@@ -86,15 +86,12 @@ private slots:
         event.setProperty("uid", "testuid2");
         Sink::Store::create<Sink::ApplicationDomain::Event>(event).exec().waitForFinished();
 
-        Sink::Query query;
-        query.resources << "org.kde.dummy.instance1";
+        const auto query = Query::ResourceFilter("org.kde.dummy.instance1") ;
 
         // Ensure all local data is processed
         Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
 
-        query.propertyFilter.insert("uid", "testuid");
-
-        auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Event>(query);
+        auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Event>(query + Query::PropertyFilter("uid", "testuid"));
         QTRY_COMPARE(model->rowCount(QModelIndex()), 1);
         auto value = model->index(0, 0, QModelIndex()).data(Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::Event::Ptr>();
 
@@ -114,15 +111,12 @@ private slots:
         event.setProperty("summary", "summaryValue2");
         Sink::Store::create<Sink::ApplicationDomain::Event>(event).exec().waitForFinished();
 
-        Sink::Query query;
-        query.resources << "org.kde.dummy.instance1";
+        const auto query = Query::ResourceFilter("org.kde.dummy.instance1") ;
 
         // Ensure all local data is processed
         Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
 
-        query.propertyFilter.insert("summary", "summaryValue2");
-
-        auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Event>(query);
+        auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Event>(query + Query::PropertyFilter("summary", "summaryValue2"));
         QTRY_COMPARE(model->rowCount(QModelIndex()), 1);
         auto value = model->index(0, 0, QModelIndex()).data(Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::Event::Ptr>();
 
@@ -147,8 +141,7 @@ private slots:
 
     void testSyncAndFacade()
     {
-        Sink::Query query;
-        query.resources << "org.kde.dummy.instance1";
+        const auto query = Query::ResourceFilter("org.kde.dummy.instance1");
 
         // Ensure all local data is processed
         Sink::Store::synchronize(query).exec().waitForFinished();
@@ -164,8 +157,7 @@ private slots:
 
     void testSyncAndFacadeMail()
     {
-        Sink::Query query;
-        query.resources << "org.kde.dummy.instance1";
+        const auto query = Query::ResourceFilter("org.kde.dummy.instance1");
 
         // Ensure all local data is processed
         Sink::Store::synchronize(query).exec().waitForFinished();
@@ -187,9 +179,7 @@ private slots:
         event.setProperty("summary", "summaryValue");
         Sink::Store::create<Sink::ApplicationDomain::Event>(event).exec().waitForFinished();
 
-        Sink::Query query;
-        query.resources << "org.kde.dummy.instance1";
-        query.propertyFilter.insert("uid", "testuid");
+        const auto query = Query::ResourceFilter("org.kde.dummy.instance1") + Query::PropertyFilter("uid", "testuid");
 
         // Ensure all local data is processed
         Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
@@ -238,11 +228,9 @@ private slots:
 
     void testWriteModifyDeleteLive()
     {
-
-        Sink::Query query;
-        query.resources << "org.kde.dummy.instance1";
+        auto query = Query::ResourceFilter("org.kde.dummy.instance1");
         query.liveQuery = true;
-        query.propertyFilter.insert("uid", "testuid");
+        query += Query::PropertyFilter("uid", "testuid");
 
         auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Event>(query);
         QTRY_VERIFY(model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
diff --git a/tests/maildirresourcetest.cpp b/tests/maildirresourcetest.cpp
index b5c1c3c..9b014e3 100644
--- a/tests/maildirresourcetest.cpp
+++ b/tests/maildirresourcetest.cpp
@@ -265,7 +265,7 @@ private slots:
 
         Sink::Query folderQuery;
         folderQuery.resources << "org.kde.maildir.instance1";
-        folderQuery.propertyFilter.insert("name", "testCreateFolder");
+        folderQuery += Sink::Query::PropertyFilter("name", "testCreateFolder");
         auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Folder>(folderQuery);
         QTRY_VERIFY(model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
         QCOMPARE(model->rowCount(QModelIndex()), 1);
diff --git a/tests/mailquerybenchmark.cpp b/tests/mailquerybenchmark.cpp
index 6b93863..20ee63c 100644
--- a/tests/mailquerybenchmark.cpp
+++ b/tests/mailquerybenchmark.cpp
@@ -159,7 +159,7 @@ private slots:
                                   << "subject"
                                   << "date";
         query.sortProperty = "date";
-        query.propertyFilter.insert("folder", "folder1");
+        query += Sink::Query::PropertyFilter("folder", "folder1");
         query.limit = 1000;
 
         populateDatabase(50000);
diff --git a/tests/querytest.cpp b/tests/querytest.cpp
index 7b9129e..a654931 100644
--- a/tests/querytest.cpp
+++ b/tests/querytest.cpp
@@ -202,7 +202,7 @@ private slots:
         Sink::Query query;
         query.resources << "org.kde.dummy.instance1";
         query.liveQuery = false;
-        query.propertyFilter.insert("uid", "test1");
+        query += Sink::Query::PropertyFilter("uid", "test1");
 
         // Ensure all local data is processed
         Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
@@ -243,7 +243,7 @@ private slots:
         // Test
         Sink::Query query;
         query.resources << "org.kde.dummy.instance1";
-        query.propertyFilter.insert("folder", folderEntity->identifier());
+        query += Sink::Query::PropertyFilter("folder", *folderEntity);
 
         // Ensure all local data is processed
         Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
@@ -302,7 +302,7 @@ private slots:
         // Test
         Sink::Query query;
         query.resources << "org.kde.dummy.instance1";
-        query.propertyFilter.insert("folder", folderEntity->identifier());
+        query += Sink::Query::PropertyFilter("folder", *folderEntity);
         query.sortProperty = "date";
         query.limit = 1;
         query.liveQuery = false;