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

Split some of the autotests into widget and non widget parts.

Browse Source 
Since the tests are mostly not widget based.

Change-Id: Ic3fa4224b19f2a5c710fd4763b5e645252975c1c
Reviewed-on: http://codereview.qt-project.org/4174
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
This commit is contained in:
Michael Goddard
2011-09-05 16:13:46 +10:00
committed by Qt by Nokia
parent 461a37b412
commit d690596868
30 changed files with 856 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/qmediaplayer/qmediaplayer.pro
View File

@@ -1,6 +1,6 @@
load(qttest_p4)
QT += network multimediakit-private multimediakitwidgets-private
QT += network multimediakit-private
CONFIG += no_private_qt_headers_warning
HEADERS += tst_qmediaplayer.h

37
tests/auto/qmediaplayer/tst_qmediaplayer.cpp
View File

@@ -43,7 +43,6 @@
#include "tst_qmediaplayer.h"
#include <qgraphicsvideoitem.h>
#include <QtNetwork/qnetworkconfigmanager.h>
// Encouraging successful diversity through copy and paste.
@@ -936,29 +935,14 @@ void tst_QMediaPlayer::testNetworkAccess()
void tst_QMediaPlayer::testSetVideoOutput()
{
QVideoWidget widget;
QGraphicsVideoItem item;
MockVideoSurface surface;
MockMediaPlayerService service;
MockMediaServiceProvider provider(&service);
QMediaPlayer player(0, 0, &provider);
player.setVideoOutput(&widget);
QVERIFY(widget.mediaObject() == &player);
player.setVideoOutput(&item);
QVERIFY(widget.mediaObject() == 0);
QVERIFY(item.mediaObject() == &player);
player.setVideoOutput(reinterpret_cast<QVideoWidget *>(0));
QVERIFY(item.mediaObject() == 0);
player.setVideoOutput(&widget);
QVERIFY(widget.mediaObject() == &player);
player.setVideoOutput(reinterpret_cast<QGraphicsVideoItem *>(0));
QVERIFY(widget.mediaObject() == 0);
player.setVideoOutput(&surface);
QVERIFY(service.rendererControl->surface() == &surface);
@@ -969,54 +953,35 @@ void tst_QMediaPlayer::testSetVideoOutput()
player.setVideoOutput(&surface);
QVERIFY(service.rendererControl->surface() == &surface);
player.setVideoOutput(&widget);
player.setVideoOutput(reinterpret_cast<QVideoWidget *>(0));
QVERIFY(service.rendererControl->surface() == 0);
QVERIFY(widget.mediaObject() == &player);
player.setVideoOutput(&surface);
QVERIFY(service.rendererControl->surface() == &surface);
QVERIFY(widget.mediaObject() == 0);
}
void tst_QMediaPlayer::testSetVideoOutputNoService()
{
QVideoWidget widget;
QGraphicsVideoItem item;
MockVideoSurface surface;
MockMediaServiceProvider provider(0, true);
QMediaPlayer player(0, 0, &provider);
player.setVideoOutput(&widget);
QVERIFY(widget.mediaObject() == 0);
player.setVideoOutput(&item);
QVERIFY(item.mediaObject() == 0);
player.setVideoOutput(&surface);
// Nothing we can verify here other than it doesn't assert.
}
void tst_QMediaPlayer::testSetVideoOutputNoControl()
{
QVideoWidget widget;
QGraphicsVideoItem item;
MockVideoSurface surface;
MockMediaPlayerService service;
service.rendererRef = 1;
service.windowRef = 1;
MockMediaServiceProvider provider(&service);
QMediaPlayer player(0, 0, &provider);
player.setVideoOutput(&widget);
QVERIFY(widget.mediaObject() == 0);
player.setVideoOutput(&item);
QVERIFY(item.mediaObject() == 0);
player.setVideoOutput(&surface);
QVERIFY(service.rendererControl->surface() == 0);
}

1
tests/auto/qmediaplayer/tst_qmediaplayer.h
View File

@@ -54,7 +54,6 @@
#include <qmediastreamscontrol.h>
#include <qmedianetworkaccesscontrol.h>
#include <qvideorenderercontrol.h>
#include <qvideowindowcontrol.h>
#include "mockmediaserviceprovider.h"
#include "mockmediaplayerservice.h"