diff options
author | Toby Tomkins <toby.tomkins@nokia.com> | 2012-07-12 13:53:58 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-13 01:06:17 +0200 |
commit | 5f06930b166e8dda5309bb40cd2379073a018ba4 (patch) | |
tree | 7113beaa4f75818852b8012bb44dafc36dcc79ba /tests/auto/integration/qsoundeffect | |
parent | 8509e390aee373b6652989d51d5475ce00b676ad (diff) | |
download | qtmultimedia-5f06930b166e8dda5309bb40cd2379073a018ba4.tar.gz |
Replace insignificant flag for mac with QEXPECT_FAIL. Keep for win32.
Change-Id: Ied8519294e34d74ef854baa5be5cba2972a7f33c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/integration/qsoundeffect')
-rw-r--r-- | tests/auto/integration/qsoundeffect/qsoundeffect.pro | 4 | ||||
-rw-r--r-- | tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp | 21 |
2 files changed, 24 insertions, 1 deletions
diff --git a/tests/auto/integration/qsoundeffect/qsoundeffect.pro b/tests/auto/integration/qsoundeffect/qsoundeffect.pro index 95b6c5aed..4ef2103b6 100644 --- a/tests/auto/integration/qsoundeffect/qsoundeffect.pro +++ b/tests/auto/integration/qsoundeffect/qsoundeffect.pro @@ -4,7 +4,7 @@ QT += core multimedia-private testlib CONFIG += no_private_qt_headers_warning # This is more of a system test -CONFIG += testcase insignificant_test +CONFIG += testcase SOURCES += tst_qsoundeffect.cpp @@ -15,3 +15,5 @@ unix:!mac { } TESTDATA += test.wav + +win32: CONFIG += insignificant_test diff --git a/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp b/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp index 150dd22aa..131aed036 100644 --- a/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp +++ b/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp @@ -156,6 +156,9 @@ void tst_QSoundEffect::testLooping() QTestEventLoop::instance().enterLoop(3); QCOMPARE(sound->loopsRemaining(), 0); +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-26488 Fails on Mac", Abort); +#endif QCOMPARE(readSignal_Remaining.count(),5); } @@ -198,6 +201,9 @@ void tst_QSoundEffect::testPlaying() QTestEventLoop::instance().enterLoop(1); sound->play(); QTestEventLoop::instance().enterLoop(1); +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-26488 Fails on Mac", Abort); +#endif QCOMPARE(sound->isPlaying(), false); //invalid source @@ -213,6 +219,9 @@ void tst_QSoundEffect::testPlaying() void tst_QSoundEffect::testStatus() { sound->setSource(QUrl()); +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-26488 Fails on Mac", Abort); +#endif QCOMPARE(sound->status(), QSoundEffect::Null); //valid source @@ -272,6 +281,9 @@ void tst_QSoundEffect::testSetSourceWhileLoading() QVERIFY(sound->isPlaying()); sound->setSource(QUrl()); +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-26488 Fails on Mac", Abort); +#endif QCOMPARE(sound->status(), QSoundEffect::Null); sound->setSource(url2); @@ -302,6 +314,9 @@ void tst_QSoundEffect::testSetSourceWhilePlaying() QVERIFY(sound->isPlaying()); sound->setSource(QUrl()); +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-26488 Fails on Mac", Abort); +#endif QCOMPARE(sound->status(), QSoundEffect::Null); sound->setSource(url2); @@ -323,6 +338,9 @@ void tst_QSoundEffect::testSetSourceWhilePlaying() void tst_QSoundEffect::testSupportedMimeTypes() { QStringList mimeTypes = sound->supportedMimeTypes(); +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-26488 Fails on Mac", Abort); +#endif QVERIFY(!mimeTypes.empty()); QVERIFY(mimeTypes.indexOf(QLatin1String("audio/wav")) != -1 || mimeTypes.indexOf(QLatin1String("audio/x-wav")) != -1 || @@ -338,6 +356,9 @@ void tst_QSoundEffect::testCorruptFile() QVERIFY(!sound->isPlaying()); QVERIFY(sound->status() == QSoundEffect::Loading || sound->status() == QSoundEffect::Error); QTRY_COMPARE(sound->status(), QSoundEffect::Error); +#ifdef Q_OS_MAC + QEXPECT_FAIL("", "QTBUG-26488 Fails on Mac", Abort); +#endif QCOMPARE(statusSpy.count(), 2); sound->play(); QVERIFY(!sound->isPlaying()); |