Remove tst_manual_qsslsocket manual test as irrelevant
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:
parent
279c891ddf
commit
dca3467993
@ -47,7 +47,6 @@ endif()
|
|||||||
add_subdirectory(qstorageinfo)
|
add_subdirectory(qstorageinfo)
|
||||||
add_subdirectory(qscreen)
|
add_subdirectory(qscreen)
|
||||||
add_subdirectory(qscreen_xrandr)
|
add_subdirectory(qscreen_xrandr)
|
||||||
add_subdirectory(qsslsocket)
|
|
||||||
add_subdirectory(qsysinfo)
|
add_subdirectory(qsysinfo)
|
||||||
add_subdirectory(qtabletevent)
|
add_subdirectory(qtabletevent)
|
||||||
add_subdirectory(qtexteditlist)
|
add_subdirectory(qtexteditlist)
|
||||||
|
@ -32,7 +32,6 @@ qstorageinfo \
|
|||||||
qscreen \
|
qscreen \
|
||||||
qscreen_xrandr \
|
qscreen_xrandr \
|
||||||
qssloptions \
|
qssloptions \
|
||||||
qsslsocket \
|
|
||||||
qsysinfo \
|
qsysinfo \
|
||||||
qtabletevent \
|
qtabletevent \
|
||||||
qtexteditlist \
|
qtexteditlist \
|
||||||
|
@ -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
|
|
||||||
)
|
|
@ -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"
|
|
@ -1,6 +0,0 @@
|
|||||||
CONFIG += testcase
|
|
||||||
|
|
||||||
SOURCES += main.cpp
|
|
||||||
QT = core network testlib
|
|
||||||
|
|
||||||
TARGET = tst_manual_qsslsocket
|
|
Loading…
x
Reference in New Issue
Block a user