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

Remove SkipMode parameter from QSKIP.

Browse Source 
The SkipMode parameter has been removed from the API in qtbase, so it
must be in all calls to QSKIP.

Task-number: QTBUG-21851, QTBUG-21652
Change-Id: Ib6225572a46eac7881222fdce192750b8b13ee3b
Reviewed-by: Steve Schilz <sschilz@pasco.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Jason McDonald
2011-11-09 14:14:08 +10:00
committed by Qt by Nokia
parent 23af917dc5
commit 34cdc41a93
10 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/integration/qaudioinput/tst_qaudioinput.cpp
View File

@@ -148,7 +148,7 @@ void tst_QAudioInput::initTestCase()
QAudioDeviceInfo::availableDevices(QAudio::AudioInput); QAudioDeviceInfo::availableDevices(QAudio::AudioInput);
if (devices.size() <= 0) if (devices.size() <= 0)
QSKIP("No audio backend", SkipAll); QSKIP("No audio backend");
audioDevice = QAudioDeviceInfo::defaultInputDevice(); audioDevice = QAudioDeviceInfo::defaultInputDevice();

2
tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp
View File

@@ -193,7 +193,7 @@ void tst_QAudioOutput::initTestCase()
QAudioDeviceInfo::availableDevices(QAudio::AudioOutput); QAudioDeviceInfo::availableDevices(QAudio::AudioOutput);
if (devices.size() <= 0) if (devices.size() <= 0)
QSKIP("No audio backend", SkipAll); QSKIP("No audio backend");
audioDevice = QAudioDeviceInfo::defaultOutputDevice(); audioDevice = QAudioDeviceInfo::defaultOutputDevice();

12
tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
View File

