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

tst_QConcatenateTablesProxyModel: extend shouldMergeRoleNames() with removal

Browse Source 
We should also test removal, not just addition.

Amends 5ffb9d7ae6d60fb370b79f8222dab7d7e628fa4f.

Change-Id: I0842a6be6230362e2095f6c8b2b1ced230826c5e
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit e15ef96bcb59de31937881b8e901f94bcf98355a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2025-03-17 19:44:00 +01:00 committed by Qt Cherry-pick Bot
parent 89bc556da0
commit 56976f8f08
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/auto/corelib/itemmodels/qconcatenatetablesproxymodel/tst_qconcatenatetablesproxymodel.cpp
View File

@ -980,6 +980,13 @@ void tst_QConcatenateTablesProxyModel::shouldMergeRoleNames()
QCOMPARE(roleNames[Qt::DisplayRole], "display"); QCOMPARE(roleNames[Qt::DisplayRole], "display");
QCOMPARE(roleNames[Qt::UserRole], "user"); QCOMPARE(roleNames[Qt::UserRole], "user");
QCOMPARE(roleNames[Qt::UserRole + 1], "user+1"); QCOMPARE(roleNames[Qt::UserRole + 1], "user+1");
// When removing a source model
pm.removeSourceModel(&mod2);
// Then the role names should be updated
const auto roleNamesAfterMod2Removal = pm.roleNames();
QVERIFY(!roleNamesAfterMod2Removal.contains(Qt::UserRole + 1));
} }
QTEST_GUILESS_MAIN(tst_QConcatenateTablesProxyModel) QTEST_GUILESS_MAIN(tst_QConcatenateTablesProxyModel)