1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tests: Use QVERIFY instead of QCOMPARE for empty lists

Browse Source 
Pick-to: 5.15
Change-Id: I4da02fa11583eca3844bf42efcdf818b8bbd6a94
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Friedemann Kleint 2020-07-10 11:59:20 +02:00
parent a83b2c64a9
commit 773a6bffd7
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/corelib/io/qsettings/tst_qsettings.cpp
View File

@ -1115,7 +1115,7 @@ void tst_QSettings::setValue()
QCOMPARE(settings.value("key 2").toStringList(), QStringList() << "" << "a" << "" << "bc" << ""); QCOMPARE(settings.value("key 2").toStringList(), QStringList() << "" << "a" << "" << "bc" << "");
settings.setValue("key 3", QList<QVariant>()); 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")); settings.setValue("key 3", QList<QVariant>() << 1 << QString("a"));
QCOMPARE(settings.value("key 3").toList(), QList<QVariant>() << 1 << QString("a")); QCOMPARE(settings.value("key 3").toList(), QList<QVariant>() << 1 << QString("a"));

2
tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
View File

@ -1664,7 +1664,7 @@ void tst_QMetaObject::metaMethod()
//wrong object //wrong object
//QVERIFY(!sl13.invoke(this, Q_RETURN_ARG(QList<QString>, returnValue), Q_ARG(QList<QString>, argument))); //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))); 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))); QVERIFY(sl13.invoke(&obj, Q_RETURN_ARG(QList<QString>, returnValue), Q_ARG(QList<QString>, argument)));
QCOMPARE(returnValue, argument); QCOMPARE(returnValue, argument);

2
tests/auto/corelib/thread/qfuture/tst_qfuture.cpp
View File

@ -797,7 +797,7 @@ void tst_QFuture::cancel()
result = 3; result = 3;
futureInterface.reportResult(&result); futureInterface.reportResult(&result);
futureInterface.reportFinished(); futureInterface.reportFinished();
QCOMPARE(f.results(), QList<int>()); QVERIFY(f.results().isEmpty());
} }
} }

2
tests/auto/corelib/tools/qversionnumber/tst_qversionnumber.cpp
View File

@ -227,7 +227,7 @@ void tst_QVersionNumber::constructorDefault()
QCOMPARE(version.majorVersion(), 0); QCOMPARE(version.majorVersion(), 0);
QCOMPARE(version.minorVersion(), 0); QCOMPARE(version.minorVersion(), 0);
QCOMPARE(version.microVersion(), 0); QCOMPARE(version.microVersion(), 0);
QCOMPARE(version.segments(), QList<int>()); QVERIFY(version.segments().isEmpty());
} }
void tst_QVersionNumber::constructorVersioned_data() void tst_QVersionNumber::constructorVersioned_data()

6
tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp
View File

@ -722,7 +722,7 @@ void tst_QStandardItemModel::data()
currentRoles.clear(); currentRoles.clear();
// bad args // bad args
m_model->setData(QModelIndex(), "bla", Qt::DisplayRole); m_model->setData(QModelIndex(), "bla", Qt::DisplayRole);
QCOMPARE(currentRoles, QList<int> {}); QVERIFY(currentRoles.isEmpty());
QIcon icon; QIcon icon;
for (int r = 0; r < m_model->rowCount(); ++r) { for (int r = 0; r < m_model->rowCount(); ++r) {
@ -749,7 +749,7 @@ void tst_QStandardItemModel::clearItemData()
{ {
currentRoles.clear(); currentRoles.clear();
QVERIFY(!m_model->clearItemData(QModelIndex())); QVERIFY(!m_model->clearItemData(QModelIndex()));
QCOMPARE(currentRoles, QList<int> {}); QVERIFY(currentRoles.isEmpty());
const QModelIndex idx = m_model->index(0, 0); const QModelIndex idx = m_model->index(0, 0);
const QMap<int, QVariant> oldData = m_model->itemData(idx); const QMap<int, QVariant> oldData = m_model->itemData(idx);
m_model->setData(idx, QLatin1String("initialitem"), Qt::DisplayRole); m_model->setData(idx, QLatin1String("initialitem"), Qt::DisplayRole);
@ -761,7 +761,7 @@ void tst_QStandardItemModel::clearItemData()
QCOMPARE(idx.data(Qt::ToolTipRole), QVariant()); QCOMPARE(idx.data(Qt::ToolTipRole), QVariant());
QCOMPARE(idx.data(Qt::DisplayRole), QVariant()); QCOMPARE(idx.data(Qt::DisplayRole), QVariant());
QCOMPARE(idx.data(Qt::EditRole), QVariant()); QCOMPARE(idx.data(Qt::EditRole), QVariant());
QCOMPARE(currentRoles, QList<int> {}); QVERIFY(currentRoles.isEmpty());
m_model->setItemData(idx, oldData); m_model->setItemData(idx, oldData);
currentRoles.clear(); currentRoles.clear();
} }

4
tests/auto/gui/util/qundogroup/tst_qundogroup.cpp
View File

@ -253,7 +253,7 @@ void tst_QUndoGroup::addRemoveStack()
QCOMPARE(group.stacks(), QList<QUndoStack*>() << &stack2); QCOMPARE(group.stacks(), QList<QUndoStack*>() << &stack2);
group.removeStack(&stack2); group.removeStack(&stack2);
QCOMPARE(group.stacks(), QList<QUndoStack*>()); QVERIFY(group.stacks().isEmpty());
} }
void tst_QUndoGroup::deleteStack() void tst_QUndoGroup::deleteStack()
@ -290,7 +290,7 @@ void tst_QUndoGroup::deleteStack()
QCOMPARE(group.activeStack(), stack3); QCOMPARE(group.activeStack(), stack3);
group.removeStack(stack3); group.removeStack(stack3);
QCOMPARE(group.stacks(), QList<QUndoStack*>()); QVERIFY(group.stacks().isEmpty());
QCOMPARE(group.activeStack(), nullptr); QCOMPARE(group.activeStack(), nullptr);
delete stack3; delete stack3;

