API unit tests from Maemo API test team.
A large number of tweaks and changes to original tests, and refactor a lot of the mock backends to reduce duplication. Changed viewfinder test case to use mock service and provider so that it matches the image capture test case. Reviewed-by: Jonas Rabbe (cherry picked from commit e40bef5508a4165cec4a46b97115aed461027fa5) Also licence header fix: (cherry picked from commit e9ee9e8c48b45b97d62ee4a82e400fa9d8ea8107) Change-Id: Ic59891d75563bb2e008a336eea859e8c44d8d831 Reviewed-on: http://codereview.qt.nokia.com/2078 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
committed by
Qt by Nokia
parent
1e4dda9710
commit
a6128410da
@@ -85,6 +85,8 @@ private slots:
|
||||
void setVideoOutput();
|
||||
void debugEnums();
|
||||
|
||||
void mediaChanged_signal();
|
||||
|
||||
public:
|
||||
tst_QMediaImageViewer() : m_network(0) {}
|
||||
|
||||
@@ -386,7 +388,17 @@ void tst_QMediaImageViewer::setConsecutiveMedia()
|
||||
QMediaImageViewerService *service = qobject_cast<QMediaImageViewerService *>(viewer.service());
|
||||
service->setNetworkManager(m_network);
|
||||
|
||||
viewer.setMedia(networkMedia2);
|
||||
viewer.setMedia(networkMedia1);
|
||||
|
||||
QCOMPARE(viewer.media(), networkMedia1);
|
||||
QCOMPARE(viewer.mediaStatus(), QMediaImageViewer::LoadingMedia);
|
||||
|
||||
QTestEventLoop::instance().enterLoop(2);
|
||||
QCOMPARE(viewer.media(), networkMedia1);
|
||||
QCOMPARE(viewer.mediaStatus(), QMediaImageViewer::LoadedMedia);
|
||||
|
||||
viewer.setMedia(fileMedia1);
|
||||
viewer.setMedia(networkMedia2);
|
||||
|
||||
QCOMPARE(viewer.media(), networkMedia2);
|
||||
@@ -420,6 +432,7 @@ void tst_QMediaImageViewer::setConsecutiveMedia()
|
||||
void tst_QMediaImageViewer::setInvalidMedia()
|
||||
{
|
||||
QMediaImageViewer viewer;
|
||||
viewer.setTimeout(250);
|
||||
|
||||
QMediaImageViewerService *service = qobject_cast<QMediaImageViewerService *>(viewer.service());
|
||||
service->setNetworkManager(m_network);
|
||||
@@ -1031,6 +1044,20 @@ void tst_QMediaImageViewer::debugEnums()
|
||||
qDebug() << QMediaImageViewer::NoMedia;
|
||||
}
|
||||
|
||||
void tst_QMediaImageViewer::mediaChanged_signal()
|
||||
{
|
||||
QMediaContent imageMedia(imageUrl("image.png"));
|
||||
QMediaImageViewer viewer;
|
||||
viewer.setTimeout(250);
|
||||
viewer.setNotifyInterval(150);
|
||||
|
||||
QSignalSpy spy(&viewer, SIGNAL(mediaChanged(QMediaContent)));
|
||||
QVERIFY(spy.size() == 0);
|
||||
|
||||
viewer.setMedia(imageMedia);
|
||||
QVERIFY(spy.size() == 1);
|
||||
}
|
||||
|
||||
QTEST_MAIN(tst_QMediaImageViewer)
|
||||
|
||||
#include "tst_qmediaimageviewer.moc"
|
||||
|
||||
Reference in New Issue
Block a user