diff options
author | Tuomas Heimonen <tuomas.heimonen@theqtcompany.com> | 2016-06-29 08:52:29 +0300 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-07-04 13:32:26 +0000 |
commit | efccadf055dee97dae0a985c0680ff55acc5fbd7 (patch) | |
tree | 953c47287af9e8d1c80ee41fb440aadbd0ec753f /tests | |
parent | 59f20906d9d6d7bc33069fc0960c59edf0e232e1 (diff) | |
download | qtmultimedia-efccadf055dee97dae0a985c0680ff55acc5fbd7.tar.gz |
tst_qsoundeffect: Update to case testLooping
Be more permissive while checking loops remaining.
Remove file BLACKLIST
Task-number: QTBUG-46689
Change-Id: I15b5fb55ee770a190b2c21dd8cf1fad45665a73c
Reviewed-by: Milla Pohjanheimo <milla.pohjanheimo@qt.io>
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/integration/qsoundeffect/BLACKLIST | 7 | ||||
-rw-r--r-- | tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp | 6 |
2 files changed, 3 insertions, 10 deletions
diff --git a/tests/auto/integration/qsoundeffect/BLACKLIST b/tests/auto/integration/qsoundeffect/BLACKLIST deleted file mode 100644 index 1feeb4b5f..000000000 --- a/tests/auto/integration/qsoundeffect/BLACKLIST +++ /dev/null @@ -1,7 +0,0 @@ -# QTBUG-46689 - -[testLooping] -ubuntu-14.04 64bit -redhatenterpriselinuxworkstation-6.6 -rhel-7.1 -opensuse-13.1 diff --git a/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp b/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp index 604607ab0..035ce3e13 100644 --- a/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp +++ b/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp @@ -188,7 +188,7 @@ void tst_QSoundEffect::testLooping() // wait for all the loops to be completed QTRY_COMPARE(sound->loopsRemaining(), 0); - QVERIFY(readSignal_Remaining.count() >= 6); + QTRY_VERIFY(readSignal_Remaining.count() >= 6); QTRY_VERIFY(!sound->isPlaying()); } @@ -203,7 +203,7 @@ void tst_QSoundEffect::testLooping() QCOMPARE(readSignal_Remaining.count(), 0); sound->play(); - QCOMPARE(sound->loopsRemaining(), int(QSoundEffect::Infinite)); + QTRY_COMPARE(sound->loopsRemaining(), int(QSoundEffect::Infinite)); QCOMPARE(readSignal_Remaining.count(), 1); QTest::qWait(1500); @@ -219,7 +219,7 @@ void tst_QSoundEffect::testLooping() QCOMPARE(readSignal_Remaining.count(), 1); QTRY_COMPARE(sound->loopsRemaining(), 0); - QVERIFY(readSignal_Remaining.count() >= 2); + QTRY_VERIFY(readSignal_Remaining.count() >= 2); QTRY_VERIFY(!sound->isPlaying()); } } |