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

QLocal{Socket,Server}: extend the test coverage for property bindings

Browse Source 
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
Change-Id: I695bb050d39eeae9ffb84c097c36601a4ca89af6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 1ad424aed502386c97359b65f37edf2966c0dfa6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Ivan Solovev 2023-08-28 14:43:14 +02:00 committed by Qt Cherry-pick Bot
parent 75dc131a28
commit b34073eab5
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/auto/network/socket/qlocalsocket/CMakeLists.txt
View File

@ -10,5 +10,6 @@ qt_internal_add_test(tst_qlocalsocket
QLOCALSOCKET_DEBUG QLOCALSOCKET_DEBUG
LIBRARIES LIBRARIES
Qt::Network Qt::Network
Qt::TestPrivate
) )
add_dependencies(tst_qlocalsocket socketprocess) add_dependencies(tst_qlocalsocket socketprocess)

20
tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
View File

@ -5,6 +5,7 @@
#include <QTest> #include <QTest>
#include <QSignalSpy> #include <QSignalSpy>
#include <QtTest/private/qpropertytesthelper_p.h>
#if QT_CONFIG(process) #if QT_CONFIG(process)
#include <QProcess> #include <QProcess>
#endif #endif
@ -123,6 +124,7 @@ private slots:
void verifyListenWithDescriptor_data(); void verifyListenWithDescriptor_data();
void serverBindingsAndProperties(); void serverBindingsAndProperties();
void socketBindings();
protected slots: protected slots:
void socketClosedSlot(); void socketClosedSlot();
@ -1807,14 +1809,18 @@ void tst_QLocalSocket::serverBindingsAndProperties()
{ {
CrashSafeLocalServer server; CrashSafeLocalServer server;
QProperty<QLocalServer::SocketOptions> sockOpts; QTestPrivate::testReadWritePropertyBasics(
server.bindableSocketOptions().setBinding(Qt::makePropertyBinding(sockOpts)); server, QLocalServer::SocketOptions{QLocalServer::GroupAccessOption},
sockOpts = QLocalServer::GroupAccessOption | QLocalServer::UserAccessOption; QLocalServer::SocketOptions{QLocalServer::OtherAccessOption}, "socketOptions");
QCOMPARE(server.socketOptions(), sockOpts.value()); }
sockOpts.setBinding(server.bindableSocketOptions().makeBinding()); void tst_QLocalSocket::socketBindings()
server.setSocketOptions(QLocalServer::OtherAccessOption); {
QCOMPARE(sockOpts.value(), QLocalServer::OtherAccessOption); QLocalSocket socket;
QTestPrivate::testReadWritePropertyBasics(
socket, QLocalSocket::SocketOptions{QLocalSocket::AbstractNamespaceOption},
QLocalSocket::SocketOptions{QLocalSocket::NoOptions}, "socketOptions");
} }
QTEST_MAIN(tst_QLocalSocket) QTEST_MAIN(tst_QLocalSocket)