We get an offline status notification initially

2 files changed, 18 insertions, 8 deletions

diff --git a/common/notification.cpp b/common/notification.cpp
index e688b6d..da31e20 100644
--- a/common/notification.cpp
+++ b/common/notification.cpp
@@ -48,8 +48,8 @@ static QByteArray name(int type)
 
 QDebug operator<<(QDebug dbg, const Sink::Notification &n)
 {
-    dbg << "Notification(Type: " << name(n.type) << "Id, : " << n.id  << ", Code: ";
+    dbg << "Notification(Type:" << name(n.type) << "Id, :" << n.id  << ", Code:";
     dbg << n.code;
-    dbg << ", Message: " << n.message << ", Entities: " << n.entities << ")";
+    dbg << ", Message:" << n.message << ", Entities:" << n.entities << ")";
     return dbg.space();
 }
diff --git a/tests/notificationtest.cpp b/tests/notificationtest.cpp
index a34d325..e268a17 100644
--- a/tests/notificationtest.cpp
+++ b/tests/notificationtest.cpp
@@ -67,12 +67,22 @@ private slots:
         VERIFYEXEC(Sink::Store::synchronize(query));
         VERIFYEXEC(Sink::ResourceControl::flushMessageQueue(QByteArrayList() << "sink.dummy.instance1"));
 
-        QVERIFY(statusNotifications.size() <= 3);
-        QTRY_COMPARE(statusNotifications.size(), 3);
-        //Sync
-        QCOMPARE(statusNotifications.at(0).code, static_cast<int>(ApplicationDomain::Status::ConnectedStatus));
-        QCOMPARE(statusNotifications.at(1).code, static_cast<int>(ApplicationDomain::Status::BusyStatus));
-        QCOMPARE(statusNotifications.at(2).code, static_cast<int>(ApplicationDomain::Status::ConnectedStatus));
+        using namespace Sink::ApplicationDomain;
+        {
+            QList<Status> expected = {
+                Status::OfflineStatus,
+                Status::ConnectedStatus,
+                Status::BusyStatus,
+                Status::ConnectedStatus
+            };
+            qInfo() << "Received notifications " << statusNotifications;
+            QVERIFY2(statusNotifications.size() <= expected.size(), "More notifications than expected.");
+            QTRY_COMPARE(statusNotifications.size(), expected.size());
+            qInfo() << "All received notifications " << statusNotifications;
+            for (auto i = 0; i < statusNotifications.size(); i++) {
+                QCOMPARE(statusNotifications.at(i).code, static_cast<int>(expected.at(i)));
+            }
+        }
         //Changereplay
         // It can happen that we get a changereplay notification pair first and then a second one at the end,
         // we therefore currently filter all changereplay notifications (see above).