diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt index 267ee7deb33..6e3dd8aedcf 100644 --- a/tests/manual/CMakeLists.txt +++ b/tests/manual/CMakeLists.txt @@ -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) diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index c3bfad32e9a..d2774a6e6e5 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -32,7 +32,6 @@ qstorageinfo \ qscreen \ qscreen_xrandr \ qssloptions \ -qsslsocket \ qsysinfo \ qtabletevent \ qtexteditlist \ diff --git a/tests/manual/qsslsocket/CMakeLists.txt b/tests/manual/qsslsocket/CMakeLists.txt deleted file mode 100644 index 59f902a3018..00000000000 --- a/tests/manual/qsslsocket/CMakeLists.txt +++ /dev/null @@ -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 -) diff --git a/tests/manual/qsslsocket/main.cpp b/tests/manual/qsslsocket/main.cpp deleted file mode 100644 index cc3cdb92d6a..00000000000 --- a/tests/manual/qsslsocket/main.cpp +++ /dev/null @@ -1,127 +0,0 @@ -// Copyright (C) 2014 BlackBerry Limited. All rights reserved. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only - - -#include -#include -#include - -#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("setConfiguration"); - QTest::addColumn("host"); - QTest::addColumn >("allowedProtocols"); - QTest::addColumn("expectedProtocol"); - QTest::addColumn("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() - << QSslConfiguration::NextProtocolNegotiationNone; - - tag = host.toLocal8Bit(); - tag.append("-none-explicit"); - QTest::newRow(tag) - << true - << host - << QList() - << QByteArray() - << QSslConfiguration::NextProtocolNegotiationNone; - - tag = host.toLocal8Bit(); - tag.append("-http/1.1"); - QTest::newRow(tag) - << true - << host - << (QList() << QSslConfiguration::NextProtocolHttp1_1) - << QByteArray(QSslConfiguration::NextProtocolHttp1_1) - << QSslConfiguration::NextProtocolNegotiationNegotiated; - - tag = host.toLocal8Bit(); - tag.append("-h2"); - QTest::newRow(tag) - << true - << host - << (QList() << QSslConfiguration::ALPNProtocolHTTP2) - << QByteArray(QSslConfiguration::ALPNProtocolHTTP2) - << QSslConfiguration::NextProtocolNegotiationNegotiated; - - tag = host.toLocal8Bit(); - tag.append("-h2-and-http/1.1"); - QTest::newRow(tag) - << true - << host - << (QList() << 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, 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" diff --git a/tests/manual/qsslsocket/qsslsocket.pro b/tests/manual/qsslsocket/qsslsocket.pro deleted file mode 100644 index 511d31898fa..00000000000 --- a/tests/manual/qsslsocket/qsslsocket.pro +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG += testcase - -SOURCES += main.cpp -QT = core network testlib - -TARGET = tst_manual_qsslsocket