diff options
Diffstat (limited to 'tests')
7 files changed, 32 insertions, 32 deletions
diff --git a/tests/auto/unit/qcamera/tst_qcamera.cpp b/tests/auto/unit/qcamera/tst_qcamera.cpp index 788579507..a39945c3c 100644 --- a/tests/auto/unit/qcamera/tst_qcamera.cpp +++ b/tests/auto/unit/qcamera/tst_qcamera.cpp @@ -497,12 +497,12 @@ void tst_QCamera::testCameraCaptureMetadata() QVariantList metadata = metadataSignal[0]; QCOMPARE(metadata[0].toInt(), id); - QCOMPARE(metadata[1].toString(), QtMultimedia::MetaData::FocalLengthIn35mmFilm); + QCOMPARE(metadata[1].toString(), QMediaMetaData::FocalLengthIn35mmFilm); QCOMPARE(metadata[2].value<QVariant>().toInt(), 50); metadata = metadataSignal[1]; QCOMPARE(metadata[0].toInt(), id); - QCOMPARE(metadata[1].toString(), QtMultimedia::MetaData::DateTimeOriginal); + QCOMPARE(metadata[1].toString(), QMediaMetaData::DateTimeOriginal); QDateTime captureTime = metadata[2].value<QVariant>().value<QDateTime>(); QVERIFY(qAbs(captureTime.secsTo(QDateTime::currentDateTime()) < 5)); //it should not takes more than 5 seconds for signal to arrive here diff --git a/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp b/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp index bc6773326..5049b77a9 100644 --- a/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp +++ b/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp @@ -846,17 +846,17 @@ void tst_QDeclarativeAudio::metaData_data() QTest::newRow("title") << QByteArray("title") - << QtMultimedia::MetaData::Title + << QMediaMetaData::Title << QVariant(QString::fromLatin1("This is a title")); QTest::newRow("genre") << QByteArray("genre") - << QtMultimedia::MetaData::Genre + << QMediaMetaData::Genre << QVariant(QString::fromLatin1("rock")); QTest::newRow("trackNumber") << QByteArray("trackNumber") - << QtMultimedia::MetaData::TrackNumber + << QMediaMetaData::TrackNumber << QVariant(8); } diff --git a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp index 9fd8c747a..1b83e1af0 100644 --- a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp +++ b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp @@ -346,7 +346,7 @@ void tst_QMediaObject::nullMetaDataControl() QCOMPARE(object.isMetaDataAvailable(), false); - QCOMPARE(object.metaData(QtMultimedia::MetaData::Title).toString(), QString()); + QCOMPARE(object.metaData(QMediaMetaData::Title).toString(), QString()); QCOMPARE(object.availableMetaData(), QStringList()); QCOMPARE(spy.count(), 0); } @@ -422,18 +422,18 @@ void tst_QMediaObject::metaData() QtTestMediaObject object(&service); QVERIFY(object.availableMetaData().isEmpty()); - service.metaData.m_data.insert(QtMultimedia::MetaData::AlbumArtist, artist); - service.metaData.m_data.insert(QtMultimedia::MetaData::Title, title); - service.metaData.m_data.insert(QtMultimedia::MetaData::Genre, genre); + service.metaData.m_data.insert(QMediaMetaData::AlbumArtist, artist); + service.metaData.m_data.insert(QMediaMetaData::Title, title); + service.metaData.m_data.insert(QMediaMetaData::Genre, genre); - QCOMPARE(object.metaData(QtMultimedia::MetaData::AlbumArtist).toString(), artist); - QCOMPARE(object.metaData(QtMultimedia::MetaData::Title).toString(), title); + QCOMPARE(object.metaData(QMediaMetaData::AlbumArtist).toString(), artist); + QCOMPARE(object.metaData(QMediaMetaData::Title).toString(), title); QStringList metaDataKeys = object.availableMetaData(); QCOMPARE(metaDataKeys.size(), 3); - QVERIFY(metaDataKeys.contains(QtMultimedia::MetaData::AlbumArtist)); - QVERIFY(metaDataKeys.contains(QtMultimedia::MetaData::Title)); - QVERIFY(metaDataKeys.contains(QtMultimedia::MetaData::Genre)); + QVERIFY(metaDataKeys.contains(QMediaMetaData::AlbumArtist)); + QVERIFY(metaDataKeys.contains(QMediaMetaData::Title)); + QVERIFY(metaDataKeys.contains(QMediaMetaData::Genre)); } void tst_QMediaObject::availability() diff --git a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp index 6f3965844..c544e990b 100644 --- a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp +++ b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp @@ -843,9 +843,9 @@ void tst_QMediaRecorder::nullMetaDataControl() QCOMPARE(recorder.isMetaDataAvailable(), false); QCOMPARE(recorder.isMetaDataWritable(), false); - recorder.setMetaData(QtMultimedia::MetaData::Title, title); + recorder.setMetaData(QMediaMetaData::Title, title); - QCOMPARE(recorder.metaData(QtMultimedia::MetaData::Title).toString(), QString()); + QCOMPARE(recorder.metaData(QMediaMetaData::Title).toString(), QString()); QCOMPARE(recorder.availableMetaData(), QStringList()); QCOMPARE(spy.count(), 0); } @@ -959,19 +959,19 @@ void tst_QMediaRecorder::metaData() QMediaRecorder recorder(&object); QVERIFY(object.availableMetaData().isEmpty()); - service.mockMetaDataControl->m_data.insert(QtMultimedia::MetaData::AlbumArtist, artist); - service.mockMetaDataControl->m_data.insert(QtMultimedia::MetaData::Title, title); - service.mockMetaDataControl->m_data.insert(QtMultimedia::MetaData::Genre, genre); + service.mockMetaDataControl->m_data.insert(QMediaMetaData::AlbumArtist, artist); + service.mockMetaDataControl->m_data.insert(QMediaMetaData::Title, title); + service.mockMetaDataControl->m_data.insert(QMediaMetaData::Genre, genre); service.mockMetaDataControl->m_data.insert(QLatin1String("CustomEntry"), custom ); - QCOMPARE(recorder.metaData(QtMultimedia::MetaData::AlbumArtist).toString(), artist); - QCOMPARE(recorder.metaData(QtMultimedia::MetaData::Title).toString(), title); + QCOMPARE(recorder.metaData(QMediaMetaData::AlbumArtist).toString(), artist); + QCOMPARE(recorder.metaData(QMediaMetaData::Title).toString(), title); QStringList metaDataKeys = recorder.availableMetaData(); QCOMPARE(metaDataKeys.size(), 4); - QVERIFY(metaDataKeys.contains(QtMultimedia::MetaData::AlbumArtist)); - QVERIFY(metaDataKeys.contains(QtMultimedia::MetaData::Title)); - QVERIFY(metaDataKeys.contains(QtMultimedia::MetaData::Genre)); + QVERIFY(metaDataKeys.contains(QMediaMetaData::AlbumArtist)); + QVERIFY(metaDataKeys.contains(QMediaMetaData::Title)); + QVERIFY(metaDataKeys.contains(QMediaMetaData::Genre)); QVERIFY(metaDataKeys.contains(QLatin1String("CustomEntry"))); } @@ -995,9 +995,9 @@ void tst_QMediaRecorder::setMetaData() QMediaRecorder recorder(&object); - recorder.setMetaData(QtMultimedia::MetaData::Title, title); - QCOMPARE(recorder.metaData(QtMultimedia::MetaData::Title).toString(), title); - QCOMPARE(service.mockMetaDataControl->m_data.value(QtMultimedia::MetaData::Title).toString(), title); + recorder.setMetaData(QMediaMetaData::Title, title); + QCOMPARE(recorder.metaData(QMediaMetaData::Title).toString(), title); + QCOMPARE(service.mockMetaDataControl->m_data.value(QMediaMetaData::Title).toString(), title); } void tst_QMediaRecorder::testAudioSettingsCopyConstructor() diff --git a/tests/auto/unit/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp b/tests/auto/unit/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp index 2efc57e23..84e169b2f 100644 --- a/tests/auto/unit/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp +++ b/tests/auto/unit/qmetadatareadercontrol/tst_qmetadatareadercontrol.cpp @@ -91,7 +91,7 @@ void tst_QMetaDataReaderControl::metaDataReaderControlMetaData () { MockMetaDataReaderControl *metaData = new MockMetaDataReaderControl(); QVERIFY(metaData !=NULL); - metaData->metaData(QtMultimedia::MetaData::Title); + metaData->metaData(QMediaMetaData::Title); delete metaData; } diff --git a/tests/auto/unit/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp b/tests/auto/unit/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp index c0c898801..c3cfd2240 100644 --- a/tests/auto/unit/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp +++ b/tests/auto/unit/qmetadatawritercontrol/tst_qmetadatawritercontrol.cpp @@ -74,8 +74,8 @@ void tst_QMetaDataWriterControl::constructor() mock->availableMetaData(); mock->isMetaDataAvailable(); mock->isWritable(); - mock->metaData(QtMultimedia::MetaData::Title); - mock->setMetaData(QtMultimedia::MetaData::Title, QVariant()); + mock->metaData(QMediaMetaData::Title); + mock->setMetaData(QMediaMetaData::Title, QVariant()); ((MockMetaDataWriterControl*)mock)->setWritable(); ((MockMetaDataWriterControl*)mock)->setMetaDataAvailable(); delete mock; diff --git a/tests/auto/unit/qmultimedia_common/mockcameraimagecapturecontrol.h b/tests/auto/unit/qmultimedia_common/mockcameraimagecapturecontrol.h index a11c140a8..6fcd3560e 100644 --- a/tests/auto/unit/qmultimedia_common/mockcameraimagecapturecontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockcameraimagecapturecontrol.h @@ -95,11 +95,11 @@ private Q_SLOTS: emit imageCaptured(m_captureRequest, QImage()); emit imageMetadataAvailable(m_captureRequest, - QtMultimedia::MetaData::FocalLengthIn35mmFilm, + QMediaMetaData::FocalLengthIn35mmFilm, QVariant(50)); emit imageMetadataAvailable(m_captureRequest, - QtMultimedia::MetaData::DateTimeOriginal, + QMediaMetaData::DateTimeOriginal, QVariant(QDateTime::currentDateTime())); emit imageMetadataAvailable(m_captureRequest, |