From ba94c4300c52dd80774ed7affc2ef9b4508cb7be Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Fri, 4 Nov 2016 12:40:24 +0100
Subject: Don't expose the live query flag directly.

---
 tests/accountstest.cpp                              |  4 ++--
 tests/clientapitest.cpp                             |  9 +--------
 tests/databasepopulationandfacadequerybenchmark.cpp |  1 -
 tests/dummyresourcetest.cpp                         |  2 +-
 tests/mailquerybenchmark.cpp                        |  1 -
 tests/modelinteractivitytest.cpp                    |  2 +-
 tests/querytest.cpp                                 | 15 ++++++---------
 tests/resourceconfigtest.cpp                        |  2 +-
 8 files changed, 12 insertions(+), 24 deletions(-)

(limited to 'tests')

diff --git a/tests/accountstest.cpp b/tests/accountstest.cpp
index 8216210..88b13f3 100644
--- a/tests/accountstest.cpp
+++ b/tests/accountstest.cpp
@@ -99,7 +99,7 @@ private slots:
         Store::create(account).exec().waitForFinished();
 
         Query query;
-        query.liveQuery = true;
+        query.setFlags(Query::LiveQuery);
         auto model = Store::loadModel<SinkAccount>(query);
         QTRY_COMPARE(model->rowCount(QModelIndex()), 1);
 
