diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-17 10:48:30 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-17 10:48:30 +0200 |
| commit | b4f2dc4f62b2cb4bd9c43de56bbfd0024404c190 (patch) | |
| tree | b4a71b9a45b1c1c3adf21cdc49de68f9c86b1e9c /tests/auto/unit/qmediaobject/tst_qmediaobject.cpp | |
| parent | 393602150d1f3eec25252aa40045f9e24ae5329b (diff) | |
| parent | 820205e604a5f281238c23464638fdff72b969d1 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Ib8d05d6e21c7beb19f618cd1edc52d248b1e43b8
Diffstat (limited to 'tests/auto/unit/qmediaobject/tst_qmediaobject.cpp')
| -rw-r--r-- | tests/auto/unit/qmediaobject/tst_qmediaobject.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp index 31775249a..0548d1e1a 100644 --- a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp +++ b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp @@ -288,14 +288,19 @@ void tst_QMediaObject::notifySignals() QFETCH(int, count); QtTestMediaObject object; + QSignalSpy spy(&object, SIGNAL(aChanged(int))); + object.setNotifyInterval(interval); object.addPropertyWatch("a"); - QSignalSpy spy(&object, SIGNAL(aChanged(int))); + QElapsedTimer timer; + timer.start(); - QTestEventLoop::instance().enterLoop(1); + QTRY_COMPARE(spy.count(), count); - QCOMPARE(spy.count(), count); + qint64 elapsed = timer.elapsed(); + int expectedElapsed = count * interval * 1.3; // give it some margin of error + QVERIFY2(elapsed < expectedElapsed, QString("elapsed: %1, expected: %2").arg(elapsed).arg(expectedElapsed).toLocal8Bit().constData()); } void tst_QMediaObject::notifyInterval_data() |