From 56976f8f0806fc8e4717eed0ccbaf0540cd714b2 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Mon, 17 Mar 2025 19:44:00 +0100
Subject: [PATCH] tst_QConcatenateTablesProxyModel: extend
 shouldMergeRoleNames() with removal

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>
---
 .../tst_qconcatenatetablesproxymodel.cpp                   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/auto/corelib/itemmodels/qconcatenatetablesproxymodel/tst_qconcatenatetablesproxymodel.cpp b/tests/auto/corelib/itemmodels/qconcatenatetablesproxymodel/tst_qconcatenatetablesproxymodel.cpp
index f349cd0e5bb..fd477e0137e 100644
--- a/tests/auto/corelib/itemmodels/qconcatenatetablesproxymodel/tst_qconcatenatetablesproxymodel.cpp
+++ b/tests/auto/corelib/itemmodels/qconcatenatetablesproxymodel/tst_qconcatenatetablesproxymodel.cpp
@@ -980,6 +980,13 @@ void tst_QConcatenateTablesProxyModel::shouldMergeRoleNames()
     QCOMPARE(roleNames[Qt::DisplayRole], "display");
     QCOMPARE(roleNames[Qt::UserRole], "user");
     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)