From c40d79106c056057bfd38cd74c4d9c8df90277b3 Mon Sep 17 00:00:00 2001 From: Michael Goddard Date: Wed, 18 Jan 2012 13:54:53 +1000 Subject: Set the volume for our automatic integration tests. These aren't manual test, so we don't care if you can't hear it. QSound does not have a volume property (yet). Change-Id: I6ef90262decf4630de84478215bfe8d259db4751 Reviewed-by: Ling Hu --- tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp | 7 +++++++ tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp index 7c79b36ca..31b253869 100755 --- a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp +++ b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp @@ -398,6 +398,8 @@ void tst_QAudioOutput::disableNotifyInterval() if (audioFiles.size() > 0) { QAudioOutput audioOutputCheck(testFormats.at(0), this); audioOutputCheck.setNotifyInterval(0); + audioOutputCheck.setVolume(0.1f); + QSignalSpy notifySignal(&audioOutputCheck, SIGNAL(notify())); QFile *audioFile = audioFiles.at(0).data(); audioFile->open(QIODevice::ReadOnly); @@ -476,6 +478,7 @@ void tst_QAudioOutput::pull() QAudioOutput audioOutput(testFormats.at(i), this); audioOutput.setNotifyInterval(100); + audioOutput.setVolume(0.1f); QSignalSpy notifySignal(&audioOutput, SIGNAL(notify())); QSignalSpy stateSignal(&audioOutput, SIGNAL(stateChanged(QAudio::State))); @@ -538,6 +541,7 @@ void tst_QAudioOutput::pullSuspendResume() QAudioOutput audioOutput(testFormats.at(i), this); audioOutput.setNotifyInterval(100); + audioOutput.setVolume(0.1f); QSignalSpy notifySignal(&audioOutput, SIGNAL(notify())); QSignalSpy stateSignal(&audioOutput, SIGNAL(stateChanged(QAudio::State))); @@ -627,6 +631,7 @@ void tst_QAudioOutput::push() QAudioOutput audioOutput(testFormats.at(i), this); audioOutput.setNotifyInterval(100); + audioOutput.setVolume(0.1f); QSignalSpy notifySignal(&audioOutput, SIGNAL(notify())); QSignalSpy stateSignal(&audioOutput, SIGNAL(stateChanged(QAudio::State))); @@ -714,6 +719,7 @@ void tst_QAudioOutput::pushSuspendResume() QAudioOutput audioOutput(testFormats.at(i), this); audioOutput.setNotifyInterval(100); + audioOutput.setVolume(0.1f); QSignalSpy notifySignal(&audioOutput, SIGNAL(notify())); QSignalSpy stateSignal(&audioOutput, SIGNAL(stateChanged(QAudio::State))); @@ -841,6 +847,7 @@ void tst_QAudioOutput::pushUnderrun() QAudioOutput audioOutput(testFormats.at(i), this); audioOutput.setNotifyInterval(100); + audioOutput.setVolume(0.1f); QSignalSpy notifySignal(&audioOutput, SIGNAL(notify())); QSignalSpy stateSignal(&audioOutput, SIGNAL(stateChanged(QAudio::State))); diff --git a/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp b/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp index d61e46336..c1c6818f9 100644 --- a/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp +++ b/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp @@ -94,6 +94,7 @@ void tst_QSoundEffect::testSource() QSignalSpy readSignal(sound, SIGNAL(sourceChanged())); sound->setSource(url); + sound->setVolume(0.1f); QCOMPARE(sound->source(),url); QCOMPARE(readSignal.count(),1); @@ -110,6 +111,7 @@ void tst_QSoundEffect::testLooping() QSignalSpy readSignal_Remaining(sound, SIGNAL(loopsRemainingChanged())); sound->setLoopCount(5); + sound->setVolume(0.1f); QCOMPARE(sound->loopCount(),5); QCOMPARE(readSignal_Count.count(),1); @@ -147,6 +149,7 @@ void tst_QSoundEffect::testMuting() void tst_QSoundEffect::testPlaying() { sound->setLoopCount(QSoundEffect::Infinite); + sound->setVolume(0.1f); //valid source sound->setSource(url); QTestEventLoop::instance().enterLoop(1); @@ -200,6 +203,7 @@ void tst_QSoundEffect::testDestroyWhilePlaying() { QSoundEffect *instance = new QSoundEffect(); instance->setSource(url); + instance->setVolume(0.1f); QTestEventLoop::instance().enterLoop(1); instance->play(); QTest::qWait(500); @@ -211,6 +215,7 @@ void tst_QSoundEffect::testDestroyWhileRestartPlaying() { QSoundEffect *instance = new QSoundEffect(); instance->setSource(url); + instance->setVolume(0.1f); QTestEventLoop::instance().enterLoop(1); instance->play(); QTest::qWait(1000); -- cgit v1.2.3