diff options
Diffstat (limited to 'tests')
29 files changed, 154 insertions, 110 deletions
diff --git a/tests/auto/integration/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp b/tests/auto/integration/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp index 9d44dc16f..c946c0894 100644 --- a/tests/auto/integration/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp +++ b/tests/auto/integration/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp @@ -226,7 +226,8 @@ void tst_QAudioDeviceInfo::equalityOperator() QVERIFY(!(dev1 != dev2)); // Make sure each available device is not equal to null - foreach (const QAudioDeviceInfo info, QAudioDeviceInfo::availableDevices(QAudio::AudioOutput)) { + const auto infos = QAudioDeviceInfo::availableDevices(QAudio::AudioOutput); + for (const QAudioDeviceInfo info : infos) { QVERIFY(dev1 != info); QVERIFY(!(dev1 == info)); diff --git a/tests/auto/integration/qaudioinput/BLACKLIST b/tests/auto/integration/qaudioinput/BLACKLIST index 994ea8f38..b7b86283b 100644 --- a/tests/auto/integration/qaudioinput/BLACKLIST +++ b/tests/auto/integration/qaudioinput/BLACKLIST @@ -5,5 +5,3 @@ linux linux [pullSuspendResume] linux -[push] -linux diff --git a/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp b/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp index 64e872f27..bcc50f78a 100644 --- a/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp +++ b/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp @@ -220,7 +220,7 @@ void tst_QAudioInput::initTestCase() QVERIFY(m_temporaryDir->isValid()); const QString temporaryAudioPath = m_temporaryDir->path() + slash; - foreach (const QAudioFormat &format, testFormats) { + for (const QAudioFormat &format : qAsConst(testFormats)) { const QString fileName = temporaryAudioPath + formatToFileName(format) + QStringLiteral(".wav"); audioFiles.append(FilePtr::create(fileName)); } diff --git a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp index f167bf8ec..f3a676073 100644 --- a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp +++ b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp @@ -264,7 +264,7 @@ void tst_QAudioOutput::initTestCase() QVERIFY(m_temporaryDir->isValid()); const QString temporaryAudioPath = m_temporaryDir->path() + slash; - foreach (const QAudioFormat &format, testFormats) { + for (const QAudioFormat &format : qAsConst(testFormats)) { qint64 len = (format.sampleRate()*format.channelCount()*(format.sampleSize()/8)*2); // 2 seconds createSineWaveData(format, len); // Write generate sine wave data to file diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp index b8d501c12..ccd68aeec 100644 --- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp +++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp @@ -68,8 +68,10 @@ public slots: void cleanupTestCase(); private slots: +#if QT_DEPRECATED_SINCE(5, 3) void testAvailableDevices(); void testDeviceDescription(); +#endif void testCameraInfo(); void testCtorWithDevice(); void testCtorWithCameraInfo(); @@ -100,6 +102,7 @@ void tst_QCameraBackend::cleanupTestCase() { } +#if QT_DEPRECATED_SINCE(5, 3) void tst_QCameraBackend::testAvailableDevices() { int deviceCount = QMediaServiceProvider::defaultServiceProvider()->devices(QByteArray(Q_MEDIASERVICE_CAMERA)).count(); @@ -113,22 +116,24 @@ void tst_QCameraBackend::testDeviceDescription() if (deviceCount == 0) QVERIFY(QCamera::deviceDescription(QByteArray("random")).isNull()); else { - foreach (const QByteArray &device, QCamera::availableDevices()) + const auto devices = QCamera::availableDevices(); + for (const QByteArray &device : devices) QVERIFY(QCamera::deviceDescription(device).length() > 0); } } +#endif void tst_QCameraBackend::testCameraInfo() { int deviceCount = QMediaServiceProvider::defaultServiceProvider()->devices(QByteArray(Q_MEDIASERVICE_CAMERA)).count(); - QList<QCameraInfo> cameras = QCameraInfo::availableCameras(); + const QList<QCameraInfo> cameras = QCameraInfo::availableCameras(); QCOMPARE(cameras.count(), deviceCount); if (cameras.isEmpty()) { QVERIFY(QCameraInfo::defaultCamera().isNull()); QSKIP("Camera selection is not supported"); } - foreach (const QCameraInfo &info, cameras) { + for (const QCameraInfo &info : cameras) { QVERIFY(!info.deviceName().isEmpty()); QVERIFY(!info.description().isEmpty()); QVERIFY(info.orientation() % 90 == 0); @@ -137,10 +142,11 @@ void tst_QCameraBackend::testCameraInfo() void tst_QCameraBackend::testCtorWithDevice() { - if (QCamera::availableDevices().isEmpty()) + const auto availableCameras = QCameraInfo::availableCameras(); + if (availableCameras.isEmpty()) QSKIP("Camera selection not supported"); - QCamera *camera = new QCamera(QCamera::availableDevices().first()); + QCamera *camera = new QCamera(availableCameras.first().deviceName().toLatin1()); QCOMPARE(camera->error(), QCamera::NoError); delete camera; @@ -624,11 +630,11 @@ void tst_QCameraBackend::testVideoRecording_data() { QTest::addColumn<QByteArray>("device"); - QList<QByteArray> devices = QCamera::availableDevices(); + const auto devices = QCameraInfo::availableCameras(); - foreach (const QByteArray &device, devices) { - QTest::newRow(QCamera::deviceDescription(device).toUtf8()) - << device; + for (const auto &device : devices) { + QTest::newRow(device.description().toUtf8()) + << device.deviceName().toLatin1(); } if (devices.isEmpty()) diff --git a/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro b/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro index 1f3a00b42..c4221232a 100644 --- a/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro +++ b/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro @@ -1,6 +1,6 @@ TARGET = tst_qdeclarativevideooutput -QT += multimedia-private qml testlib quick +QT += multimedia-private qml testlib quick qtmultimediaquicktools-private CONFIG += testcase RESOURCES += qml.qrc diff --git a/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp b/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp index 5b9fdd03c..798b63f96 100644 --- a/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp +++ b/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp @@ -280,11 +280,11 @@ void tst_QDeclarativeVideoOutput::surfaceSource() QVERIFY(holder.videoSurface() != 0); // Now we could do things with the surface.. - QList<QVideoFrame::PixelFormat> formats = holder.videoSurface()->supportedPixelFormats(); + const QList<QVideoFrame::PixelFormat> formats = holder.videoSurface()->supportedPixelFormats(); QVERIFY(formats.count() > 0); // See if we can start and stop each pixel format (..) - foreach (QVideoFrame::PixelFormat format, formats) { + for (QVideoFrame::PixelFormat format : formats) { QVideoSurfaceFormat surfaceFormat(QSize(200,100), format); QVERIFY(holder.videoSurface()->isFormatSupported(surfaceFormat)); // This does kind of depend on node factories diff --git a/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro b/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro index 82108d220..eeb1c0135 100644 --- a/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro +++ b/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro @@ -1,6 +1,6 @@ TARGET = tst_qdeclarativevideooutput_window -QT += multimedia-private qml testlib quick +QT += multimedia-private qml testlib quick qtmultimediaquicktools-private CONFIG += testcase RESOURCES += qml.qrc diff --git a/tests/auto/integration/qmediaplayerbackend/BLACKLIST b/tests/auto/integration/qmediaplayerbackend/BLACKLIST index c81f6c24f..c2833f1f7 100644 --- a/tests/auto/integration/qmediaplayerbackend/BLACKLIST +++ b/tests/auto/integration/qmediaplayerbackend/BLACKLIST @@ -1,8 +1,10 @@ # QTBUG-46368 osx -windows - +windows-7 +windows-7sp1 +windows-10 msvc-2015 +windows-10 msvc-2017 # Media player plugin not built at the moment on this platform opensuse-13.1 64bit diff --git a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp index df218be7f..9cd3b7fa9 100644 --- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp +++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp @@ -154,7 +154,7 @@ QMediaContent tst_QMediaPlayerBackend::selectVideoFile(const QStringList& mediaC QSignalSpy errorSpy(&player, SIGNAL(error(QMediaPlayer::Error))); - foreach (QString s, mediaCandidates) { + for (const QString &s : mediaCandidates) { QFileInfo videoFile(s); if (!videoFile.exists()) continue; @@ -1354,6 +1354,7 @@ void tst_QMediaPlayerBackend::surfaceTest_data() QList<QVideoFrame::PixelFormat> formatsYUV; formatsYUV << QVideoFrame::Format_YUV420P + << QVideoFrame::Format_YUV422P << QVideoFrame::Format_YV12 << QVideoFrame::Format_UYVY << QVideoFrame::Format_YUYV diff --git a/tests/auto/integration/shared/mediafileselector.h b/tests/auto/integration/shared/mediafileselector.h index 8b88d14a4..984da6e2b 100644 --- a/tests/auto/integration/shared/mediafileselector.h +++ b/tests/auto/integration/shared/mediafileselector.h @@ -42,7 +42,7 @@ static QMediaContent selectMediaFile(const QStringList& mediaCandidates) QSignalSpy errorSpy(&player, SIGNAL(error(QMediaPlayer::Error))); - foreach (QString s, mediaCandidates) { + for (const QString &s : mediaCandidates) { QFileInfo mediaFile(s); if (!mediaFile.exists()) continue; diff --git a/tests/auto/unit/qcamera/tst_qcamera.cpp b/tests/auto/unit/qcamera/tst_qcamera.cpp index fa5e7187b..4b6202173 100644 --- a/tests/auto/unit/qcamera/tst_qcamera.cpp +++ b/tests/auto/unit/qcamera/tst_qcamera.cpp @@ -794,16 +794,16 @@ void tst_QCamera::testImageSettings() QVERIFY(!settings.isNull()); settings = QImageEncoderSettings(); - settings.setEncodingOption(QLatin1Literal("encoderOption"), QVariant(1)); - QCOMPARE(settings.encodingOption(QLatin1Literal("encoderOption")), QVariant(1)); + settings.setEncodingOption(QLatin1String("encoderOption"), QVariant(1)); + QCOMPARE(settings.encodingOption(QLatin1String("encoderOption")), QVariant(1)); QVariantMap options; - options.insert(QLatin1Literal("encoderOption"), QVariant(1)); + options.insert(QLatin1String("encoderOption"), QVariant(1)); QCOMPARE(settings.encodingOptions(), options); - options.insert(QLatin1Literal("encoderOption2"), QVariant(2)); - options.remove(QLatin1Literal("encoderOption")); + options.insert(QLatin1String("encoderOption2"), QVariant(2)); + options.remove(QLatin1String("encoderOption")); settings.setEncodingOptions(options); - QCOMPARE(settings.encodingOption(QLatin1Literal("encoderOption")), QVariant()); - QCOMPARE(settings.encodingOption(QLatin1Literal("encoderOption2")), QVariant(2)); + QCOMPARE(settings.encodingOption(QLatin1String("encoderOption")), QVariant()); + QCOMPARE(settings.encodingOption(QLatin1String("encoderOption2")), QVariant(2)); QVERIFY(!settings.isNull()); QVERIFY(settings != QImageEncoderSettings()); @@ -874,11 +874,11 @@ void tst_QCamera::testImageSettings() QVERIFY(settings1 != settings2); settings1 = QImageEncoderSettings(); - settings1.setEncodingOption(QLatin1Literal("encoderOption"), QVariant(1)); + settings1.setEncodingOption(QLatin1String("encoderOption"), QVariant(1)); settings2 = QImageEncoderSettings(); - settings2.setEncodingOption(QLatin1Literal("encoderOption"), QVariant(1)); + settings2.setEncodingOption(QLatin1String("encoderOption"), QVariant(1)); QVERIFY(settings1 == settings2); - settings2.setEncodingOption(QLatin1Literal("encoderOption"), QVariant(2)); + settings2.setEncodingOption(QLatin1String("encoderOption"), QVariant(2)); QVERIFY(settings1 != settings2); } diff --git a/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp b/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp index b270e93eb..87c72521c 100644 --- a/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp +++ b/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp @@ -411,17 +411,17 @@ void tst_QDeclarativeAudio::source() audio.setSource(url1); QCOMPARE(audio.source(), url1); - QCOMPARE(provider.playerControl()->media().canonicalUrl(), url1); + QCOMPARE(provider.playerControl()->media().request().url(), url1); QCOMPARE(spy.count(), 1); audio.setSource(url2); QCOMPARE(audio.source(), url2); - QCOMPARE(provider.playerControl()->media().canonicalUrl(), url2); + QCOMPARE(provider.playerControl()->media().request().url(), url2); QCOMPARE(spy.count(), 2); audio.setSource(url3); QCOMPARE(audio.source(), url3); - QCOMPARE(provider.playerControl()->media().canonicalUrl(), url3); + QCOMPARE(provider.playerControl()->media().request().url(), url3); QCOMPARE(spy.count(), 3); } diff --git a/tests/auto/unit/qmediacontent/tst_qmediacontent.cpp b/tests/auto/unit/qmediacontent/tst_qmediacontent.cpp index d10257c19..3c68a32b1 100644 --- a/tests/auto/unit/qmediacontent/tst_qmediacontent.cpp +++ b/tests/auto/unit/qmediacontent/tst_qmediacontent.cpp @@ -43,12 +43,16 @@ private slots: void testNull(); void testUrlCtor(); void testRequestCtor(); +#if QT_DEPRECATED_SINCE(6, 0) void testResourceCtor(); void testResourceListCtor(); +#endif void testCopy(); void testAssignment(); void testEquality(); +#if QT_DEPRECATED_SINCE(6, 0) void testResources(); +#endif void testPlaylist(); }; @@ -57,17 +61,23 @@ void tst_QMediaContent::testNull() QMediaContent media; QCOMPARE(media.isNull(), true); + QCOMPARE(media.request().url(), QUrl()); +#if QT_DEPRECATED_SINCE(6, 0) QCOMPARE(media.canonicalUrl(), QUrl()); QCOMPARE(media.canonicalResource(), QMediaResource()); QCOMPARE(media.resources(), QMediaResourceList()); +#endif } void tst_QMediaContent::testUrlCtor() { QMediaContent media(QUrl("http://example.com/movie.mov")); + QCOMPARE(media.request().url(), QUrl("http://example.com/movie.mov")); +#if QT_DEPRECATED_SINCE(6, 0) QCOMPARE(media.canonicalUrl(), QUrl("http://example.com/movie.mov")); QCOMPARE(media.canonicalResource().url(), QUrl("http://example.com/movie.mov")); +#endif } void tst_QMediaContent::testRequestCtor() @@ -76,13 +86,18 @@ void tst_QMediaContent::testRequestCtor() request.setAttribute(QNetworkRequest::User, QVariant(1234)); QMediaContent media(request); + QCOMPARE(media.request().url(), QUrl("http://example.com/movie.mov")); + QCOMPARE(media.request(), request); +#if QT_DEPRECATED_SINCE(6, 0) QCOMPARE(media.canonicalUrl(), QUrl("http://example.com/movie.mov")); QCOMPARE(media.canonicalRequest(),request); QCOMPARE(media.canonicalResource().request(), request); QCOMPARE(media.canonicalResource().url(), QUrl("http://example.com/movie.mov")); +#endif } +#if QT_DEPRECATED_SINCE(6, 0) void tst_QMediaContent::testResourceCtor() { QMediaContent media(QMediaResource(QUrl("http://example.com/movie.mov"))); @@ -100,10 +115,11 @@ void tst_QMediaContent::testResourceListCtor() QCOMPARE(media.canonicalUrl(), QUrl("http://example.com/movie.mov")); QCOMPARE(media.canonicalResource().url(), QUrl("http://example.com/movie.mov")); } +#endif void tst_QMediaContent::testCopy() { - QMediaContent media1(QMediaResource(QUrl("http://example.com/movie.mov"))); + QMediaContent media1(QUrl("http://example.com/movie.mov")); QMediaContent media2(media1); QVERIFY(media1 == media2); @@ -111,7 +127,7 @@ void tst_QMediaContent::testCopy() void tst_QMediaContent::testAssignment() { - QMediaContent media1(QMediaResource(QUrl("http://example.com/movie.mov"))); + QMediaContent media1(QUrl("http://example.com/movie.mov")); QMediaContent media2; QMediaContent media3; @@ -126,9 +142,9 @@ void tst_QMediaContent::testEquality() { QMediaContent media1; QMediaContent media2; - QMediaContent media3(QMediaResource(QUrl("http://example.com/movie.mov"))); - QMediaContent media4(QMediaResource(QUrl("http://example.com/movie.mov"))); - QMediaContent media5(QMediaResource(QUrl("file:///some/where/over/the/rainbow.mp3"))); + QMediaContent media3(QUrl("http://example.com/movie.mov")); + QMediaContent media4(QUrl("http://example.com/movie.mov")); + QMediaContent media5(QUrl("file:///some/where/over/the/rainbow.mp3")); // null == null QCOMPARE(media1 == media2, true); @@ -147,6 +163,7 @@ void tst_QMediaContent::testEquality() QCOMPARE(media4 != media5, true); } +#if QT_DEPRECATED_SINCE(6, 0) void tst_QMediaContent::testResources() { QMediaResourceList resourceList; @@ -160,17 +177,18 @@ void tst_QMediaContent::testResources() QCOMPARE(res[0], QMediaResource(QUrl("http://example.com/movie-main.mov"))); QCOMPARE(res[1], QMediaResource(QUrl("http://example.com/movie-big.mov"))); } +#endif void tst_QMediaContent::testPlaylist() { QMediaContent media(QUrl("http://example.com/movie.mov")); - QVERIFY(media.canonicalUrl().isValid()); + QVERIFY(media.request().url().isValid()); QVERIFY(!media.playlist()); { QPointer<QMediaPlaylist> playlist(new QMediaPlaylist); media = QMediaContent(playlist.data(), QUrl("http://example.com/sample.m3u"), true); - QVERIFY(media.canonicalUrl().isValid()); + QVERIFY(media.request().url().isValid()); QCOMPARE(media.playlist(), playlist.data()); media = QMediaContent(); // Make sure playlist is destroyed by QMediaContent @@ -189,7 +207,7 @@ void tst_QMediaContent::testPlaylist() { QPointer<QMediaPlaylist> playlist(new QMediaPlaylist); media = QMediaContent(playlist.data(), QUrl(), false); - QVERIFY(!media.canonicalUrl().isValid()); + QVERIFY(!media.request().url().isValid()); QCOMPARE(media.playlist(), playlist.data()); media = QMediaContent(); QVERIFY(playlist); diff --git a/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp b/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp index 94d297ad0..f2b993722 100644 --- a/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp +++ b/tests/auto/unit/qmediaplayer/tst_qmediaplayer.cpp @@ -1293,7 +1293,7 @@ void tst_QMediaPlayer::testQrc() } // Check the media actually passed to the backend - QCOMPARE(mockService->mockControl->media().canonicalUrl().scheme(), backendMediaContentScheme); + QCOMPARE(mockService->mockControl->media().request().url().scheme(), backendMediaContentScheme); QCOMPARE(bool(mockService->mockControl->mediaStream()), backendHasStream); } @@ -1329,7 +1329,7 @@ void tst_QMediaPlayer::testAudioRole() spy.clear(); - player.setProperty("audioRole", qVariantFromValue(QAudio::AlarmRole)); + player.setProperty("audioRole", QVariant::fromValue(QAudio::AlarmRole)); QCOMPARE(qvariant_cast<QAudio::Role>(player.property("audioRole")), QAudio::AlarmRole); QCOMPARE(mockService->mockAudioRoleControl->audioRole(), QAudio::AlarmRole); QCOMPARE(spy.count(), 1); @@ -1397,7 +1397,7 @@ void tst_QMediaPlayer::testCustomAudioRole() spyCustomRole.clear(); QString customRole2(QStringLiteral("customRole2")); - player.setProperty("customAudioRole", qVariantFromValue(customRole2)); + player.setProperty("customAudioRole", QVariant::fromValue(customRole2)); QCOMPARE(qvariant_cast<QString>(player.property("customAudioRole")), customRole2); QCOMPARE(mockService->mockCustomAudioRoleControl->customAudioRole(), customRole2); QCOMPARE(spyRole.count(), 0); diff --git a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp index 3a59823ca..9b1385dac 100644 --- a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp +++ b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp @@ -542,19 +542,19 @@ void tst_QMediaPlaylist::loadM3uFile() QCOMPARE(playlist.error(), QMediaPlaylist::NoError); QCOMPARE(playlist.mediaCount(), 7); - QCOMPARE(playlist.media(0).canonicalUrl(), QUrl(QLatin1String("http://test.host/path"))); - QCOMPARE(playlist.media(1).canonicalUrl(), QUrl(QLatin1String("http://test.host/path"))); + QCOMPARE(playlist.media(0).request().url(), QUrl(QLatin1String("http://test.host/path"))); + QCOMPARE(playlist.media(1).request().url(), QUrl(QLatin1String("http://test.host/path"))); testFileName = QFINDTESTDATA("testdata/testfile"); - QCOMPARE(playlist.media(2).canonicalUrl(), + QCOMPARE(playlist.media(2).request().url(), QUrl::fromLocalFile(testFileName)); testFileName = QFINDTESTDATA("testdata"); - QCOMPARE(playlist.media(3).canonicalUrl(), + QCOMPARE(playlist.media(3).request().url(), QUrl::fromLocalFile(testFileName + "/testdir/testfile")); - QCOMPARE(playlist.media(4).canonicalUrl(), QUrl(QLatin1String("file:///testdir/testfile"))); - QCOMPARE(playlist.media(5).canonicalUrl(), QUrl(QLatin1String("file://path/name#suffix"))); + QCOMPARE(playlist.media(4).request().url(), QUrl(QLatin1String("file:///testdir/testfile"))); + QCOMPARE(playlist.media(5).request().url(), QUrl(QLatin1String("file://path/name#suffix"))); //ensure #2 suffix is not stripped from path testFileName = QFINDTESTDATA("testdata/testfile2#suffix"); - QCOMPARE(playlist.media(6).canonicalUrl(), QUrl::fromLocalFile(testFileName)); + QCOMPARE(playlist.media(6).request().url(), QUrl::fromLocalFile(testFileName)); // check ability to load from QNetworkRequest loadSpy.clear(); @@ -597,19 +597,19 @@ void tst_QMediaPlaylist::loadPLSFile() QCOMPARE(playlist.error(), QMediaPlaylist::NoError); QCOMPARE(playlist.mediaCount(), 7); - QCOMPARE(playlist.media(0).canonicalUrl(), QUrl(QLatin1String("http://test.host/path"))); - QCOMPARE(playlist.media(1).canonicalUrl(), QUrl(QLatin1String("http://test.host/path"))); + QCOMPARE(playlist.media(0).request().url(), QUrl(QLatin1String("http://test.host/path"))); + QCOMPARE(playlist.media(1).request().url(), QUrl(QLatin1String("http://test.host/path"))); testFileName = QFINDTESTDATA("testdata/testfile"); - QCOMPARE(playlist.media(2).canonicalUrl(), + QCOMPARE(playlist.media(2).request().url(), QUrl::fromLocalFile(testFileName)); testFileName = QFINDTESTDATA("testdata"); - QCOMPARE(playlist.media(3).canonicalUrl(), + QCOMPARE(playlist.media(3).request().url(), QUrl::fromLocalFile(testFileName + "/testdir/testfile")); - QCOMPARE(playlist.media(4).canonicalUrl(), QUrl(QLatin1String("file:///testdir/testfile"))); - QCOMPARE(playlist.media(5).canonicalUrl(), QUrl(QLatin1String("file://path/name#suffix"))); + QCOMPARE(playlist.media(4).request().url(), QUrl(QLatin1String("file:///testdir/testfile"))); + QCOMPARE(playlist.media(5).request().url(), QUrl(QLatin1String("file://path/name#suffix"))); //ensure #2 suffix is not stripped from path testFileName = QFINDTESTDATA("testdata/testfile2#suffix"); - QCOMPARE(playlist.media(6).canonicalUrl(), QUrl::fromLocalFile(testFileName)); + QCOMPARE(playlist.media(6).request().url(), QUrl::fromLocalFile(testFileName)); // Try to load a totem-pl generated playlist // (Format doesn't respect the spec) @@ -622,7 +622,7 @@ void tst_QMediaPlaylist::loadPLSFile() QVERIFY(loadFailedSpy.isEmpty()); QCOMPARE(playlist.error(), QMediaPlaylist::NoError); QCOMPARE(playlist.mediaCount(), 1); - QCOMPARE(playlist.media(0).canonicalUrl(), QUrl(QLatin1String("http://test.host/path"))); + QCOMPARE(playlist.media(0).request().url(), QUrl(QLatin1String("http://test.host/path"))); // check ability to load from QNetworkRequest diff --git a/tests/auto/unit/qmediapluginloader/tst_qmediapluginloader.cpp b/tests/auto/unit/qmediapluginloader/tst_qmediapluginloader.cpp index 3a7b661df..ce1b2b9d0 100644 --- a/tests/auto/unit/qmediapluginloader/tst_qmediapluginloader.cpp +++ b/tests/auto/unit/qmediapluginloader/tst_qmediapluginloader.cpp @@ -72,7 +72,7 @@ void tst_QMediaPluginLoader::testInstance() if (keys.isEmpty()) // Test is invalidated, skip. QSKIP("No plug-ins available"); - foreach (const QString &key, keys) + for (const QString &key : keys) QVERIFY(loader->instance(key) != 0); } @@ -83,7 +83,7 @@ void tst_QMediaPluginLoader::testInstances() if (keys.isEmpty()) // Test is invalidated, skip. QSKIP("No plug-ins available"); - foreach (const QString &key, keys) + for (const QString &key : keys) QVERIFY(loader->instances(key).size() > 0); } diff --git a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp index 2bcf2011d..944207dfe 100644 --- a/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp +++ b/tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp @@ -512,16 +512,16 @@ void tst_QMediaRecorder::testAudioSettings() QVERIFY(!settings.isNull()); settings = QAudioEncoderSettings(); - settings.setEncodingOption(QLatin1Literal("encoderOption"), QVariant(1)); - QCOMPARE(settings.encodingOption(QLatin1Literal("encoderOption")), QVariant(1)); + settings.setEncodingOption(QLatin1String("encoderOption"), QVariant(1)); + QCOMPARE(settings.encodingOption(QLatin1String("encoderOption")), QVariant(1)); QVariantMap options; - options.insert(QLatin1Literal("encoderOption"), QVariant(1)); + options.insert(QLatin1String("encoderOption"), QVariant(1)); QCOMPARE(settings.encodingOptions(), options); - options.insert(QLatin1Literal("encoderOption2"), QVariant(2)); - options.remove(QLatin1Literal("encoderOption")); + options.insert(QLatin1String("encoderOption2"), QVariant(2)); + options.remove(QLatin1String("encoderOption")); settings.setEncodingOptions(options); - QCOMPARE(settings.encodingOption(QLatin1Literal("encoderOption")), QVariant()); - QCOMPARE(settings.encodingOption(QLatin1Literal("encoderOption2")), QVariant(2)); + QCOMPARE(settings.encodingOption(QLatin1String("encoderOption")), QVariant()); + QCOMPARE(settings.encodingOption(QLatin1String("encoderOption2")), QVariant(2)); QVERIFY(!settings.isNull()); QVERIFY(settings != QAudioEncoderSettings()); @@ -614,11 +614,11 @@ void tst_QMediaRecorder::testAudioSettings() QVERIFY(settings1 != settings2); settings1 = QAudioEncoderSettings(); - settings1.setEncodingOption(QLatin1Literal("encoderOption"), QVariant(1)); + settings1.setEncodingOption(QLatin1String("encoderOption"), QVariant(1)); settings2 = QAudioEncoderSettings(); - settings2.setEncodingOption(QLatin1Literal("encoderOption"), QVariant(1)); + settings2.setEncodingOption(QLatin1String("encoderOption"), QVariant(1)); QVERIFY(settings1 == settings2); - settings2.setEncodingOption(QLatin1Literal("encoderOption"), QVariant(2)); + settings2.setEncodingOption(QLatin1String("encoderOption"), QVariant(2)); QVERIFY(settings1 != settings2); } @@ -663,16 +663,16 @@ void tst_QMediaRecorder::testVideoSettings() QVERIFY(!settings.isNull()); settings = QVideoEncoderSettings(); - settings.setEncodingOption(QLatin1Literal("encoderOption"), QVariant(1)); - QCOMPARE(settings.encodingOption(QLatin1Literal("encoderOption")), QVariant(1)); + settings.setEncodingOption(QLatin1String("encoderOption"), QVariant(1)); + QCOMPARE(settings.encodingOption(QLatin1String("encoderOption")), QVariant(1)); QVariantMap options; - options.insert(QLatin1Literal("encoderOption"), QVariant(1)); + options.insert(QLatin1String("encoderOption"), QVariant(1)); QCOMPARE(settings.encodingOptions(), options); - options.insert(QLatin1Literal("encoderOption2"), QVariant(2)); - options.remove(QLatin1Literal("encoderOption")); + options.insert(QLatin1String("encoderOption2"), QVariant(2)); + options.remove(QLatin1String("encoderOption")); settings.setEncodingOptions(options); - QCOMPARE(settings.encodingOption(QLatin1Literal("encoderOption")), QVariant()); - QCOMPARE(settings.encodingOption(QLatin1Literal("encoderOption2")), QVariant(2)); + QCOMPARE(settings.encodingOption(QLatin1String("encoderOption")), QVariant()); + QCOMPARE(settings.encodingOption(QLatin1String("encoderOption2")), QVariant(2)); QVERIFY(!settings.isNull()); QVERIFY(settings != QVideoEncoderSettings()); @@ -766,11 +766,11 @@ void tst_QMediaRecorder::testVideoSettings() QVERIFY(settings1 != settings2); settings1 = QVideoEncoderSettings(); - settings1.setEncodingOption(QLatin1Literal("encoderOption"), QVariant(1)); + settings1.setEncodingOption(QLatin1String("encoderOption"), QVariant(1)); settings2 = QVideoEncoderSettings(); - settings2.setEncodingOption(QLatin1Literal("encoderOption"), QVariant(1)); + settings2.setEncodingOption(QLatin1String("encoderOption"), QVariant(1)); QVERIFY(settings1 == settings2); - settings2.setEncodingOption(QLatin1Literal("encoderOption"), QVariant(2)); + settings2.setEncodingOption(QLatin1String("encoderOption"), QVariant(2)); QVERIFY(settings1 != settings2); } diff --git a/tests/auto/unit/qmediaresource/tst_qmediaresource.cpp b/tests/auto/unit/qmediaresource/tst_qmediaresource.cpp index cfb6b44e9..786570bec 100644 --- a/tests/auto/unit/qmediaresource/tst_qmediaresource.cpp +++ b/tests/auto/unit/qmediaresource/tst_qmediaresource.cpp @@ -37,6 +37,7 @@ class tst_QMediaResource : public QObject { Q_OBJECT private slots: +#if QT_DEPRECATED_SINCE(6, 0) void constructNull(); void construct_data(); void construct(); @@ -47,8 +48,15 @@ private slots: void constructorRequest(); void copyConstructor(); +#else + void initTestCase() + { + QSKIP("Skipping this test, QMediaResource is deprecated."); + } +#endif }; +#if QT_DEPRECATED_SINCE(6, 0) void tst_QMediaResource::constructNull() { QMediaResource resource; @@ -682,6 +690,8 @@ void tst_QMediaResource::copyConstructor() QCOMPARE(original1 == copy1, true); } +#endif // QT_DEPRECATED_SINCE(6, 0) + QTEST_MAIN(tst_QMediaResource) #include "tst_qmediaresource.moc" diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro index 7fcaadbc2..813d102cb 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro @@ -11,7 +11,7 @@ PLUGIN_CLASS_NAME = MockServicePlugin1 load(qt_plugin) DESTDIR = ../$${PLUGIN_TYPE} -win32 { +win32:debug_and_release { CONFIG(debug, debug|release) { DESTDIR = ../debug/$${PLUGIN_TYPE} } else { diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro index 4ac001ec9..f2ac3291d 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro @@ -11,7 +11,7 @@ PLUGIN_CLASS_NAME = MockServicePlugin2 load(qt_plugin) DESTDIR = ../$${PLUGIN_TYPE} -win32 { +win32:debug_and_release { CONFIG(debug, debug|release) { DESTDIR = ../debug/$${PLUGIN_TYPE} } else { diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro index 34cd2fed1..51f87d9da 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro @@ -11,7 +11,7 @@ PLUGIN_CLASS_NAME = MockServicePlugin3 load(qt_plugin) DESTDIR = ../$${PLUGIN_TYPE} -win32 { +win32:debug_and_release { CONFIG(debug, debug|release) { DESTDIR = ../debug/$${PLUGIN_TYPE} } else { diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro index 0900bfc40..c3834ab03 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro @@ -11,7 +11,7 @@ PLUGIN_CLASS_NAME = MockServicePlugin4 load(qt_plugin) DESTDIR = ../$${PLUGIN_TYPE} -win32 { +win32:debug_and_release { CONFIG(debug, debug|release) { DESTDIR = ../debug/$${PLUGIN_TYPE} } else { diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro index 37f287f9d..b273c6b15 100644 --- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro +++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro @@ -11,7 +11,7 @@ PLUGIN_CLASS_NAME = MockServicePlugin5 load(qt_plugin) DESTDIR = ../$${PLUGIN_TYPE} -win32 { +win32:debug_and_release { CONFIG(debug, debug|release) { DESTDIR = ../debug/$${PLUGIN_TYPE} } else { diff --git a/tests/auto/unit/qmediaserviceprovider/test/test.pro b/tests/auto/unit/qmediaserviceprovider/test/test.pro index 2cf78c100..94f7f259a 100644 --- a/tests/auto/unit/qmediaserviceprovider/test/test.pro +++ b/tests/auto/unit/qmediaserviceprovider/test/test.pro @@ -5,7 +5,7 @@ QT += multimedia-private testlib SOURCES += ../tst_qmediaserviceprovider.cpp -win32 { +win32:debug_and_release { CONFIG(debug, debug|release) { TARGET = ../../debug/tst_qmediaserviceprovider } else { diff --git a/tests/auto/unit/qmultimedia_common/mockcameraexposurecontrol.h b/tests/auto/unit/qmultimedia_common/mockcameraexposurecontrol.h index 017615aa9..1b2372cf5 100644 --- a/tests/auto/unit/qmultimedia_common/mockcameraexposurecontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockcameraexposurecontrol.h @@ -51,13 +51,22 @@ public: m_shutterRanges << 0.001 << 0.01 << 0.1 << 1.0; m_exposureRanges << -2.0 << 2.0; - QList<QCameraExposure::ExposureMode> exposureModes; - exposureModes << QCameraExposure::ExposureAuto << QCameraExposure::ExposureManual << QCameraExposure::ExposureBacklight - << QCameraExposure::ExposureNight << QCameraExposure::ExposureSpotlight << QCameraExposure::ExposureSports - << QCameraExposure::ExposureSnow << QCameraExposure:: ExposureLargeAperture << QCameraExposure::ExposureSmallAperture - << QCameraExposure::ExposurePortrait << QCameraExposure::ExposureModeVendor << QCameraExposure::ExposureBeach; + const QCameraExposure::ExposureMode exposureModes[] = { + QCameraExposure::ExposureAuto, + QCameraExposure::ExposureManual, + QCameraExposure::ExposureBacklight, + QCameraExposure::ExposureNight, + QCameraExposure::ExposureSpotlight, + QCameraExposure::ExposureSports, + QCameraExposure::ExposureSnow, + QCameraExposure:: ExposureLargeAperture, + QCameraExposure::ExposureSmallAperture, + QCameraExposure::ExposurePortrait, + QCameraExposure::ExposureModeVendor, + QCameraExposure::ExposureBeach, + }; - foreach (QCameraExposure::ExposureMode mode, exposureModes) + for (QCameraExposure::ExposureMode mode : exposureModes) m_exposureModes << QVariant::fromValue<QCameraExposure::ExposureMode>(mode); m_meteringModes << QVariant::fromValue<QCameraExposure::MeteringMode>(QCameraExposure::MeteringMatrix) diff --git a/tests/auto/unit/qmultimedia_common/mockmediaplaylistcontrol.h b/tests/auto/unit/qmultimedia_common/mockmediaplaylistcontrol.h index 229f70ea8..cc56e9adb 100644 --- a/tests/auto/unit/qmultimedia_common/mockmediaplaylistcontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockmediaplaylistcontrol.h @@ -82,7 +82,8 @@ public: bool bMediaContentChanged = false; int i = 0; for (; i < playlistProvider()->mediaCount(); i++) { - if (playlistProvider()->media(i).canonicalUrl().toString() != newProvider->media(i).canonicalUrl().toString()) { + if (playlistProvider()->media(i).request().url().toString() + != newProvider->media(i).request().url().toString()) { bMediaContentChanged = true; break; } diff --git a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp index 43dc52022..7ba631e58 100644 --- a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp +++ b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp @@ -730,16 +730,14 @@ void tst_QPainterVideoSurface::shaderSupportedFormat_data() QTest::addColumn<bool>("supportedPixelFormat"); QTest::addColumn<bool>("supportedFormat"); - QList<QPair<QPainterVideoSurface::ShaderType, QByteArray> > types; - - + const QPair<QPainterVideoSurface::ShaderType, QByteArray> types[] = { #if !defined(QT_OPENGL_ES) - types << qMakePair(QPainterVideoSurface::FragmentProgramShader, QByteArray("ARBfp: ")); + qMakePair(QPainterVideoSurface::FragmentProgramShader, QByteArray("ARBfp: ")), #endif - types << qMakePair(QPainterVideoSurface::GlslShader, QByteArray("GLSL: ")); + qMakePair(QPainterVideoSurface::GlslShader, QByteArray("GLSL: ")), + }; - QPair<QPainterVideoSurface::ShaderType, QByteArray> type; - foreach (type, types) { + for (const auto &type : types) { QTest::newRow((type.second + "rgb32 640x480").constData()) << type.first << QAbstractVideoBuffer::NoHandle @@ -952,14 +950,14 @@ void tst_QPainterVideoSurface::shaderPresent_data() QTest::addColumn<int>("bytesB"); QTest::addColumn<int>("bytesPerLineB"); - QList<QPair<QPainterVideoSurface::ShaderType, QByteArray> > types; + const QPair<QPainterVideoSurface::ShaderType, QByteArray> types[] = { #if !defined(QT_OPENGL_ES) - types << qMakePair(QPainterVideoSurface::FragmentProgramShader, QByteArray("ARBfp: ")); + qMakePair(QPainterVideoSurface::FragmentProgramShader, QByteArray("ARBfp: ")), #endif - types << qMakePair(QPainterVideoSurface::GlslShader, QByteArray("GLSL: ")); + qMakePair(QPainterVideoSurface::GlslShader, QByteArray("GLSL: ")), + }; - QPair<QPainterVideoSurface::ShaderType, QByteArray> type; - foreach (type, types) { + for (const auto &type : types) { QTest::newRow((type.second + "rgb32 -> argb32").constData()) << type.first << QVideoFrame::Format_RGB32 diff --git a/tests/auto/unit/qvideosurfaceformat/tst_qvideosurfaceformat.cpp b/tests/auto/unit/qvideosurfaceformat/tst_qvideosurfaceformat.cpp index 5412a838d..4fa754a45 100644 --- a/tests/auto/unit/qvideosurfaceformat/tst_qvideosurfaceformat.cpp +++ b/tests/auto/unit/qvideosurfaceformat/tst_qvideosurfaceformat.cpp @@ -321,7 +321,7 @@ void tst_QVideoSurfaceFormat::scanLineDirection() { QVideoSurfaceFormat format(QSize(16, 16), QVideoFrame::Format_RGB32); - format.setProperty("scanLineDirection", qVariantFromValue(direction)); + format.setProperty("scanLineDirection", QVariant::fromValue(direction)); QCOMPARE(format.scanLineDirection(), direction); QCOMPARE( @@ -363,7 +363,7 @@ void tst_QVideoSurfaceFormat::yCbCrColorSpaceEnum() } { QVideoSurfaceFormat format(QSize(64, 64), QVideoFrame::Format_RGB32); - format.setProperty("yCbCrColorSpace", qVariantFromValue(colorspace)); + format.setProperty("yCbCrColorSpace", QVariant::fromValue(colorspace)); QCOMPARE(format.yCbCrColorSpace(), colorspace); QCOMPARE(qvariant_cast<QVideoSurfaceFormat::YCbCrColorSpace>(format.property("yCbCrColorSpace")), |