From bda8582f39711b77db95f3fad42d6a779f39dcfb Mon Sep 17 00:00:00 2001
From: Ivan Solovev <ivan.solovev@qt.io>
Date: Mon, 28 Aug 2023 13:07:22 +0200
Subject: [PATCH] QStandardItemModel: extend the test coverage for property
 bindings

The pre-existing tests were not using the QTestPrivate helpers, so
extend them with the call to QTestPrivate::testReadWritePropertyBasics.

The updated test didn't reveal any problems with binding loops, so no
other action is required for now.

Task-number: QTBUG-116346
Change-Id: I360614a40fe2bacb796051607ed67e7e666b4f22
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit ac59fcdab8adb80648fee15956428630946dd01d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 tests/auto/gui/itemmodels/qstandarditemmodel/CMakeLists.txt   | 1 +
 .../itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp  | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/tests/auto/gui/itemmodels/qstandarditemmodel/CMakeLists.txt b/tests/auto/gui/itemmodels/qstandarditemmodel/CMakeLists.txt
index c241d97294c..76df6bfdd94 100644
--- a/tests/auto/gui/itemmodels/qstandarditemmodel/CMakeLists.txt
+++ b/tests/auto/gui/itemmodels/qstandarditemmodel/CMakeLists.txt
@@ -14,4 +14,5 @@ qt_internal_add_test(tst_qstandarditemmodel
         Qt::GuiPrivate
         Qt::Widgets
         Qt::WidgetsPrivate
+        Qt::TestPrivate
 )
diff --git a/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp b/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp
index 73e74b22295..f5f02761d52 100644
--- a/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp
+++ b/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp
@@ -10,6 +10,7 @@
 #include <QAbstractItemModelTester>
 
 #include <private/qabstractitemmodel_p.h>
+#include <private/qpropertytesthelper_p.h>
 #include <private/qtreeview_p.h>
 
 #include <algorithm>
@@ -902,6 +903,9 @@ void tst_QStandardItemModel::sortRoleBindings()
     sortRoleObserver.setBinding([&] { return model.sortRole(); });
     model.setSortRole(Qt::EditRole);
     QCOMPARE(sortRoleObserver, Qt::EditRole);
+
+    QTestPrivate::testReadWritePropertyBasics(model, static_cast<int>(Qt::DisplayRole),
+                                              static_cast<int>(Qt::EditRole), "sortRole");
 }
 
 void tst_QStandardItemModel::findItems()