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 <artem.dyomin@qt.io>
This commit is contained in:
Volker Hilsheimer 2025-04-07 18:11:49 +02:00
parent 25f5bd5f66
commit db7e2d6fd0

View File

@ -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<MetaObjectTuple>,
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());