@@ -149,7 +149,7 @@ void tst_QCameraBackend::initTestCase()
QCamera camera; QCamera camera;
if (!camera.isAvailable()) if (!camera.isAvailable())
QSKIP("Camera is not available", SkipAll); QSKIP("Camera is not available");
} }
void tst_QCameraBackend::cleanupTestCase() void tst_QCameraBackend::cleanupTestCase()
@@ -258,7 +258,7 @@ void tst_QCameraBackend::testCaptureMode()
if (!camera.isCaptureModeSupported(QCamera::CaptureVideo)) { if (!camera.isCaptureModeSupported(QCamera::CaptureVideo)) {
camera.setCaptureMode(QCamera::CaptureVideo); camera.setCaptureMode(QCamera::CaptureVideo);
QCOMPARE(camera.captureMode(), QCamera::CaptureStillImage); QCOMPARE(camera.captureMode(), QCamera::CaptureStillImage);
QSKIP("Video capture not supported", SkipAll); QSKIP("Video capture not supported");
} }
camera.setCaptureMode(QCamera::CaptureVideo); camera.setCaptureMode(QCamera::CaptureVideo);
@@ -380,7 +380,7 @@ void tst_QCameraBackend::testCaptureToBuffer()
#endif #endif
if (!imageCapture.isCaptureDestinationSupported(QCameraImageCapture::CaptureToBuffer)) if (!imageCapture.isCaptureDestinationSupported(QCameraImageCapture::CaptureToBuffer))
QSKIP("Buffer capture not supported", SkipAll); QSKIP("Buffer capture not supported");
QTRY_COMPARE(camera.status(), QCamera::LoadedStatus); QTRY_COMPARE(camera.status(), QCamera::LoadedStatus);
@@ -512,7 +512,7 @@ void tst_QCameraBackend::testCaptureToBuffer()
void tst_QCameraBackend::testCameraCaptureMetadata() void tst_QCameraBackend::testCameraCaptureMetadata()
{ {
#ifndef Q_WS_MAEMO_6 #ifndef Q_WS_MAEMO_6
QSKIP("Capture metadata is supported only on harmattan", SkipAll); QSKIP("Capture metadata is supported only on harmattan");
#endif #endif
QCamera camera; QCamera camera;
@@ -535,7 +535,7 @@ void tst_QCameraBackend::testCameraCaptureMetadata()
void tst_QCameraBackend::testExposureCompensation() void tst_QCameraBackend::testExposureCompensation()
{ {
#if !defined(Q_WS_MAEMO_6) #if !defined(Q_WS_MAEMO_6)
QSKIP("Capture exposure parameters are supported only on mobile platforms", SkipAll); QSKIP("Capture exposure parameters are supported only on mobile platforms");
#endif #endif
QCamera camera; QCamera camera;
@@ -582,7 +582,7 @@ void tst_QCameraBackend::testExposureCompensation()
void tst_QCameraBackend::testExposureMode() void tst_QCameraBackend::testExposureMode()
{ {
#if !defined(Q_WS_MAEMO_6) #if !defined(Q_WS_MAEMO_6)
QSKIP("Capture exposure parameters are supported only on mobile platforms", SkipAll); QSKIP("Capture exposure parameters are supported only on mobile platforms");
#endif #endif
QCamera camera; QCamera camera;

2
tests/auto/unit/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp
View File

@@ -640,7 +640,7 @@ void tst_QGraphicsVideoItem::paint()
QPainterVideoSurface *surface = qobject_cast<QPainterVideoSurface *>( QPainterVideoSurface *surface = qobject_cast<QPainterVideoSurface *>(
object.testService->rendererControl->surface()); object.testService->rendererControl->surface());
if (!surface) if (!surface)
QSKIP("QGraphicsVideoItem is not QPainterVideoSurface based", SkipAll); QSKIP("QGraphicsVideoItem is not QPainterVideoSurface based");
QVideoSurfaceFormat format(QSize(2, 2), QVideoFrame::Format_RGB32); QVideoSurfaceFormat format(QSize(2, 2), QVideoFrame::Format_RGB32);

6
tests/auto/unit/qmediaimageviewer/tst_qmediaimageviewer.cpp
View File

@@ -899,7 +899,7 @@ void tst_QMediaImageViewer::rendererControl()
QMediaService *service = viewer.service(); QMediaService *service = viewer.service();
if (service == 0) if (service == 0)
QSKIP("Image viewer object has no service.", SkipSingle); QSKIP("Image viewer object has no service.");
QMediaControl *mediaControl = service->requestControl(QVideoRendererControl_iid); QMediaControl *mediaControl = service->requestControl(QVideoRendererControl_iid);
QVERIFY(mediaControl != 0); QVERIFY(mediaControl != 0);
@@ -918,7 +918,7 @@ void tst_QMediaImageViewer::rendererControl()
QTestEventLoop::instance().enterLoop(2); QTestEventLoop::instance().enterLoop(2);
if (viewer.mediaStatus() != QMediaImageViewer::LoadedMedia) if (viewer.mediaStatus() != QMediaImageViewer::LoadedMedia)
QSKIP("failed to load test image", SkipSingle); QSKIP("failed to load test image");
QCOMPARE(surfaceA.isActive(), true); QCOMPARE(surfaceA.isActive(), true);
@@ -993,7 +993,7 @@ void tst_QMediaImageViewer::setVideoOutput()
QTestEventLoop::instance().enterLoop(2); QTestEventLoop::instance().enterLoop(2);
if (imageViewer.mediaStatus() != QMediaImageViewer::LoadedMedia) if (imageViewer.mediaStatus() != QMediaImageViewer::LoadedMedia)
QSKIP("failed to load test image", SkipSingle); QSKIP("failed to load test image");
QtTestVideoSurface surface; QtTestVideoSurface surface;

2
tests/auto/unit/qmediaimageviewerwidgets/tst_qmediaimageviewerwidgets.cpp
View File

@@ -97,7 +97,7 @@ void tst_QMediaImageViewerWidgets::setVideoOutput()
QTestEventLoop::instance().enterLoop(2); QTestEventLoop::instance().enterLoop(2);
if (imageViewer.mediaStatus() != QMediaImageViewer::LoadedMedia) if (imageViewer.mediaStatus() != QMediaImageViewer::LoadedMedia)
QSKIP("failed to load test image", SkipSingle); QSKIP("failed to load test image");
QVideoWidget widget; QVideoWidget widget;
QGraphicsVideoItem item; QGraphicsVideoItem item;

6
tests/auto/unit/qmediapluginloader/tst_qmediapluginloader.cpp
View File

@@ -83,7 +83,7 @@ void tst_QMediaPluginLoader::testInstance()
const QStringList keys = loader->keys(); const QStringList keys = loader->keys();
if (keys.isEmpty()) // Test is invalidated, skip. if (keys.isEmpty()) // Test is invalidated, skip.
QSKIP("No plug-ins available", SkipAll); QSKIP("No plug-ins available");
foreach (const QString &key, keys) foreach (const QString &key, keys)
QVERIFY(loader->instance(key) != 0); QVERIFY(loader->instance(key) != 0);
@@ -94,7 +94,7 @@ void tst_QMediaPluginLoader::testInstances()
const QStringList keys = loader->keys(); const QStringList keys = loader->keys();
if (keys.isEmpty()) // Test is invalidated, skip. if (keys.isEmpty()) // Test is invalidated, skip.
QSKIP("No plug-ins available", SkipAll); QSKIP("No plug-ins available");
foreach (const QString &key, keys) foreach (const QString &key, keys)
QVERIFY(loader->instances(key).size() > 0); QVERIFY(loader->instances(key).size() > 0);
@@ -107,7 +107,7 @@ void tst_QMediaPluginLoader::testInvalidKey()
// This test assumes there is no 'invalid-key' in the key list, verify that. // This test assumes there is no 'invalid-key' in the key list, verify that.
if (loader->keys().contains(key)) if (loader->keys().contains(key))
QSKIP("a plug-in includes the invalid key", SkipAll); QSKIP("a plug-in includes the invalid key");
QVERIFY(loader->instance(key) == 0); QVERIFY(loader->instance(key) == 0);

6
tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp
View File

@@ -328,7 +328,7 @@ void tst_QMediaServiceProvider::testObtainService()
QMediaServiceProvider *provider = QMediaServiceProvider::defaultServiceProvider(); QMediaServiceProvider *provider = QMediaServiceProvider::defaultServiceProvider();
if (provider == 0) if (provider == 0)
QSKIP("No default provider", SkipSingle); QSKIP("No default provider");
QMediaService *service = 0; QMediaService *service = 0;
@@ -347,7 +347,7 @@ void tst_QMediaServiceProvider::testHasSupport()
QMediaServiceProvider *provider = QMediaServiceProvider::defaultServiceProvider(); QMediaServiceProvider *provider = QMediaServiceProvider::defaultServiceProvider();
if (provider == 0) if (provider == 0)
QSKIP("No default provider", SkipSingle); QSKIP("No default provider");
QCOMPARE(provider->hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "video/ogv", QStringList()), QCOMPARE(provider->hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "video/ogv", QStringList()),
QtMultimedia::MaybeSupported); QtMultimedia::MaybeSupported);
@@ -405,7 +405,7 @@ void tst_QMediaServiceProvider::testSupportedMimeTypes()
QMediaServiceProvider *provider = QMediaServiceProvider::defaultServiceProvider(); QMediaServiceProvider *provider = QMediaServiceProvider::defaultServiceProvider();
if (provider == 0) if (provider == 0)
QSKIP("No default provider", SkipSingle); QSKIP("No default provider");
QVERIFY(provider->supportedMimeTypes(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER)).contains("audio/ogg")); QVERIFY(provider->supportedMimeTypes(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER)).contains("audio/ogg"));
QVERIFY(!provider->supportedMimeTypes(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER)).contains("audio/mp3")); QVERIFY(!provider->supportedMimeTypes(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER)).contains("audio/mp3"));