@@ -130,7 +130,7 @@ private slots:
         VERIFYEXEC(Sink::Store::create(res));
         {
             Sink::Query query;
-            query.liveQuery = true;
+            query.setFlags(Query::LiveQuery);
             query.request<Sink::ApplicationDomain::SinkAccount::Status>();
 
             auto model = Sink::Store::loadModel<Sink::ApplicationDomain::SinkAccount>(query);
diff --git a/tests/clientapitest.cpp b/tests/clientapitest.cpp
index 94c78a7..3f500b7 100644
--- a/tests/clientapitest.cpp
+++ b/tests/clientapitest.cpp
@@ -107,7 +107,6 @@ private slots:
 
         Sink::Query query;
         query.resourceFilter("dummyresource.instance1");
-        query.liveQuery = false;
 
         auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Event>(query);
         QTRY_VERIFY(model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
@@ -118,7 +117,6 @@ private slots:
     {
         Sink::Query query;
         query.resourceFilter("nonexisting.resource");
-        query.liveQuery = false;
 
         auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Event>(query);
         QTRY_VERIFY(model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
@@ -132,7 +130,6 @@ private slots:
 
         Sink::Query query;
         query.resourceFilter("dummyresource.instance1");
-        query.liveQuery = false;
 
         auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Folder>(query);
         QTRY_COMPARE(model->rowCount(), 1);
@@ -150,7 +147,6 @@ private slots:
         // Test
         Sink::Query query;
         query.resourceFilter("dummyresource.instance1");
-        query.liveQuery = false;
         query.parentProperty = "parent";
 
         auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Folder>(query);
@@ -173,7 +169,6 @@ private slots:
         // Test
         Sink::Query query;
         query.resourceFilter("dummyresource.instance1");
-        query.liveQuery = false;
         query.parentProperty = "parent";
 
         auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Folder>(query);
@@ -196,7 +191,7 @@ private slots:
         // Test
         Sink::Query query;
         query.resourceFilter("dummyresource.instance1");
-        query.liveQuery = true;
+        query.setFlags(Sink::Query::LiveQuery);
         query.parentProperty = "parent";
 
         auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Folder>(query);
@@ -247,7 +242,6 @@ private slots:
         ResourceConfig::addResource("dummyresource.instance2", "dummyresource");
 
         Sink::Query query;
-        query.liveQuery = false;
 
         int childrenFetchedCount = 0;
         auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Event>(query);
@@ -271,7 +265,6 @@ private slots:
 
         Sink::Query query;
         query.resourceFilter("dummyresource.instance1");
-        query.liveQuery = false;
 
         bool gotValue = false;
         auto result = Sink::Store::fetchOne<Sink::ApplicationDomain::Event>(query)
diff --git a/tests/databasepopulationandfacadequerybenchmark.cpp b/tests/databasepopulationandfacadequerybenchmark.cpp
index 834ce30..f1904ad 100644
--- a/tests/databasepopulationandfacadequerybenchmark.cpp
+++ b/tests/databasepopulationandfacadequerybenchmark.cpp
@@ -90,7 +90,6 @@ class DatabasePopulationAndFacadeQueryBenchmark : public QObject
         const auto startingRss = getCurrentRSS();
 
         Sink::Query query;
-        query.liveQuery = false;
         query.requestedProperties << "uid"
                                   << "summary";
 
diff --git a/tests/dummyresourcetest.cpp b/tests/dummyresourcetest.cpp
index 0883a13..f8d8543 100644
--- a/tests/dummyresourcetest.cpp
+++ b/tests/dummyresourcetest.cpp
@@ -238,7 +238,7 @@ private slots:
     void testWriteModifyDeleteLive()
     {
         auto query = Query().resourceFilter("sink.dummy.instance1");
-        query.liveQuery = true;
+        query.setFlags(Query::LiveQuery);
         query.filter<Event::Uid>("testuid");
 
         auto model = Sink::Store::loadModel<Event>(query);
diff --git a/tests/mailquerybenchmark.cpp b/tests/mailquerybenchmark.cpp
index 90cc4ba..e2c6864 100644
--- a/tests/mailquerybenchmark.cpp
+++ b/tests/mailquerybenchmark.cpp
@@ -152,7 +152,6 @@ private slots:
     void test50k()
     {
         Sink::Query query;
-        query.liveQuery = false;
         query.request<Mail::Uid>()
              .request<Mail::Subject>()
              .request<Mail::Date>();
diff --git a/tests/modelinteractivitytest.cpp b/tests/modelinteractivitytest.cpp
index 6d1c51c..5231c1a 100644
--- a/tests/modelinteractivitytest.cpp
+++ b/tests/modelinteractivitytest.cpp
@@ -78,7 +78,7 @@ private slots:
 
         Sink::Query query;
         query.resourceFilter("sink.dummy.instance1");
-        query.liveQuery = true;
+        query.setFlags(Sink::Query::LiveQuery);
 
         VERIFYEXEC(Sink::ResourceControl::flushMessageQueue(QByteArrayList() << "sink.dummy.instance1"));
 
diff --git a/tests/querytest.cpp b/tests/querytest.cpp
index 9ae3c74..a5e1caf 100644
--- a/tests/querytest.cpp
+++ b/tests/querytest.cpp
@@ -50,7 +50,7 @@ private slots:
         // Test
         Sink::Query query;
         query.resourceFilter("foobar");
-        query.liveQuery = true;
+        query.setFlags(Query::LiveQuery);
 
         // We fetch before the data is available and rely on the live query mechanism to deliver the actual data
         auto model = Sink::Store::loadModel<Mail>(query);
@@ -70,7 +70,7 @@ private slots:
         // Test
         Sink::Query query;
         query.resourceFilter("sink.dummy.instance1");
-        query.liveQuery = true;
+        query.setFlags(Query::LiveQuery);
 
         // We fetch before the data is available and rely on the live query mechanism to deliver the actual data
         auto model = Sink::Store::loadModel<Mail>(query);
@@ -88,7 +88,6 @@ private slots:
         // Test
         Sink::Query query;
         query.resourceFilter("sink.dummy.instance1");
-        query.liveQuery = false;
 
         // Ensure all local data is processed
         VERIFYEXEC(Sink::ResourceControl::flushMessageQueue(QByteArrayList() << "sink.dummy.instance1"));
@@ -119,7 +118,7 @@ private slots:
         // Test
         Sink::Query query;
         query.resourceFilter("sink.dummy.instance1");
-        query.liveQuery = true;
+        query.setFlags(Query::LiveQuery);
         query.filter<Mail::Folder>("folder1");
 
         // We fetch before the data is available and rely on the live query mechanism to deliver the actual data
@@ -182,7 +181,7 @@ private slots:
         // Test
         Sink::Query query;
         query.resourceFilter("sink.dummy.instance1");
-        query.liveQuery = true;
+        query.setFlags(Query::LiveQuery);
 
         // We fetch before the data is available and rely on the live query mechanism to deliver the actual data
         auto model = Sink::Store::loadModel<Folder>(query);
@@ -253,7 +252,6 @@ private slots:
         // Test
         Sink::Query query;
         query.resourceFilter("sink.dummy.instance1");
-        query.liveQuery = false;
         query.filter<Mail::Uid>("test1");
 
         // Ensure all local data is processed
@@ -412,7 +410,6 @@ private slots:
         query.filter<Mail::Folder>(*folderEntity);
         query.sort<Mail::Date>();
         query.limit = 1;
-        query.liveQuery = false;
 
         // Ensure all local data is processed
         VERIFYEXEC(Sink::ResourceControl::flushMessageQueue(QByteArrayList() << "sink.dummy.instance1"));
@@ -433,7 +430,7 @@ private slots:
     void testReactToNewResource()
     {
         Sink::Query query;
-        query.liveQuery = true;
+        query.setFlags(Query::LiveQuery);
         auto model = Sink::Store::loadModel<Folder>(query);
         QTRY_COMPARE(model->rowCount(QModelIndex()), 0);
 
@@ -560,7 +557,7 @@ private slots:
         Query query;
         query.filter<Mail::Folder>(Sink::Query().containsFilter<Folder::SpecialPurpose>("purpose1"));
         query.request<Mail::Uid>();
-        query.liveQuery = true;
+        query.setFlags(Query::LiveQuery);
 
         auto model = Sink::Store::loadModel<Mail>(query);
         QTRY_COMPARE(model->rowCount(), 1);
diff --git a/tests/resourceconfigtest.cpp b/tests/resourceconfigtest.cpp
index c06b0fb..df98a61 100644
--- a/tests/resourceconfigtest.cpp
+++ b/tests/resourceconfigtest.cpp
@@ -86,7 +86,7 @@ private slots:
         VERIFYEXEC(Sink::Store::create(res));
         {
             Sink::Query query;
-            query.liveQuery = true;
+            query.setFlags(Query::LiveQuery);
             query.request<SinkResource::Status>();
             auto model = Sink::Store::loadModel<SinkResource>(query);
             QTRY_COMPARE(model->rowCount(QModelIndex()), 1);
-- 
cgit v1.2.3