From 871a21c05728344af5159014c81b09634d969263 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Fri, 27 May 2011 11:31:38 +1000 Subject: tests: improve failure messages from tst_mediaobject Add some checks for Phonon::ErrorState, and make sure that the errorString() is put into the test failure log in this case. Reviewed-by: Jason McDonald Change-Id: I7e844b85c821df02ad562108d9752c7fc43534d5 --- tests/auto/mediaobject/tst_mediaobject.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/auto/mediaobject/tst_mediaobject.cpp b/tests/auto/mediaobject/tst_mediaobject.cpp index f16a6f7..dc2fdbc 100644 --- a/tests/auto/mediaobject/tst_mediaobject.cpp +++ b/tests/auto/mediaobject/tst_mediaobject.cpp @@ -745,17 +745,19 @@ void tst_MediaObject::playUrl() media.setProperty("InternetAccessPointName", iap); #endif //Q_OS_SYMBIAN media.setCurrentSource(Phonon::MediaSource(url)); - QVERIFY(media.state() != Phonon::ErrorState); + QVERIFY2(media.state() != Phonon::ErrorState, qPrintable(media.errorString())); //we use a long 30s timeout here as it can take a long time for the streaming source to //be sucessfully prepared depending on the network. if (media.state() != Phonon::StoppedState) QTest::waitForSignal(&media, SIGNAL(stateChanged(Phonon::State, Phonon::State)), 30000); + QVERIFY2(media.state() != Phonon::ErrorState, qPrintable(media.errorString())); QCOMPARE(media.state(), Phonon::StoppedState); media.play(); if (media.state() != Phonon::PlayingState) QTest::waitForSignal(&media, SIGNAL(stateChanged(Phonon::State, Phonon::State)), 15000); + QVERIFY2(media.state() != Phonon::ErrorState, qPrintable(media.errorString())); QCOMPARE(media.state(), Phonon::PlayingState); //sleep and allow some of the stream to be played @@ -772,6 +774,7 @@ void tst_MediaObject::playUrl() media.stop(); if (media.state() != Phonon::StoppedState) QTest::waitForSignal(&media, SIGNAL(stateChanged(Phonon::State, Phonon::State)), 15000); + QVERIFY2(media.state() != Phonon::ErrorState, qPrintable(media.errorString())); QCOMPARE(media.state(), Phonon::StoppedState); } -- cgit v1.2.3