diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-27 11:49:33 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-27 11:49:33 +1000 |
commit | 52364069b83cd95c73f06973cd4eaadec63083e4 (patch) | |
tree | 4d93a06371e1788bce8ef79490f7fea21b413527 | |
parent | b1bf17740fc917381ff2accc649a07e377fc697c (diff) | |
parent | 871a21c05728344af5159014c81b09634d969263 (diff) |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtphonon-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtphonon-staging:
tests: improve failure messages from tst_mediaobject
-rw-r--r-- | tests/auto/mediaobject/tst_mediaobject.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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); } |