From fd3a3a72921fa1e55f265f2d30e94615e388505e Mon Sep 17 00:00:00 2001 From: Dmytro Poplavskiy Date: Fri, 3 Feb 2012 14:23:56 +1000 Subject: 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 --- .../unit/qmediarecorder/tst_qmediarecorder.cpp | 25 ++++++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'tests/auto/unit/qmediarecorder') diff --git a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp index c99308631..713159538 100644 --- a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp +++ b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp @@ -833,13 +833,24 @@ void tst_QMediaRecorder::metaDataChanged() QMediaRecorder recorder(&object); - QSignalSpy spy(&recorder, SIGNAL(metaDataChanged())); - - service.mockMetaDataControl->metaDataChanged(); - QCOMPARE(spy.count(), 1); - - service.mockMetaDataControl->metaDataChanged(); - QCOMPARE(spy.count(), 2); + QSignalSpy changedSpy(&recorder, SIGNAL(metaDataChanged())); + QSignalSpy changedWithValueSpy(&recorder, SIGNAL(metaDataChanged(QString,QVariant))); + + service.mockMetaDataControl->setMetaData("key", "Value"); + QCOMPARE(changedSpy.count(), 1); + QCOMPARE(changedWithValueSpy.count(), 1); + QCOMPARE(changedWithValueSpy.last()[0], QVariant("key")); + QCOMPARE(changedWithValueSpy.last()[1].value(), QVariant("Value")); + + service.mockMetaDataControl->setMetaData("key", "Value"); + QCOMPARE(changedSpy.count(), 1); + QCOMPARE(changedWithValueSpy.count(), 1); + + service.mockMetaDataControl->setMetaData("key2", "Value"); + QCOMPARE(changedSpy.count(), 2); + QCOMPARE(changedWithValueSpy.count(), 2); + QCOMPARE(changedWithValueSpy.last()[0], QVariant("key2")); + QCOMPARE(changedWithValueSpy.last()[1].value(), QVariant("Value")); } void tst_QMediaRecorder::metaData_data() -- cgit v1.2.3