18
tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
View File

@@ -666,7 +666,7 @@ void tst_QPainterVideoSurface::shaderTypeStarted()
surface.setGLContext(const_cast<QGLContext *>(widget.context())); surface.setGLContext(const_cast<QGLContext *>(widget.context()));
if (!(surface.supportedShaderTypes() & shaderType)) if (!(surface.supportedShaderTypes() & shaderType))
QSKIP("Shader type unsupported on this platform", SkipSingle); QSKIP("Shader type unsupported on this platform");
surface.setShaderType(shaderType); surface.setShaderType(shaderType);
QCOMPARE(surface.shaderType(), shaderType); QCOMPARE(surface.shaderType(), shaderType);
@@ -909,11 +909,11 @@ void tst_QPainterVideoSurface::shaderSupportedFormat()
if (!(surface.supportedShaderTypes() & shaderType)) if (!(surface.supportedShaderTypes() & shaderType))
QSKIP("Shader type not supported on this platform", SkipSingle); QSKIP("Shader type not supported on this platform");
surface.setShaderType(shaderType); surface.setShaderType(shaderType);
if (surface.shaderType() != shaderType) if (surface.shaderType() != shaderType)
QSKIP("Shader type couldn't be set", SkipSingle); QSKIP("Shader type couldn't be set");
const QList<QVideoFrame::PixelFormat> pixelFormats = surface.supportedPixelFormats(handleType); const QList<QVideoFrame::PixelFormat> pixelFormats = surface.supportedPixelFormats(handleType);
@@ -1023,11 +1023,11 @@ void tst_QPainterVideoSurface::shaderPresent()
surface.setGLContext(const_cast<QGLContext *>(widget.context())); surface.setGLContext(const_cast<QGLContext *>(widget.context()));
if (!(surface.supportedShaderTypes() & shaderType)) if (!(surface.supportedShaderTypes() & shaderType))
QSKIP("Shader type unsupported on this platform", SkipSingle); QSKIP("Shader type unsupported on this platform");
surface.setShaderType(shaderType); surface.setShaderType(shaderType);
if (surface.shaderType() != shaderType) if (surface.shaderType() != shaderType)
QSKIP("Shader type couldn't be set", SkipSingle); QSKIP("Shader type couldn't be set");
QSignalSpy frameSpy(&surface, SIGNAL(frameChanged())); QSignalSpy frameSpy(&surface, SIGNAL(frameChanged()));
@@ -1152,11 +1152,11 @@ void tst_QPainterVideoSurface::shaderPresentOpaqueFrame()
surface.setGLContext(const_cast<QGLContext *>(widget.context())); surface.setGLContext(const_cast<QGLContext *>(widget.context()));
if (!(surface.supportedShaderTypes() & shaderType)) if (!(surface.supportedShaderTypes() & shaderType))
QSKIP("Shader type unsupported on this platform", SkipSingle); QSKIP("Shader type unsupported on this platform");
surface.setShaderType(shaderType); surface.setShaderType(shaderType);
if (surface.shaderType() != shaderType) if (surface.shaderType() != shaderType)
QSKIP("Shader type couldn't be set", SkipSingle); QSKIP("Shader type couldn't be set");
QVideoSurfaceFormat format(QSize(64, 64), QVideoFrame::Format_RGB32); QVideoSurfaceFormat format(QSize(64, 64), QVideoFrame::Format_RGB32);
@@ -1199,11 +1199,11 @@ void tst_QPainterVideoSurface::shaderPresentGLFrame()
surface.setGLContext(const_cast<QGLContext *>(widget.context())); surface.setGLContext(const_cast<QGLContext *>(widget.context()));
if (!(surface.supportedShaderTypes() & shaderType)) if (!(surface.supportedShaderTypes() & shaderType))
QSKIP("Shader type unsupported on this platform", SkipSingle); QSKIP("Shader type unsupported on this platform");
surface.setShaderType(shaderType); surface.setShaderType(shaderType);
if (surface.shaderType() != shaderType) if (surface.shaderType() != shaderType)
QSKIP("Shader type couldn't be set", SkipSingle); QSKIP("Shader type couldn't be set");
QVideoSurfaceFormat format( QVideoSurfaceFormat format(
QSize(2, 2), QVideoFrame::Format_RGB32, QAbstractVideoBuffer::GLTextureHandle); QSize(2, 2), QVideoFrame::Format_RGB32, QAbstractVideoBuffer::GLTextureHandle);

