Fix the wavedecoder a little.

Handle RIFX and corrupted files better.  Update the autotest so that it
is run properly (and copies files properly in shadow build).  Fix the
gendata script to properly create testdata.

Change-Id: I47b705507bebaef54df2835ec767c6b220c64678
Reviewed-on: http://codereview.qt-project.org/6380
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>

16 files changed, 29 insertions, 26 deletions

diff --git a/tests/auto/multimedia.pro b/tests/auto/multimedia.pro
index 6a6d08b9e..307a25256 100644
--- a/tests/auto/multimedia.pro
+++ b/tests/auto/multimedia.pro
@@ -27,6 +27,7 @@ SUBDIRS += \
     qmediaobject \
     qcamera \
     qcamerabackend \
+    qwavedecoder
 
 # These is disabled until intent is clearer
 #    qvideodevicecontrol \
diff --git a/tests/auto/qwavedecoder/data/gendata.sh b/tests/auto/qwavedecoder/data/gendata.sh
index 9954ed409..0dd82cef7 100755
--- a/tests/auto/qwavedecoder/data/gendata.sh
+++ b/tests/auto/qwavedecoder/data/gendata.sh
@@ -58,9 +58,9 @@ for channel in 1 2; do
     for samplebits in 8 16 32; do
         for samplerate in 44100 8000; do
             if [ $samplebits -ne 8 ]; then
-                sox --endian "${endian}" -c ${channel} -b ${samplebits} -r ${samplerate} -n isawav_${channel}_${samplebits}_${samplerate}_${endian_extn}.wav synth 0.25 sine 300-3300
+                sox -n --endian "${endian}" -c ${channel} -b ${samplebits} -r ${samplerate} isawav_${channel}_${samplebits}_${samplerate}_${endian_extn}.wav synth 0.25 sine 300-3300
             else
-                sox -c ${channel} -b ${samplebits} -r ${samplerate} -n isawav_${channel}_${samplebits}_${samplerate}.wav synth 0.25 sine 300-3300
+                sox -n -c ${channel} -b ${samplebits} -r ${samplerate} isawav_${channel}_${samplebits}_${samplerate}.wav synth 0.25 sine 300-3300
             fi
         done
      done
diff --git a/tests/auto/qwavedecoder/data/isawav_1_16_44100_le.wav b/tests/auto/qwavedecoder/data/isawav_1_16_44100_le.wav
index d8373cde4..88b1a8379 100644
--- a/tests/auto/qwavedecoder/data/isawav_1_16_44100_le.wav
+++ b/tests/auto/qwavedecoder/data/isawav_1_16_44100_le.wav
diff --git a/tests/auto/qwavedecoder/data/isawav_1_16_8000_le.wav b/tests/auto/qwavedecoder/data/isawav_1_16_8000_le.wav
index 6467b9a98..83a405907 100644
--- a/tests/auto/qwavedecoder/data/isawav_1_16_8000_le.wav
+++ b/tests/auto/qwavedecoder/data/isawav_1_16_8000_le.wav
diff --git a/tests/auto/qwavedecoder/data/isawav_1_32_44100_le.wav b/tests/auto/qwavedecoder/data/isawav_1_32_44100_le.wav
index 6d4efdefc..9c437b155 100644
--- a/tests/auto/qwavedecoder/data/isawav_1_32_44100_le.wav
+++ b/tests/auto/qwavedecoder/data/isawav_1_32_44100_le.wav
diff --git a/tests/auto/qwavedecoder/data/isawav_1_32_8000_le.wav b/tests/auto/qwavedecoder/data/isawav_1_32_8000_le.wav
index 9963f63fe..f90a8bc35 100644
--- a/tests/auto/qwavedecoder/data/isawav_1_32_8000_le.wav
+++ b/tests/auto/qwavedecoder/data/isawav_1_32_8000_le.wav
diff --git a/tests/auto/qwavedecoder/data/isawav_1_8_44100.wav b/tests/auto/qwavedecoder/data/isawav_1_8_44100.wav
index 638696999..7d10829ea 100644
--- a/tests/auto/qwavedecoder/data/isawav_1_8_44100.wav
+++ b/tests/auto/qwavedecoder/data/isawav_1_8_44100.wav
diff --git a/tests/auto/qwavedecoder/data/isawav_1_8_8000.wav b/tests/auto/qwavedecoder/data/isawav_1_8_8000.wav
index ac7b40f69..76c08e89e 100644
--- a/tests/auto/qwavedecoder/data/isawav_1_8_8000.wav
+++ b/tests/auto/qwavedecoder/data/isawav_1_8_8000.wav
diff --git a/tests/auto/qwavedecoder/data/isawav_2_16_44100_be.wav b/tests/auto/qwavedecoder/data/isawav_2_16_44100_be.wav
index d3ffb04f0..ca0cd425a 100644
--- a/tests/auto/qwavedecoder/data/isawav_2_16_44100_be.wav
+++ b/tests/auto/qwavedecoder/data/isawav_2_16_44100_be.wav
diff --git a/tests/auto/qwavedecoder/data/isawav_2_16_8000_be.wav b/tests/auto/qwavedecoder/data/isawav_2_16_8000_be.wav
index 8638f19b9..3a684590b 100644
--- a/tests/auto/qwavedecoder/data/isawav_2_16_8000_be.wav
+++ b/tests/auto/qwavedecoder/data/isawav_2_16_8000_be.wav
diff --git a/tests/auto/qwavedecoder/data/isawav_2_32_44100_be.wav b/tests/auto/qwavedecoder/data/isawav_2_32_44100_be.wav
index edf655558..f1aaf2906 100644
--- a/tests/auto/qwavedecoder/data/isawav_2_32_44100_be.wav
+++ b/tests/auto/qwavedecoder/data/isawav_2_32_44100_be.wav
diff --git a/tests/auto/qwavedecoder/data/isawav_2_32_8000_be.wav b/tests/auto/qwavedecoder/data/isawav_2_32_8000_be.wav
index 642f10c06..c10c20872 100644
--- a/tests/auto/qwavedecoder/data/isawav_2_32_8000_be.wav
+++ b/tests/auto/qwavedecoder/data/isawav_2_32_8000_be.wav
diff --git a/tests/auto/qwavedecoder/data/isawav_2_8_44100.wav b/tests/auto/qwavedecoder/data/isawav_2_8_44100.wav
index dcb001741..befd02baf 100644
--- a/tests/auto/qwavedecoder/data/isawav_2_8_44100.wav
+++ b/tests/auto/qwavedecoder/data/isawav_2_8_44100.wav
diff --git a/tests/auto/qwavedecoder/data/isawav_2_8_8000.wav b/tests/auto/qwavedecoder/data/isawav_2_8_8000.wav
index 901ee35c7..ce8b0d06a 100644
--- a/tests/auto/qwavedecoder/data/isawav_2_8_8000.wav
+++ b/tests/auto/qwavedecoder/data/isawav_2_8_8000.wav
diff --git a/tests/auto/qwavedecoder/qwavedecoder.pro b/tests/auto/qwavedecoder/qwavedecoder.pro
index 435aae956..4f0339a87 100644
--- a/tests/auto/qwavedecoder/qwavedecoder.pro
+++ b/tests/auto/qwavedecoder/qwavedecoder.pro
@@ -6,8 +6,8 @@ SOURCES += tst_qwavedecoder.cpp \
 QT += multimedia-private testlib
 CONFIG += no_private_qt_headers_warning testcase
 
