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 | |
| 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')
20 files changed, 422 insertions, 422 deletions
diff --git a/tests/auto/integration/qaudiodecoderbackend/tst_qaudiodecoderbackend.cpp b/tests/auto/integration/qaudiodecoderbackend/tst_qaudiodecoderbackend.cpp index 964137d4a..2fe14272c 100644 --- a/tests/auto/integration/qaudiodecoderbackend/tst_qaudiodecoderbackend.cpp +++ b/tests/auto/integration/qaudiodecoderbackend/tst_qaudiodecoderbackend.cpp @@ -169,13 +169,13 @@ void tst_QAudioDecoderBackend::fileTest() QCOMPARE(byteCount, 44094 * 2); QVERIFY(qAbs(qint64(duration) - 1000000) < 20000); QVERIFY(qAbs((d.position() + (buffer.duration() / 1000)) - 1000) < 20); - QTRY_COMPARE(finishedSpy.count(), 1); + QTRY_COMPARE(finishedSpy.size(), 1); QVERIFY(!d.bufferAvailable()); QTRY_VERIFY(!d.isDecoding()); d.stop(); QTRY_VERIFY(!d.isDecoding()); - QTRY_COMPARE(durationSpy.count(), 2); + QTRY_COMPARE(durationSpy.size(), 2); QCOMPARE(d.duration(), qint64(-1)); QVERIFY(!d.bufferAvailable()); readySpy.clear(); @@ -256,13 +256,13 @@ void tst_QAudioDecoderBackend::fileTest() QVERIFY(qAbs(byteCount - 22047) < 100); QVERIFY(qAbs(qint64(duration) - 1000000) < 20000); QVERIFY(qAbs((d.position() + (buffer.duration() / 1000)) - 1000) < 20); - QTRY_COMPARE(finishedSpy.count(), 1); + QTRY_COMPARE(finishedSpy.size(), 1); QVERIFY(!d.bufferAvailable()); QVERIFY(!d.isDecoding()); d.stop(); QTRY_VERIFY(!d.isDecoding()); - QTRY_COMPARE(durationSpy.count(), 2); + QTRY_COMPARE(durationSpy.size(), 2); QCOMPARE(d.duration(), qint64(-1)); QVERIFY(!d.bufferAvailable()); } @@ -320,7 +320,7 @@ void tst_QAudioDecoderBackend::unsupportedFileTest() QVERIFY(finishedSpy.isEmpty()); QVERIFY(positionSpy.isEmpty()); // Either reject the file directly, or set the duration to 5secs on setUrl() and back to -1 on start() - QVERIFY(durationSpy.isEmpty() || durationSpy.count() == 2); + QVERIFY(durationSpy.isEmpty() || durationSpy.size() == 2); errorSpy.clear(); @@ -337,7 +337,7 @@ void tst_QAudioDecoderBackend::unsupportedFileTest() QVERIFY(isDecodingSpy.isEmpty()); QVERIFY(finishedSpy.isEmpty()); QVERIFY(positionSpy.isEmpty()); - QVERIFY(durationSpy.isEmpty() || durationSpy.count() == 2); + QVERIFY(durationSpy.isEmpty() || durationSpy.size() == 2); d.stop(); @@ -598,14 +598,14 @@ void tst_QAudioDecoderBackend::deviceTest() QCOMPARE(sampleCount, 44094); QVERIFY(qAbs(qint64(duration) - 1000000) < 20000); QVERIFY(qAbs((d.position() + (buffer.duration() / 1000)) - 1000) < 20); - QTRY_COMPARE(finishedSpy.count(), 1); + QTRY_COMPARE(finishedSpy.size(), 1); QVERIFY(!d.bufferAvailable()); QTRY_VERIFY(!d.isDecoding()); d.stop(); QTRY_VERIFY(!d.isDecoding()); QVERIFY(!d.bufferAvailable()); - QTRY_COMPARE(durationSpy.count(), 2); + QTRY_COMPARE(durationSpy.size(), 2); QCOMPARE(d.duration(), qint64(-1)); readySpy.clear(); bufferChangedSpy.clear(); @@ -651,7 +651,7 @@ void tst_QAudioDecoderBackend::deviceTest() d.stop(); QTRY_VERIFY(!d.isDecoding()); QVERIFY(!d.bufferAvailable()); - QTRY_COMPARE(durationSpy.count(), 2); + QTRY_COMPARE(durationSpy.size(), 2); QCOMPARE(d.duration(), qint64(-1)); } diff --git a/tests/auto/integration/qaudiosink/tst_qaudiosink.cpp b/tests/auto/integration/qaudiosink/tst_qaudiosink.cpp index 9dfed0620..b7ef9d2bd 100644 --- a/tests/auto/integration/qaudiosink/tst_qaudiosink.cpp +++ b/tests/auto/integration/qaudiosink/tst_qaudiosink.cpp @@ -135,7 +135,7 @@ void tst_QAudioSink::generate_audiofile_testrows() QTest::addColumn<FilePtr>("audioFile"); QTest::addColumn<QAudioFormat>("audioFormat"); - for (int i=0; i<audioFiles.count(); i++) { + for (int i=0; i<audioFiles.size(); i++) { QTest::newRow(QString("Audio File %1").arg(i).toUtf8().constData()) << audioFiles.at(i) << testFormats.at(i); @@ -313,7 +313,7 @@ void tst_QAudioSink::stopWhileStopped() audioOutput.stop(); // Check that no state transition occurred - QVERIFY2((stateSignal.count() == 0), "stop() while stopped is emitting a signal and it shouldn't"); + QVERIFY2((stateSignal.size() == 0), "stop() while stopped is emitting a signal and it shouldn't"); QVERIFY2((audioOutput.error() == QAudio::NoError), "error() was not set to QAudio::NoError after stop()"); } @@ -333,7 +333,7 @@ void tst_QAudioSink::suspendWhileStopped() audioOutput.suspend(); // Check that no state transition occurred - QVERIFY2((stateSignal.count() == 0), "stop() while suspended is emitting a signal and it shouldn't"); + QVERIFY2((stateSignal.size() == 0), "stop() while suspended is emitting a signal and it shouldn't"); QVERIFY2((audioOutput.error() == QAudio::NoError), "error() was not set to QAudio::NoError after stop()"); } @@ -353,7 +353,7 @@ void tst_QAudioSink::resumeWhileStopped() audioOutput.resume(); // Check that no state transition occurred - QVERIFY2((stateSignal.count() == 0), "resume() while stopped is emitting a signal and it shouldn't"); + QVERIFY2((stateSignal.size() == 0), "resume() while stopped is emitting a signal and it shouldn't"); QVERIFY2((audioOutput.error() == QAudio::NoError), "error() was not set to QAudio::NoError after resume()"); } @@ -380,8 +380,8 @@ void tst_QAudioSink::pull() audioOutput.start(audioFile.data()); // Check that QAudioSink immediately transitions to ActiveState - QTRY_VERIFY2((stateSignal.count() == 1), - QString("didn't emit signal on start(), got %1 signals instead").arg(stateSignal.count()).toUtf8().constData()); + QTRY_VERIFY2((stateSignal.size() == 1), + QString("didn't emit signal on start(), got %1 signals instead").arg(stateSignal.size()).toUtf8().constData()); QVERIFY2((audioOutput.state() == QAudio::ActiveState), "didn't transition to ActiveState after start()"); QVERIFY2((audioOutput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after start()"); stateSignal.clear(); @@ -392,7 +392,7 @@ void tst_QAudioSink::pull() // Wait until playback finishes QTRY_VERIFY2(audioFile->atEnd(), "didn't play to EOF"); - QTRY_VERIFY(stateSignal.count() > 0); + QTRY_VERIFY(stateSignal.size() > 0); QCOMPARE(qvariant_cast<QAudio::State>(stateSignal.last().at(0)), QAudio::IdleState); QVERIFY2((audioOutput.state() == QAudio::IdleState), "didn't transitions to IdleState when at EOF"); stateSignal.clear(); @@ -401,8 +401,8 @@ void tst_QAudioSink::pull() audioOutput.stop(); QTest::qWait(40); - QVERIFY2((stateSignal.count() == 1), - QString("didn't emit StoppedState signal after stop(), got %1 signals instead").arg(stateSignal.count()).toUtf8().constData()); + QVERIFY2((stateSignal.size() == 1), + QString("didn't emit StoppedState signal after stop(), got %1 signals instead").arg(stateSignal.size()).toUtf8().constData()); QVERIFY2((audioOutput.state() == QAudio::StoppedState), "didn't transitions to StoppedState after stop()"); QVERIFY2((audioOutput.error() == QAudio::NoError), "error() is not QAudio::NoError after stop()"); @@ -432,8 +432,8 @@ void tst_QAudioSink::pullSuspendResume() audioOutput.start(audioFile.data()); // Check that QAudioSink immediately transitions to ActiveState - QTRY_VERIFY2((stateSignal.count() == 1), - QString("didn't emit signal on start(), got %1 signals instead").arg(stateSignal.count()).toUtf8().constData()); + QTRY_VERIFY2((stateSignal.size() == 1), + QString("didn't emit signal on start(), got %1 signals instead").arg(stateSignal.size()).toUtf8().constData()); QVERIFY2((audioOutput.state() == QAudio::ActiveState), "didn't transition to ActiveState after start()"); QVERIFY2((audioOutput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after start()"); stateSignal.clear(); @@ -444,9 +444,9 @@ void tst_QAudioSink::pullSuspendResume() audioOutput.suspend(); QTest::qWait(100); - QTRY_VERIFY2((stateSignal.count() == 1), + QTRY_VERIFY2((stateSignal.size() == 1), QString("didn't emit SuspendedState signal after suspend(), got %1 signals instead") - .arg(stateSignal.count()).toUtf8().constData()); + .arg(stateSignal.size()).toUtf8().constData()); QVERIFY2((audioOutput.state() == QAudio::SuspendedState), "didn't transition to SuspendedState after suspend()"); QVERIFY2((audioOutput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after suspend()"); stateSignal.clear(); @@ -461,15 +461,15 @@ void tst_QAudioSink::pullSuspendResume() audioOutput.resume(); // Check that QAudioSink immediately transitions to ActiveState - QVERIFY2((stateSignal.count() == 1), - QString("didn't emit signal after resume(), got %1 signals instead").arg(stateSignal.count()).toUtf8().constData()); + QVERIFY2((stateSignal.size() == 1), + QString("didn't emit signal after resume(), got %1 signals instead").arg(stateSignal.size()).toUtf8().constData()); QVERIFY2((audioOutput.state() == QAudio::ActiveState), "didn't transition to ActiveState after resume()"); QVERIFY2((audioOutput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after resume()"); stateSignal.clear(); // Wait until playback finishes QTRY_VERIFY2(audioFile->atEnd(), "didn't play to EOF"); - QTRY_VERIFY(stateSignal.count() > 0); + QTRY_VERIFY(stateSignal.size() > 0); QCOMPARE(qvariant_cast<QAudio::State>(stateSignal.last().at(0)), QAudio::IdleState); QVERIFY2((audioOutput.state() == QAudio::IdleState), "didn't transitions to IdleState when at EOF"); stateSignal.clear(); @@ -478,8 +478,8 @@ void tst_QAudioSink::pullSuspendResume() audioOutput.stop(); QTest::qWait(40); - QVERIFY2((stateSignal.count() == 1), - QString("didn't emit StoppedState signal after stop(), got %1 signals instead").arg(stateSignal.count()).toUtf8().constData()); + QVERIFY2((stateSignal.size() == 1), + QString("didn't emit StoppedState signal after stop(), got %1 signals instead").arg(stateSignal.size()).toUtf8().constData()); QVERIFY2((audioOutput.state() == QAudio::StoppedState), "didn't transitions to StoppedState after stop()"); QVERIFY2((audioOutput.error() == QAudio::NoError), "error() is not QAudio::NoError after stop()"); @@ -523,12 +523,12 @@ void tst_QAudioSink::pullResumeFromUnderrun() audioSource.available = 128; audioOutput.start(&audioSource); - QTRY_VERIFY(stateSignal.count() == 1); + QTRY_VERIFY(stateSignal.size() == 1); QVERIFY(audioOutput.state() == QAudio::ActiveState); QVERIFY(audioOutput.error() == QAudio::NoError); stateSignal.clear(); - QTRY_VERIFY(stateSignal.count() == 1); + QTRY_VERIFY(stateSignal.size() == 1); QVERIFY(audioOutput.state() == QAudio::IdleState); QVERIFY(audioOutput.error() == QAudio::UnderrunError); stateSignal.clear(); @@ -540,12 +540,12 @@ void tst_QAudioSink::pullResumeFromUnderrun() // Resume pull emit audioSource.readyRead(); - QTRY_VERIFY(stateSignal.count() == 1); + QTRY_VERIFY(stateSignal.size() == 1); QVERIFY(audioOutput.state() == QAudio::ActiveState); QVERIFY(audioOutput.error() == QAudio::NoError); stateSignal.clear(); - QTRY_VERIFY(stateSignal.count() == 1); + QTRY_VERIFY(stateSignal.size() == 1); QVERIFY(audioOutput.state() == QAudio::IdleState); QVERIFY(audioOutput.error() == QAudio::NoError); @@ -575,8 +575,8 @@ void tst_QAudioSink::push() QIODevice* feed = audioOutput.start(); // Check that QAudioSink immediately transitions to IdleState - QTRY_VERIFY2((stateSignal.count() == 1), - QString("didn't emit signal on start(), got %1 signals instead").arg(stateSignal.count()).toUtf8().constData()); + QTRY_VERIFY2((stateSignal.size() == 1), + QString("didn't emit signal on start(), got %1 signals instead").arg(stateSignal.size()).toUtf8().constData()); QVERIFY2((audioOutput.state() == QAudio::IdleState), "didn't transition to IdleState after start()"); QVERIFY2((audioOutput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after start()"); stateSignal.clear(); @@ -597,9 +597,9 @@ void tst_QAudioSink::push() if (firstBuffer) { // Check for transition to ActiveState when data is provided - QVERIFY2((stateSignal.count() == 1), + QVERIFY2((stateSignal.size() == 1), QString("didn't emit signal after receiving data, got %1 signals instead") - .arg(stateSignal.count()).toUtf8().constData()); + .arg(stateSignal.size()).toUtf8().constData()); QVERIFY2((audioOutput.state() == QAudio::ActiveState), "didn't transition to ActiveState after receiving data"); QVERIFY2((audioOutput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after receiving data"); firstBuffer = false; @@ -612,7 +612,7 @@ void tst_QAudioSink::push() // Wait until playback finishes QVERIFY2(audioFile->atEnd(), "didn't play to EOF"); QTRY_VERIFY(audioOutput.state() == QAudio::IdleState); - QTRY_VERIFY(stateSignal.count() > 0); + QTRY_VERIFY(stateSignal.size() > 0); QCOMPARE(qvariant_cast<QAudio::State>(stateSignal.last().at(0)), QAudio::IdleState); QVERIFY2((audioOutput.state() == QAudio::IdleState), "didn't transitions to IdleState when at EOF"); stateSignal.clear(); @@ -621,8 +621,8 @@ void tst_QAudioSink::push() audioOutput.stop(); QTest::qWait(40); - QVERIFY2((stateSignal.count() == 1), - QString("didn't emit StoppedState signal after stop(), got %1 signals instead").arg(stateSignal.count()).toUtf8().constData()); + QVERIFY2((stateSignal.size() == 1), + QString("didn't emit StoppedState signal after stop(), got %1 signals instead").arg(stateSignal.size()).toUtf8().constData()); QVERIFY2((audioOutput.state() == QAudio::StoppedState), "didn't transitions to StoppedState after stop()"); QVERIFY2((audioOutput.error() == QAudio::NoError), "error() is not QAudio::NoError after stop()"); @@ -654,8 +654,8 @@ void tst_QAudioSink::pushSuspendResume() QIODevice* feed = audioOutput.start(); // Check that QAudioSink immediately transitions to IdleState - QTRY_VERIFY2((stateSignal.count() == 1), - QString("didn't emit signal on start(), got %1 signals instead").arg(stateSignal.count()).toUtf8().constData()); + QTRY_VERIFY2((stateSignal.size() == 1), + QString("didn't emit signal on start(), got %1 signals instead").arg(stateSignal.size()).toUtf8().constData()); QVERIFY2((audioOutput.state() == QAudio::IdleState), "didn't transition to IdleState after start()"); QVERIFY2((audioOutput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after start()"); stateSignal.clear(); @@ -677,9 +677,9 @@ void tst_QAudioSink::pushSuspendResume() if (firstBuffer) { // Check for transition to ActiveState when data is provided - QVERIFY2((stateSignal.count() == 1), + QVERIFY2((stateSignal.size() == 1), QString("didn't emit signal after receiving data, got %1 signals instead") - .arg(stateSignal.count()).toUtf8().constData()); + .arg(stateSignal.size()).toUtf8().constData()); QVERIFY2((audioOutput.state() == QAudio::ActiveState), "didn't transition to ActiveState after receiving data"); QVERIFY2((audioOutput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after receiving data"); firstBuffer = false; @@ -691,9 +691,9 @@ void tst_QAudioSink::pushSuspendResume() audioOutput.suspend(); - QTRY_VERIFY2((stateSignal.count() == 1), + QTRY_VERIFY2((stateSignal.size() == 1), QString("didn't emit SuspendedState signal after suspend(), got %1 signals instead") - .arg(stateSignal.count()).toUtf8().constData()); + .arg(stateSignal.size()).toUtf8().constData()); QVERIFY2((audioOutput.state() == QAudio::SuspendedState), "didn't transition to SuspendedState after suspend()"); QVERIFY2((audioOutput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after suspend()"); stateSignal.clear(); @@ -712,8 +712,8 @@ void tst_QAudioSink::pushSuspendResume() QTest::qWait(20); // Check that QAudioSink immediately transitions to IdleState - QVERIFY2((stateSignal.count() == 1), - QString("didn't emit signal after resume(), got %1 signals instead").arg(stateSignal.count()).toUtf8().constData()); + QVERIFY2((stateSignal.size() == 1), + QString("didn't emit signal after resume(), got %1 signals instead").arg(stateSignal.size()).toUtf8().constData()); QVERIFY2((audioOutput.state() == QAudio::IdleState), "didn't transition to IdleState after resume()"); QVERIFY2((audioOutput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after resume()"); stateSignal.clear(); @@ -731,7 +731,7 @@ void tst_QAudioSink::pushSuspendResume() stateSignal.clear(); QVERIFY2(audioFile->atEnd(), "didn't play to EOF"); - QTRY_VERIFY(stateSignal.count() > 0); + QTRY_VERIFY(stateSignal.size() > 0); QCOMPARE(qvariant_cast<QAudio::State>(stateSignal.last().at(0)), QAudio::IdleState); QVERIFY2((audioOutput.state() == QAudio::IdleState), "didn't transitions to IdleState when at EOF"); stateSignal.clear(); @@ -740,8 +740,8 @@ void tst_QAudioSink::pushSuspendResume() audioOutput.stop(); QTest::qWait(40); - QVERIFY2((stateSignal.count() == 1), - QString("didn't emit StoppedState signal after stop(), got %1 signals instead").arg(stateSignal.count()).toUtf8().constData()); + QVERIFY2((stateSignal.size() == 1), + QString("didn't emit StoppedState signal after stop(), got %1 signals instead").arg(stateSignal.size()).toUtf8().constData()); QVERIFY2((audioOutput.state() == QAudio::StoppedState), "didn't transitions to StoppedState after stop()"); QVERIFY2((audioOutput.error() == QAudio::NoError), "error() is not QAudio::NoError after stop()"); @@ -773,8 +773,8 @@ void tst_QAudioSink::pushUnderrun() QIODevice* feed = audioOutput.start(); // Check that QAudioSink immediately transitions to IdleState - QTRY_VERIFY2((stateSignal.count() == 1), - QString("didn't emit signal on start(), got %1 signals instead").arg(stateSignal.count()).toUtf8().constData()); + QTRY_VERIFY2((stateSignal.size() == 1), + QString("didn't emit signal on start(), got %1 signals instead").arg(stateSignal.size()).toUtf8().constData()); QVERIFY2((audioOutput.state() == QAudio::IdleState), "didn't transition to IdleState after start()"); QVERIFY2((audioOutput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after start()"); stateSignal.clear(); @@ -797,9 +797,9 @@ void tst_QAudioSink::pushUnderrun() if (firstBuffer) { // Check for transition to ActiveState when data is provided - QVERIFY2((stateSignal.count() == 1), + QVERIFY2((stateSignal.size() == 1), QString("didn't emit signal after receiving data, got %1 signals instead") - .arg(stateSignal.count()).toUtf8().constData()); + .arg(stateSignal.size()).toUtf8().constData()); QVERIFY2((audioOutput.state() == QAudio::ActiveState), "didn't transition to ActiveState after receiving data"); QVERIFY2((audioOutput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after receiving data"); firstBuffer = false; @@ -812,9 +812,9 @@ void tst_QAudioSink::pushUnderrun() // Wait for data to be played QTest::qWait(700); - QVERIFY2((stateSignal.count() == 1), + QVERIFY2((stateSignal.size() == 1), QString("didn't emit IdleState signal after suspend(), got %1 signals instead") - .arg(stateSignal.count()).toUtf8().constData()); + .arg(stateSignal.size()).toUtf8().constData()); QVERIFY2((audioOutput.state() == QAudio::IdleState), "didn't transition to IdleState, no data"); QVERIFY2((audioOutput.error() == QAudio::UnderrunError), "error state is not equal to QAudio::UnderrunError, no data"); stateSignal.clear(); @@ -827,9 +827,9 @@ void tst_QAudioSink::pushUnderrun() written += feed->write(buffer); if (firstBuffer) { // Check for transition to ActiveState when data is provided - QVERIFY2((stateSignal.count() == 1), + QVERIFY2((stateSignal.size() == 1), QString("didn't emit signal after receiving data, got %1 signals instead") - .arg(stateSignal.count()).toUtf8().constData()); + .arg(stateSignal.size()).toUtf8().constData()); QVERIFY2((audioOutput.state() == QAudio::ActiveState), "didn't transition to ActiveState after receiving data"); QVERIFY2((audioOutput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after receiving data"); firstBuffer = false; @@ -841,8 +841,8 @@ void tst_QAudioSink::pushUnderrun() // Wait until playback finishes QVERIFY2(audioFile->atEnd(), "didn't play to EOF"); - QTRY_VERIFY2((stateSignal.count() == 1), - QString("didn't emit IdleState signal when at EOF, got %1 signals instead").arg(stateSignal.count()).toUtf8().constData()); + QTRY_VERIFY2((stateSignal.size() == 1), + QString("didn't emit IdleState signal when at EOF, got %1 signals instead").arg(stateSignal.size()).toUtf8().constData()); QVERIFY2((audioOutput.state() == QAudio::IdleState), "didn't transitions to IdleState when at EOF"); stateSignal.clear(); @@ -850,8 +850,8 @@ void tst_QAudioSink::pushUnderrun() audioOutput.stop(); QTest::qWait(40); - QVERIFY2((stateSignal.count() == 1), - QString("didn't emit StoppedState signal after stop(), got %1 signals instead").arg(stateSignal.count()).toUtf8().constData()); + QVERIFY2((stateSignal.size() == 1), + QString("didn't emit StoppedState signal after stop(), got %1 signals instead").arg(stateSignal.size()).toUtf8().constData()); QVERIFY2((audioOutput.state() == QAudio::StoppedState), "didn't transitions to StoppedState after stop()"); QVERIFY2((audioOutput.error() == QAudio::NoError), "error() is not QAudio::NoError after stop()"); diff --git a/tests/auto/integration/qaudiosource/tst_qaudiosource.cpp b/tests/auto/integration/qaudiosource/tst_qaudiosource.cpp index 274f8bc91..4877d4ae5 100644 --- a/tests/auto/integration/qaudiosource/tst_qaudiosource.cpp +++ b/tests/auto/integration/qaudiosource/tst_qaudiosource.cpp @@ -84,7 +84,7 @@ void tst_QAudioSource::generate_audiofile_testrows() QTest::addColumn<FilePtr>("audioFile"); QTest::addColumn<QAudioFormat>("audioFormat"); - for (int i=0; i<audioFiles.count(); i++) { + for (int i=0; i<audioFiles.size(); i++) { QTest::newRow(QString("%1").arg(i).toUtf8().constData()) << audioFiles.at(i) << testFormats.at(i); @@ -264,7 +264,7 @@ void tst_QAudioSource::stopWhileStopped() audioInput.stop(); // Check that no state transition occurred - QVERIFY2((stateSignal.count() == 0), "stop() while stopped is emitting a signal and it shouldn't"); + QVERIFY2((stateSignal.size() == 0), "stop() while stopped is emitting a signal and it shouldn't"); QVERIFY2((audioInput.error() == QAudio::NoError), "error() was not set to QAudio::NoError after stop()"); } @@ -284,7 +284,7 @@ void tst_QAudioSource::suspendWhileStopped() audioInput.suspend(); // Check that no state transition occurred - QVERIFY2((stateSignal.count() == 0), "stop() while suspended is emitting a signal and it shouldn't"); + QVERIFY2((stateSignal.size() == 0), "stop() while suspended is emitting a signal and it shouldn't"); QVERIFY2((audioInput.error() == QAudio::NoError), "error() was not set to QAudio::NoError after stop()"); } @@ -304,7 +304,7 @@ void tst_QAudioSource::resumeWhileStopped() audioInput.resume(); // Check that no state transition occurred - QVERIFY2((stateSignal.count() == 0), "resume() while stopped is emitting a signal and it shouldn't"); + QVERIFY2((stateSignal.size() == 0), "resume() while stopped is emitting a signal and it shouldn't"); QVERIFY2((audioInput.error() == QAudio::NoError), "error() was not set to QAudio::NoError after resume()"); } @@ -335,7 +335,7 @@ void tst_QAudioSource::pull() audioInput.start(audioFile.data()); // Check that QAudioSource immediately transitions to ActiveState or IdleState - QTRY_VERIFY2((stateSignal.count() > 0),"didn't emit signals on start()"); + QTRY_VERIFY2((stateSignal.size() > 0),"didn't emit signals on start()"); QVERIFY2((audioInput.state() == QAudio::ActiveState || audioInput.state() == QAudio::IdleState), "didn't transition to ActiveState or IdleState after start()"); QVERIFY2((audioInput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after start()"); @@ -355,8 +355,8 @@ void tst_QAudioSource::pull() QString("processedUSecs() doesn't fall in acceptable range, should be 300000 (%1)").arg(processedUs).toUtf8().constData()); audioInput.stop(); - QTRY_VERIFY2((stateSignal.count() == 1), - QString("didn't emit StoppedState signal after stop(), got %1 signals instead").arg(stateSignal.count()).toUtf8().constData()); + QTRY_VERIFY2((stateSignal.size() == 1), + QString("didn't emit StoppedState signal after stop(), got %1 signals instead").arg(stateSignal.size()).toUtf8().constData()); QVERIFY2((audioInput.state() == QAudio::StoppedState), "didn't transitions to StoppedState after stop()"); QVERIFY2((audioInput.error() == QAudio::NoError), "error() is not QAudio::NoError after stop()"); @@ -400,7 +400,7 @@ void tst_QAudioSource::pullSuspendResume() audioInput.start(audioFile.data()); // Check that QAudioSource immediately transitions to ActiveState or IdleState - QTRY_VERIFY2((stateSignal.count() > 0),"didn't emit signals on start()"); + QTRY_VERIFY2((stateSignal.size() > 0),"didn't emit signals on start()"); QVERIFY2((audioInput.state() == QAudio::ActiveState || audioInput.state() == QAudio::IdleState), "didn't transition to ActiveState or IdleState after start()"); QVERIFY2((audioInput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after start()"); @@ -421,8 +421,8 @@ void tst_QAudioSource::pullSuspendResume() audioInput.suspend(); - QTRY_VERIFY2((stateSignal.count() == 1), - QString("didn't emit SuspendedState signal after suspend(), got %1 signals instead").arg(stateSignal.count()).toUtf8().constData()); + QTRY_VERIFY2((stateSignal.size() == 1), + QString("didn't emit SuspendedState signal after suspend(), got %1 signals instead").arg(stateSignal.size()).toUtf8().constData()); QVERIFY2((audioInput.state() == QAudio::SuspendedState), "didn't transitions to SuspendedState after stop()"); QVERIFY2((audioInput.error() == QAudio::NoError), "error() is not QAudio::NoError after stop()"); stateSignal.clear(); @@ -438,16 +438,16 @@ void tst_QAudioSource::pullSuspendResume() audioInput.resume(); // Check that QAudioSource immediately transitions to ActiveState - QTRY_VERIFY2((stateSignal.count() == 1), - QString("didn't emit signal after resume(), got %1 signals instead").arg(stateSignal.count()).toUtf8().constData()); + QTRY_VERIFY2((stateSignal.size() == 1), + QString("didn't emit signal after resume(), got %1 signals instead").arg(stateSignal.size()).toUtf8().constData()); QVERIFY2((audioInput.state() == QAudio::ActiveState), "didn't transition to ActiveState after resume()"); QVERIFY2((audioInput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after resume()"); stateSignal.clear(); audioInput.stop(); QTest::qWait(40); - QTRY_VERIFY2((stateSignal.count() == 1), - QString("didn't emit StoppedState signal after stop(), got %1 signals instead").arg(stateSignal.count()).toUtf8().constData()); + QTRY_VERIFY2((stateSignal.size() == 1), + QString("didn't emit StoppedState signal after stop(), got %1 signals instead").arg(stateSignal.size()).toUtf8().constData()); QVERIFY2((audioInput.state() == QAudio::StoppedState), "didn't transitions to StoppedState after stop()"); QVERIFY2((audioInput.error() == QAudio::NoError), "error() is not QAudio::NoError after stop()"); @@ -489,7 +489,7 @@ void tst_QAudioSource::push() QIODevice* feed = audioInput.start(); // Check that QAudioSource immediately transitions to IdleState - QTRY_VERIFY2((stateSignal.count() == 1),"didn't emit IdleState signal on start()"); + QTRY_VERIFY2((stateSignal.size() == 1),"didn't emit IdleState signal on start()"); QVERIFY2((audioInput.state() == QAudio::IdleState), "didn't transition to IdleState after start()"); QVERIFY2((audioInput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after start()"); @@ -509,7 +509,7 @@ void tst_QAudioSource::push() totalBytesRead += buffer.size(); if (firstBuffer && buffer.size()) { // Check for transition to ActiveState when data is provided - QTRY_VERIFY2((stateSignal.count() == 1),"didn't emit ActiveState signal on data"); + QTRY_VERIFY2((stateSignal.size() == 1),"didn't emit ActiveState signal on data"); QVERIFY2((audioInput.state() == QAudio::ActiveState), "didn't transition to ActiveState after data"); QVERIFY2((audioInput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after start()"); @@ -522,8 +522,8 @@ void tst_QAudioSource::push() qint64 processedUs = audioInput.processedUSecs(); audioInput.stop(); - QTRY_VERIFY2((stateSignal.count() == 1), - QString("didn't emit StoppedState signal after stop(), got %1 signals instead").arg(stateSignal.count()).toUtf8().constData()); + QTRY_VERIFY2((stateSignal.size() == 1), + QString("didn't emit StoppedState signal after stop(), got %1 signals instead").arg(stateSignal.size()).toUtf8().constData()); QVERIFY2((audioInput.state() == QAudio::StoppedState), "didn't transitions to StoppedState after stop()"); QVERIFY2(qTolerantCompare(processedUs, 500000LL), @@ -569,7 +569,7 @@ void tst_QAudioSource::pushSuspendResume() QIODevice* feed = audioInput.start(); // Check that QAudioSource immediately transitions to IdleState - QTRY_VERIFY2((stateSignal.count() == 1),"didn't emit IdleState signal on start()"); + QTRY_VERIFY2((stateSignal.size() == 1),"didn't emit IdleState signal on start()"); QVERIFY2((audioInput.state() == QAudio::IdleState), "didn't transition to IdleState after start()"); QVERIFY2((audioInput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after start()"); @@ -588,7 +588,7 @@ void tst_QAudioSource::pushSuspendResume() totalBytesRead += buffer.size(); if (firstBuffer && buffer.size()) { // Check for transition to ActiveState when data is provided - QTRY_VERIFY2((stateSignal.count() == 1),"didn't emit ActiveState signal on data"); + QTRY_VERIFY2((stateSignal.size() == 1),"didn't emit ActiveState signal on data"); QVERIFY2((audioInput.state() == QAudio::ActiveState), "didn't transition to ActiveState after data"); QVERIFY2((audioInput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after start()"); @@ -599,8 +599,8 @@ void tst_QAudioSource::pushSuspendResume() audioInput.suspend(); - QTRY_VERIFY2((stateSignal.count() == 1), - QString("didn't emit SuspendedState signal after suspend(), got %1 signals instead").arg(stateSignal.count()).toUtf8().constData()); + QTRY_VERIFY2((stateSignal.size() == 1), + QString("didn't emit SuspendedState signal after suspend(), got %1 signals instead").arg(stateSignal.size()).toUtf8().constData()); QVERIFY2((audioInput.state() == QAudio::SuspendedState), "didn't transitions to SuspendedState after stop()"); QVERIFY2((audioInput.error() == QAudio::NoError), "error() is not QAudio::NoError after stop()"); stateSignal.clear(); @@ -619,7 +619,7 @@ void tst_QAudioSource::pushSuspendResume() audioInput.resume(); // Check that QAudioSource immediately transitions to Active or IdleState - QTRY_VERIFY2((stateSignal.count() > 0),"didn't emit signals on resume()"); + QTRY_VERIFY2((stateSignal.size() > 0),"didn't emit signals on resume()"); QVERIFY2((audioInput.state() == QAudio::ActiveState || audioInput.state() == QAudio::IdleState), "didn't transition to ActiveState or IdleState after resume()"); QVERIFY2((audioInput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after resume()"); @@ -640,8 +640,8 @@ void tst_QAudioSource::pushSuspendResume() processedUs = audioInput.processedUSecs(); audioInput.stop(); - QTRY_VERIFY2((stateSignal.count() == 1), - QString("didn't emit StoppedState signal after stop(), got %1 signals instead").arg(stateSignal.count()).toUtf8().constData()); + QTRY_VERIFY2((stateSignal.size() == 1), + QString("didn't emit StoppedState signal after stop(), got %1 signals instead").arg(stateSignal.size()).toUtf8().constData()); QVERIFY2((audioInput.state() == QAudio::StoppedState), "didn't transitions to StoppedState after stop()"); QVERIFY2(qTolerantCompare(processedUs, 1000000LL), @@ -671,7 +671,7 @@ void tst_QAudioSource::reset() QIODevice* device = audioInput.start(); // Check that QAudioSource immediately transitions to IdleState - QTRY_VERIFY2((stateSignal.count() == 1),"didn't emit IdleState signal on start()"); + QTRY_VERIFY2((stateSignal.size() == 1),"didn't emit IdleState signal on start()"); QVERIFY2((audioInput.state() == QAudio::IdleState), "didn't transition to IdleState after start()"); QVERIFY2((audioInput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after start()"); QTRY_VERIFY2_WITH_TIMEOUT((audioInput.bytesAvailable() > 0), "no bytes available after starting", 10000); @@ -682,7 +682,7 @@ void tst_QAudioSource::reset() stateSignal.clear(); audioInput.reset(); - QTRY_VERIFY2((stateSignal.count() == 1),"didn't emit StoppedState signal after reset()"); + QTRY_VERIFY2((stateSignal.size() == 1),"didn't emit StoppedState signal after reset()"); QVERIFY2((audioInput.state() == QAudio::StoppedState), "didn't transitions to StoppedState after reset()"); QVERIFY2((audioInput.bytesAvailable() == 0), "buffer not cleared after reset()"); } @@ -702,13 +702,13 @@ void tst_QAudioSource::reset() audioInput.start(&buffer); // Check that QAudioSource immediately transitions to ActiveState - QTRY_VERIFY2((stateSignal.count() >= 1),"didn't emit state changed signal on start()"); + QTRY_VERIFY2((stateSignal.size() >= 1),"didn't emit state changed signal on start()"); QTRY_VERIFY2((audioInput.state() == QAudio::ActiveState), "didn't transition to ActiveState after start()"); QVERIFY2((audioInput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after start()"); stateSignal.clear(); audioInput.reset(); - QTRY_VERIFY2((stateSignal.count() >= 1),"didn't emit StoppedState signal after reset()"); + QTRY_VERIFY2((stateSignal.size() >= 1),"didn't emit StoppedState signal after reset()"); QVERIFY2((audioInput.state() == QAudio::StoppedState), "didn't transitions to StoppedState after reset()"); QVERIFY2((audioInput.bytesAvailable() == 0), "buffer not cleared after reset()"); } 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>(); diff --git a/tests/auto/integration/qmediacapturesession/tst_qmediacapturesession.cpp b/tests/auto/integration/qmediacapturesession/tst_qmediacapturesession.cpp index 62590c4d2..d957e50e7 100644 --- a/tests/auto/integration/qmediacapturesession/tst_qmediacapturesession.cpp +++ b/tests/auto/integration/qmediacapturesession/tst_qmediacapturesession.cpp @@ -112,7 +112,7 @@ void tst_QMediaCaptureSession::recordFail(QMediaCaptureSession &session) session.setRecorder(&recorder); recorder.record(); - QTRY_VERIFY_WITH_TIMEOUT(recorderErrorSignal.count() == 1, 2000); + QTRY_VERIFY_WITH_TIMEOUT(recorderErrorSignal.size() == 1, 2000); QTRY_VERIFY_WITH_TIMEOUT(recorder.recorderState() == QMediaRecorder::StoppedState, 2000); } @@ -153,13 +153,13 @@ void tst_QMediaCaptureSession::record_video_without_preview() session.setCamera(&camera); camera.setActive(true); - QTRY_COMPARE(cameraChanged.count(), 1); + QTRY_COMPARE(cameraChanged.size(), 1); recordOk(session); QVERIFY(!QTest::currentTestFailed()); session.setCamera(nullptr); - QTRY_COMPARE(cameraChanged.count(), 2); + QTRY_COMPARE(cameraChanged.size(), 2); // can't record without audio and video recordFail(session); @@ -177,25 +177,25 @@ void tst_QMediaCaptureSession::can_add_and_remove_AudioInput_with_and_without_Au QSignalSpy audioOutputChanged(&session, SIGNAL(audioOutputChanged())); session.setAudioInput(&input); - QTRY_COMPARE(audioInputChanged.count(), 1); + QTRY_COMPARE(audioInputChanged.size(), 1); session.setAudioInput(nullptr); - QTRY_COMPARE(audioInputChanged.count(), 2); + QTRY_COMPARE(audioInputChanged.size(), 2); QAudioOutput output; if (output.device().isNull()) return; session.setAudioOutput(&output); - QTRY_COMPARE(audioOutputChanged.count(), 1); + QTRY_COMPARE(audioOutputChanged.size(), 1); session.setAudioInput(&input); - QTRY_COMPARE(audioInputChanged.count(), 3); + QTRY_COMPARE(audioInputChanged.size(), 3); session.setAudioOutput(nullptr); - QTRY_COMPARE(audioOutputChanged.count(), 2); + QTRY_COMPARE(audioOutputChanged.size(), 2); session.setAudioInput(nullptr); - QTRY_COMPARE(audioInputChanged.count(), 4); + QTRY_COMPARE(audioInputChanged.size(), 4); } void tst_QMediaCaptureSession::can_change_AudioDevices_on_attached_AudioInput() @@ -211,19 +211,19 @@ void tst_QMediaCaptureSession::can_change_AudioDevices_on_attached_AudioInput() QSignalSpy audioInputChanged(&session, SIGNAL(audioInputChanged())); session.setAudioInput(&input); - QTRY_COMPARE(audioInputChanged.count(), 1); + QTRY_COMPARE(audioInputChanged.size(), 1); recordOk(session); QVERIFY(!QTest::currentTestFailed()); input.setDevice(audioInputs[1]); - QTRY_COMPARE(deviceChanged.count(), 1); + QTRY_COMPARE(deviceChanged.size(), 1); recordOk(session); QVERIFY(!QTest::currentTestFailed()); input.setDevice(audioInputs[0]); - QTRY_COMPARE(deviceChanged.count(), 2); + QTRY_COMPARE(deviceChanged.size(), 2); recordOk(session); QVERIFY(!QTest::currentTestFailed()); @@ -245,22 +245,22 @@ void tst_QMediaCaptureSession::can_change_AudioInput_during_recording() QSignalSpy durationChanged(&recorder, SIGNAL(durationChanged(qint64))); session.setAudioInput(&input); - QTRY_COMPARE(audioInputChanged.count(), 1); + QTRY_COMPARE(audioInputChanged.size(), 1); recorder.record(); QTRY_VERIFY(recorder.recorderState() == QMediaRecorder::RecordingState); QVERIFY(durationChanged.wait(2000)); session.setAudioInput(nullptr); - QTRY_COMPARE(audioInputChanged.count(), 2); + QTRY_COMPARE(audioInputChanged.size(), 2); session.setAudioInput(&input); - QTRY_COMPARE(audioInputChanged.count(), 3); + QTRY_COMPARE(audioInputChanged.size(), 3); recorder.stop(); QTRY_VERIFY(recorder.recorderState() == QMediaRecorder::StoppedState); QVERIFY(recorderErrorSignal.isEmpty()); session.setAudioInput(nullptr); - QTRY_COMPARE(audioInputChanged.count(), 4); + QTRY_COMPARE(audioInputChanged.size(), 4); QString fileName = recorder.actualLocation().toLocalFile(); QVERIFY(!fileName.isEmpty()); @@ -278,10 +278,10 @@ void tst_QMediaCaptureSession::disconnects_deleted_AudioInput() { QAudioInput input; session.setAudioInput(&input); - QTRY_COMPARE(audioInputChanged.count(), 1); + QTRY_COMPARE(audioInputChanged.size(), 1); } QVERIFY(session.audioInput() == nullptr); - QTRY_COMPARE(audioInputChanged.count(), 2); + QTRY_COMPARE(audioInputChanged.size(), 2); } void tst_QMediaCaptureSession::can_move_AudioInput_between_sessions() @@ -299,16 +299,16 @@ void tst_QMediaCaptureSession::can_move_AudioInput_between_sessions() QMediaCaptureSession session2; QSignalSpy audioInputChanged2(&session2, SIGNAL(audioInputChanged())); session2.setAudioInput(&input); - QTRY_COMPARE(audioInputChanged2.count(), 1); + QTRY_COMPARE(audioInputChanged2.size(), 1); } session0.setAudioInput(&input); - QTRY_COMPARE(audioInputChanged0.count(), 1); + QTRY_COMPARE(audioInputChanged0.size(), 1); QVERIFY(session0.audioInput() != nullptr); session1.setAudioInput(&input); - QTRY_COMPARE(audioInputChanged0.count(), 2); + QTRY_COMPARE(audioInputChanged0.size(), 2); QVERIFY(session0.audioInput() == nullptr); - QTRY_COMPARE(audioInputChanged1.count(), 1); + QTRY_COMPARE(audioInputChanged1.size(), 1); QVERIFY(session1.audioInput() != nullptr); } @@ -322,10 +322,10 @@ void tst_QMediaCaptureSession::disconnects_deleted_AudioOutput() { QAudioOutput output; session.setAudioOutput(&output); - QTRY_COMPARE(audioOutputChanged.count(), 1); + QTRY_COMPARE(audioOutputChanged.size(), 1); } QVERIFY(session.audioOutput() == nullptr); - QTRY_COMPARE(audioOutputChanged.count(), 2); + QTRY_COMPARE(audioOutputChanged.size(), 2); } void tst_QMediaCaptureSession::can_move_AudioOutput_between_sessions_and_player() @@ -345,31 +345,31 @@ void tst_QMediaCaptureSession::can_move_AudioOutput_between_sessions_and_player( QMediaCaptureSession session2; QSignalSpy audioOutputChanged2(&session2, SIGNAL(audioOutputChanged())); session2.setAudioOutput(&output); - QTRY_COMPARE(audioOutputChanged2.count(), 1); + QTRY_COMPARE(audioOutputChanged2.size(), 1); } session0.setAudioOutput(&output); - QTRY_COMPARE(audioOutputChanged0.count(), 1); + QTRY_COMPARE(audioOutputChanged0.size(), 1); QVERIFY(session0.audioOutput() != nullptr); session1.setAudioOutput(&output); - QTRY_COMPARE(audioOutputChanged0.count(), 2); + QTRY_COMPARE(audioOutputChanged0.size(), 2); QVERIFY(session0.audioOutput() == nullptr); - QTRY_COMPARE(audioOutputChanged1.count(), 1); + QTRY_COMPARE(audioOutputChanged1.size(), 1); QVERIFY(session1.audioOutput() != nullptr); player.setAudioOutput(&output); - QTRY_COMPARE(audioOutputChanged0.count(), 2); + QTRY_COMPARE(audioOutputChanged0.size(), 2); QVERIFY(session0.audioOutput() == nullptr); - QTRY_COMPARE(audioOutputChanged1.count(), 2); + QTRY_COMPARE(audioOutputChanged1.size(), 2); QVERIFY(session1.audioOutput() == nullptr); - QTRY_COMPARE(audioOutputChangedPlayer.count(), 1); + QTRY_COMPARE(audioOutputChangedPlayer.size(), 1); QVERIFY(player.audioOutput() != nullptr); session0.setAudioOutput(&output); - QTRY_COMPARE(audioOutputChanged0.count(), 3); + QTRY_COMPARE(audioOutputChanged0.size(), 3); QVERIFY(session0.audioOutput() != nullptr); - QTRY_COMPARE(audioOutputChangedPlayer.count(), 2); + QTRY_COMPARE(audioOutputChangedPlayer.size(), 2); QVERIFY(player.audioOutput() == nullptr); } @@ -390,13 +390,13 @@ void tst_QMediaCaptureSession::can_add_and_remove_Camera() session.setCamera(&camera); camera.setActive(true); - QTRY_COMPARE(cameraChanged.count(), 1); + QTRY_COMPARE(cameraChanged.size(), 1); session.setCamera(nullptr); - QTRY_COMPARE(cameraChanged.count(), 2); + QTRY_COMPARE(cameraChanged.size(), 2); session.setCamera(&camera); - QTRY_COMPARE(cameraChanged.count(), 3); + QTRY_COMPARE(cameraChanged.size(), 3); recordOk(session); QVERIFY(!QTest::currentTestFailed()); @@ -414,23 +414,23 @@ void tst_QMediaCaptureSession::can_move_Camera_between_sessions() QMediaCaptureSession session2; QSignalSpy cameraChanged2(&session2, SIGNAL(cameraChanged())); session2.setCamera(&camera); - QTRY_COMPARE(cameraChanged2.count(), 1); + QTRY_COMPARE(cameraChanged2.size(), 1); } QVERIFY(camera.captureSession() == nullptr); session0.setCamera(&camera); - QTRY_COMPARE(cameraChanged0.count(), 1); + QTRY_COMPARE(cameraChanged0.size(), 1); QVERIFY(session0.camera() == &camera); QVERIFY(camera.captureSession() == &session0); session1.setCamera(&camera); - QTRY_COMPARE(cameraChanged0.count(), 2); + QTRY_COMPARE(cameraChanged0.size(), 2); QVERIFY(session0.camera() == nullptr); - QTRY_COMPARE(cameraChanged1.count(), 1); + QTRY_COMPARE(cameraChanged1.size(), 1); QVERIFY(session1.camera() == &camera); QVERIFY(camera.captureSession() == &session1); } - QTRY_COMPARE(cameraChanged1.count(), 2); + QTRY_COMPARE(cameraChanged1.size(), 2); QVERIFY(session1.camera() == nullptr); } @@ -452,15 +452,15 @@ void tst_QMediaCaptureSession::can_disconnect_Camera_when_recording() camera.setActive(true); session.setCamera(&camera); - QTRY_COMPARE(cameraChanged.count(), 1); + QTRY_COMPARE(cameraChanged.size(), 1); durationChanged.clear(); recorder.record(); QTRY_VERIFY(recorder.recorderState() == QMediaRecorder::RecordingState); - QTRY_VERIFY(durationChanged.count() > 0); + QTRY_VERIFY(durationChanged.size() > 0); session.setCamera(nullptr); - QTRY_COMPARE(cameraChanged.count(), 2); + QTRY_COMPARE(cameraChanged.size(), 2); recorder.stop(); QTRY_VERIFY(recorder.recorderState() == QMediaRecorder::StoppedState); @@ -491,14 +491,14 @@ void tst_QMediaCaptureSession::can_add_and_remove_different_Cameras() camera.setActive(true); session.setCamera(&camera); - QTRY_COMPARE(cameraChanged.count(), 1); + QTRY_COMPARE(cameraChanged.size(), 1); session.setCamera(nullptr); - QTRY_COMPARE(cameraChanged.count(), 2); + QTRY_COMPARE(cameraChanged.size(), 2); session.setCamera(&camera2); camera2.setActive(true); - QTRY_COMPARE(cameraChanged.count(), 3); + QTRY_COMPARE(cameraChanged.size(), 3); recordOk(session); QVERIFY(!QTest::currentTestFailed()); @@ -522,7 +522,7 @@ void tst_QMediaCaptureSession::can_change_CameraDevice_on_attached_Camera() QSignalSpy cameraChanged(&session, SIGNAL(cameraChanged())); session.setCamera(&camera); - QTRY_COMPARE(cameraChanged.count(), 1); + QTRY_COMPARE(cameraChanged.size(), 1); recordFail(session); QVERIFY(!QTest::currentTestFailed()); @@ -533,7 +533,7 @@ void tst_QMediaCaptureSession::can_change_CameraDevice_on_attached_Camera() camera.setCameraDevice(cameraDevices[1]); camera.setActive(true); - QTRY_COMPARE(cameraDeviceChanged.count(), 1); + QTRY_COMPARE(cameraDeviceChanged.size(), 1); recordOk(session); QVERIFY(!QTest::currentTestFailed()); @@ -556,22 +556,22 @@ void tst_QMediaCaptureSession::can_change_VideoOutput_with_and_without_camera() QSignalSpy cameraChanged(&session, SIGNAL(cameraChanged())); session.setCamera(&camera); - QTRY_COMPARE(cameraChanged.count(), 1); + QTRY_COMPARE(cameraChanged.size(), 1); session.setVideoOutput(&videoOutput); - QTRY_COMPARE(videoOutputChanged.count(), 1); + QTRY_COMPARE(videoOutputChanged.size(), 1); session.setVideoOutput(nullptr); - QTRY_COMPARE(videoOutputChanged.count(), 2); + QTRY_COMPARE(videoOutputChanged.size(), 2); session.setVideoOutput(&videoOutput2); - QTRY_COMPARE(videoOutputChanged.count(), 3); + QTRY_COMPARE(videoOutputChanged.size(), 3); session.setCamera(nullptr); - QTRY_COMPARE(cameraChanged.count(), 2); + QTRY_COMPARE(cameraChanged.size(), 2); session.setVideoOutput(nullptr); - QTRY_COMPARE(videoOutputChanged.count(), 4); + QTRY_COMPARE(videoOutputChanged.size(), 4); } void tst_QMediaCaptureSession::can_change_VideoOutput_when_recording() @@ -595,20 +595,20 @@ void tst_QMediaCaptureSession::can_change_VideoOutput_when_recording() camera.setActive(true); session.setCamera(&camera); - QTRY_COMPARE(cameraChanged.count(), 1); + QTRY_COMPARE(cameraChanged.size(), 1); recorder.record(); QTRY_VERIFY(recorder.recorderState() == QMediaRecorder::RecordingState); QVERIFY(durationChanged.wait(2000)); session.setVideoOutput(&videoOutput); - QTRY_COMPARE(videoOutputChanged.count(), 1); + QTRY_COMPARE(videoOutputChanged.size(), 1); session.setVideoOutput(nullptr); - QTRY_COMPARE(videoOutputChanged.count(), 2); + QTRY_COMPARE(videoOutputChanged.size(), 2); session.setVideoOutput(&videoOutput); - QTRY_COMPARE(videoOutputChanged.count(), 3); + QTRY_COMPARE(videoOutputChanged.size(), 3); recorder.stop(); QTRY_VERIFY(recorder.recorderState() == QMediaRecorder::StoppedState); @@ -634,16 +634,16 @@ void tst_QMediaCaptureSession::can_add_and_remove_recorders() QSignalSpy recorderChanged(&session, SIGNAL(recorderChanged())); session.setAudioInput(&input); - QTRY_COMPARE(audioInputChanged.count(), 1); + QTRY_COMPARE(audioInputChanged.size(), 1); session.setRecorder(&recorder); - QTRY_COMPARE(recorderChanged.count(), 1); + QTRY_COMPARE(recorderChanged.size(), 1); session.setRecorder(&recorder2); - QTRY_COMPARE(recorderChanged.count(), 2); + QTRY_COMPARE(recorderChanged.size(), 2); session.setRecorder(&recorder); - QTRY_COMPARE(recorderChanged.count(), 3); + QTRY_COMPARE(recorderChanged.size(), 3); recordOk(session); QVERIFY(!QTest::currentTestFailed()); @@ -661,23 +661,23 @@ void tst_QMediaCaptureSession::can_move_Recorder_between_sessions() QMediaCaptureSession session2; QSignalSpy recorderChanged2(&session2, SIGNAL(recorderChanged())); session2.setRecorder(&recorder); - QTRY_COMPARE(recorderChanged2.count(), 1); + QTRY_COMPARE(recorderChanged2.size(), 1); } QVERIFY(recorder.captureSession() == nullptr); session0.setRecorder(&recorder); - QTRY_COMPARE(recorderChanged0.count(), 1); + QTRY_COMPARE(recorderChanged0.size(), 1); QVERIFY(session0.recorder() == &recorder); QVERIFY(recorder.captureSession() == &session0); session1.setRecorder(&recorder); - QTRY_COMPARE(recorderChanged0.count(), 2); + QTRY_COMPARE(recorderChanged0.size(), 2); QVERIFY(session0.recorder() == nullptr); - QTRY_COMPARE(recorderChanged1.count(), 1); + QTRY_COMPARE(recorderChanged1.size(), 1); QVERIFY(session1.recorder() == &recorder); QVERIFY(recorder.captureSession() == &session1); } - QTRY_COMPARE(recorderChanged1.count(), 2); + QTRY_COMPARE(recorderChanged1.size(), 2); QVERIFY(session1.recorder() == nullptr); } @@ -699,7 +699,7 @@ void tst_QMediaCaptureSession::can_record_AudioInput_with_null_AudioDevice() QSignalSpy audioInputChanged(&session, SIGNAL(audioInputChanged())); session.setAudioInput(&input); - QTRY_COMPARE(audioInputChanged.count(), 1); + QTRY_COMPARE(audioInputChanged.size(), 1); recordOk(session); QVERIFY(!QTest::currentTestFailed()); @@ -717,7 +717,7 @@ void tst_QMediaCaptureSession::can_record_Camera_with_null_CameraDevice() QSignalSpy cameraChanged(&session, SIGNAL(cameraChanged())); session.setCamera(&camera); - QTRY_COMPARE(cameraChanged.count(), 1); + QTRY_COMPARE(cameraChanged.size(), 1); camera.setActive(true); recordOk(session); @@ -739,17 +739,17 @@ void tst_QMediaCaptureSession::recording_stops_when_recorder_removed() QSignalSpy durationChanged(&recorder, SIGNAL(durationChanged(qint64))); session.setAudioInput(&input); - QTRY_COMPARE(audioInputChanged.count(), 1); + QTRY_COMPARE(audioInputChanged.size(), 1); session.setRecorder(&recorder); - QTRY_COMPARE(recorderChanged.count(), 1); + QTRY_COMPARE(recorderChanged.size(), 1); recorder.record(); QTRY_VERIFY(recorder.recorderState() == QMediaRecorder::RecordingState); QVERIFY(durationChanged.wait(2000)); session.setRecorder(nullptr); - QTRY_COMPARE(recorderChanged.count(), 2); + QTRY_COMPARE(recorderChanged.size(), 2); QTRY_VERIFY(recorder.recorderState() == QMediaRecorder::StoppedState); QVERIFY(recorderErrorSignal.isEmpty()); @@ -778,30 +778,30 @@ void tst_QMediaCaptureSession::can_add_and_remove_ImageCapture() QVERIFY(!capture.isReadyForCapture()); session.setImageCapture(&capture); - QTRY_COMPARE(imageCaptureChanged.count(), 1); + QTRY_COMPARE(imageCaptureChanged.size(), 1); QVERIFY(!capture.isAvailable()); QVERIFY(!capture.isReadyForCapture()); session.setCamera(&camera); - QTRY_COMPARE(cameraChanged.count(), 1); + QTRY_COMPARE(cameraChanged.size(), 1); QVERIFY(capture.isAvailable()); QVERIFY(!capture.isReadyForCapture()); camera.setActive(true); - QTRY_COMPARE(readyForCaptureChanged.count(), 1); + QTRY_COMPARE(readyForCaptureChanged.size(), 1); QVERIFY(capture.isReadyForCapture()); session.setImageCapture(nullptr); - QTRY_COMPARE(imageCaptureChanged.count(), 2); - QTRY_COMPARE(readyForCaptureChanged.count(), 2); + QTRY_COMPARE(imageCaptureChanged.size(), 2); + QTRY_COMPARE(readyForCaptureChanged.size(), 2); QVERIFY(!capture.isAvailable()); QVERIFY(!capture.isReadyForCapture()); session.setImageCapture(&capture); - QTRY_COMPARE(imageCaptureChanged.count(), 3); - QTRY_COMPARE(readyForCaptureChanged.count(), 3); + QTRY_COMPARE(imageCaptureChanged.size(), 3); + QTRY_COMPARE(readyForCaptureChanged.size(), 3); QVERIFY(capture.isAvailable()); QVERIFY(capture.isReadyForCapture()); } @@ -818,23 +818,23 @@ void tst_QMediaCaptureSession::can_move_ImageCapture_between_sessions() QMediaCaptureSession session2; QSignalSpy imageCaptureChanged2(&session2, SIGNAL(imageCaptureChanged())); session2.setImageCapture(&imageCapture); - QTRY_COMPARE(imageCaptureChanged2.count(), 1); + QTRY_COMPARE(imageCaptureChanged2.size(), 1); } QVERIFY(imageCapture.captureSession() == nullptr); session0.setImageCapture(&imageCapture); - QTRY_COMPARE(imageCaptureChanged0.count(), 1); + QTRY_COMPARE(imageCaptureChanged0.size(), 1); QVERIFY(session0.imageCapture() == &imageCapture); QVERIFY(imageCapture.captureSession() == &session0); session1.setImageCapture(&imageCapture); - QTRY_COMPARE(imageCaptureChanged0.count(), 2); + QTRY_COMPARE(imageCaptureChanged0.size(), 2); QVERIFY(session0.imageCapture() == nullptr); - QTRY_COMPARE(imageCaptureChanged1.count(), 1); + QTRY_COMPARE(imageCaptureChanged1.size(), 1); QVERIFY(session1.imageCapture() == &imageCapture); QVERIFY(imageCapture.captureSession() == &session1); } - QTRY_COMPARE(imageCaptureChanged1.count(), 2); + QTRY_COMPARE(imageCaptureChanged1.size(), 2); QVERIFY(session1.imageCapture() == nullptr); } @@ -857,18 +857,18 @@ void tst_QMediaCaptureSession::capture_is_not_available_when_Camera_is_null() session.setCamera(&camera); camera.setActive(true); - QTRY_COMPARE(readyForCaptureChanged.count(), 1); + QTRY_COMPARE(readyForCaptureChanged.size(), 1); QVERIFY(capture.isReadyForCapture()); QVERIFY(capture.capture() >= 0); - QTRY_COMPARE(capturedSignal.count(), 1); + QTRY_COMPARE(capturedSignal.size(), 1); QVERIFY(capture.isReadyForCapture()); - int readyCount = readyForCaptureChanged.count(); + int readyCount = readyForCaptureChanged.size(); session.setCamera(nullptr); - QTRY_COMPARE(readyForCaptureChanged.count(), readyCount + 1); + QTRY_COMPARE(readyForCaptureChanged.size(), readyCount + 1); QVERIFY(!capture.isReadyForCapture()); QVERIFY(!capture.isAvailable()); QVERIFY(capture.capture() < 0); @@ -896,22 +896,22 @@ void tst_QMediaCaptureSession::can_add_ImageCapture_and_capture_during_recording camera.setActive(true); session.setRecorder(&recorder); - QTRY_COMPARE(recorderChanged.count(), 1); + QTRY_COMPARE(recorderChanged.size(), 1); recorder.record(); QTRY_VERIFY(recorder.recorderState() == QMediaRecorder::RecordingState); QVERIFY(durationChanged.wait(2000)); session.setImageCapture(&capture); - QTRY_COMPARE(imageCaptureChanged.count(), 1); - QTRY_COMPARE(readyForCaptureChanged.count(), 1); + QTRY_COMPARE(imageCaptureChanged.size(), 1); + QTRY_COMPARE(readyForCaptureChanged.size(), 1); QVERIFY(capture.isReadyForCapture()); QVERIFY(capture.capture() >= 0); - QTRY_COMPARE(capturedSignal.count(), 1); + QTRY_COMPARE(capturedSignal.size(), 1); session.setImageCapture(nullptr); - QVERIFY(readyForCaptureChanged.count() >= 2); + QVERIFY(readyForCaptureChanged.size() >= 2); QVERIFY(!capture.isReadyForCapture()); recorder.stop(); @@ -950,7 +950,7 @@ void tst_QMediaCaptureSession::testAudioMute() recorder.record(); audioInput.setMuted(true); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.last()[0], true); QTRY_VERIFY_WITH_TIMEOUT(recorder.recorderState() == QMediaRecorder::RecordingState, 2000); @@ -958,7 +958,7 @@ void tst_QMediaCaptureSession::testAudioMute() audioInput.setMuted(false); - QCOMPARE(spy.count(), 2); + QCOMPARE(spy.size(), 2); QCOMPARE(spy.last()[0], false); recorder.stop(); diff --git a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp index 2e0fd40d9..b4742bbec 100644 --- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp +++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp @@ -237,9 +237,9 @@ void tst_QMediaPlayerBackend::loadMedia() QVERIFY(player.mediaStatus() != QMediaPlayer::InvalidMedia); QVERIFY(player.source() == localWavFile); - QCOMPARE(stateSpy.count(), 0); - QVERIFY(statusSpy.count() > 0); - QCOMPARE(mediaSpy.count(), 1); + QCOMPARE(stateSpy.size(), 0); + QVERIFY(statusSpy.size() > 0); + QCOMPARE(mediaSpy.size(), 1); QCOMPARE(mediaSpy.last()[0].value<QUrl>(), localWavFile); QTRY_COMPARE(player.mediaStatus(), QMediaPlayer::LoadedMedia); @@ -341,10 +341,10 @@ void tst_QMediaPlayerBackend::playPauseStop() QCOMPARE(player.mediaStatus(), QMediaPlayer::NoMedia); QCOMPARE(player.error(), QMediaPlayer::NoError); QCOMPARE(player.position(), 0); - QCOMPARE(stateSpy.count(), 0); - QCOMPARE(statusSpy.count(), 0); - QCOMPARE(positionSpy.count(), 0); - QCOMPARE(errorSpy.count(), 0); + QCOMPARE(stateSpy.size(), 0); + QCOMPARE(statusSpy.size(), 0); + QCOMPARE(positionSpy.size(), 0); + QCOMPARE(errorSpy.size(), 0); // Check pause() without a media player.pause(); @@ -353,10 +353,10 @@ void tst_QMediaPlayerBackend::playPauseStop() QCOMPARE(player.mediaStatus(), QMediaPlayer::NoMedia); QCOMPARE(player.error(), QMediaPlayer::NoError); QCOMPARE(player.position(), 0); - QCOMPARE(stateSpy.count(), 0); - QCOMPARE(statusSpy.count(), 0); - QCOMPARE(positionSpy.count(), 0); - QCOMPARE(errorSpy.count(), 0); + QCOMPARE(stateSpy.size(), 0); + QCOMPARE(statusSpy.size(), 0); + QCOMPARE(positionSpy.size(), 0); + QCOMPARE(errorSpy.size(), 0); // The rest is with a valid media @@ -370,14 +370,14 @@ void tst_QMediaPlayerBackend::playPauseStop() QTRY_COMPARE(player.mediaStatus(), QMediaPlayer::BufferedMedia); - QCOMPARE(stateSpy.count(), 1); + QCOMPARE(stateSpy.size(), 1); QCOMPARE(stateSpy.last()[0].value<QMediaPlayer::PlaybackState>(), QMediaPlayer::PlayingState); - QTRY_VERIFY(statusSpy.count() > 0 && + QTRY_VERIFY(statusSpy.size() > 0 && statusSpy.last()[0].value<QMediaPlayer::MediaStatus>() == QMediaPlayer::BufferedMedia); QTRY_VERIFY(player.position() > 100); QVERIFY(player.duration() > 0); - QTRY_VERIFY(positionSpy.count() > 0); + QTRY_VERIFY(positionSpy.size() > 0); QTRY_VERIFY(positionSpy.last()[0].value<qint64>() > 0); stateSpy.clear(); @@ -390,7 +390,7 @@ void tst_QMediaPlayerBackend::playPauseStop() QCOMPARE(player.playbackState(), QMediaPlayer::PausedState); QTRY_COMPARE(player.mediaStatus(), QMediaPlayer::BufferedMedia); - QCOMPARE(stateSpy.count(), 1); + QCOMPARE(stateSpy.size(), 1); QCOMPARE(stateSpy.last()[0].value<QMediaPlayer::PlaybackState>(), QMediaPlayer::PausedState); QTest::qWait(500); @@ -405,15 +405,15 @@ void tst_QMediaPlayerBackend::playPauseStop() QCOMPARE(player.playbackState(), QMediaPlayer::StoppedState); QTRY_COMPARE(player.mediaStatus(), QMediaPlayer::LoadedMedia); - QCOMPARE(stateSpy.count(), 1); + QCOMPARE(stateSpy.size(), 1); QCOMPARE(stateSpy.last()[0].value<QMediaPlayer::PlaybackState>(), QMediaPlayer::StoppedState); //it's allowed to emit statusChanged() signal async - QTRY_COMPARE(statusSpy.count(), 1); + QTRY_COMPARE(statusSpy.size(), 1); QCOMPARE(statusSpy.last()[0].value<QMediaPlayer::MediaStatus>(), QMediaPlayer::LoadedMedia); //ensure the position is reset to 0 at stop and positionChanged(0) is emitted QTRY_COMPARE(player.position(), qint64(0)); - QTRY_VERIFY(positionSpy.count() > 0); + QTRY_VERIFY(positionSpy.size() > 0); QCOMPARE(positionSpy.last()[0].value<qint64>(), qint64(0)); QVERIFY(player.duration() > 0); @@ -425,9 +425,9 @@ void tst_QMediaPlayerBackend::playPauseStop() QCOMPARE(player.playbackState(), QMediaPlayer::PlayingState); QTRY_COMPARE(player.mediaStatus(), QMediaPlayer::BufferedMedia); - QCOMPARE(stateSpy.count(), 1); + QCOMPARE(stateSpy.size(), 1); QCOMPARE(stateSpy.last()[0].value<QMediaPlayer::PlaybackState>(), QMediaPlayer::PlayingState); - QCOMPARE(statusSpy.count(), 1); // Should not go through Loading again when play -> stop -> play + QCOMPARE(statusSpy.size(), 1); // Should not go through Loading again when play -> stop -> play QCOMPARE(statusSpy.last()[0].value<QMediaPlayer::MediaStatus>(), QMediaPlayer::BufferedMedia); player.stop(); @@ -437,28 +437,28 @@ void tst_QMediaPlayerBackend::playPauseStop() player.setSource(localWavFile2); - QTRY_VERIFY(statusSpy.count() > 0); + QTRY_VERIFY(statusSpy.size() > 0); QTRY_COMPARE(player.mediaStatus(), QMediaPlayer::LoadedMedia); QCOMPARE(statusSpy.last()[0].value<QMediaPlayer::MediaStatus>(), QMediaPlayer::LoadedMedia); QCOMPARE(player.playbackState(), QMediaPlayer::StoppedState); - QCOMPARE(stateSpy.count(), 0); + QCOMPARE(stateSpy.size(), 0); player.play(); QTRY_COMPARE(player.mediaStatus(), QMediaPlayer::BufferedMedia); - QTRY_VERIFY(positionSpy.count() > 0 && positionSpy.last()[0].value<qint64>() > 100); + QTRY_VERIFY(positionSpy.size() > 0 && positionSpy.last()[0].value<qint64>() > 100); QVERIFY(player.position() > 100); positionSpy.clear(); player.setSource(localWavFile); QTRY_COMPARE(player.mediaStatus(), QMediaPlayer::LoadedMedia); - QTRY_VERIFY(statusSpy.count() > 0); + QTRY_VERIFY(statusSpy.size() > 0); QCOMPARE(statusSpy.last()[0].value<QMediaPlayer::MediaStatus>(), QMediaPlayer::LoadedMedia); QCOMPARE(player.playbackState(), QMediaPlayer::StoppedState); - QTRY_VERIFY(stateSpy.count() > 0); + QTRY_VERIFY(stateSpy.size() > 0); QCOMPARE(stateSpy.last()[0].value<QMediaPlayer::PlaybackState>(), QMediaPlayer::StoppedState); - QTRY_VERIFY(positionSpy.count() > 0 && positionSpy.last()[0].value<qint64>() == 0); + QTRY_VERIFY(positionSpy.size() > 0 && positionSpy.last()[0].value<qint64>() == 0); QCOMPARE(player.position(), 0); stateSpy.clear(); @@ -472,12 +472,12 @@ void tst_QMediaPlayerBackend::playPauseStop() player.setSource(QUrl()); QTRY_COMPARE(player.mediaStatus(), QMediaPlayer::NoMedia); - QTRY_VERIFY(statusSpy.count() > 0); + QTRY_VERIFY(statusSpy.size() > 0); QCOMPARE(statusSpy.last()[0].value<QMediaPlayer::MediaStatus>(), QMediaPlayer::NoMedia); QCOMPARE(player.playbackState(), QMediaPlayer::StoppedState); - QTRY_VERIFY(stateSpy.count() > 0); + QTRY_VERIFY(stateSpy.size() > 0); QCOMPARE(stateSpy.last()[0].value<QMediaPlayer::PlaybackState>(), QMediaPlayer::StoppedState); - QTRY_VERIFY(positionSpy.count() > 0); + QTRY_VERIFY(positionSpy.size() > 0); QCOMPARE(player.position(), 0); QCOMPARE(positionSpy.last()[0].value<qint64>(), 0); QCOMPARE(player.duration(), 0); @@ -505,15 +505,15 @@ void tst_QMediaPlayerBackend::processEOS() //wait up to 5 seconds for EOS QTRY_COMPARE(player.mediaStatus(), QMediaPlayer::EndOfMedia); - QVERIFY(statusSpy.count() > 0); + QVERIFY(statusSpy.size() > 0); QCOMPARE(statusSpy.last()[0].value<QMediaPlayer::MediaStatus>(), QMediaPlayer::EndOfMedia); QCOMPARE(player.playbackState(), QMediaPlayer::StoppedState); - QCOMPARE(stateSpy.count(), 2); + QCOMPARE(stateSpy.size(), 2); QCOMPARE(stateSpy.last()[0].value<QMediaPlayer::PlaybackState>(), QMediaPlayer::StoppedState); //at EOS the position stays at the end of file QCOMPARE(player.position(), player.duration()); - QTRY_VERIFY(positionSpy.count() > 0); + QTRY_VERIFY(positionSpy.size() > 0); QTRY_COMPARE(positionSpy.last()[0].value<qint64>(), player.duration()); stateSpy.clear(); @@ -524,32 +524,32 @@ void tst_QMediaPlayerBackend::processEOS() //position is reset to start QTRY_VERIFY(player.position() < 100); - QTRY_VERIFY(positionSpy.count() > 0); + QTRY_VERIFY(positionSpy.size() > 0); QCOMPARE(positionSpy.first()[0].value<qint64>(), 0); QCOMPARE(player.playbackState(), QMediaPlayer::PlayingState); QTRY_COMPARE(player.mediaStatus(), QMediaPlayer::BufferedMedia); - QCOMPARE(stateSpy.count(), 1); + QCOMPARE(stateSpy.size(), 1); QCOMPARE(stateSpy.last()[0].value<QMediaPlayer::PlaybackState>(), QMediaPlayer::PlayingState); - QVERIFY(statusSpy.count() > 0); + QVERIFY(statusSpy.size() > 0); QCOMPARE(statusSpy.last()[0].value<QMediaPlayer::MediaStatus>(), QMediaPlayer::BufferedMedia); positionSpy.clear(); QTRY_VERIFY(player.position() > 100); - QTRY_VERIFY(positionSpy.count() > 0 && positionSpy.last()[0].value<qint64>() > 100); + QTRY_VERIFY(positionSpy.size() > 0 && positionSpy.last()[0].value<qint64>() > 100); player.setPosition(900); //wait up to 5 seconds for EOS QTRY_COMPARE(player.mediaStatus(), QMediaPlayer::EndOfMedia); - QVERIFY(statusSpy.count() > 0); + QVERIFY(statusSpy.size() > 0); QCOMPARE(statusSpy.last()[0].value<QMediaPlayer::MediaStatus>(), QMediaPlayer::EndOfMedia); QCOMPARE(player.playbackState(), QMediaPlayer::StoppedState); - QCOMPARE(stateSpy.count(), 2); + QCOMPARE(stateSpy.size(), 2); QCOMPARE(stateSpy.last()[0].value<QMediaPlayer::PlaybackState>(), QMediaPlayer::StoppedState); //position stays at the end of file QCOMPARE(player.position(), player.duration()); - QTRY_VERIFY(positionSpy.count() > 0); + QTRY_VERIFY(positionSpy.size() > 0); QTRY_COMPARE(positionSpy.last()[0].value<qint64>(), player.duration()); //after setPosition EndOfMedia status should be reset to Loaded @@ -560,8 +560,8 @@ void tst_QMediaPlayerBackend::processEOS() //this transition can be async, so allow backend to perform it QTRY_COMPARE(player.mediaStatus(), QMediaPlayer::LoadedMedia); - QCOMPARE(stateSpy.count(), 0); - QTRY_VERIFY(statusSpy.count() > 0 && + QCOMPARE(stateSpy.size(), 0); + QTRY_VERIFY(statusSpy.size() > 0 && statusSpy.last()[0].value<QMediaPlayer::MediaStatus>() == QMediaPlayer::LoadedMedia); player.play(); @@ -579,15 +579,15 @@ void tst_QMediaPlayerBackend::processEOS() player.pause(); QTRY_COMPARE(player.position(), 0); - QTRY_VERIFY(positionSpy.count() > 0); + QTRY_VERIFY(positionSpy.size() > 0); QTRY_COMPARE(positionSpy.first()[0].value<qint64>(), 0); QCOMPARE(player.playbackState(), QMediaPlayer::PausedState); QTRY_COMPARE(player.mediaStatus(), QMediaPlayer::BufferedMedia); - QCOMPARE(stateSpy.count(), 1); + QCOMPARE(stateSpy.size(), 1); QCOMPARE(stateSpy.last()[0].value<QMediaPlayer::PlaybackState>(), QMediaPlayer::PausedState); - QVERIFY(statusSpy.count() > 0); + QVERIFY(statusSpy.size() > 0); QCOMPARE(statusSpy.last()[0].value<QMediaPlayer::MediaStatus>(), QMediaPlayer::BufferedMedia); } @@ -670,29 +670,29 @@ void tst_QMediaPlayerBackend::volumeAndMuted() output.setVolume(0); QTRY_COMPARE(output.volume(), 0); QVERIFY(!output.isMuted()); - QCOMPARE(volumeSpy.count(), 1); + QCOMPARE(volumeSpy.size(), 1); QCOMPARE(volumeSpy.last()[0].toFloat(), output.volume()); - QCOMPARE(mutedSpy.count(), 0); + QCOMPARE(mutedSpy.size(), 0); output.setVolume(0.5); QTRY_COMPARE(output.volume(), 0.5); QVERIFY(!output.isMuted()); - QCOMPARE(volumeSpy.count(), 2); + QCOMPARE(volumeSpy.size(), 2); QCOMPARE(volumeSpy.last()[0].toFloat(), output.volume()); - QCOMPARE(mutedSpy.count(), 0); + QCOMPARE(mutedSpy.size(), 0); output.setMuted(true); QTRY_VERIFY(output.isMuted()); QVERIFY(output.volume() > 0); - QCOMPARE(volumeSpy.count(), 2); - QCOMPARE(mutedSpy.count(), 1); + QCOMPARE(volumeSpy.size(), 2); + QCOMPARE(mutedSpy.size(), 1); QCOMPARE(mutedSpy.last()[0].toBool(), output.isMuted()); output.setMuted(false); QTRY_VERIFY(!output.isMuted()); QVERIFY(output.volume() > 0); - QCOMPARE(volumeSpy.count(), 2); - QCOMPARE(mutedSpy.count(), 2); + QCOMPARE(volumeSpy.size(), 2); + QCOMPARE(mutedSpy.size(), 2); QCOMPARE(mutedSpy.last()[0].toBool(), output.isMuted()); } @@ -883,11 +883,11 @@ void tst_QMediaPlayerBackend::seekInStoppedState() player.setPosition(position); QTRY_VERIFY(qAbs(player.position() - position) < qint64(200)); - QTRY_VERIFY(positionSpy.count() > 0); + QTRY_VERIFY(positionSpy.size() > 0); QVERIFY(qAbs(positionSpy.last()[0].value<qint64>() - position) < qint64(200)); QCOMPARE(player.playbackState(), QMediaPlayer::StoppedState); - QCOMPARE(stateSpy.count(), 0); + QCOMPARE(stateSpy.size(), 0); QCOMPARE(player.mediaStatus(), QMediaPlayer::LoadedMedia); @@ -902,7 +902,7 @@ void tst_QMediaPlayerBackend::seekInStoppedState() QTest::qWait(100); // Check that it never played from the beginning QVERIFY(player.position() > position); - for (int i = 0; i < positionSpy.count(); ++i) + for (int i = 0; i < positionSpy.size(); ++i) QVERIFY(positionSpy.at(i)[0].value<qint64>() > (position - 200)); // ------ @@ -919,11 +919,11 @@ void tst_QMediaPlayerBackend::seekInStoppedState() player.setPosition(position); QTRY_VERIFY(qAbs(player.position() - position) < qint64(200)); - QTRY_VERIFY(positionSpy.count() > 0); + QTRY_VERIFY(positionSpy.size() > 0); QVERIFY(qAbs(positionSpy.last()[0].value<qint64>() - position) < qint64(200)); QCOMPARE(player.playbackState(), QMediaPlayer::StoppedState); - QCOMPARE(stateSpy.count(), 0); + QCOMPARE(stateSpy.size(), 0); QCOMPARE(player.mediaStatus(), QMediaPlayer::LoadedMedia); @@ -938,7 +938,7 @@ void tst_QMediaPlayerBackend::seekInStoppedState() QTest::qWait(500); // Check that it never played from the beginning QVERIFY(player.position() > (position - 200)); - for (int i = 0; i < positionSpy.count(); ++i) + for (int i = 0; i < positionSpy.size(); ++i) QVERIFY(positionSpy.at(i)[0].value<qint64>() > (position - 200)); // ------ @@ -955,11 +955,11 @@ void tst_QMediaPlayerBackend::seekInStoppedState() player.setPosition(position); QTRY_VERIFY(qAbs(player.position() - position) < qint64(200)); - QTRY_VERIFY(positionSpy.count() > 0); + QTRY_VERIFY(positionSpy.size() > 0); QVERIFY(qAbs(positionSpy.last()[0].value<qint64>() - position) < qint64(200)); QCOMPARE(player.playbackState(), QMediaPlayer::StoppedState); - QCOMPARE(stateSpy.count(), 0); + QCOMPARE(stateSpy.size(), 0); QCOMPARE(player.mediaStatus(), QMediaPlayer::LoadedMedia); player.play(); @@ -972,7 +972,7 @@ void tst_QMediaPlayerBackend::seekInStoppedState() QTest::qWait(500); // Check that it never played from the beginning QVERIFY(player.position() > (position - 200)); - for (int i = 0; i < positionSpy.count(); ++i) + for (int i = 0; i < positionSpy.size(); ++i) QVERIFY(positionSpy.at(i)[0].value<qint64>() > (position - 200)); } @@ -1263,7 +1263,7 @@ void tst_QMediaPlayerBackend::metadata() player.setSource(localFileWithMetadata); - QTRY_VERIFY(metadataChangedSpy.count() > 0); + QTRY_VERIFY(metadataChangedSpy.size() > 0); QCOMPARE(player.metaData().value(QMediaMetaData::Title).toString(), QStringLiteral("Nokia Tune")); QCOMPARE(player.metaData().value(QMediaMetaData::ContributingArtist).toString(), QStringLiteral("TestArtist")); @@ -1273,7 +1273,7 @@ void tst_QMediaPlayerBackend::metadata() player.setSource(QUrl()); - QCOMPARE(metadataChangedSpy.count(), 1); + QCOMPARE(metadataChangedSpy.size(), 1); QVERIFY(player.metaData().isEmpty()); } @@ -1333,13 +1333,13 @@ void tst_QMediaPlayerBackend::audioVideoAvailable() player.setSource(localVideoFile); QTRY_VERIFY(player.hasVideo()); QTRY_VERIFY(player.hasAudio()); - QCOMPARE(hasVideoSpy.count(), 1); - QCOMPARE(hasAudioSpy.count(), 1); + QCOMPARE(hasVideoSpy.size(), 1); + QCOMPARE(hasAudioSpy.size(), 1); player.setSource(QUrl()); QTRY_VERIFY(!player.hasVideo()); QTRY_VERIFY(!player.hasAudio()); - QCOMPARE(hasVideoSpy.count(), 2); - QCOMPARE(hasAudioSpy.count(), 2); + QCOMPARE(hasVideoSpy.size(), 2); + QCOMPARE(hasAudioSpy.size(), 2); } void tst_QMediaPlayerBackend::isSeekable() diff --git a/tests/auto/integration/qquickvideooutput/tst_qquickvideooutput.cpp b/tests/auto/integration/qquickvideooutput/tst_qquickvideooutput.cpp index a94405b0d..d38c704b1 100644 --- a/tests/auto/integration/qquickvideooutput/tst_qquickvideooutput.cpp +++ b/tests/auto/integration/qquickvideooutput/tst_qquickvideooutput.cpp @@ -99,19 +99,19 @@ void tst_QQuickVideoOutput::fillMode() // Default is preserveaspectfit QCOMPARE(videoOutput->property("fillMode").value<QQuickVideoOutput::FillMode>(), QQuickVideoOutput::PreserveAspectFit); - QCOMPARE(propSpy.count(), 0); + QCOMPARE(propSpy.size(), 0); videoOutput->setProperty("fillMode", QVariant(int(QQuickVideoOutput::PreserveAspectCrop))); QCOMPARE(videoOutput->property("fillMode").value<QQuickVideoOutput::FillMode>(), QQuickVideoOutput::PreserveAspectCrop); - QCOMPARE(propSpy.count(), 1); + QCOMPARE(propSpy.size(), 1); videoOutput->setProperty("fillMode", QVariant(int(QQuickVideoOutput::Stretch))); QCOMPARE(videoOutput->property("fillMode").value<QQuickVideoOutput::FillMode>(), QQuickVideoOutput::Stretch); - QCOMPARE(propSpy.count(), 2); + QCOMPARE(propSpy.size(), 2); videoOutput->setProperty("fillMode", QVariant(int(QQuickVideoOutput::Stretch))); QCOMPARE(videoOutput->property("fillMode").value<QQuickVideoOutput::FillMode>(), QQuickVideoOutput::Stretch); - QCOMPARE(propSpy.count(), 2); + QCOMPARE(propSpy.size(), 2); delete videoOutput; } @@ -128,43 +128,43 @@ void tst_QQuickVideoOutput::orientation() // Default orientation is 0 QCOMPARE(videoOutput->property("orientation").toInt(), 0); - QCOMPARE(propSpy.count(), 0); + QCOMPARE(propSpy.size(), 0); videoOutput->setProperty("orientation", QVariant(90)); QCOMPARE(videoOutput->property("orientation").toInt(), 90); - QCOMPARE(propSpy.count(), 1); + QCOMPARE(propSpy.size(), 1); videoOutput->setProperty("orientation", QVariant(180)); QCOMPARE(videoOutput->property("orientation").toInt(), 180); - QCOMPARE(propSpy.count(), 2); + QCOMPARE(propSpy.size(), 2); videoOutput->setProperty("orientation", QVariant(270)); QCOMPARE(videoOutput->property("orientation").toInt(), 270); - QCOMPARE(propSpy.count(), 3); + QCOMPARE(propSpy.size(), 3); videoOutput->setProperty("orientation", QVariant(360)); QCOMPARE(videoOutput->property("orientation").toInt(), 360); - QCOMPARE(propSpy.count(), 4); + QCOMPARE(propSpy.size(), 4); // More than 360 should be fine videoOutput->setProperty("orientation", QVariant(540)); QCOMPARE(videoOutput->property("orientation").toInt(), 540); - QCOMPARE(propSpy.count(), 5); + QCOMPARE(propSpy.size(), 5); // Negative should be fine videoOutput->setProperty("orientation", QVariant(-180)); QCOMPARE(videoOutput->property("orientation").toInt(), -180); - QCOMPARE(propSpy.count(), 6); + QCOMPARE(propSpy.size(), 6); // Same value should not reemit videoOutput->setProperty("orientation", QVariant(-180)); QCOMPARE(videoOutput->property("orientation").toInt(), -180); - QCOMPARE(propSpy.count(), 6); + QCOMPARE(propSpy.size(), 6); // Non multiples of 90 should not work videoOutput->setProperty("orientation", QVariant(-1)); QCOMPARE(videoOutput->property("orientation").toInt(), -180); - QCOMPARE(propSpy.count(), 6); + QCOMPARE(propSpy.size(), 6); delete videoOutput; } @@ -292,11 +292,11 @@ void tst_QQuickVideoOutput::sourceRect() presentDummyFrame(holder.videoSink(), QSize(200,100)); QCOMPARE(videoOutput->property("sourceRect").toRectF(), QRectF(0, 0, 200, 100)); - QCOMPARE(propSpy.count(), 1); + QCOMPARE(propSpy.size(), 1); // Another frame shouldn't cause a source rect change presentDummyFrame(holder.videoSink(), QSize(200,100)); - QCOMPARE(propSpy.count(), 1); + QCOMPARE(propSpy.size(), 1); QCOMPARE(videoOutput->property("sourceRect").toRectF(), QRectF(0, 0, 200, 100)); // Changing orientation and stretch modes should not affect this diff --git a/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp b/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp index 08e37ead1..1422879d9 100644 --- a/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp +++ b/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp @@ -97,7 +97,7 @@ void tst_QSoundEffect::testSource() sound->setVolume(0.1f); QCOMPARE(sound->source(),url); - QCOMPARE(readSignal.count(),1); + QCOMPARE(readSignal.size(),1); QTestEventLoop::instance().enterLoop(1); sound->play(); @@ -116,18 +116,18 @@ void tst_QSoundEffect::testLooping() sound->setLoopCount(3); sound->setVolume(0.1f); QCOMPARE(sound->loopCount(), 3); - QCOMPARE(readSignal_Count.count(), 1); + QCOMPARE(readSignal_Count.size(), 1); QCOMPARE(sound->loopsRemaining(), 0); - QCOMPARE(readSignal_Remaining.count(), 0); + QCOMPARE(readSignal_Remaining.size(), 0); sound->play(); - QVERIFY(readSignal_Remaining.count() > 0); + QVERIFY(readSignal_Remaining.size() > 0); // test.wav is about 200ms, wait until it has finished playing 3 times QTestEventLoop::instance().enterLoop(3); QTRY_COMPARE(sound->loopsRemaining(), 0); - QVERIFY(readSignal_Remaining.count() == 4); + QVERIFY(readSignal_Remaining.size() == 4); QTRY_VERIFY(!sound->isPlaying()); // QTBUG-36643 (setting the loop count while playing should work) @@ -137,29 +137,29 @@ void tst_QSoundEffect::testLooping() sound->setLoopCount(10); QCOMPARE(sound->loopCount(), 10); - QCOMPARE(readSignal_Count.count(), 1); + QCOMPARE(readSignal_Count.size(), 1); QCOMPARE(sound->loopsRemaining(), 0); - QCOMPARE(readSignal_Remaining.count(), 0); + QCOMPARE(readSignal_Remaining.size(), 0); sound->play(); - QVERIFY(readSignal_Remaining.count() > 0); + QVERIFY(readSignal_Remaining.size() > 0); // wait for the sound to be played several times QTRY_VERIFY(sound->loopsRemaining() <= 7); - QVERIFY(readSignal_Remaining.count() >= 3); + QVERIFY(readSignal_Remaining.size() >= 3); readSignal_Count.clear(); readSignal_Remaining.clear(); // change the loop count while playing sound->setLoopCount(3); QCOMPARE(sound->loopCount(), 3); - QCOMPARE(readSignal_Count.count(), 1); + QCOMPARE(readSignal_Count.size(), 1); QCOMPARE(sound->loopsRemaining(), 3); - QCOMPARE(readSignal_Remaining.count(), 1); + QCOMPARE(readSignal_Remaining.size(), 1); // wait for all the loops to be completed QTRY_COMPARE(sound->loopsRemaining(), 0); - QTRY_VERIFY(readSignal_Remaining.count() == 4); + QTRY_VERIFY(readSignal_Remaining.size() == 4); QTRY_VERIFY(!sound->isPlaying()); } @@ -169,13 +169,13 @@ void tst_QSoundEffect::testLooping() sound->setLoopCount(QSoundEffect::Infinite); QCOMPARE(sound->loopCount(), int(QSoundEffect::Infinite)); - QCOMPARE(readSignal_Count.count(), 1); + QCOMPARE(readSignal_Count.size(), 1); QCOMPARE(sound->loopsRemaining(), 0); - QCOMPARE(readSignal_Remaining.count(), 0); + QCOMPARE(readSignal_Remaining.size(), 0); sound->play(); QTRY_COMPARE(sound->loopsRemaining(), int(QSoundEffect::Infinite)); - QCOMPARE(readSignal_Remaining.count(), 1); + QCOMPARE(readSignal_Remaining.size(), 1); QTest::qWait(500); QVERIFY(sound->isPlaying()); @@ -185,12 +185,12 @@ void tst_QSoundEffect::testLooping() // Setting the loop count to 0 should play it one last time sound->setLoopCount(0); QCOMPARE(sound->loopCount(), 1); - QCOMPARE(readSignal_Count.count(), 1); + QCOMPARE(readSignal_Count.size(), 1); QCOMPARE(sound->loopsRemaining(), 1); - QCOMPARE(readSignal_Remaining.count(), 1); + QCOMPARE(readSignal_Remaining.size(), 1); QTRY_COMPARE(sound->loopsRemaining(), 0); - QTRY_VERIFY(readSignal_Remaining.count() >= 2); + QTRY_VERIFY(readSignal_Remaining.size() >= 2); QTRY_VERIFY(!sound->isPlaying()); } } @@ -202,7 +202,7 @@ void tst_QSoundEffect::testVolume() sound->setVolume(0.5); QCOMPARE(sound->volume(),0.5); - QTRY_COMPARE(readSignal.count(),1); + QTRY_COMPARE(readSignal.size(),1); } void tst_QSoundEffect::testMuting() @@ -212,7 +212,7 @@ void tst_QSoundEffect::testMuting() sound->setMuted(true); QCOMPARE(sound->isMuted(),true); - QTRY_COMPARE(readSignal.count(),1); + QTRY_COMPARE(readSignal.size(),1); } void tst_QSoundEffect::testPlaying() @@ -382,7 +382,7 @@ void tst_QSoundEffect::testCorruptFile() QVERIFY(!sound->isPlaying()); QVERIFY(sound->status() == QSoundEffect::Loading || sound->status() == QSoundEffect::Error); QTRY_COMPARE(sound->status(), QSoundEffect::Error); - QCOMPARE(statusSpy.count(), 2); + QCOMPARE(statusSpy.size(), 2); sound->play(); QVERIFY(!sound->isPlaying()); diff --git a/tests/auto/unit/mockbackend/qmockaudiodecoder.h b/tests/auto/unit/mockbackend/qmockaudiodecoder.h index 99ba6d2b1..424ff015f 100644 --- a/tests/auto/unit/mockbackend/qmockaudiodecoder.h +++ b/tests/auto/unit/mockbackend/qmockaudiodecoder.h @@ -101,7 +101,7 @@ public: QAudioBuffer read() override { QAudioBuffer a; - if (mBuffers.length() > 0) { + if (mBuffers.size() > 0) { a = mBuffers.takeFirst(); mPosition = a.startTime() / 1000; positionChanged(mPosition); @@ -120,7 +120,7 @@ public: bool bufferAvailable() const override { - return mBuffers.length() > 0; + return mBuffers.size() > 0; } qint64 position() const override @@ -141,14 +141,14 @@ private slots: return; // We just keep the length of mBuffers to 3 or less. - if (mBuffers.length() < 3) { + if (mBuffers.size() < 3) { QByteArray b(sizeof(mSerial), 0); memcpy(b.data(), &mSerial, sizeof(mSerial)); qint64 position = (sizeof(mSerial) * mSerial * qint64(1000000)) / (mFormat.sampleRate() * mFormat.channelCount()); mSerial++; mBuffers.push_back(QAudioBuffer(b, mFormat, position)); emit bufferReady(); - if (mBuffers.count() == 1) + if (mBuffers.size() == 1) emit bufferAvailableChanged(true); } } diff --git a/tests/auto/unit/multimedia/qaudiodecoder/tst_qaudiodecoder.cpp b/tests/auto/unit/multimedia/qaudiodecoder/tst_qaudiodecoder.cpp index 9b7127e74..45abab7d3 100644 --- a/tests/auto/unit/multimedia/qaudiodecoder/tst_qaudiodecoder.cpp +++ b/tests/auto/unit/multimedia/qaudiodecoder/tst_qaudiodecoder.cpp @@ -62,9 +62,9 @@ void tst_QAudioDecoder::read() QVERIFY(!d.isDecoding()); QVERIFY(d.bufferAvailable() == false); - QCOMPARE(readySpy.count(), 0); - QCOMPARE(bufferChangedSpy.count(), 0); - QCOMPARE(errorSpy.count(), 1); + QCOMPARE(readySpy.size(), 0); + QCOMPARE(bufferChangedSpy.size(), 0); + QCOMPARE(errorSpy.size(), 1); // Set the source to something d.setSource(QUrl::fromLocalFile("Blah")); @@ -97,13 +97,13 @@ void tst_QAudioDecoder::read() QVERIFY(b.format().channelCount() == 1); QVERIFY(b.sampleCount() == 4); - QVERIFY(readySpy.count() >= 1); - QVERIFY(errorSpy.count() == 0); + QVERIFY(readySpy.size() >= 1); + QVERIFY(errorSpy.size() == 0); if (d.bufferAvailable()) { - QVERIFY(bufferChangedSpy.count() == 1); + QVERIFY(bufferChangedSpy.size() == 1); } else { - QVERIFY(bufferChangedSpy.count() == 2); + QVERIFY(bufferChangedSpy.size() == 2); } } @@ -123,9 +123,9 @@ void tst_QAudioDecoder::stop() QVERIFY(!d.isDecoding()); QVERIFY(d.bufferAvailable() == false); - QCOMPARE(readySpy.count(), 0); - QCOMPARE(bufferChangedSpy.count(), 0); - QCOMPARE(errorSpy.count(), 1); + QCOMPARE(readySpy.size(), 0); + QCOMPARE(bufferChangedSpy.size(), 0); + QCOMPARE(errorSpy.size(), 1); // Set the source to something d.setSource(QUrl::fromLocalFile("Blah")); @@ -262,10 +262,10 @@ void tst_QAudioDecoder::readAll() int i = 0; forever { QVERIFY(d.isDecoding()); - QCOMPARE(isDecodingSpy.count(), 1); - QCOMPARE(durationSpy.count(), 1); + QCOMPARE(isDecodingSpy.size(), 1); + QCOMPARE(durationSpy.size(), 1); QVERIFY(finishedSpy.isEmpty()); - QTRY_VERIFY(bufferAvailableSpy.count() >= 1); + QTRY_VERIFY(bufferAvailableSpy.size() >= 1); if (d.bufferAvailable()) { QAudioBuffer b = d.read(); QVERIFY(b.isValid()); @@ -276,8 +276,8 @@ void tst_QAudioDecoder::readAll() i++; if (i == MOCK_DECODER_MAX_BUFFERS) { - QCOMPARE(finishedSpy.count(), 1); - QCOMPARE(isDecodingSpy.count(), 2); + QCOMPARE(finishedSpy.size(), 1); + QCOMPARE(isDecodingSpy.size(), 2); QVERIFY(!d.isDecoding()); QList<QVariant> arguments = isDecodingSpy.takeLast(); QVERIFY(arguments.at(0).toBool() == false); diff --git a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp index bfe78cccd..ff8672955 100644 --- a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp +++ b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp @@ -262,7 +262,7 @@ void tst_QCamera::testCameraCaptureMetadata() QVariantList metadata = metadataSignal[0]; QCOMPARE(metadata[0].toInt(), id); QMediaMetaData data = metadata[1].value<QMediaMetaData>(); - QCOMPARE(data.keys().length(), 2); + QCOMPARE(data.keys().size(), 2); QCOMPARE(data[QMediaMetaData::Author].toString(), "Author"); QCOMPARE(data[QMediaMetaData::Date].toDateTime().date().year(), 2021); } @@ -423,7 +423,7 @@ void tst_QCamera::testCameraEncodingProperyChange() camera.start(); QCOMPARE(camera.isActive(), true); - QCOMPARE(activeChangedSignal.count(), 1); + QCOMPARE(activeChangedSignal.size(), 1); } void tst_QCamera::testSetVideoOutput() @@ -609,7 +609,7 @@ void tst_QCamera::testErrorSignal() /* Set the QPlatformCamera error and verify if the signal is emitted correctly in QCamera */ service->mockCameraControl->setError(QCamera::CameraError,QString("Camera Error")); - QVERIFY(spyError.count() == 1); + QVERIFY(spyError.size() == 1); QCamera::Error err = qvariant_cast<QCamera::Error >(spyError.at(0).at(0)); QVERIFY(err == QCamera::CameraError); @@ -617,7 +617,7 @@ void tst_QCamera::testErrorSignal() /* Set the QPlatformCamera error and verify if the signal is emitted correctly in QCamera */ service->mockCameraControl->setError(QCamera::CameraError,QString("InvalidRequestError Error")); - QVERIFY(spyError.count() == 1); + QVERIFY(spyError.size() == 1); err = qvariant_cast<QCamera::Error >(spyError.at(0).at(0)); QVERIFY(err == QCamera::CameraError); @@ -625,7 +625,7 @@ void tst_QCamera::testErrorSignal() /* Set the QPlatformCamera error and verify if the signal is emitted correctly in QCamera */ service->mockCameraControl->setError(QCamera::CameraError,QString("NotSupportedFeatureError Error")); - QVERIFY(spyError.count() == 1); + QVERIFY(spyError.size() == 1); err = qvariant_cast<QCamera::Error >(spyError.at(0).at(0)); QVERIFY(err == QCamera::CameraError); @@ -679,34 +679,34 @@ void tst_QCamera::testSetCameraFormat() QCamera camera; QCameraDevice device = camera.cameraDevice(); auto videoFormats = device.videoFormats(); - QVERIFY(videoFormats.count()); + QVERIFY(videoFormats.size()); QCameraFormat cameraFormat = videoFormats.first(); QSignalSpy spy(&camera, SIGNAL(cameraFormatChanged())); - QVERIFY(spy.count() == 0); + QVERIFY(spy.size() == 0); camera.setCameraFormat(cameraFormat); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(camera.cameraFormat(), cameraFormat); QCOMPARE(camera.cameraFormat().pixelFormat(), QVideoFrameFormat::Format_ARGB8888); QCOMPARE(camera.cameraFormat().resolution(), QSize(640, 480)); QCOMPARE(camera.cameraFormat().minFrameRate(), 0); QCOMPARE(camera.cameraFormat().maxFrameRate(), 30); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); spy.clear(); camera.setCameraFormat({}); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(camera.cameraFormat(), QCameraFormat()); spy.clear(); camera.setCameraDevice(QMediaDevices::videoInputs().at(1)); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(camera.cameraFormat(), QCameraFormat()); camera.setCameraFormat(camera.cameraDevice().videoFormats().first()); QCOMPARE(camera.cameraFormat().pixelFormat(), QVideoFrameFormat::Format_XRGB8888); QCOMPARE(camera.cameraFormat().resolution(), QSize(1280, 720)); QCOMPARE(camera.cameraFormat().minFrameRate(), 0); QCOMPARE(camera.cameraFormat().maxFrameRate(), 30); - QCOMPARE(spy.count(), 2); + QCOMPARE(spy.size(), 2); } //Added this code to cover QCamera::FocusModeHyperfocal and QCamera::FocusModeAutoNear @@ -734,13 +734,13 @@ void tst_QCamera::testZoomChanged() session.setCamera(&camera); QSignalSpy spy(&camera, SIGNAL(zoomFactorChanged(float))); - QVERIFY(spy.count() == 0); + QVERIFY(spy.size() == 0); camera.setZoomFactor(2.0); - QVERIFY(spy.count() == 1); + QVERIFY(spy.size() == 1); camera.zoomTo(3.0, 1); - QVERIFY(spy.count() == 2); + QVERIFY(spy.size() == 2); camera.zoomTo(1.0, 0); - QVERIFY(spy.count() == 3); + QVERIFY(spy.size() == 3); } void tst_QCamera::testMaxZoomChangedSignal() @@ -753,7 +753,7 @@ void tst_QCamera::testMaxZoomChangedSignal() // ### change max zoom factor on backend, e.g. by changing camera QSignalSpy spy(&camera, SIGNAL(maximumZoomFactorChanged(float))); mock->maximumZoomFactorChanged(55); - QVERIFY(spy.count() == 1); + QVERIFY(spy.size() == 1); QCOMPARE(camera.maximumZoomFactor(), 55); } @@ -765,7 +765,7 @@ void tst_QCamera::testSignalExposureCompensationChanged() QSignalSpy spyExposureCompensationChanged(&camera, SIGNAL(exposureCompensationChanged(float))); - QVERIFY(spyExposureCompensationChanged.count() ==0); + QVERIFY(spyExposureCompensationChanged.size() ==0); QVERIFY(camera.exposureCompensation() != 800); camera.setExposureCompensation(2.0); @@ -774,14 +774,14 @@ void tst_QCamera::testSignalExposureCompensationChanged() QVERIFY(camera.exposureCompensation() == 2.0); - QCOMPARE(spyExposureCompensationChanged.count(),1); + QCOMPARE(spyExposureCompensationChanged.size(),1); // Setting the same should not result in a signal camera.setExposureCompensation(2.0); QTest::qWait(100); QVERIFY(camera.exposureCompensation() == 2.0); - QCOMPARE(spyExposureCompensationChanged.count(),1); + QCOMPARE(spyExposureCompensationChanged.size(),1); } void tst_QCamera::testSignalIsoSensitivityChanged() @@ -792,11 +792,11 @@ void tst_QCamera::testSignalIsoSensitivityChanged() QSignalSpy spyisoSensitivityChanged(&camera, SIGNAL(isoSensitivityChanged(int))); - QVERIFY(spyisoSensitivityChanged.count() ==0); + QVERIFY(spyisoSensitivityChanged.size() ==0); camera.setManualIsoSensitivity(800); //set the manualiso sentivity to 800 QTest::qWait(100); - QVERIFY(spyisoSensitivityChanged.count() ==1); + QVERIFY(spyisoSensitivityChanged.size() ==1); } void tst_QCamera::testSignalShutterSpeedChanged() @@ -807,12 +807,12 @@ void tst_QCamera::testSignalShutterSpeedChanged() QSignalSpy spySignalExposureTimeChanged(&camera, SIGNAL(exposureTimeChanged(float))); - QVERIFY(spySignalExposureTimeChanged.count() ==0); + QVERIFY(spySignalExposureTimeChanged.size() ==0); camera.setManualExposureTime(2.0);//set the ManualShutterSpeed to 2.0 QTest::qWait(100); - QVERIFY(spySignalExposureTimeChanged.count() ==1); + QVERIFY(spySignalExposureTimeChanged.size() ==1); } void tst_QCamera::testSignalFlashReady() @@ -823,7 +823,7 @@ void tst_QCamera::testSignalFlashReady() QSignalSpy spyflashReady(&camera,SIGNAL(flashReady(bool))); - QVERIFY(spyflashReady.count() == 0); + QVERIFY(spyflashReady.size() == 0); QVERIFY(camera.flashMode() == QCamera::FlashAuto); @@ -831,7 +831,7 @@ void tst_QCamera::testSignalFlashReady() QVERIFY(camera.flashMode() == QCamera::FlashOff); - QCOMPARE(spyflashReady.count(), 1); + QCOMPARE(spyflashReady.size(), 1); } QTEST_MAIN(tst_QCamera) diff --git a/tests/auto/unit/multimedia/qcameradevice/tst_qcameradevice.cpp b/tests/auto/unit/multimedia/qcameradevice/tst_qcameradevice.cpp index ecf6b5479..7a96fdd5c 100644 --- a/tests/auto/unit/multimedia/qcameradevice/tst_qcameradevice.cpp +++ b/tests/auto/unit/multimedia/qcameradevice/tst_qcameradevice.cpp @@ -94,7 +94,7 @@ void tst_QCameraDevice::defaultCamera() void tst_QCameraDevice::availableCameras() { QList<QCameraDevice> cameras = QMediaDevices::videoInputs(); - QCOMPARE(cameras.count(), 3); + QCOMPARE(cameras.size(), 3); QCameraDevice info = cameras.at(0); QVERIFY(!info.isNull()); @@ -108,7 +108,7 @@ void tst_QCameraDevice::availableCameras() QCOMPARE(info.description(), QStringLiteral("frontCamera")); QCOMPARE(info.position(), QCameraDevice::FrontFace); - QCOMPARE(cameras.count(), 3); + QCOMPARE(cameras.size(), 3); info = cameras.at(2); QVERIFY(!info.isNull()); QCOMPARE(info.id(), QStringLiteral("back")); diff --git a/tests/auto/unit/multimedia/qimagecapture/tst_qimagecapture.cpp b/tests/auto/unit/multimedia/qimagecapture/tst_qimagecapture.cpp index 221606aa0..fdd2adf18 100644 --- a/tests/auto/unit/multimedia/qimagecapture/tst_qimagecapture.cpp +++ b/tests/auto/unit/multimedia/qimagecapture/tst_qimagecapture.cpp @@ -206,7 +206,7 @@ void tst_QImageCapture::error() QSignalSpy spy(&imageCapture, SIGNAL(errorOccurred(int,QImageCapture::Error,QString))); imageCapture.captureToFile(); QTest::qWait(30); - QVERIFY(spy.count() == 1); + QVERIFY(spy.size() == 1); QVERIFY(qvariant_cast<int>(spy.at(0).at(0)) == -1); QVERIFY(qvariant_cast<QImageCapture::Error>(spy.at(0).at(1)) == QImageCapture::NotReadyError); QVERIFY(qvariant_cast<QString>(spy.at(0).at(2)) == "Could not capture in stopped state"); @@ -228,7 +228,7 @@ void tst_QImageCapture::imageCaptured() imageCapture.captureToFile(); QTRY_VERIFY(imageCapture.isReadyForCapture()); - QVERIFY(spy.count() == 1); + QVERIFY(spy.size() == 1); QVERIFY(qvariant_cast<int>(spy.at(0).at(0)) > 0); QImage image = qvariant_cast<QImage>(spy.at(0).at(1)); QVERIFY(image.isNull() == true); @@ -251,7 +251,7 @@ void tst_QImageCapture::imageExposed() imageCapture.captureToFile(); QTRY_VERIFY(imageCapture.isReadyForCapture()); - QVERIFY(spy.count() == 1); + QVERIFY(spy.size() == 1); QVERIFY(qvariant_cast<int>(spy.at(0).at(0)) > 0); spy.clear(); camera.stop(); @@ -272,7 +272,7 @@ void tst_QImageCapture::imageSaved() imageCapture.captureToFile(QString::fromLatin1("/usr/share")); QTRY_VERIFY(imageCapture.isReadyForCapture()); - QVERIFY(spy.count() == 1); + QVERIFY(spy.size() == 1); QVERIFY(qvariant_cast<int>(spy.at(0).at(0)) > 0); QVERIFY(qvariant_cast<QString>(spy.at(0).at(1)) == "/usr/share"); spy.clear(); @@ -291,13 +291,13 @@ void tst_QImageCapture::readyForCaptureChanged() QVERIFY(imageCapture.isReadyForCapture() == false); imageCapture.captureToFile(); QTest::qWait(100); - QVERIFY(spy.count() == 0); + QVERIFY(spy.size() == 0); QVERIFY2(!imageCapture.errorString().isEmpty(),"Could not capture in stopped state" ); camera.start(); QTest::qWait(100); imageCapture.captureToFile(); QTest::qWait(100); - QVERIFY(spy.count() == 2); + QVERIFY(spy.size() == 2); QVERIFY(spy.at(0).at(0).toBool() == false); QVERIFY(spy.at(1).at(0).toBool() == true); camera.stop(); diff --git a/tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp b/tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp index fe1fb0b9c..a4f18bc6a 100644 --- a/tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp +++ b/tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp @@ -300,25 +300,25 @@ void tst_QMediaPlayer::testPosition() { QSignalSpy spy(player, SIGNAL(positionChanged(qint64))); player->setPosition(position); QCOMPARE(player->position(), position); - QCOMPARE(spy.count(), 0); } + QCOMPARE(spy.size(), 0); } mockPlayer->setPosition(position); { QSignalSpy spy(player, SIGNAL(positionChanged(qint64))); player->setPosition(0); QCOMPARE(player->position(), qint64(0)); - QCOMPARE(spy.count(), position == 0 ? 0 : 1); } + QCOMPARE(spy.size(), position == 0 ? 0 : 1); } mockPlayer->setPosition(position); { QSignalSpy spy(player, SIGNAL(positionChanged(qint64))); player->setPosition(duration); QCOMPARE(player->position(), duration); - QCOMPARE(spy.count(), position == duration ? 0 : 1); } + QCOMPARE(spy.size(), position == duration ? 0 : 1); } mockPlayer->setPosition(position); { QSignalSpy spy(player, SIGNAL(positionChanged(qint64))); player->setPosition(-1); QCOMPARE(player->position(), qint64(0)); - QCOMPARE(spy.count(), position == 0 ? 0 : 1); } + QCOMPARE(spy.size(), position == 0 ? 0 : 1); } } else { @@ -326,7 +326,7 @@ void tst_QMediaPlayer::testPosition() player->setPosition(position); QCOMPARE(player->position(), position); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } } @@ -348,22 +348,22 @@ void tst_QMediaPlayer::testVolume() { QSignalSpy spy(audioOutput, SIGNAL(volumeChanged(float))); audioOutput->setVolume(.1f); QCOMPARE(audioOutput->volume(), .1f); - QCOMPARE(spy.count(), 1); } + QCOMPARE(spy.size(), 1); } { QSignalSpy spy(audioOutput, SIGNAL(volumeChanged(float))); audioOutput->setVolume(-1000.f); QCOMPARE(audioOutput->volume(), 0.f); - QCOMPARE(spy.count(), 1); } + QCOMPARE(spy.size(), 1); } { QSignalSpy spy(audioOutput, SIGNAL(volumeChanged(float))); audioOutput->setVolume(1.f); QCOMPARE(audioOutput->volume(), 1.f); - QCOMPARE(spy.count(), 1); } + QCOMPARE(spy.size(), 1); } { QSignalSpy spy(audioOutput, SIGNAL(volumeChanged(float))); audioOutput->setVolume(1000.f); QCOMPARE(audioOutput->volume(), 1.f); - QCOMPARE(spy.count(), 0); } + QCOMPARE(spy.size(), 0); } } } @@ -388,7 +388,7 @@ void tst_QMediaPlayer::testMuted() audioOutput->setMuted(!muted); QCOMPARE(audioOutput->isMuted(), !muted); QCOMPARE(audioOutput->volume(), vol); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } } @@ -448,7 +448,7 @@ void tst_QMediaPlayer::testPlaybackRate() QSignalSpy spy(player, SIGNAL(playbackRateChanged(qreal))); player->setPlaybackRate(playbackRate + 0.5f); QCOMPARE(player->playbackRate(), playbackRate + 0.5f); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } } @@ -520,11 +520,11 @@ void tst_QMediaPlayer::testPlay() if (!valid || mediaContent.isEmpty()) { QCOMPARE(player->playbackState(), QMediaPlayer::StoppedState); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } else { QCOMPARE(player->playbackState(), QMediaPlayer::PlayingState); - QCOMPARE(spy.count(), state == QMediaPlayer::PlayingState ? 0 : 1); + QCOMPARE(spy.size(), state == QMediaPlayer::PlayingState ? 0 : 1); } } @@ -551,11 +551,11 @@ void tst_QMediaPlayer::testPause() if (!valid || mediaContent.isEmpty()) { QCOMPARE(player->playbackState(), QMediaPlayer::StoppedState); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } else { QCOMPARE(player->playbackState(), QMediaPlayer::PausedState); - QCOMPARE(spy.count(), state == QMediaPlayer::PausedState ? 0 : 1); + QCOMPARE(spy.size(), state == QMediaPlayer::PausedState ? 0 : 1); } } @@ -580,11 +580,11 @@ void tst_QMediaPlayer::testStop() if (mediaContent.isEmpty() || state == QMediaPlayer::StoppedState) { QCOMPARE(player->playbackState(), QMediaPlayer::StoppedState); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } else { QCOMPARE(player->playbackState(), QMediaPlayer::StoppedState); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); } } @@ -608,58 +608,58 @@ void tst_QMediaPlayer::testMediaStatus() mockPlayer->setMediaStatus(QMediaPlayer::LoadingMedia); QCOMPARE(player->mediaStatus(), QMediaPlayer::LoadingMedia); - QCOMPARE(statusSpy.count(), 1); + QCOMPARE(statusSpy.size(), 1); QCOMPARE(qvariant_cast<QMediaPlayer::MediaStatus>(statusSpy.last().value(0)), QMediaPlayer::LoadingMedia); mockPlayer->setMediaStatus(QMediaPlayer::LoadedMedia); QCOMPARE(player->mediaStatus(), QMediaPlayer::LoadedMedia); - QCOMPARE(statusSpy.count(), 2); + QCOMPARE(statusSpy.size(), 2); QCOMPARE(qvariant_cast<QMediaPlayer::MediaStatus>(statusSpy.last().value(0)), QMediaPlayer::LoadedMedia); // Verify the bufferProgressChanged() signal isn't being emitted. - QCOMPARE(bufferSpy.count(), 0); + QCOMPARE(bufferSpy.size(), 0); mockPlayer->setMediaStatus(QMediaPlayer::StalledMedia); QCOMPARE(player->mediaStatus(), QMediaPlayer::StalledMedia); - QCOMPARE(statusSpy.count(), 3); + QCOMPARE(statusSpy.size(), 3); QCOMPARE(qvariant_cast<QMediaPlayer::MediaStatus>(statusSpy.last().value(0)), QMediaPlayer::StalledMedia); // Verify the bufferProgressChanged() signal is being emitted. - QVERIFY(bufferSpy.count() > bufferSignals); + QVERIFY(bufferSpy.size() > bufferSignals); QCOMPARE(bufferSpy.last().value(0).toInt(), bufferProgress); - bufferSignals = bufferSpy.count(); + bufferSignals = bufferSpy.size(); mockPlayer->setMediaStatus(QMediaPlayer::BufferingMedia); QCOMPARE(player->mediaStatus(), QMediaPlayer::BufferingMedia); - QCOMPARE(statusSpy.count(), 4); + QCOMPARE(statusSpy.size(), 4); QCOMPARE(qvariant_cast<QMediaPlayer::MediaStatus>(statusSpy.last().value(0)), QMediaPlayer::BufferingMedia); // Verify the bufferProgressChanged() signal is being emitted. - QVERIFY(bufferSpy.count() > bufferSignals); + QVERIFY(bufferSpy.size() > bufferSignals); QCOMPARE(bufferSpy.last().value(0).toInt(), bufferProgress); - bufferSignals = bufferSpy.count(); + bufferSignals = bufferSpy.size(); mockPlayer->setMediaStatus(QMediaPlayer::BufferedMedia); QCOMPARE(player->mediaStatus(), QMediaPlayer::BufferedMedia); - QCOMPARE(statusSpy.count(), 5); + QCOMPARE(statusSpy.size(), 5); QCOMPARE(qvariant_cast<QMediaPlayer::MediaStatus>(statusSpy.last().value(0)), QMediaPlayer::BufferedMedia); // Verify the bufferProgressChanged() signal isn't being emitted. - QCOMPARE(bufferSpy.count(), bufferSignals); + QCOMPARE(bufferSpy.size(), bufferSignals); mockPlayer->setMediaStatus(QMediaPlayer::EndOfMedia); QCOMPARE(player->mediaStatus(), QMediaPlayer::EndOfMedia); - QCOMPARE(statusSpy.count(), 6); + QCOMPARE(statusSpy.size(), 6); QCOMPARE(qvariant_cast<QMediaPlayer::MediaStatus>(statusSpy.last().value(0)), QMediaPlayer::EndOfMedia); @@ -778,15 +778,15 @@ void tst_QMediaPlayer::testQrc() player->setSource(mediaContent); QTRY_COMPARE(player->mediaStatus(), status); - QCOMPARE(statusSpy.count(), 1); + QCOMPARE(statusSpy.size(), 1); QCOMPARE(qvariant_cast<QMediaPlayer::MediaStatus>(statusSpy.last().value(0)), status); QCOMPARE(player->source(), mediaContent); - QCOMPARE(mediaSpy.count(), 1); + QCOMPARE(mediaSpy.size(), 1); QCOMPARE(qvariant_cast<QUrl>(mediaSpy.last().value(0)), mediaContent); QCOMPARE(player->error(), error); - QCOMPARE(errorSpy.count(), errorCount); + QCOMPARE(errorSpy.size(), errorCount); if (errorCount > 0) { QCOMPARE(qvariant_cast<QMediaPlayer::Error>(errorSpy.last().value(0)), error); QVERIFY(!player->errorString().isEmpty()); diff --git a/tests/auto/unit/multimedia/qmediarecorder/tst_qmediarecorder.cpp b/tests/auto/unit/multimedia/qmediarecorder/tst_qmediarecorder.cpp index a329de198..7c6f41d45 100644 --- a/tests/auto/unit/multimedia/qmediarecorder/tst_qmediarecorder.cpp +++ b/tests/auto/unit/multimedia/qmediarecorder/tst_qmediarecorder.cpp @@ -131,17 +131,17 @@ void tst_QMediaRecorder::testNullControls() recorder.record(); QCOMPARE(recorder.recorderState(), QMediaRecorder::StoppedState); QCOMPARE(recorder.error(), QMediaRecorder::NoError); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); recorder.pause(); QCOMPARE(recorder.recorderState(), QMediaRecorder::StoppedState); QCOMPARE(recorder.error(), QMediaRecorder::NoError); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); recorder.stop(); QCOMPARE(recorder.recorderState(), QMediaRecorder::StoppedState); QCOMPARE(recorder.error(), QMediaRecorder::NoError); - QCOMPARE(spy.count(), 0); + QCOMPARE(spy.size(), 0); } void tst_QMediaRecorder::testDeleteMediaSource() @@ -175,7 +175,7 @@ void tst_QMediaRecorder::testError() mock->error(QMediaRecorder::FormatError, errorString); QCOMPARE(encoder->error(), QMediaRecorder::FormatError); QCOMPARE(encoder->errorString(), errorString); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.last()[0].value<QMediaRecorder::Error>(), QMediaRecorder::FormatError); } @@ -214,30 +214,30 @@ void tst_QMediaRecorder::testRecord() QCOMPARE(encoder->error(), QMediaRecorder::NoError); QCOMPARE(encoder->errorString(), QString()); - QCOMPARE(stateSignal.count(), 1); + QCOMPARE(stateSignal.size(), 1); QCOMPARE(stateSignal.last()[0].value<QMediaRecorder::RecorderState>(), QMediaRecorder::RecordingState); QTestEventLoop::instance().enterLoop(1); - QVERIFY(progressSignal.count() > 0); + QVERIFY(progressSignal.size() > 0); encoder->pause(); QCOMPARE(encoder->recorderState(), QMediaRecorder::PausedState); - QCOMPARE(stateSignal.count(), 2); + QCOMPARE(stateSignal.size(), 2); QTestEventLoop::instance().enterLoop(1); encoder->stop(); QCOMPARE(encoder->recorderState(), QMediaRecorder::StoppedState); - QCOMPARE(stateSignal.count(), 3); + QCOMPARE(stateSignal.size(), 3); QTestEventLoop::instance().enterLoop(1); mock->stop(); - QCOMPARE(stateSignal.count(), 3); + QCOMPARE(stateSignal.size(), 3); mock->reset(); } @@ -398,7 +398,7 @@ void tst_QMediaRecorder::testEnum() emit mock->error(QMediaRecorder::ResourceError, errorString); QCOMPARE(encoder->error(), QMediaRecorder::ResourceError); QCOMPARE(encoder->errorString(), errorString); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.last()[0].value<QMediaRecorder::Error>(), QMediaRecorder::ResourceError); } diff --git a/tests/auto/unit/multimedia/qmediatimerange/tst_qmediatimerange.cpp b/tests/auto/unit/multimedia/qmediatimerange/tst_qmediatimerange.cpp index cbd46733a..5b92b7d0b 100644 --- a/tests/auto/unit/multimedia/qmediatimerange/tst_qmediatimerange.cpp +++ b/tests/auto/unit/multimedia/qmediatimerange/tst_qmediatimerange.cpp @@ -145,7 +145,7 @@ void tst_QMediaTimeRange::testGetters() // isEmpty + isContinuous + intervals + start + end QVERIFY(!x.isEmpty()); QVERIFY(!x.isContinuous()); - QVERIFY(x.intervals().count() == 2); + QVERIFY(x.intervals().size() == 2); QVERIFY(x.intervals()[0].start() == 10); QVERIFY(x.intervals()[0].end() == 20); QVERIFY(x.intervals()[1].start() == 30); @@ -291,7 +291,7 @@ void tst_QMediaTimeRange::testAddInterval() QVERIFY(!x.isEmpty()); QVERIFY(!x.isContinuous()); - QVERIFY(x.intervals().count() == 2); + QVERIFY(x.intervals().size() == 2); QVERIFY(x.intervals()[0].start() == 10); QVERIFY(x.intervals()[0].end() == 40); QVERIFY(x.intervals()[1].start() == 50); @@ -441,7 +441,7 @@ void tst_QMediaTimeRange::testRemoveInterval() QVERIFY(!x.isEmpty()); QVERIFY(!x.isContinuous()); - QVERIFY(x.intervals().count() == 2); + QVERIFY(x.intervals().size() == 2); QVERIFY(x.intervals()[0].start() == 10); QVERIFY(x.intervals()[0].end() == 19); QVERIFY(x.intervals()[1].start() == 41); @@ -489,7 +489,7 @@ void tst_QMediaTimeRange::testRemoveInterval() QVERIFY(!x.isEmpty()); QVERIFY(!x.isContinuous()); - QVERIFY(x.intervals().count() == 2); + QVERIFY(x.intervals().size() == 2); QVERIFY(x.intervals()[0].start() == 10); QVERIFY(x.intervals()[0].end() == 14); QVERIFY(x.intervals()[1].start() == 36); @@ -511,7 +511,7 @@ void tst_QMediaTimeRange::testRemoveInterval() QVERIFY(!x.isEmpty()); QVERIFY(!x.isContinuous()); - QVERIFY(x.intervals().count() == 2); + QVERIFY(x.intervals().size() == 2); QVERIFY(x.intervals()[0].start() == 10); QVERIFY(x.intervals()[0].end() == 19); QVERIFY(x.intervals()[1].start() == 41); @@ -572,7 +572,7 @@ void tst_QMediaTimeRange::testRemoveTimeRange() QVERIFY(!b.isEmpty()); QVERIFY(!b.isContinuous()); - QVERIFY(b.intervals().count() == 2); + QVERIFY(b.intervals().size() == 2); QVERIFY(b.intervals()[0].start() == 10); QVERIFY(b.intervals()[0].end() == 19); QVERIFY(b.intervals()[1].start() == 51); @@ -593,7 +593,7 @@ void tst_QMediaTimeRange::testRemoveTimeRange() QVERIFY(!b.isEmpty()); QVERIFY(!b.isContinuous()); - QVERIFY(b.intervals().count() == 2); + QVERIFY(b.intervals().size() == 2); QVERIFY(b.intervals()[0].start() == 10); QVERIFY(b.intervals()[0].end() == 19); QVERIFY(b.intervals()[1].start() == 91); diff --git a/tests/auto/unit/multimedia/qvideoframe/tst_qvideoframe.cpp b/tests/auto/unit/multimedia/qvideoframe/tst_qvideoframe.cpp index 7685e0cb4..d400ce5d4 100644 --- a/tests/auto/unit/multimedia/qvideoframe/tst_qvideoframe.cpp +++ b/tests/auto/unit/multimedia/qvideoframe/tst_qvideoframe.cpp @@ -645,24 +645,24 @@ void tst_QVideoFrame::mapPlanes() QFETCH(QList<int>, strides); QFETCH(QList<int>, offsets); - QCOMPARE(strides.count(), offsets.count() + 1); + QCOMPARE(strides.size(), offsets.size() + 1); QCOMPARE(frame.map(QVideoFrame::ReadOnly), true); - QCOMPARE(frame.planeCount(), strides.count()); + QCOMPARE(frame.planeCount(), strides.size()); - QVERIFY(strides.count() > 0); + QVERIFY(strides.size() > 0); QCOMPARE(frame.bytesPerLine(0), strides.at(0)); QVERIFY(frame.bits(0)); - if (strides.count() > 1) { + if (strides.size() > 1) { QCOMPARE(frame.bytesPerLine(1), strides.at(1)); QCOMPARE(int(frame.bits(1) - frame.bits(0)), offsets.at(0)); } - if (strides.count() > 2) { + if (strides.size() > 2) { QCOMPARE(frame.bytesPerLine(2), strides.at(2)); QCOMPARE(int(frame.bits(2) - frame.bits(0)), offsets.at(1)); } - if (strides.count() > 3) { + if (strides.size() > 3) { QCOMPARE(frame.bytesPerLine(3), strides.at(3)); QCOMPARE(int(frame.bits(3) - frame.bits(0)), offsets.at(0)); } diff --git a/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp b/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp index a87fc64df..be72e6481 100644 --- a/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp +++ b/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp @@ -60,7 +60,7 @@ void tst_QCameraWidgets::testCameraEncodingProperyChange() camera.start(); QCOMPARE(camera.isActive(), true); - QCOMPARE(activeChangedSignal.count(), 1); + QCOMPARE(activeChangedSignal.size(), 1); } void tst_QCameraWidgets::testSetVideoOutput() diff --git a/tests/auto/unit/multimediawidgets/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp b/tests/auto/unit/multimediawidgets/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp index 47b4f16cd..d08bfc625 100644 --- a/tests/auto/unit/multimediawidgets/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp +++ b/tests/auto/unit/multimediawidgets/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp @@ -225,7 +225,7 @@ void tst_QGraphicsVideoItem::nativeSize() QCoreApplication::processEvents(); QCOMPARE(item.nativeSize(), nativeSize); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.last().first().toSizeF(), nativeSize); } diff --git a/tests/auto/unit/multimediawidgets/qvideowidget/tst_qvideowidget.cpp b/tests/auto/unit/multimediawidgets/qvideowidget/tst_qvideowidget.cpp index 09ca68984..63e7f01dc 100644 --- a/tests/auto/unit/multimediawidgets/qvideowidget/tst_qvideowidget.cpp +++ b/tests/auto/unit/multimediawidgets/qvideowidget/tst_qvideowidget.cpp @@ -177,14 +177,14 @@ void tst_QVideoWidget::fullScreen() widget.setFullScreen(true); QVERIFY(QTest::qWaitForWindowExposed(&widget)); QCOMPARE(widget.isFullScreen(), true); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); QCOMPARE(spy.value(0).value(0).toBool(), true); // Test returning to normal with setFullScreen(false). widget.setFullScreen(false); QVERIFY(QTest::qWaitForWindowExposed(&widget)); QCOMPARE(widget.isFullScreen(), false); - QCOMPARE(spy.count(), 2); + QCOMPARE(spy.size(), 2); QCOMPARE(spy.value(1).value(0).toBool(), false); QCOMPARE(widget.windowFlags(), windowFlags); @@ -192,35 +192,35 @@ void tst_QVideoWidget::fullScreen() widget.showFullScreen(); QVERIFY(QTest::qWaitForWindowExposed(&widget)); QCOMPARE(widget.isFullScreen(), true); - QCOMPARE(spy.count(), 3); + QCOMPARE(spy.size(), 3); QCOMPARE(spy.value(2).value(0).toBool(), true); // Test returning to normal with showNormal(). widget.showNormal(); QVERIFY(QTest::qWaitForWindowExposed(&widget)); QCOMPARE(widget.isFullScreen(), false); - QCOMPARE(spy.count(), 4); + QCOMPARE(spy.size(), 4); QCOMPARE(spy.value(3).value(0).toBool(), false); QCOMPARE(widget.windowFlags(), windowFlags); // Test setFullScreen(false) and showNormal() do nothing when isFullScreen() == false. widget.setFullScreen(false); QCOMPARE(widget.isFullScreen(), false); - QCOMPARE(spy.count(), 4); + QCOMPARE(spy.size(), 4); widget.showNormal(); QVERIFY(QTest::qWaitForWindowExposed(&widget)); QCOMPARE(widget.isFullScreen(), false); - QCOMPARE(spy.count(), 4); + QCOMPARE(spy.size(), 4); // Test setFullScreen(true) and showFullScreen() do nothing when isFullScreen() == true. widget.showFullScreen(); QVERIFY(QTest::qWaitForWindowExposed(&widget)); widget.setFullScreen(true); QCOMPARE(widget.isFullScreen(), true); - QCOMPARE(spy.count(), 5); + QCOMPARE(spy.size(), 5); widget.showFullScreen(); QCOMPARE(widget.isFullScreen(), true); - QCOMPARE(spy.count(), 5); + QCOMPARE(spy.size(), 5); } static const uchar rgb32ImageData[] = |