summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/integration/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp3
-rw-r--r--tests/auto/integration/qaudioinput/tst_qaudioinput.cpp2
-rw-r--r--tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp2
-rw-r--r--tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp11
-rw-r--r--tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp4
-rw-r--r--tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp2
-rw-r--r--tests/auto/integration/shared/mediafileselector.h2
-rw-r--r--tests/auto/unit/qmediapluginloader/tst_qmediapluginloader.cpp4
-rw-r--r--tests/auto/unit/qmultimedia_common/mockcameraexposurecontrol.h21
-rw-r--r--tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp22
10 files changed, 41 insertions, 32 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/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..b0497be2f 100644
--- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
+++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
@@ -113,7 +113,8 @@ 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);
}
}
@@ -121,14 +122,14 @@ void tst_QCameraBackend::testDeviceDescription()
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);
@@ -624,9 +625,9 @@ void tst_QCameraBackend::testVideoRecording_data()
{
QTest::addColumn<QByteArray>("device");
- QList<QByteArray> devices = QCamera::availableDevices();
+ const QList<QByteArray> devices = QCamera::availableDevices();
- foreach (const QByteArray &device, devices) {
+ for (const QByteArray &device : devices) {
QTest::newRow(QCamera::deviceDescription(device).toUtf8())
<< device;
}
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/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
index a776602a0..a61352a18 100644
--- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
+++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp
@@ -152,7 +152,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;
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/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/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/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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 20:16:03 +0000