4
tests/auto/other/qaccessibility/tst_qaccessibility.cpp
View File

@ -2882,8 +2882,8 @@ void tst_QAccessibility::listTest()
QCOMPARE(cellInterface->columnIndex(), 0); QCOMPARE(cellInterface->columnIndex(), 0);
QCOMPARE(cellInterface->rowExtent(), 1); QCOMPARE(cellInterface->rowExtent(), 1);
QCOMPARE(cellInterface->columnExtent(), 1); QCOMPARE(cellInterface->columnExtent(), 1);
QCOMPARE(cellInterface->rowHeaderCells(), QList<QAccessibleInterface*>()); QVERIFY(cellInterface->rowHeaderCells().isEmpty());
QCOMPARE(cellInterface->columnHeaderCells(), QList<QAccessibleInterface*>()); QVERIFY(cellInterface->columnHeaderCells().isEmpty());
QCOMPARE(cellInterface->table()->object(), listView); QCOMPARE(cellInterface->table()->object(), listView);

8
tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
View File

@ -944,7 +944,7 @@ void tst_QGraphicsView::rubberBandSelectionMode()
// terminate the rubber band. // terminate the rubber band.
view.viewport()->setMouseTracking(false); view.viewport()->setMouseTracking(false);
QCOMPARE(scene.selectedItems(), QList<QGraphicsItem *>()); QVERIFY(scene.selectedItems().isEmpty());
sendMousePress(view.viewport(), QPoint(), Qt::LeftButton); sendMousePress(view.viewport(), QPoint(), Qt::LeftButton);
sendMouseMove(view.viewport(), view.viewport()->rect().center(), sendMouseMove(view.viewport(), view.viewport()->rect().center(),
Qt::LeftButton, Qt::LeftButton); Qt::LeftButton, Qt::LeftButton);
@ -954,10 +954,10 @@ void tst_QGraphicsView::rubberBandSelectionMode()
view.setRubberBandSelectionMode(Qt::ContainsItemShape); view.setRubberBandSelectionMode(Qt::ContainsItemShape);
QCOMPARE(view.rubberBandSelectionMode(), Qt::ContainsItemShape); QCOMPARE(view.rubberBandSelectionMode(), Qt::ContainsItemShape);
sendMousePress(view.viewport(), QPoint(), Qt::LeftButton); sendMousePress(view.viewport(), QPoint(), Qt::LeftButton);
QCOMPARE(scene.selectedItems(), QList<QGraphicsItem *>()); QVERIFY(scene.selectedItems().isEmpty());
sendMouseMove(view.viewport(), view.viewport()->rect().center(), sendMouseMove(view.viewport(), view.viewport()->rect().center(),
Qt::LeftButton, Qt::LeftButton); Qt::LeftButton, Qt::LeftButton);
QCOMPARE(scene.selectedItems(), QList<QGraphicsItem *>()); QVERIFY(scene.selectedItems().isEmpty());
sendMouseMove(view.viewport(), view.viewport()->rect().bottomRight(), sendMouseMove(view.viewport(), view.viewport()->rect().bottomRight(),
Qt::LeftButton, Qt::LeftButton); Qt::LeftButton, Qt::LeftButton);
QCOMPARE(scene.selectedItems(), QList<QGraphicsItem *>() << rect); QCOMPARE(scene.selectedItems(), QList<QGraphicsItem *>() << rect);
@ -1049,7 +1049,7 @@ void tst_QGraphicsView::rotated_rubberBand()
// terminate the rubber band. // terminate the rubber band.
view.viewport()->setMouseTracking(false); view.viewport()->setMouseTracking(false);
QCOMPARE(scene.selectedItems(), QList<QGraphicsItem *>()); QVERIFY(scene.selectedItems().isEmpty());
int midWidth = view.viewport()->width() / 2; int midWidth = view.viewport()->width() / 2;
sendMousePress(view.viewport(), QPoint(midWidth - 2, 0), Qt::LeftButton); sendMousePress(view.viewport(), QPoint(midWidth - 2, 0), Qt::LeftButton);
sendMouseMove(view.viewport(), QPoint(midWidth + 2, view.viewport()->height()), sendMouseMove(view.viewport(), QPoint(midWidth + 2, view.viewport()->height()),