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

Remove tst_manual_qsslsocket manual test as irrelevant

Browse Source 
Tests several sockets, similar tests are done in the auto-test
tst_qsslsocket.

Behaves like an auto-test. Irrelevant to be kept as an individual
manual test.

Change-Id: I53b32463da2f2f8a8a0a13be542420a528a6895a
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
Frédéric Lefebvre 2025-01-02 12:13:34 +01:00
parent 279c891ddf
commit dca3467993
5 changed files with 0 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/manual/CMakeLists.txt
View File

@ -47,7 +47,6 @@ endif()
add_subdirectory(qstorageinfo)
add_subdirectory(qscreen)
add_subdirectory(qscreen_xrandr)
add_subdirectory(qsslsocket)
add_subdirectory(qsysinfo)
add_subdirectory(qtabletevent)
add_subdirectory(qtexteditlist)

1
tests/manual/manual.pro
View File

@ -32,7 +32,6 @@ qstorageinfo \
qscreen \
qscreen_xrandr \
qssloptions \
qsslsocket \
qsysinfo \
qtabletevent \
qtexteditlist \

13
tests/manual/qsslsocket/CMakeLists.txt
View File

@ -1,13 +0,0 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
#####################################################################
## tst_manual_qsslsocket Test:
#####################################################################
qt_internal_add_test(tst_manual_qsslsocket
SOURCES
main.cpp
LIBRARIES
Qt::Network
)

127
tests/manual/qsslsocket/main.cpp
View File

@ -1,127 +0,0 @@
// Copyright (C) 2014 BlackBerry Limited. All rights reserved.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QtNetwork/qsslconfiguration.h>
#include <QtNetwork/qsslsocket.h>
#include <QTest>
#ifndef QT_NO_SSL
Q_DECLARE_METATYPE(QSslConfiguration::NextProtocolNegotiationStatus)
#endif
class tst_QSslSocket : public QObject
{
Q_OBJECT
#ifndef QT_NO_SSL
private slots:
void nextProtocolNegotiation_data();
void nextProtocolNegotiation();
#endif // QT_NO_SSL
};
#ifndef QT_NO_SSL
void tst_QSslSocket::nextProtocolNegotiation_data()
{
QTest::addColumn<bool>("setConfiguration");
QTest::addColumn<QString>("host");
QTest::addColumn<QList<QByteArray> >("allowedProtocols");
QTest::addColumn<QByteArray>("expectedProtocol");
QTest::addColumn<QSslConfiguration::NextProtocolNegotiationStatus>("expectedStatus");
const QString hosts[] = {
QStringLiteral("www.google.com"),
QStringLiteral("www.facebook.com"),
QStringLiteral("www.twitter.com"),
QStringLiteral("graph.facebook.com"),
QStringLiteral("api.twitter.com"),
};
for (const QString &host : hosts) {
QByteArray tag = host.toLocal8Bit();
tag.append("-none");
QTest::newRow(tag)
<< false
<< host
<< QList<QByteArray>()
<< QByteArray()
<< QSslConfiguration::NextProtocolNegotiationNone;
tag = host.toLocal8Bit();
tag.append("-none-explicit");
QTest::newRow(tag)
<< true
<< host
<< QList<QByteArray>()
<< QByteArray()
<< QSslConfiguration::NextProtocolNegotiationNone;
tag = host.toLocal8Bit();
tag.append("-http/1.1");
QTest::newRow(tag)
<< true
<< host
<< (QList<QByteArray>() << QSslConfiguration::NextProtocolHttp1_1)
<< QByteArray(QSslConfiguration::NextProtocolHttp1_1)
<< QSslConfiguration::NextProtocolNegotiationNegotiated;
tag = host.toLocal8Bit();
tag.append("-h2");
QTest::newRow(tag)
<< true
<< host
<< (QList<QByteArray>() << QSslConfiguration::ALPNProtocolHTTP2)
<< QByteArray(QSslConfiguration::ALPNProtocolHTTP2)
<< QSslConfiguration::NextProtocolNegotiationNegotiated;
tag = host.toLocal8Bit();
tag.append("-h2-and-http/1.1");
QTest::newRow(tag)
<< true
<< host
<< (QList<QByteArray>() << QSslConfiguration::ALPNProtocolHTTP2 << QSslConfiguration::NextProtocolHttp1_1)
<< QByteArray(QSslConfiguration::ALPNProtocolHTTP2)
<< QSslConfiguration::NextProtocolNegotiationNegotiated;
}
}
void tst_QSslSocket::nextProtocolNegotiation()
{
if (!QSslSocket::supportsSsl())
return;
QSslSocket socket;
QFETCH(bool, setConfiguration);
if (setConfiguration) {
QSslConfiguration conf = socket.sslConfiguration();
QFETCH(QList<QByteArray>, allowedProtocols);
conf.setAllowedNextProtocols(allowedProtocols);
socket.setSslConfiguration(conf);
}
QFETCH(QString, host);
socket.connectToHostEncrypted(host, 443);
socket.ignoreSslErrors();
QVERIFY(socket.waitForEncrypted(10000));
QFETCH(QByteArray, expectedProtocol);
QCOMPARE(socket.sslConfiguration().nextNegotiatedProtocol(), expectedProtocol);
QFETCH(QSslConfiguration::NextProtocolNegotiationStatus, expectedStatus);
QCOMPARE(socket.sslConfiguration().nextProtocolNegotiationStatus(), expectedStatus);
socket.disconnectFromHost();
QVERIFY(socket.waitForDisconnected());
}
#endif // QT_NO_SSL
QTEST_MAIN(tst_QSslSocket)
#include "main.moc"

6
tests/manual/qsslsocket/qsslsocket.pro
View File

@ -1,6 +0,0 @@
CONFIG += testcase
SOURCES += main.cpp
QT = core network testlib
TARGET = tst_manual_qsslsocket