diff options
Diffstat (limited to 'tests/auto/network/ssl/qsslellipticcurve')
3 files changed, 38 insertions, 48 deletions
diff --git a/tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt b/tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt index bf4d255d19..dd031a991b 100644 --- a/tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt +++ b/tests/auto/network/ssl/qsslellipticcurve/CMakeLists.txt @@ -1,12 +1,20 @@ -# Generated from qsslellipticcurve.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## tst_qsslellipticcurve Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qsslellipticcurve LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qsslellipticcurve SOURCES tst_qsslellipticcurve.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Network + BUNDLE_ANDROID_OPENSSL_LIBS ) diff --git a/tests/auto/network/ssl/qsslellipticcurve/qsslellipticcurve.pro b/tests/auto/network/ssl/qsslellipticcurve/qsslellipticcurve.pro deleted file mode 100644 index 7eae6ae864..0000000000 --- a/tests/auto/network/ssl/qsslellipticcurve/qsslellipticcurve.pro +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG += testcase - -SOURCES += tst_qsslellipticcurve.cpp -QT = core network testlib - -TARGET = tst_qsslellipticcurve diff --git a/tests/auto/network/ssl/qsslellipticcurve/tst_qsslellipticcurve.cpp b/tests/auto/network/ssl/qsslellipticcurve/tst_qsslellipticcurve.cpp index 7e268ddb62..96ef7e9828 100644 --- a/tests/auto/network/ssl/qsslellipticcurve/tst_qsslellipticcurve.cpp +++ b/tests/auto/network/ssl/qsslellipticcurve/tst_qsslellipticcurve.cpp @@ -1,33 +1,14 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Governikus GmbH & Co. KG. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include <QtTest/QtTest> +// Copyright (C) 2014 Governikus GmbH & Co. KG. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only + +#include <QTest> + +#include <QtNetwork/qtnetworkglobal.h> + +#if QT_CONFIG(ssl) +#include <QSslSocket> +#endif // ssl + #include <QSslEllipticCurve> #include <QSslConfiguration> @@ -35,30 +16,35 @@ class tst_QSslEllipticCurve : public QObject { Q_OBJECT -#ifndef QT_NO_SSL +#if QT_CONFIG(ssl) private Q_SLOTS: + void initTestCase(); void constExpr(); void construction(); void fromShortName_data(); void fromShortName(); void fromLongName_data(); void fromLongName(); -#endif +#endif // Feature 'ssl'. }; -#ifndef QT_NO_SSL +#if QT_CONFIG(ssl) + +void tst_QSslEllipticCurve::initTestCase() +{ + // At the moment only OpenSSL backend properly supports + // QSslEllipticCurve. + if (QSslSocket::activeBackend() != QStringLiteral("openssl")) + QSKIP("The active TLS backend does not support QSslEllipticCurve"); +} void tst_QSslEllipticCurve::constExpr() { -#ifdef Q_COMPILER_CONSTEXPR // check that default ctor and op ==/!= are constexpr: char array1[QSslEllipticCurve() == QSslEllipticCurve() ? 1 : -1]; char array2[QSslEllipticCurve() != QSslEllipticCurve() ? -1 : 1]; Q_UNUSED(array1); Q_UNUSED(array2); -#else - QSKIP("This test requires C++11 generalized constant expression support enabled in the compiler."); -#endif } void tst_QSslEllipticCurve::construction() @@ -79,7 +65,8 @@ void tst_QSslEllipticCurve::fromShortName_data() QTest::newRow("QString()") << QString() << QSslEllipticCurve() << false; QTest::newRow("\"\"") << QString("") << QSslEllipticCurve() << false; QTest::newRow("does-not-exist") << QStringLiteral("does-not-exist") << QSslEllipticCurve() << false; - Q_FOREACH (QSslEllipticCurve ec, QSslConfiguration::supportedEllipticCurves()) { + const auto supported = QSslConfiguration::supportedEllipticCurves(); + for (QSslEllipticCurve ec : supported) { const QString sN = ec.shortName(); QTest::newRow(qPrintable("supported EC \"" + sN + '"')) << sN << ec << true; // At least in the OpenSSL impl, the short name is case-sensitive. That feels odd. @@ -112,7 +99,8 @@ void tst_QSslEllipticCurve::fromLongName_data() QTest::newRow("QString()") << QString() << QSslEllipticCurve() << false; QTest::newRow("\"\"") << QString("") << QSslEllipticCurve() << false; QTest::newRow("does-not-exist") << QStringLiteral("does-not-exist") << QSslEllipticCurve() << false; - Q_FOREACH (QSslEllipticCurve ec, QSslConfiguration::supportedEllipticCurves()) { + const auto supported = QSslConfiguration::supportedEllipticCurves(); + for (QSslEllipticCurve ec : supported) { const QString lN = ec.longName(); QTest::newRow(qPrintable("supported EC \"" + lN + '"')) << lN << ec << true; } @@ -131,7 +119,7 @@ void tst_QSslEllipticCurve::fromLongName() QCOMPARE(result.longName(), valid ? longName : QString()); } -#endif // QT_NO_SSL +#endif // Feature 'ssl'. QTEST_MAIN(tst_QSslEllipticCurve) #include "tst_qsslellipticcurve.moc" |