slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'camera' of git://scm.dev.nokia.troll.no/qt/qtmultimediakit

Browse Source 
Change-Id: Iec6f96e3713257d25f7b1e06c6da9c153b23800b
This commit is contained in:
Michael Goddard
2011-08-30 14:42:21 +10:00
parent 4ddffcdae3 47a5dd4371
commit 3bf236cc23
58 changed files with 2121 additions and 977 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/auto/qcameraimagecapture/tst_qcameraimagecapture.cpp
View File

@@ -107,6 +107,7 @@ public slots:
private slots:
void constructor();
void mediaObject();
void deleteMediaObject();
void isReadyForCapture();
void capture();
void cancelCapture();
@@ -165,6 +166,29 @@ void tst_QCameraImageCapture::mediaObject()
QCOMPARE(medobj1, &camera1);
}
void tst_QCameraImageCapture::deleteMediaObject()
{
MockMediaServiceProvider *provider = new MockMediaServiceProvider;
provider->service = new MockCameraService;
QCamera *camera = new QCamera(0, provider);
QCameraImageCapture *capture = new QCameraImageCapture(camera);
QVERIFY(capture->mediaObject() == camera);
QVERIFY(capture->isAvailable());
delete camera;
delete provider->service;
delete provider;
//capture should detach from camera
QVERIFY(capture->mediaObject() == 0);
QVERIFY(!capture->isAvailable());
capture->capture();
delete capture;
}
//MaemoAPI-1825:test isReadyForCapture
void tst_QCameraImageCapture::isReadyForCapture()
{