summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2021-10-04 16:50:15 +0200
committerLars Knoll <lars.knoll@qt.io>2021-10-12 14:00:36 +0200
commit839cb46628b197d0a851c78d518186881e047272 (patch)
tree3502fcf336c54b07337d4168ab5fb15ff6e82fea /tests
parent6c3133a51d3c148f0c7681a89051d4203abcb1f0 (diff)
Fix QCameraBackend::testNativeMetadata() on gstreamer
Let it record a bit, otherwise we don't get anything. Don't check QMediaMetaData::Date, as some encoders set that on their own. Instead use Language and fix issues in correctly writing the language. Pick-to: 6.2 Change-Id: Ib5e2bacc053814afc2fafdae65330950e591d6fc Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
index 4bad5bbcf..91cdcef3c 100644
--- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
+++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
@@ -638,9 +638,10 @@ void tst_QCameraBackend::testNativeMetadata()
QTRY_VERIFY(camera.isActive());
// Insert common metadata supported on all platforms
+ // Don't use Date, as some backends set that on their own
QMediaMetaData metaData;
metaData.insert(QMediaMetaData::Title, QString::fromUtf8("Title"));
- metaData.insert(QMediaMetaData::Date, QDate::currentDate());
+ metaData.insert(QMediaMetaData::Language, QVariant::fromValue(QLocale::German));
metaData.insert(QMediaMetaData::Description, QString::fromUtf8("Description"));
recorder.setMetaData(metaData);
@@ -676,7 +677,9 @@ void tst_QCameraBackend::testNativeMetadata()
QTRY_VERIFY(metadataChangedSpy.count() > 0);
QCOMPARE(player.metaData().value(QMediaMetaData::Title).toString(), metaData.value(QMediaMetaData::Title).toString());
- QCOMPARE(player.metaData().value(QMediaMetaData::Date).toDateTime(), metaData.value(QMediaMetaData::Date).toDateTime());
+ auto lang = player.metaData().value(QMediaMetaData::Language).value<QLocale::Language>();
+ if (lang != QLocale::AnyLanguage)
+ QCOMPARE(lang, metaData.value(QMediaMetaData::Language).value<QLocale::Language>());
QCOMPARE(player.metaData().value(QMediaMetaData::Description).toString(), metaData.value(QMediaMetaData::Description).toString());
metadataChangedSpy.clear();