-data.path = .
-data.sources = data
+data.files = data
+data.path = $${OUT_PWD}
 
 INSTALLS += data
 
diff --git a/tests/auto/qwavedecoder/tst_qwavedecoder.cpp b/tests/auto/qwavedecoder/tst_qwavedecoder.cpp
index aeed403e3..6bf529f9c 100644
--- a/tests/auto/qwavedecoder/tst_qwavedecoder.cpp
+++ b/tests/auto/qwavedecoder/tst_qwavedecoder.cpp
@@ -44,18 +44,18 @@
 #include <QtTest/QtTest>
 #include <private/qwavedecoder_p.h>
 
-#ifndef QTRY_VERIFY
-#define QTRY_VERIFY(__expr) \
+#ifndef QTRY_COMPARE
+#define QTRY_COMPARE(__expr, __expected) \
     do { \
         const int __step = 50; \
         const int __timeout = 10000; \
         if (!(__expr)) { \
             QTest::qWait(0); \
         } \
-        for (int __i = 0; __i < __timeout && !(__expr); __i+=__step) { \
+        for (int __i = 0; __i < __timeout && !((__expr) == (__expected)); __i+=__step) { \
             QTest::qWait(__step); \
         } \
-        QVERIFY(__expr); \
+        QCOMPARE(__expr, __expected); \
     } while (0)
 #endif
 
@@ -131,10 +131,11 @@ void tst_QWaveDecoder::integrity_data()
     QTest::newRow("File isawav_2_16_8000_be.wav") << QString("isawav_2_16_8000_be.wav")  << tst_QWaveDecoder::None << 2 << 16 << 8000 << QAudioFormat::BigEndian;
     QTest::newRow("File isawav_2_16_44100_be.wav") << QString("isawav_2_16_44100_be.wav")  << tst_QWaveDecoder::None << 2 << 16 << 44100 << QAudioFormat::BigEndian;
 
-    QTest::newRow("File isawav_1_32_8000_le.wav") << QString("isawav_1_32_8000_le.wav")  << tst_QWaveDecoder::None << 1 << 32 << 8000 << QAudioFormat::LittleEndian;
-    QTest::newRow("File isawav_1_32_44100_le.wav") << QString("isawav_1_32_44100_le.wav")  << tst_QWaveDecoder::None << 1 << 32 << 44100 << QAudioFormat::LittleEndian;
-    QTest::newRow("File isawav_2_32_8000_be.wav") << QString("isawav_2_32_8000_be.wav")  << tst_QWaveDecoder::None << 2 << 32 << 8000 << QAudioFormat::BigEndian;
-    QTest::newRow("File isawav_2_32_44100_be.wav") << QString("isawav_2_32_44100_be.wav")  << tst_QWaveDecoder::None << 2 << 32 << 44100 << QAudioFormat::BigEndian;
+    // 32 bit waves are not supported
+    QTest::newRow("File isawav_1_32_8000_le.wav") << QString("isawav_1_32_8000_le.wav")  << tst_QWaveDecoder::FormatDescriptor << 1 << 32 << 8000 << QAudioFormat::LittleEndian;
+    QTest::newRow("File isawav_1_32_44100_le.wav") << QString("isawav_1_32_44100_le.wav")  << tst_QWaveDecoder::FormatDescriptor << 1 << 32 << 44100 << QAudioFormat::LittleEndian;
+    QTest::newRow("File isawav_2_32_8000_be.wav") << QString("isawav_2_32_8000_be.wav")  << tst_QWaveDecoder::FormatDescriptor << 2 << 32 << 8000 << QAudioFormat::BigEndian;
+    QTest::newRow("File isawav_2_32_44100_be.wav") << QString("isawav_2_32_44100_be.wav")  << tst_QWaveDecoder::FormatDescriptor << 2 << 32 << 44100 << QAudioFormat::BigEndian;
 }
 
 void tst_QWaveDecoder::integrity()
