From db7e2d6fd07778d8aa88bf0d92694acd4ab7e0ee Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 7 Apr 2025 18:11:49 +0200 Subject: [PATCH] QGIM: fix test coverage for gadgets-that-are-tuples The test data for SingleColumn and MultiColumn disambiguation types was incorrectly removed in 7803e6c000cc0fddba392bcbaefdc3a93ff4b26c. Inserting rows of a MultiColumn wrapper around a pointer doesn't work, so QEXPECT_FAIL that test for now. As a drive-by, remove an obsolete QEXPECT_FAIL; we never add a table of pointers in multiple value categories, as they all reference the same data. Change-Id: Ief4750094f8262f01ff81aa41d113971abd37307 Reviewed-by: Artem Dyomin --- .../qgenericitemmodel/tst_qgenericitemmodel.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/auto/corelib/itemmodels/qgenericitemmodel/tst_qgenericitemmodel.cpp b/tests/auto/corelib/itemmodels/qgenericitemmodel/tst_qgenericitemmodel.cpp index 012fc15e7a2..50fd1fd2187 100644 --- a/tests/auto/corelib/itemmodels/qgenericitemmodel/tst_qgenericitemmodel.cpp +++ b/tests/auto/corelib/itemmodels/qgenericitemmodel/tst_qgenericitemmodel.cpp @@ -692,6 +692,12 @@ void tst_QGenericItemModel::createTestData() ADD_COPY(listOfObjects, 2, ChangeAction::ChangeRows | ChangeAction::SetData); + ADD_COPY(listOfMetaObjectTuple, 1, + ChangeAction::ChangeRows | ChangeAction::SetData | ChangeAction::SetItemData); + ADD_REF(tableOfMetaObjectTuple, + std::tuple_size_v, + ChangeAction::ChangeRows | ChangeAction::SetData | ChangeAction::SetItemData); + ADD_ALL(tableOfNumbers, 5, ChangeAction::All); ADD_POINTER(tableOfPointers, 2, ChangeAction::All | ChangeAction::SetItemData); @@ -1237,9 +1243,8 @@ void tst_QGenericItemModel::insertRows() const QVariant lastValue = lastItem.data(); QEXPECT_FAIL("tableOfPointersPointer", "No item created", Continue); - QEXPECT_FAIL("tableOfPointersRef", "No item created", Continue); QEXPECT_FAIL("listOfMetaObjectTupleCopy", "No object created", Continue); - QEXPECT_FAIL("tableOfMetaObjectTupleCopy", "No object created", Continue); + QEXPECT_FAIL("tableOfMetaObjectTupleRef", "No object created", Continue); QVERIFY(firstValue.isValid() && lastValue.isValid()); QCOMPARE(model->setData(firstItem, lastValue), canSetData && lastValue.isValid());