summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSami Nurmenniemi <sami.nurmenniemi@qt.io>2017-12-29 07:51:58 (GMT)
committerJani Heikkinen <jani.heikkinen@qt.io>2018-01-09 07:46:40 (GMT)
commit2661593df95b8a5a56af0a8fd22af5be7f7ea8fb (patch)
treece98e3089c1a738fb5183db38006bc8893ecef31
parent6d51090572d843d781376d0128dddb3c9a0e307c (diff)
downloadqtwebchannel-2661593df95b8a5a56af0a8fd22af5be7f7ea8fb.tar.gz
Clean up TestWebChannel::testAsyncObjectv5.9.45.9.4
Task-number: QTBUG-63152 Change-Id: I22df2328f0ab6d2a2d12458dbeaec68bfbe36985 (cherry picked from commit 5a9dd81f260f320b5af108c1a6b3d0b82a04f15d) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
-rw-r--r--tests/auto/webchannel/tst_webchannel.cpp15
1 files changed, 3 insertions, 12 deletions
diff --git a/tests/auto/webchannel/tst_webchannel.cpp b/tests/auto/webchannel/tst_webchannel.cpp
index 4309647..a44220f 100644
--- a/tests/auto/webchannel/tst_webchannel.cpp
+++ b/tests/auto/webchannel/tst_webchannel.cpp
@@ -770,11 +770,6 @@ void TestWebChannel::testInfiniteRecursion()
void TestWebChannel::testAsyncObject()
{
- auto waitForSignal = [] (QSignalSpy& spy) {
- for (int i=0; (i<5) && (spy.count() == 0); i++)
- spy.wait(1000);
- };
-
QWebChannel channel;
channel.connectTo(m_dummyTransport);
@@ -793,8 +788,7 @@ void TestWebChannel::testAsyncObject()
{
QSignalSpy spy(&obj, &TestObject::propChanged);
channel.d_func()->publisher->invokeMethod(&obj, method, args);
- waitForSignal(spy);
- QCOMPARE(spy.count(), 1);
+ QTRY_COMPARE(spy.count(), 1);
QCOMPARE(spy.at(0).at(0).toString(), args.at(0).toString());
}
@@ -810,13 +804,10 @@ void TestWebChannel::testAsyncObject()
{
QSignalSpy spy(&obj, &TestObject::replay);
QMetaObject::invokeMethod(&obj, "fire");
- waitForSignal(spy);
- QCOMPARE(spy.count(), 1);
+ QTRY_COMPARE(spy.count(), 1);
channel.deregisterObject(&obj);
QMetaObject::invokeMethod(&obj, "fire");
- spy.takeFirst();
- waitForSignal(spy);
- QCOMPARE(spy.count(), 1);
+ QTRY_COMPARE(spy.count(), 2);
}
thread.quit();