@@ -146,6 +147,7 @@ void tst_QWaveDecoder::integrity()
     QFETCH(int, samplerate);
     QFETCH(QAudioFormat::Endian, byteorder);
 
+
     QFile stream;
     stream.setFileName(QString("data/") + file);
     stream.open(QIODevice::ReadOnly);
@@ -157,28 +159,28 @@ void tst_QWaveDecoder::integrity()
     QSignalSpy invalidFormatSpy(&waveDecoder, SIGNAL(invalidFormat()));
 
     if (corruption == NotAWav) {
-        QTRY_VERIFY(validFormatSpy.count() == 0);
-        QTRY_VERIFY(invalidFormatSpy.count() == 0);
+        QTRY_COMPARE(validFormatSpy.count(), 0);
+        QTRY_COMPARE(invalidFormatSpy.count(), 0);
     } else if (corruption == NoSampleData) {
-        QTRY_VERIFY(validFormatSpy.count() == 1);
-        QTRY_VERIFY(invalidFormatSpy.count() == 0);
+        QTRY_COMPARE(validFormatSpy.count(), 1);
+        QTRY_COMPARE(invalidFormatSpy.count(), 0);
         QVERIFY(waveDecoder.audioFormat().isValid());
         QVERIFY(waveDecoder.size() == 0);
         QVERIFY(waveDecoder.duration() == 0);
     } else if (corruption == FormatDescriptor) {
-        QTRY_VERIFY(invalidFormatSpy.count() == 1);
-        QTRY_VERIFY(validFormatSpy.count() == 0);
+        QTRY_COMPARE(invalidFormatSpy.count(), 1);
+        QTRY_COMPARE(validFormatSpy.count(), 0);
     } else if (corruption == FormatString) {
-        QTRY_VERIFY(invalidFormatSpy.count() == 1);
-        QTRY_VERIFY(validFormatSpy.count() == 0);
+        QTRY_COMPARE(invalidFormatSpy.count(), 1);
+        QTRY_COMPARE(validFormatSpy.count(), 0);
         QVERIFY(!waveDecoder.audioFormat().isValid());
     } else if (corruption == DataDescriptor) {
-        QTRY_VERIFY(validFormatSpy.count() == 1);
-        QTRY_VERIFY(invalidFormatSpy.count() == 0);
+        QTRY_COMPARE(validFormatSpy.count(), 0);
+        QTRY_COMPARE(invalidFormatSpy.count(), 1);
         QVERIFY(waveDecoder.size() == 0);
     } else if (corruption == None) {
-        QTRY_VERIFY(validFormatSpy.count() == 1);
-        QTRY_VERIFY(invalidFormatSpy.count() == 0);
+        QTRY_COMPARE(validFormatSpy.count(), 1);
+        QTRY_COMPARE(invalidFormatSpy.count(), 0);
         QVERIFY(waveDecoder.audioFormat().isValid());
         QVERIFY(waveDecoder.size() > 0);
         QVERIFY(waveDecoder.duration() == 250);
@@ -206,7 +208,7 @@ void tst_QWaveDecoder::readAllAtOnce()
     QWaveDecoder waveDecoder(&stream);
     QSignalSpy validFormatSpy(&waveDecoder, SIGNAL(formatKnown()));
 
-    QTRY_VERIFY(validFormatSpy.count() == 1);
+    QTRY_COMPARE(validFormatSpy.count(), 1);
     QVERIFY(waveDecoder.size() > 0);
 
     QByteArray buffer;
@@ -232,7 +234,7 @@ void tst_QWaveDecoder::readPerByte()
     QWaveDecoder waveDecoder(&stream);
     QSignalSpy validFormatSpy(&waveDecoder, SIGNAL(formatKnown()));
 
-    QTRY_VERIFY(validFormatSpy.count() == 1);
+    QTRY_COMPARE(validFormatSpy.count(), 1);
     QVERIFY(waveDecoder.size() > 0);
 
     qint64 readSize = 0;