From 7287dae6c279583e5c5f0fafd8207341cc5a15af Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Thu, 22 Feb 2018 17:22:26 +0100
Subject: Properly deal with filtered entities in reduced queries.

Filtered entities would still end up in the entities list before.
---
 tests/querytest.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/tests/querytest.cpp b/tests/querytest.cpp
index f65d477..52f0024 100644
--- a/tests/querytest.cpp
+++ b/tests/querytest.cpp
@@ -1211,7 +1211,7 @@ private slots:
         Query query;
         query.setId("testLivequeryThreadleaderChange");
         query.setFlags(Query::LiveQuery);
-        query.reduce<Mail::Folder>(Query::Reduce::Selector::max<Mail::Date>()).count("count").collect<Mail::Folder>("folders");
+        query.reduce<Mail::Folder>(Query::Reduce::Selector::max<Mail::Date>()).count().collect<Mail::Folder>();
         query.sort<Mail::Date>();
         query.request<Mail::MessageId>();
         query.filter<Mail::Important>(false);
@@ -1224,8 +1224,8 @@ private slots:
         {
             auto mail = model->data(model->index(0, 0, QModelIndex{}), Sink::Store::DomainObjectRole).value<Mail::Ptr>();
             QCOMPARE(mail->getMessageId(), QByteArray{"mail1"});
-            QCOMPARE(mail->getProperty("count").toInt(), 2);
-            QCOMPARE(mail->getProperty("folders").toList().size(), 2);
+            QCOMPARE(mail->count(), 2);
+            QCOMPARE(mail->getCollectedProperty<Mail::Folder>().size(), 2);
         }
     }
 
-- 
cgit v1.2.3