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

QGIM: improve test to initialize data of associative containers

Browse Source 
When we insert a new row where the row type is an associative container,
the resulting row holds no data, and the QVariant we get from data is
invalid. So far we have QEXPECT_FAIL'ed the test that checks if the data
from a new row is valid. This is misleading; there is a valid map in the
row, which is what we want to test.

Instead, connect to the rowsInserted signal to populate the new row(s)
with (empty, but valid) data.

Change-Id: If89e30c2944581bd0059f908e2dfb956c655f34f
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
This commit is contained in:
Volker Hilsheimer 2025-04-07 17:56:55 +02:00
parent 17ee99ae2d
commit 2d8a04d753
1 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
tests/auto/corelib/itemmodels/qgenericitemmodel/tst_qgenericitemmodel.cpp
View File

@ -1188,6 +1188,36 @@ void tst_QGenericItemModel::insertRows()
QFETCH(const ChangeActions, changeActions);
const bool canSetData = changeActions.testFlag(ChangeAction::SetData);
// associative containers are empty, so we need to explicitly set data for
// newly created rows
static const QList<QByteArrayView> associativeContainers = {
"listOfNamedRoles",
"tableOfEnumRoles",
"tableOfIntRoles",
"stdTableOfIntRoles",
"stdTableOfIntRolesWithSharedRows",
};
const auto it = std::find_if(associativeContainers.begin(), associativeContainers.end(),
[current = QByteArrayView(QTest::currentDataTag())](const QByteArrayView &tag) {
if (tag == current)
return true;
for (auto suffix : { "Pointer", "Copy", "Ref", "UPtr", "SPtr" }) {
if (tag + suffix == current)
return true;
}
return false;
});
if (it != associativeContainers.end()) {
connect(model.get(), &QAbstractItemModel::rowsInserted,
this, [model = model.get()](const QModelIndex &parent, int start, int end) {
for (int row = start; row <= end; ++row) {
model->setData(model->index(row, 0, parent), row);
model->setData(model->index(row, model->columnCount(parent) - 1, parent), row);
}
});
}
const QList<QPersistentModelIndex> pmiList = allIndexes(model.get());
QCOMPARE(model->rowCount(), expectedRowCount);
@ -1195,21 +1225,6 @@ void tst_QGenericItemModel::insertRows()
QCOMPARE(model->rowCount() == expectedRowCount + 1,
changeActions.testFlag(ChangeAction::InsertRows));
auto ignoreFailureFromAssociativeContainers = [] {
for (auto suffix : { "Pointer", "Copy", "Ref", "UPtr", "SPtr" }) {
auto addCase = [suffix](const std::string& testName,
const std::string& containerName) {
QEXPECT_FAIL((testName + suffix).c_str(),
(containerName + " is empty by design").c_str(),
Continue);
};
addCase("listOfNamedRoles", "QVariantMap");
addCase("tableOfEnumRoles", "QVariantMap");
addCase("tableOfIntRoles", "QVariantMap");
addCase("stdTableOfIntRoles", "std::map");
addCase("stdTableOfIntRolesWithSharedRows", "std::map");
}
};
// get and put data into the new row
const QModelIndex firstItem = model->index(0, 0);
const QModelIndex lastItem = model->index(0, expectedColumnCount - 1);
@ -1225,13 +1240,8 @@ void tst_QGenericItemModel::insertRows()
QEXPECT_FAIL("tableOfMetaObjectTupleCopy", "No object created", Continue);
QEXPECT_FAIL("movedListOfObjects", "No object created", Continue);
// associative containers are default constructed with no valid data
ignoreFailureFromAssociativeContainers();
QVERIFY(firstValue.isValid() && lastValue.isValid());
ignoreFailureFromAssociativeContainers();
QCOMPARE(model->setData(firstItem, lastValue), canSetData && lastValue.isValid());
ignoreFailureFromAssociativeContainers();
QCOMPARE(model->setData(lastItem, firstValue), canSetData && firstValue.isValid());
// append more rows