From 34cdc41a935766a7d773cb7e2bdb7ce27711dd9d Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 9 Nov 2011 14:14:08 +1000 Subject: Remove SkipMode parameter from QSKIP. 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 Reviewed-by: Rohan McGovern --- tests/auto/integration/qaudioinput/tst_qaudioinput.cpp | 2 +- .../auto/integration/qaudiooutput/tst_qaudiooutput.cpp | 2 +- .../integration/qcamerabackend/tst_qcamerabackend.cpp | 12 ++++++------ .../unit/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp | 2 +- .../unit/qmediaimageviewer/tst_qmediaimageviewer.cpp | 6 +++--- .../tst_qmediaimageviewerwidgets.cpp | 2 +- .../unit/qmediapluginloader/tst_qmediapluginloader.cpp | 6 +++--- .../tst_qmediaserviceprovider.cpp | 6 +++--- .../qpaintervideosurface/tst_qpaintervideosurface.cpp | 18 +++++++++--------- tests/auto/unit/qwavedecoder/tst_qwavedecoder.cpp | 4 ++-- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp b/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp index 30ed2e10a..a70af910d 100755 --- a/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp +++ b/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp @@ -148,7 +148,7 @@ void tst_QAudioInput::initTestCase() QAudioDeviceInfo::availableDevices(QAudio::AudioInput); if (devices.size() <= 0) - QSKIP("No audio backend", SkipAll); + QSKIP("No audio backend"); audioDevice = QAudioDeviceInfo::defaultInputDevice(); diff --git a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp index 8810a5969..aa32a2d50 100755 --- a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp +++ b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp @@ -193,7 +193,7 @@ void tst_QAudioOutput::initTestCase() QAudioDeviceInfo::availableDevices(QAudio::AudioOutput); if (devices.size() <= 0) - QSKIP("No audio backend", SkipAll); + QSKIP("No audio backend"); audioDevice = QAudioDeviceInfo::defaultOutputDevice(); diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp index 25e960d44..f32f427a6 100644 --- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp +++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp @@ -149,7 +149,7 @@ void tst_QCameraBackend::initTestCase() QCamera camera; if (!camera.isAvailable()) - QSKIP("Camera is not available", SkipAll); + QSKIP("Camera is not available"); } void tst_QCameraBackend::cleanupTestCase() @@ -258,7 +258,7 @@ void tst_QCameraBackend::testCaptureMode() if (!camera.isCaptureModeSupported(QCamera::CaptureVideo)) { camera.setCaptureMode(QCamera::CaptureVideo); QCOMPARE(camera.captureMode(), QCamera::CaptureStillImage); - QSKIP("Video capture not supported", SkipAll); + QSKIP("Video capture not supported"); } camera.setCaptureMode(QCamera::CaptureVideo); @@ -380,7 +380,7 @@ void tst_QCameraBackend::testCaptureToBuffer() #endif if (!imageCapture.isCaptureDestinationSupported(QCameraImageCapture::CaptureToBuffer)) - QSKIP("Buffer capture not supported", SkipAll); + QSKIP("Buffer capture not supported"); QTRY_COMPARE(camera.status(), QCamera::LoadedStatus); @@ -512,7 +512,7 @@ void tst_QCameraBackend::testCaptureToBuffer() void tst_QCameraBackend::testCameraCaptureMetadata() { #ifndef Q_WS_MAEMO_6 - QSKIP("Capture metadata is supported only on harmattan", SkipAll); + QSKIP("Capture metadata is supported only on harmattan"); #endif QCamera camera; @@ -535,7 +535,7 @@ void tst_QCameraBackend::testCameraCaptureMetadata() void tst_QCameraBackend::testExposureCompensation() { #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 QCamera camera; @@ -582,7 +582,7 @@ void tst_QCameraBackend::testExposureCompensation() void tst_QCameraBackend::testExposureMode() { #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 QCamera camera; diff --git a/tests/auto/unit/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp b/tests/auto/unit/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp index 393ac7a49..76f1f7089 100644 --- a/tests/auto/unit/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp +++ b/tests/auto/unit/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp @@ -640,7 +640,7 @@ void tst_QGraphicsVideoItem::paint() QPainterVideoSurface *surface = qobject_cast( object.testService->rendererControl->surface()); if (!surface) - QSKIP("QGraphicsVideoItem is not QPainterVideoSurface based", SkipAll); + QSKIP("QGraphicsVideoItem is not QPainterVideoSurface based"); QVideoSurfaceFormat format(QSize(2, 2), QVideoFrame::Format_RGB32); diff --git a/tests/auto/unit/qmediaimageviewer/tst_qmediaimageviewer.cpp b/tests/auto/unit/qmediaimageviewer/tst_qmediaimageviewer.cpp index 00cfe8549..4d67774cc 100644 --- a/tests/auto/unit/qmediaimageviewer/tst_qmediaimageviewer.cpp +++ b/tests/auto/unit/qmediaimageviewer/tst_qmediaimageviewer.cpp @@ -899,7 +899,7 @@ void tst_QMediaImageViewer::rendererControl() QMediaService *service = viewer.service(); if (service == 0) - QSKIP("Image viewer object has no service.", SkipSingle); + QSKIP("Image viewer object has no service."); QMediaControl *mediaControl = service->requestControl(QVideoRendererControl_iid); QVERIFY(mediaControl != 0); @@ -918,7 +918,7 @@ void tst_QMediaImageViewer::rendererControl() QTestEventLoop::instance().enterLoop(2); if (viewer.mediaStatus() != QMediaImageViewer::LoadedMedia) - QSKIP("failed to load test image", SkipSingle); + QSKIP("failed to load test image"); QCOMPARE(surfaceA.isActive(), true); @@ -993,7 +993,7 @@ void tst_QMediaImageViewer::setVideoOutput() QTestEventLoop::instance().enterLoop(2); if (imageViewer.mediaStatus() != QMediaImageViewer::LoadedMedia) - QSKIP("failed to load test image", SkipSingle); + QSKIP("failed to load test image"); QtTestVideoSurface surface; diff --git a/tests/auto/unit/qmediaimageviewerwidgets/tst_qmediaimageviewerwidgets.cpp b/tests/auto/unit/qmediaimageviewerwidgets/tst_qmediaimageviewerwidgets.cpp index 80c745fe0..75407a3cd 100644 --- a/tests/auto/unit/qmediaimageviewerwidgets/tst_qmediaimageviewerwidgets.cpp +++ b/tests/auto/unit/qmediaimageviewerwidgets/tst_qmediaimageviewerwidgets.cpp @@ -97,7 +97,7 @@ void tst_QMediaImageViewerWidgets::setVideoOutput() QTestEventLoop::instance().enterLoop(2); if (imageViewer.mediaStatus() != QMediaImageViewer::LoadedMedia) - QSKIP("failed to load test image", SkipSingle); + QSKIP("failed to load test image"); QVideoWidget widget; QGraphicsVideoItem item; diff --git a/tests/auto/unit/qmediapluginloader/tst_qmediapluginloader.cpp b/tests/auto/unit/qmediapluginloader/tst_qmediapluginloader.cpp index 198d950a2..138fc1eb2 100644 --- a/tests/auto/unit/qmediapluginloader/tst_qmediapluginloader.cpp +++ b/tests/auto/unit/qmediapluginloader/tst_qmediapluginloader.cpp @@ -83,7 +83,7 @@ void tst_QMediaPluginLoader::testInstance() const QStringList keys = loader->keys(); if (keys.isEmpty()) // Test is invalidated, skip. - QSKIP("No plug-ins available", SkipAll); + QSKIP("No plug-ins available"); foreach (const QString &key, keys) QVERIFY(loader->instance(key) != 0); @@ -94,7 +94,7 @@ void tst_QMediaPluginLoader::testInstances() const QStringList keys = loader->keys(); if (keys.isEmpty()) // Test is invalidated, skip. - QSKIP("No plug-ins available", SkipAll); + QSKIP("No plug-ins available"); foreach (const QString &key, keys) 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. 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); diff --git a/tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp b/tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp index c70401f7d..fcb157c81 100644 --- a/tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp +++ b/tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp @@ -328,7 +328,7 @@ void tst_QMediaServiceProvider::testObtainService() QMediaServiceProvider *provider = QMediaServiceProvider::defaultServiceProvider(); if (provider == 0) - QSKIP("No default provider", SkipSingle); + QSKIP("No default provider"); QMediaService *service = 0; @@ -347,7 +347,7 @@ void tst_QMediaServiceProvider::testHasSupport() QMediaServiceProvider *provider = QMediaServiceProvider::defaultServiceProvider(); if (provider == 0) - QSKIP("No default provider", SkipSingle); + QSKIP("No default provider"); QCOMPARE(provider->hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "video/ogv", QStringList()), QtMultimedia::MaybeSupported); @@ -405,7 +405,7 @@ void tst_QMediaServiceProvider::testSupportedMimeTypes() QMediaServiceProvider *provider = QMediaServiceProvider::defaultServiceProvider(); 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/mp3")); diff --git a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp index 53ed906e9..dc2a10df5 100644 --- a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp +++ b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp @@ -666,7 +666,7 @@ void tst_QPainterVideoSurface::shaderTypeStarted() surface.setGLContext(const_cast(widget.context())); if (!(surface.supportedShaderTypes() & shaderType)) - QSKIP("Shader type unsupported on this platform", SkipSingle); + QSKIP("Shader type unsupported on this platform"); surface.setShaderType(shaderType); QCOMPARE(surface.shaderType(), shaderType); @@ -909,11 +909,11 @@ void tst_QPainterVideoSurface::shaderSupportedFormat() if (!(surface.supportedShaderTypes() & shaderType)) - QSKIP("Shader type not supported on this platform", SkipSingle); + QSKIP("Shader type not supported on this platform"); surface.setShaderType(shaderType); if (surface.shaderType() != shaderType) - QSKIP("Shader type couldn't be set", SkipSingle); + QSKIP("Shader type couldn't be set"); const QList pixelFormats = surface.supportedPixelFormats(handleType); @@ -1023,11 +1023,11 @@ void tst_QPainterVideoSurface::shaderPresent() surface.setGLContext(const_cast(widget.context())); if (!(surface.supportedShaderTypes() & shaderType)) - QSKIP("Shader type unsupported on this platform", SkipSingle); + QSKIP("Shader type unsupported on this platform"); surface.setShaderType(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())); @@ -1152,11 +1152,11 @@ void tst_QPainterVideoSurface::shaderPresentOpaqueFrame() surface.setGLContext(const_cast(widget.context())); if (!(surface.supportedShaderTypes() & shaderType)) - QSKIP("Shader type unsupported on this platform", SkipSingle); + QSKIP("Shader type unsupported on this platform"); surface.setShaderType(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); @@ -1199,11 +1199,11 @@ void tst_QPainterVideoSurface::shaderPresentGLFrame() surface.setGLContext(const_cast(widget.context())); if (!(surface.supportedShaderTypes() & shaderType)) - QSKIP("Shader type unsupported on this platform", SkipSingle); + QSKIP("Shader type unsupported on this platform"); surface.setShaderType(shaderType); if (surface.shaderType() != shaderType) - QSKIP("Shader type couldn't be set", SkipSingle); + QSKIP("Shader type couldn't be set"); QVideoSurfaceFormat format( QSize(2, 2), QVideoFrame::Format_RGB32, QAbstractVideoBuffer::GLTextureHandle); diff --git a/tests/auto/unit/qwavedecoder/tst_qwavedecoder.cpp b/tests/auto/unit/qwavedecoder/tst_qwavedecoder.cpp index a84879b0c..ee4d7ab34 100644 --- a/tests/auto/unit/qwavedecoder/tst_qwavedecoder.cpp +++ b/tests/auto/unit/qwavedecoder/tst_qwavedecoder.cpp @@ -166,7 +166,7 @@ void tst_QWaveDecoder::file() QSignalSpy parsingErrorSpy(&waveDecoder, SIGNAL(parsingError())); if (corruption == NotAWav) { - QSKIP("Not all failures detected correctly yet", SkipSingle); + QSKIP("Not all failures detected correctly yet"); QTRY_COMPARE(parsingErrorSpy.count(), 1); QCOMPARE(validFormatSpy.count(), 0); } else if (corruption == NoSampleData) { @@ -229,7 +229,7 @@ void tst_QWaveDecoder::http() QSignalSpy parsingErrorSpy(&waveDecoder, SIGNAL(parsingError())); if (corruption == NotAWav) { - QSKIP("Not all failures detected correctly yet", SkipSingle); + QSKIP("Not all failures detected correctly yet"); QTRY_COMPARE(parsingErrorSpy.count(), 1); QCOMPARE(validFormatSpy.count(), 0); } else if (corruption == NoSampleData) { -- cgit v1.2.3