slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace insignificant flag for mac with QEXPECT_FAIL. Keep for win32.

Browse Source 
Change-Id: Ied8519294e34d74ef854baa5be5cba2972a7f33c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Toby Tomkins
2012-07-12 13:53:58 +10:00
committed by Qt by Nokia
parent 8509e390ae
commit 5f06930b16
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/integration/qsoundeffect/qsoundeffect.pro
View File

@@ -4,7 +4,7 @@ QT += core multimedia-private testlib
CONFIG += no_private_qt_headers_warning CONFIG += no_private_qt_headers_warning
# This is more of a system test # This is more of a system test
CONFIG += testcase insignificant_test CONFIG += testcase
SOURCES += tst_qsoundeffect.cpp SOURCES += tst_qsoundeffect.cpp
@@ -15,3 +15,5 @@ unix:!mac {
} }
TESTDATA += test.wav TESTDATA += test.wav
win32: CONFIG += insignificant_test

21
tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp
View File

@@ -156,6 +156,9 @@ void tst_QSoundEffect::testLooping()
QTestEventLoop::instance().enterLoop(3); QTestEventLoop::instance().enterLoop(3);
QCOMPARE(sound->loopsRemaining(), 0); QCOMPARE(sound->loopsRemaining(), 0);
#ifdef Q_OS_MAC
QEXPECT_FAIL("", "QTBUG-26488 Fails on Mac", Abort);
#endif
QCOMPARE(readSignal_Remaining.count(),5); QCOMPARE(readSignal_Remaining.count(),5);
} }
@@ -198,6 +201,9 @@ void tst_QSoundEffect::testPlaying()
QTestEventLoop::instance().enterLoop(1); QTestEventLoop::instance().enterLoop(1);
sound->play(); sound->play();
QTestEventLoop::instance().enterLoop(1); QTestEventLoop::instance().enterLoop(1);
#ifdef Q_OS_MAC
QEXPECT_FAIL("", "QTBUG-26488 Fails on Mac", Abort);
#endif
QCOMPARE(sound->isPlaying(), false); QCOMPARE(sound->isPlaying(), false);
//invalid source //invalid source
@@ -213,6 +219,9 @@ void tst_QSoundEffect::testPlaying()
void tst_QSoundEffect::testStatus() void tst_QSoundEffect::testStatus()
{ {
sound->setSource(QUrl()); sound->setSource(QUrl());
#ifdef Q_OS_MAC
QEXPECT_FAIL("", "QTBUG-26488 Fails on Mac", Abort);
#endif
QCOMPARE(sound->status(), QSoundEffect::Null); QCOMPARE(sound->status(), QSoundEffect::Null);
//valid source //valid source
@@ -272,6 +281,9 @@ void tst_QSoundEffect::testSetSourceWhileLoading()
QVERIFY(sound->isPlaying()); QVERIFY(sound->isPlaying());
sound->setSource(QUrl()); sound->setSource(QUrl());
#ifdef Q_OS_MAC
QEXPECT_FAIL("", "QTBUG-26488 Fails on Mac", Abort);
#endif
QCOMPARE(sound->status(), QSoundEffect::Null); QCOMPARE(sound->status(), QSoundEffect::Null);
sound->setSource(url2); sound->setSource(url2);
@@ -302,6 +314,9 @@ void tst_QSoundEffect::testSetSourceWhilePlaying()
QVERIFY(sound->isPlaying()); QVERIFY(sound->isPlaying());
sound->setSource(QUrl()); sound->setSource(QUrl());
#ifdef Q_OS_MAC
QEXPECT_FAIL("", "QTBUG-26488 Fails on Mac", Abort);
#endif
QCOMPARE(sound->status(), QSoundEffect::Null); QCOMPARE(sound->status(), QSoundEffect::Null);
sound->setSource(url2); sound->setSource(url2);
@@ -323,6 +338,9 @@ void tst_QSoundEffect::testSetSourceWhilePlaying()
void tst_QSoundEffect::testSupportedMimeTypes() void tst_QSoundEffect::testSupportedMimeTypes()
{ {
QStringList mimeTypes = sound->supportedMimeTypes(); QStringList mimeTypes = sound->supportedMimeTypes();
#ifdef Q_OS_MAC
QEXPECT_FAIL("", "QTBUG-26488 Fails on Mac", Abort);
#endif
QVERIFY(!mimeTypes.empty()); QVERIFY(!mimeTypes.empty());
QVERIFY(mimeTypes.indexOf(QLatin1String("audio/wav")) != -1 || QVERIFY(mimeTypes.indexOf(QLatin1String("audio/wav")) != -1 ||
mimeTypes.indexOf(QLatin1String("audio/x-wav")) != -1 || mimeTypes.indexOf(QLatin1String("audio/x-wav")) != -1 ||
@@ -338,6 +356,9 @@ void tst_QSoundEffect::testCorruptFile()
QVERIFY(!sound->isPlaying()); QVERIFY(!sound->isPlaying());
QVERIFY(sound->status() == QSoundEffect::Loading || sound->status() == QSoundEffect::Error); QVERIFY(sound->status() == QSoundEffect::Loading || sound->status() == QSoundEffect::Error);
QTRY_COMPARE(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); QCOMPARE(statusSpy.count(), 2);
sound->play(); sound->play();
QVERIFY(!sound->isPlaying()); QVERIFY(!sound->isPlaying());