diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2012-02-03 14:23:56 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-06 05:35:11 +0100 |
| commit | fd3a3a72921fa1e55f265f2d30e94615e388505e (patch) | |
| tree | 11c179aa53cf546dec3b0cc128132c833c5000d7 /tests/auto/unit/qmediaobject | |
| parent | fb73a565747d06faec7c47490c0c509a74ff08e3 (diff) | |
Added metaDataChanged(key,value) signal to metadata controls.
It may be more efficient and convenient for application to use this
signal instead of metaDataChanged().
metaDataChanged() signal is emitted for compatibility,
backends should emit both signals.
Signal added QMetadataReader/WritterControl,
QMediaObject and QMediaRecorder.
Change-Id: I5ca34a40e64b22034e6fde8cd7f9735cc3f72c68
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'tests/auto/unit/qmediaobject')
| -rw-r--r-- | tests/auto/unit/qmediaobject/tst_qmediaobject.cpp | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp index 2bbcca0f6..3887463c0 100644 --- a/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp +++ b/tests/auto/unit/qmediaobject/tst_qmediaobject.cpp @@ -370,13 +370,24 @@ void tst_QMediaObject::metaDataChanged() QtTestMetaDataService service; QtTestMediaObject object(&service); - QSignalSpy spy(&object, SIGNAL(metaDataChanged())); - - service.metaData.metaDataChanged(); - QCOMPARE(spy.count(), 1); - - service.metaData.metaDataChanged(); - QCOMPARE(spy.count(), 2); + QSignalSpy changedSpy(&object, SIGNAL(metaDataChanged())); + QSignalSpy changedWithValueSpy(&object, SIGNAL(metaDataChanged(QString, QVariant))); + + service.metaData.setMetaData("key", "Value"); + QCOMPARE(changedSpy.count(), 1); + QCOMPARE(changedWithValueSpy.count(), 1); + QCOMPARE(changedWithValueSpy.last()[0], QVariant("key")); + QCOMPARE(changedWithValueSpy.last()[1].value<QVariant>(), QVariant("Value")); + + service.metaData.setMetaData("key", "Value"); + QCOMPARE(changedSpy.count(), 1); + QCOMPARE(changedWithValueSpy.count(), 1); + + service.metaData.setMetaData("key2", "Value"); + QCOMPARE(changedSpy.count(), 2); + QCOMPARE(changedWithValueSpy.count(), 2); + QCOMPARE(changedWithValueSpy.last()[0], QVariant("key2")); + QCOMPARE(changedWithValueSpy.last()[1].value<QVariant>(), QVariant("Value")); } void tst_QMediaObject::metaData_data() |