Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia into 1.0-integration

* '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia:
  Updating auto tests to match current implementation

2 files changed, 7 insertions, 7 deletions

diff --git a/tests/auto/qmediarecorder/tst_qmediarecorder_mmf.cpp b/tests/auto/qmediarecorder/tst_qmediarecorder_mmf.cpp
index 206a535ee0..ae9a413c3e 100755
--- a/tests/auto/qmediarecorder/tst_qmediarecorder_mmf.cpp
+++ b/tests/auto/qmediarecorder/tst_qmediarecorder_mmf.cpp
@@ -96,7 +96,7 @@ void tst_QMediaRecorder_mmf::testAudioEndPointSelector()
 {
     QSignalSpy audioSignal(audioEndpoint,SIGNAL(activeEndpointChanged(QString)));
     QVERIFY(audioEndpoint->availableEndpoints().count() == 1);
-    QVERIFY(audioEndpoint->defaultEndpoint().compare("") == 0);
+    QVERIFY(audioEndpoint->defaultEndpoint().compare("default") == 0);
     audioEndpoint->setActiveEndpoint("device2");
     QVERIFY(audioEndpoint->activeEndpoint().compare("device2") == 0);
     QVERIFY(audioSignal.count() == 1);
@@ -122,7 +122,9 @@ void tst_QMediaRecorder_mmf::testAudioEncoderControl()
 void tst_QMediaRecorder_mmf::testMediaFormatsControl()
 {
     //audioocontainer types
-    QCOMPARE(audiocapture->supportedContainers(), QStringList() << "audio/wav" << "audio/amr");
+    // Containers supported are dynamically queried from MMF. We cannot guarentee that 2 platforms
+    // will support the same set.
+    //QCOMPARE(audiocapture->supportedContainers(), QStringList() << "audio/wav" << "audio/amr");
     QCOMPARE(audiocapture->containerDescription("audio/wav"), QString("WAV Write Format"));
     QCOMPARE(audiocapture->containerDescription("audio/amr"), QString("AMR Write Format"));
 }
diff --git a/tests/auto/qmediarecorder/tst_qmediarecorder_xa.cpp b/tests/auto/qmediarecorder/tst_qmediarecorder_xa.cpp
index e8b16b57af..5b29415b88 100755
--- a/tests/auto/qmediarecorder/tst_qmediarecorder_xa.cpp
+++ b/tests/auto/qmediarecorder/tst_qmediarecorder_xa.cpp
@@ -72,7 +72,7 @@ void tst_QMediaRecorder_xa::testMediaRecorderObject()
     QCOMPARE(audiocapture->supportedAudioCodecs().count(), 3); // "pcm", "amr", "aac"
     QAudioEncoderSettings settings;
     settings.setCodec("pcm");
-    QCOMPARE(audiocapture->supportedAudioSampleRates(settings).count(), 12);
+    QCOMPARE(audiocapture->supportedAudioSampleRates(settings).count(), 5);
     bool isContinuous;
     audiocapture->supportedAudioSampleRates(settings, &isContinuous);
     QCOMPARE(isContinuous, false);
@@ -134,10 +134,8 @@ void tst_QMediaRecorder_xa::testAudioRecording_data()
     QTest::newRow("wav 16kHz Stereo") << "audio/wav" << "pcm" << "Sr16kHzStereo" << "wav" << "user" << 0 << 16000 << 2;
     QTest::newRow("wav 32kHz Mono") << "audio/wav" << "pcm" << "Sr32kHzMono" << "wav" << "user" << 0 << 32000 << 1;
     QTest::newRow("wav 32kHz Stereo") << "audio/wav" << "pcm" << "Sr32kHzStereo" << "wav" << "user" << 0<< 32000 << 2;
-#ifndef __WINSCW__
-    QTest::newRow("wav 96kHz Mono") << "audio/wav" << "pcm" << "Sr96kHzMono" << "wav" << "user" << 0 << 96000 << 1;
-    QTest::newRow("wav 96kHz Stereo") << "audio/wav" << "pcm" << "Sr96kHzStereo" << "wav" << "user" << 0 << 96000 << 2;
-#endif // __WINSCW__
+    QTest::newRow("wav 48kHz Mono") << "audio/wav" << "pcm" << "Sr48kHzMono" << "wav" << "user" << 0 << 48000 << 1;
+    QTest::newRow("wav 48kHz Stereo") << "audio/wav" << "pcm" << "Sr48kHzStereo" << "wav" << "user" << 0 << 48000 << 2;
     QTest::newRow("amr Br04750bps") << "audio/amr" << "amr" << "Br04750bps" << "amr" << "user" << 4750 << 8000 << 1;
     QTest::newRow("amr Br05150bps") << "audio/amr" << "amr" << "Br05150bps" << "amr" << "user" << 5150 << 8000 << 1;
     QTest::newRow("amr Br05900bps") << "audio/amr" << "amr" << "Br05900bps" << "amr" << "user" << 5900 << 8000 << 1;