From 1ad424aed502386c97359b65f37edf2966c0dfa6 Mon Sep 17 00:00:00 2001
From: Ivan Solovev <ivan.solovev@qt.io>
Date: Mon, 28 Aug 2023 14:43:14 +0200
Subject: QLocal{Socket,Server}: extend the test coverage for property bindings

The pre-existing test for QLocalServer was testing only a minor subset
of cases, so replace it with the call to
QTestPrivate::testReadWritePropertyBasics.

The test for QLocalSocket's bindable properties was missing, so add
it.

The new tests didn't reveal any problems.

Task-number: QTBUG-116346
Pick-to: 6.6 6.5
Change-Id: I695bb050d39eeae9ffb84c097c36601a4ca89af6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
---
 .../auto/network/socket/qlocalsocket/CMakeLists.txt  |  1 +
 .../network/socket/qlocalsocket/tst_qlocalsocket.cpp | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'tests/auto/network')

diff --git a/tests/auto/network/socket/qlocalsocket/CMakeLists.txt b/tests/auto/network/socket/qlocalsocket/CMakeLists.txt
index 663fc1f86a..4b886a02ee 100644
--- a/tests/auto/network/socket/qlocalsocket/CMakeLists.txt
+++ b/tests/auto/network/socket/qlocalsocket/CMakeLists.txt
@@ -17,5 +17,6 @@ qt_internal_add_test(tst_qlocalsocket
         QLOCALSOCKET_DEBUG
     LIBRARIES
         Qt::Network
+        Qt::TestPrivate
 )
 add_dependencies(tst_qlocalsocket socketprocess)
diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
index f240f3e832..9369f4a3c1 100644
--- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
+++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
@@ -5,6 +5,7 @@
 
 #include <QTest>
 #include <QSignalSpy>
+#include <QtTest/private/qpropertytesthelper_p.h>
 #if QT_CONFIG(process)
 #include <QProcess>
 #endif
@@ -123,6 +124,7 @@ private slots:
     void verifyListenWithDescriptor_data();
 
     void serverBindingsAndProperties();
+    void socketBindings();
 
 protected slots:
     void socketClosedSlot();
@@ -1807,14 +1809,18 @@ void tst_QLocalSocket::serverBindingsAndProperties()
 {
     CrashSafeLocalServer server;
 
-    QProperty<QLocalServer::SocketOptions> sockOpts;
-    server.bindableSocketOptions().setBinding(Qt::makePropertyBinding(sockOpts));
-    sockOpts = QLocalServer::GroupAccessOption | QLocalServer::UserAccessOption;
-    QCOMPARE(server.socketOptions(), sockOpts.value());
+    QTestPrivate::testReadWritePropertyBasics(
+            server, QLocalServer::SocketOptions{QLocalServer::GroupAccessOption},
+            QLocalServer::SocketOptions{QLocalServer::OtherAccessOption}, "socketOptions");
+}
+
+void tst_QLocalSocket::socketBindings()
+{
+    QLocalSocket socket;
 
-    sockOpts.setBinding(server.bindableSocketOptions().makeBinding());
-    server.setSocketOptions(QLocalServer::OtherAccessOption);
-    QCOMPARE(sockOpts.value(), QLocalServer::OtherAccessOption);
+    QTestPrivate::testReadWritePropertyBasics(
+            socket, QLocalSocket::SocketOptions{QLocalSocket::AbstractNamespaceOption},
+            QLocalSocket::SocketOptions{QLocalSocket::NoOptions}, "socketOptions");
 }
 
 QTEST_MAIN(tst_QLocalSocket)
-- 
cgit v1.2.3