From aa606f9760db6362abd9fd2e741846ec8717ae32 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Fri, 29 Sep 2023 22:25:07 +0200 Subject: [PATCH] Tests/QAbstractiItemView: fix runtime warnings Fix runtime warnings about testdata with the same name. Pick-to: 6.5 Change-Id: I5d4927cc53be3e08a524498db42a8a08396ced8e Reviewed-by: Axel Spoerl (cherry picked from commit 2203dec57bfca11722ddac7df394490a35e90b79) Reviewed-by: Qt Cherry-pick Bot --- .../qabstractitemview/tst_qabstractitemview.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp index 172fe99e2f9..22d4d5b66d0 100644 --- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp +++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp @@ -2646,11 +2646,12 @@ void tst_QAbstractItemView::dragSelectAfterNewPress() void tst_QAbstractItemView::dragWithSecondClick_data() { - QTest::addColumn("viewClass"); + QTest::addColumn("viewClass"); QTest::addColumn("doubleClick"); - for (QString viewClass : {"QListView", "QTreeView"}) { - QTest::addRow("DoubleClick") << viewClass << true; - QTest::addRow("Two Single Clicks") << viewClass << false; + const QList widgets { "QListView", "QTreeView" }; + for (const QByteArray &widget : widgets) { + QTest::newRow(widget + ": DoubleClick") << widget << true; + QTest::newRow(widget + ": Two Single Clicks") << widget << false; } } @@ -2679,7 +2680,7 @@ protected: void tst_QAbstractItemView::dragWithSecondClick() { - QFETCH(QString, viewClass); + QFETCH(QByteArray, viewClass); QFETCH(bool, doubleClick); QStandardItemModel model; @@ -3000,7 +3001,7 @@ void tst_QAbstractItemView::mouseSelection_data() SelectionEvent(SelectionEvent::Release, Qt::ControlModifier, 8)} << QList{2, 3, 4, 5, 6, 7, 8}; // Extended: Ctrl+Press-dragging in a selection should not deselect #QTBUG-59888 - QTest::addRow("Extended:Ctrl-Drag selection") << QAbstractItemView::ExtendedSelection << true + QTest::addRow("Extended:Ctrl-Drag selection,no deselect") << QAbstractItemView::ExtendedSelection << true << QAbstractItemView::NoEditTriggers << QList{SelectionEvent(SelectionEvent::Click, 2), SelectionEvent(SelectionEvent::Click, Qt::ShiftModifier, 5),