← Back to branch summary

~ubuntu-branches/ubuntu/quantal/qtmobility/quantal

« back to all changes in this revision

Viewing changes to tests/auto/qmediarecorder/tst_qmediarecorder_mmf.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2010-11-16 16:18:07 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20101116161807-k2dzt2nyse975r3l
Tags: 1.1.0-0ubuntu1
* New upstream release
* Syncronise with Debian, no remaining changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/auto/qmediarecorder/tst_qmediarecorder_mmf.cpp
96
96
{
97
97
    QSignalSpy audioSignal(audioEndpoint,SIGNAL(activeEndpointChanged(QString)));
98
98
    QVERIFY(audioEndpoint->availableEndpoints().count() == 1);
99
 
    QVERIFY(audioEndpoint->defaultEndpoint().compare("") == 0);
 
99
    QVERIFY(audioEndpoint->defaultEndpoint().compare("default") == 0);
100
100
    audioEndpoint->setActiveEndpoint("device2");
101
101
    QVERIFY(audioEndpoint->activeEndpoint().compare("device2") == 0);
102
102
    QVERIFY(audioSignal.count() == 1);
122
122
void tst_QMediaRecorder_mmf::testMediaFormatsControl()
123
123
{
124
124
    //audioocontainer types
125
 
    QCOMPARE(audiocapture->supportedContainers(), QStringList() << "audio/wav" << "audio/amr");
 
125
    // Containers supported are dynamically queried from MMF. We cannot guarentee that 2 platforms
 
126
    // will support the same set.
 
127
    //QCOMPARE(audiocapture->supportedContainers(), QStringList() << "audio/wav" << "audio/amr");
126
128
    QCOMPARE(audiocapture->containerDescription("audio/wav"), QString("WAV Write Format"));
127
129
    QCOMPARE(audiocapture->containerDescription("audio/amr"), QString("AMR Write Format"));
128
130
}