summaryrefslogtreecommitdiffstats
path: root/tests/auto/unit
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/unit')
-rw-r--r--tests/auto/unit/qcamera/tst_qcamera.cpp20
-rw-r--r--tests/auto/unit/qmediapluginloader/tst_qmediapluginloader.cpp4
-rw-r--r--tests/auto/unit/qmediarecorder/tst_qmediarecorder.cpp40
-rw-r--r--tests/auto/unit/qmultimedia_common/mockcameraexposurecontrol.h21
-rw-r--r--tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp22
5 files changed, 57 insertions, 50 deletions
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/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/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-06-19 23:17:10 +0000