4
tests/auto/unit/qwavedecoder/tst_qwavedecoder.cpp
View File

@@ -166,7 +166,7 @@ void tst_QWaveDecoder::file()
QSignalSpy parsingErrorSpy(&waveDecoder, SIGNAL(parsingError())); QSignalSpy parsingErrorSpy(&waveDecoder, SIGNAL(parsingError()));
if (corruption == NotAWav) { if (corruption == NotAWav) {
QSKIP("Not all failures detected correctly yet", SkipSingle); QSKIP("Not all failures detected correctly yet");
QTRY_COMPARE(parsingErrorSpy.count(), 1); QTRY_COMPARE(parsingErrorSpy.count(), 1);
QCOMPARE(validFormatSpy.count(), 0); QCOMPARE(validFormatSpy.count(), 0);
} else if (corruption == NoSampleData) { } else if (corruption == NoSampleData) {
@@ -229,7 +229,7 @@ void tst_QWaveDecoder::http()
QSignalSpy parsingErrorSpy(&waveDecoder, SIGNAL(parsingError())); QSignalSpy parsingErrorSpy(&waveDecoder, SIGNAL(parsingError()));
if (corruption == NotAWav) { if (corruption == NotAWav) {
QSKIP("Not all failures detected correctly yet", SkipSingle); QSKIP("Not all failures detected correctly yet");
QTRY_COMPARE(parsingErrorSpy.count(), 1); QTRY_COMPARE(parsingErrorSpy.count(), 1);
QCOMPARE(validFormatSpy.count(), 0); QCOMPARE(validFormatSpy.count(), 0);
} else if (corruption == NoSampleData) { } else if (corruption == NoSampleData) {