[libcommhistory] Fix mem_eventmodel test failures. JB#52802

sailfishos · Mar 17, 2021 · fcd71fc · fcd71fc
1 parent 1aaadeb
commit fcd71fc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/tests/common.cpp b/tests/common.cpp
@@ -583,6 +583,9 @@ void waitForIdle(int pollInterval) {
 
 bool waitSignal(QSignalSpy &spy, int msec)
 {
+    if (!spy.isEmpty()) {
+        return true;
+    }
     QTime timer;
     timer.start();
     while (timer.elapsed() < msec && spy.isEmpty()) {

diff --git a/tests/mem_eventmodel/mem_eventmodel.cpp b/tests/mem_eventmodel/mem_eventmodel.cpp
@@ -40,6 +40,8 @@ Group group;
 
 void MemEventModelTest::initTestCase()
 {
+    deleteAll();
+
     MALLINFO_DUMP("INIT");
 
     addTestGroup(group, "/org/freedesktop/Telepathy/Account/gabble/jabber/dut_40localhost0", "td@localhost");
@@ -66,9 +68,9 @@ void MemEventModelTest::addEvent()
     e1.setRecipients(Recipient(e1.localUid(), "td@localhost"));
     e1.setFreeText("addEvents 1");
 
-    QVERIFY(model->addEvent(e1));
     QSignalSpy eventsCommitted(model, SIGNAL(eventsCommitted(const QList<CommHistory::Event>&, bool)));
 
+    QVERIFY(model->addEvent(e1));
     QVERIFY(waitSignal(eventsCommitted, WAIT_TIMEOUT));
 
     QTest::qWait(CALM_TIMEOUT);
@@ -101,8 +103,8 @@ void MemEventModelTest::addEvents()
         e1.setRecipients(Recipient(e1.localUid(), "td@localhost"));
         e1.setFreeText(QString("addEvents %1").arg(i));
 
-        QVERIFY(model->addEvent(e1));
         QSignalSpy eventsCommitted(model, SIGNAL(eventsCommitted(const QList<CommHistory::Event>&, bool)));
+        QVERIFY(model->addEvent(e1));
 
         QVERIFY(waitSignal(eventsCommitted, WAIT_TIMEOUT));
         waitWithDeletes(100);
@@ -197,19 +199,20 @@ void MemEventModelTest::callSetFilter()
     QSignalSpy ready(model, SIGNAL(modelReady(bool)));
 
     model->getEvents();
-    ready.clear();
-    QVERIFY(waitSignal(ready, WAIT_TIMEOUT));
+
+    int expectedReadyCount = 1;
+    QTRY_COMPARE(ready.count(), expectedReadyCount);
+    expectedReadyCount++;
 
     for(int i = 0; i < 5; i++) {
 
         if (i&1)
             model->setFilter(CallModel::SortByTime, CommHistory::CallEvent::MissedCallType);
         else
             model->setFilter(CallModel::SortByContact, CommHistory::CallEvent::UnknownCallType);
-        ready.clear();
-        QVERIFY(waitSignal(ready, WAIT_TIMEOUT));
-        QTest::qWait(100);
 
+        QTRY_COMPARE(ready.count(), expectedReadyCount);
+        expectedReadyCount++;
         MALLINFO_DUMP("get");
     }
     delete model;