diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-10 11:59:20 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-10 14:30:58 +0200 |
| commit | 773a6bffd78b363577d27604e17f4ee08ff07e77 (patch) | |
| tree | 3974576638c136da8c55fa3695db042a81be78fa /tests/auto/corelib | |
| parent | a83b2c64a9828a1d22347eaf31fd251b2ef647ee (diff) | |
Tests: Use QVERIFY instead of QCOMPARE for empty lists
Pick-to: 5.15
Change-Id: I4da02fa11583eca3844bf42efcdf818b8bbd6a94
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'tests/auto/corelib')
4 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp index e1ee6ad82d..aa893309e8 100644 --- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp +++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp @@ -1115,7 +1115,7 @@ void tst_QSettings::setValue() QCOMPARE(settings.value("key 2").toStringList(), QStringList() << "" << "a" << "" << "bc" << ""); settings.setValue("key 3", QList<QVariant>()); - QCOMPARE(settings.value("key 3").toList(), QList<QVariant>()); + QVERIFY(settings.value("key 3").toList().isEmpty()); settings.setValue("key 3", QList<QVariant>() << 1 << QString("a")); QCOMPARE(settings.value("key 3").toList(), QList<QVariant>() << 1 << QString("a")); diff --git a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp index 4711e5999b..5f099f6458 100644 --- a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp +++ b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp @@ -1664,7 +1664,7 @@ void tst_QMetaObject::metaMethod() //wrong object //QVERIFY(!sl13.invoke(this, Q_RETURN_ARG(QList<QString>, returnValue), Q_ARG(QList<QString>, argument))); QVERIFY(!sl13.invoke(0, Q_RETURN_ARG(QList<QString>, returnValue), Q_ARG(QList<QString>, argument))); - QCOMPARE(returnValue, QList<QString>()); + QVERIFY(returnValue.isEmpty()); QVERIFY(sl13.invoke(&obj, Q_RETURN_ARG(QList<QString>, returnValue), Q_ARG(QList<QString>, argument))); QCOMPARE(returnValue, argument); diff --git a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp index 40abe3d762..cdb69ab3a3 100644 --- a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp +++ b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp @@ -797,7 +797,7 @@ void tst_QFuture::cancel() result = 3; futureInterface.reportResult(&result); futureInterface.reportFinished(); - QCOMPARE(f.results(), QList<int>()); + QVERIFY(f.results().isEmpty()); } } diff --git a/tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp b/tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp index 291fcca88c..346343b2ba 100644 --- a/tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp +++ b/tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp @@ -227,7 +227,7 @@ void tst_QVersionNumber::constructorDefault() QCOMPARE(version.majorVersion(), 0); QCOMPARE(version.minorVersion(), 0); QCOMPARE(version.microVersion(), 0); - QCOMPARE(version.segments(), QList<int>()); + QVERIFY(version.segments().isEmpty()); } void tst_QVersionNumber::constructorVersioned_data() |