diff options
author | Liang Qi <liang.qi@qt.io> | 2016-10-11 07:45:03 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-10-11 07:45:03 +0200 |
commit | 1c6c85cd7c619cc15c099ae63a5d22bcf661847c (patch) | |
tree | 5a803feb71e725853317ee1df50a19afe3c87e7a /tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp | |
parent | 4d3dae3fa63d64cc97226969c4bf7d6d91b63b57 (diff) | |
parent | 20e65d4dbd43d133d663b4733ffb09629935e731 (diff) | |
download | qtmultimedia-1c6c85cd7c619cc15c099ae63a5d22bcf661847c.tar.gz |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I7291f7a3bd5851eafe2bf0a4bd5c5f8e705a90bc
Diffstat (limited to 'tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp')
-rw-r--r-- | tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp index fbbd9c731..ca1f2b67e 100644 --- a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp +++ b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp @@ -605,9 +605,6 @@ void tst_QAudioOutput::pullSuspendResume() audioOutput.resume(); - // Give backends running in separate threads a chance to suspend. - QTest::qWait(100); - // Check that QAudioOutput immediately transitions to ActiveState QVERIFY2((stateSignal.count() == 1), QString("didn't emit signal after resume(), got %1 signals instead").arg(stateSignal.count()).toLocal8Bit().constData()); @@ -619,8 +616,8 @@ void tst_QAudioOutput::pullSuspendResume() QTest::qWait(3000); // 3 seconds should be plenty QVERIFY2(audioFile->atEnd(), "didn't play to EOF"); - QVERIFY2((stateSignal.count() == 1), - QString("didn't emit IdleState signal when at EOF, got %1 signals instead").arg(stateSignal.count()).toLocal8Bit().constData()); + QVERIFY(stateSignal.count() > 0); + QCOMPARE(qvariant_cast<QAudio::State>(stateSignal.last().at(0)), QAudio::IdleState); QVERIFY2((audioOutput.state() == QAudio::IdleState), "didn't transitions to IdleState when at EOF"); stateSignal.clear(); |