Merge commit 'ebdb89b8bb482bbb5ecd544c3d38bef35fc7d820'v0.4.0

1 files changed, 30 insertions, 2 deletions

diff --git a/tests/notificationtest.cpp b/tests/notificationtest.cpp
index f0d957e..c043f38 100644
--- a/tests/notificationtest.cpp
+++ b/tests/notificationtest.cpp
@@ -128,13 +128,41 @@ private slots:
         VERIFYEXEC(Sink::Store::synchronize(newQuery));
         VERIFYEXEC(Sink::ResourceControl::flushMessageQueue(QByteArrayList() << "sink.dummy.instance1"));
 
-        QCOMPARE(status.size(), 3);
+        QTRY_COMPARE(status.size(), 3);
         //Sync progress of item
         QCOMPARE(status.at(0), static_cast<int>(ApplicationDomain::SyncStatus::SyncInProgress));
-        QCOMPARE(status.at(1), static_cast<int>(ApplicationDomain::SyncStatus::SyncSuccess));
+        QCOMPARE(status.at(1), static_cast<int>(ApplicationDomain::SyncStatus::SyncInProgress));
         //Modification triggered during sync
         QCOMPARE(status.at(2), static_cast<int>(ApplicationDomain::SyncStatus::SyncSuccess));
     }
+
+    void testNotifier()
+    {
+        QList<int> status;
+        Sink::Notifier notifier{Sink::Query{Sink::Query::LiveQuery}.resourceFilter("sink.dummy.instance2")};
+        notifier.registerHandler([&] (const Sink::Notification &notification) {
+            if (notification.type == Notification::Info) {
+                status << notification.code;
+            }
+        });
+
+        auto query = Query().resourceFilter("sink.dummy.instance2");
+        query.setType<ApplicationDomain::Mail>();
+        query.setFlags(Query::LiveQuery | Query::UpdateStatus);
+
+        auto resource = ApplicationDomain::ApplicationDomainType::createEntity<ApplicationDomain::SinkResource>("", "sink.dummy.instance2");
+        resource.setResourceType("sink.dummy");
+        VERIFYEXEC(Store::create(resource));
+
+        VERIFYEXEC(Sink::Store::synchronize(query));
+        VERIFYEXEC(Sink::ResourceControl::flushMessageQueue(QByteArrayList() << "sink.dummy.instance2"));
+
+        QTRY_COMPARE(status.size(), 2);
+        //Sync progress of item
+        QCOMPARE(status.at(0), static_cast<int>(ApplicationDomain::SyncStatus::SyncInProgress));
+        QCOMPARE(status.at(1), static_cast<int>(ApplicationDomain::SyncStatus::SyncSuccess));
+    }
+
 };
 
 QTEST_MAIN(NotificationTest)