diff options
author | Marc Mutz <marc.mutz@qt.io> | 2022-10-05 07:54:03 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@qt.io> | 2022-10-07 17:17:19 +0200 |
commit | bf9a1e31a194adfdbb7116455633b9046b34504c (patch) | |
tree | 53b90400cea484d9ad6da0c93b67da6bb351fba8 /tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp | |
parent | d20bdbb041948737df13934418b8a3ec4979fc9b (diff) |
Port from container::count() and length() to size()
This is a semantic patch using ClangTidyTransformator as in
qtbase/df9d882d41b741fef7c5beeddb0abe9d904443d8:
auto QtContainerClass = anyOf(
expr(hasType(cxxRecordDecl(isSameOrDerivedFrom(hasAnyName(classes))))).bind(o),
expr(hasType(namedDecl(hasAnyName(<classes>)))).bind(o));
makeRule(cxxMemberCallExpr(on(QtContainerClass),
callee(cxxMethodDecl(hasAnyName({"count", "length"),
parameterCountIs(0))))),
changeTo(cat(access(o, cat("size"), "()"))),
cat("use 'size()' instead of 'count()/length()'"))
a.k.a qt-port-to-std-compatible-api with config Scope: 'Container',
with the extended set of container classes recognized.
Change-Id: I90d9db5c161f499cfabf3ce41f55c3cc4d4ff5d4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Diffstat (limited to 'tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp')
-rw-r--r-- | tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp index 56a8a13e1..acb787408 100644 --- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp +++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp @@ -241,8 +241,8 @@ void tst_QCameraBackend::testCameraStartParallel() QCOMPARE(camera2.isActive(), true); QCOMPARE(camera2.error(), QCamera::NoError); - QCOMPARE(errorSpy1.count(), 0); - QCOMPARE(errorSpy2.count(), 0); + QCOMPARE(errorSpy1.size(), 0); + QCOMPARE(errorSpy2.size(), 0); } void tst_QCameraBackend::testCameraFormat() @@ -254,14 +254,14 @@ void tst_QCameraBackend::testCameraFormat() QSKIP("No Camera available, skipping test."); QCameraFormat cameraFormat = videoFormats.first(); QSignalSpy spy(&camera, SIGNAL(cameraFormatChanged())); - QVERIFY(spy.count() == 0); + QVERIFY(spy.size() == 0); QMediaCaptureSession session; session.setCamera(&camera); - QVERIFY(videoFormats.count()); + QVERIFY(videoFormats.size()); camera.setCameraFormat(cameraFormat); QCOMPARE(camera.cameraFormat(), cameraFormat); - QVERIFY(spy.count() == 1); + QVERIFY(spy.size() == 1); TestVideoFormat videoFormatTester(cameraFormat); session.setVideoOutput(&videoFormatTester); @@ -271,11 +271,11 @@ void tst_QCameraBackend::testCameraFormat() spy.clear(); camera.stop(); // Change camera format - if (videoFormats.count() > 1) { + if (videoFormats.size() > 1) { QCameraFormat secondFormat = videoFormats.at(1); camera.setCameraFormat(secondFormat); QCOMPARE(camera.cameraFormat(), secondFormat); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(camera.cameraFormat(), secondFormat); videoFormatTester.setCameraFormatToTest(secondFormat); camera.start(); @@ -290,7 +290,7 @@ void tst_QCameraBackend::testCameraFormat() spy.clear(); camera.stop(); camera.setCameraFormat({}); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); videoFormatTester.setCameraFormatToTest({}); camera.start(); // In case of a null format, the backend should have picked @@ -301,7 +301,7 @@ void tst_QCameraBackend::testCameraFormat() spy.clear(); // Shouldn't change anything as it's the same device camera.setCameraDevice(device); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } void tst_QCameraBackend::testCameraCapture() @@ -454,13 +454,13 @@ void tst_QCameraBackend::testExposureCompensation() camera.setExposureCompensation(1.0); QCOMPARE(camera.exposureCompensation(), 1.0); - QTRY_COMPARE(exposureCompensationSignal.count(), 1); + QTRY_COMPARE(exposureCompensationSignal.size(), 1); QCOMPARE(exposureCompensationSignal.last().first().toReal(), 1.0); //exposureCompensationChanged should not be emitted when value is not changed camera.setExposureCompensation(1.0); QTest::qWait(50); - QCOMPARE(exposureCompensationSignal.count(), 1); + QCOMPARE(exposureCompensationSignal.size(), 1); //exposure compensation should be preserved during start camera.start(); @@ -471,7 +471,7 @@ void tst_QCameraBackend::testExposureCompensation() exposureCompensationSignal.clear(); camera.setExposureCompensation(-1.0); QCOMPARE(camera.exposureCompensation(), -1.0); - QTRY_COMPARE(exposureCompensationSignal.count(), 1); + QTRY_COMPARE(exposureCompensationSignal.size(), 1); QCOMPARE(exposureCompensationSignal.last().first().toReal(), -1.0); } @@ -570,7 +570,7 @@ void tst_QCameraBackend::testVideoRecording() //record 200ms clip recorder.record(); durationChanged.clear(); - QTRY_VERIFY(durationChanged.count()); + QTRY_VERIFY(durationChanged.size()); QCOMPARE(recorder.metaData(), metaData); @@ -626,7 +626,7 @@ void tst_QCameraBackend::testNativeMetadata() recorder.record(); durationChanged.clear(); - QTRY_VERIFY(durationChanged.count()); + QTRY_VERIFY(durationChanged.size()); QCOMPARE(recorder.metaData(), metaData); @@ -653,7 +653,7 @@ void tst_QCameraBackend::testNativeMetadata() player.setSource(QUrl::fromLocalFile(fileName)); player.play(); - QTRY_VERIFY(metadataChangedSpy.count() > 0); + QTRY_VERIFY(metadataChangedSpy.size() > 0); QCOMPARE(player.metaData().value(QMediaMetaData::Title).toString(), metaData.value(QMediaMetaData::Title).toString()); auto lang = player.metaData().value(QMediaMetaData::Language).value<QLocale::Language>(); |