QHttpServer auto-tests: use a function provided by QTest

Instead of having code-duplicates.

Pick-to: 6.9 6.8
Task-number: QTBUG-132645
Change-Id: I6976ae44a0ab14857d71d1cd6eef3cc09e40db34
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

tests/auto/qabstracthttpserver/CMakeLists.txt

@@ -13,4 +13,5 @@ qt_internal_add_test(tst_qabstracthttpserver
     LIBRARIES
         Qt::HttpServer
         Qt::NetworkPrivate
+        Qt::TestPrivate
 )

tests/auto/qabstracthttpserver/tst_qabstracthttpserver.cpp

@@ -12,8 +12,6 @@
 #include <QtTest/qtesteventloop.h>
 
 #include <QtCore/qregularexpression.h>
-#include <QtCore/qoperatingsystemversion.h>
-#include <QtCore/qsystemdetection.h>
 #include <QtCore/qurl.h>
 #include <QtHttpServer/qhttpserverrequest.h>
 #include <QtHttpServer/qhttpserverresponder.h>
@@ -36,6 +34,8 @@
 #include <QtNetwork/private/qhttp2connection_p.h>
 #endif
 
+#include <QtTest/private/qtesthelpers_p.h>
+
 #if QT_CONFIG(ssl)
 
 constexpr char g_privateKey[] = R"(-----BEGIN RSA PRIVATE KEY-----
@@ -417,18 +417,10 @@ void tst_QAbstractHttpServer::verifyWebSocketUpgrades()
     tcpServer.listen();
     server.bind(&tcpServer);
 #if QT_CONFIG(ssl)
-#ifdef Q_OS_MACOS
-#if !QT_MACOS_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(150000, 180000)
-    // Starting from macOS 15 our temporary keychain is ignored.
-    // We have to use kSecImportToMemoryOnly/kCFBooleanTrue key/value
-    // instead. This way we don't have to use QT_SSL_USE_TEMPORARY_KEYCHAIN anymore.
-    if (QSslSocket::activeBackend() == QLatin1String("securetransport")
-        && QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSSequoia) {
+    if (QTestPrivate::isSecureTransportBlockingTest()) {
         // We were built with SDK below 15, but a file-based keychains are not working anymore on macOS 15...
         QSKIP("This test will block in keychain access");
     }
-#endif // QT_MACOS_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE
-#endif // Q_OS_MACOS
 
     QSslServer sslServer;
     QSslConfiguration sslConfiguration = QSslConfiguration::defaultConfiguration();

tests/auto/qhttpserver/CMakeLists.txt

@@ -15,6 +15,7 @@ qt_internal_add_test(tst_qhttpserver
         tst_qhttpserver.cpp
     LIBRARIES
         Qt::HttpServer
+        Qt::TestPrivate
     TESTDATA ${test_data}
 )
 

tests/auto/qhttpserver/tst_qhttpserver.cpp

@@ -10,8 +10,6 @@
 
 #include <QtConcurrent/qtconcurrentrun.h>
 
-#include <QtCore/qoperatingsystemversion.h>
-#include <QtCore/qsystemdetection.h>
 #include <QtCore/qurl.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qlist.h>
@@ -41,6 +39,8 @@
 #include <QtNetwork/qlocalsocket.h>
 #endif
 
+#include <QtTest/private/qtesthelpers_p.h>
+
 #include <array>
 
 QT_BEGIN_NAMESPACE
@@ -133,27 +133,6 @@ ignL7f4e1m2jh0oWTLhuP1hnVFN4KAKpVIJXhbEkH59cLCN6ARXiEHCM9rmK5Rgk
 NQZlAZc2w1Ha9lqisaWWpt42QVhQM64=
 -----END CERTIFICATE-----)";
 
-// Check if it's a macOS-build-with-SDK14 running on macOS 15:
-bool sslServerIsBlockingKeychain()
-{
-#ifdef Q_OS_MACOS
-    if (QSslSocket::activeBackend() != QLatin1String("securetransport"))
-        return false;
-#if QT_MACOS_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(150000, 180000)
-    // Starting from macOS 15 our temporary keychain is ignored.
-    // We have to use kSecImportToMemoryOnly/kCFBooleanTrue key/value
-    // instead. This way we don't have to use QT_SSL_USE_TEMPORARY_KEYCHAIN anymore.
-    return false;
-#else
-    if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSSequoia) {
-        // We were built with SDK below 15, but a file-based keychains are not working anymore on macOS 15...
-        return true;
-    }
-#endif
-#endif // Q_OS_MACOS
-    return false;
-}
-
 #endif // QT_CONFIG(ssl)
 
 using namespace Qt::StringLiterals;
@@ -562,7 +541,7 @@ void tst_QHttpServer::init()
 {
 #if QT_CONFIG(ssl)
     QFETCH_GLOBAL(const bool, useSsl);
-    if (useSsl && sslServerIsBlockingKeychain())
+    if (useSsl && QTestPrivate::isSecureTransportBlockingTest())
         QSKIP("SslServer is blocking the test execution while trying to access the login keychain");
 #endif // QT_CONFIG(ssl)
 }

tests/auto/qhttpservermultithreaded/CMakeLists.txt

@@ -9,5 +9,5 @@ qt_internal_add_test(tst_qhttpservermultithreaded
     SOURCES
         tst_qhttpservermultithreaded.cpp
     LIBRARIES
-        Qt::HttpServer Qt::Concurrent
+        Qt::HttpServer Qt::Concurrent Qt::TestPrivate
 )

tests/auto/qhttpservermultithreaded/tst_qhttpservermultithreaded.cpp

@@ -7,8 +7,6 @@
 #include <QtTest/qtest.h>
 #include <QtConcurrent/qtconcurrentrun.h>
 
-#include <QtCore/qoperatingsystemversion.h>
-#include <QtCore/qsystemdetection.h>
 #include <QtCore/qbytearray.h>
 #include <QtCore/qlist.h>
 #include <QtCore/qurl.h>
@@ -30,6 +28,8 @@
 #include <QtNetwork/qsslkey.h>
 #include <QtNetwork/qsslserver.h>
 
+#include <QtTest/private/qtesthelpers_p.h>
+
 constexpr char g_privateKey[] = R"(-----BEGIN RSA PRIVATE KEY-----
 MIIJKAIBAAKCAgEAvdrtZtVquwiG12+vd3OjRVibdK2Ob73DOOWgb5rIgQ+B2Uzc
 OFa0xsiRyc/bam9CEEqgn5YHSn95LJHvN3dbsA8vrFqIXTkisFAuHJqsmsYZbAIi
@@ -428,30 +428,10 @@ QString tst_QHttpServerMultithreaded::toString(qsizetype input) const
 
 void tst_QHttpServerMultithreaded::initTestCase_data()
 {
-    // Check if it's a macOS-build-with-SDK14 running on macOS 15:
-    auto sslServerIsBlockingKeychain = []
-    {
-    #ifdef Q_OS_MACOS
-    #if QT_MACOS_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(150000, 180000)
-        // Starting from macOS 15 our temporary keychain is ignored.
-        // We have to use kSecImportToMemoryOnly/kCFBooleanTrue key/value
-        // instead. This way we don't have to use QT_SSL_USE_TEMPORARY_KEYCHAIN anymore.
-        return false;
-    #else
-        if (QSslSocket::activeBackend() == QLatin1String("securetransport")
-            && QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSSequoia) {
-            // We were built with SDK below 15, but a file-based keychains are not working anymore on macOS 15...
-            return true;
-        }
-    #endif // QT_MACOS_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE
-    #endif // Q_OS_MACOS
-        return false;
-    };
-
     QTest::addColumn<ServerType>("serverType");
     QTest::addRow("TCP") << ServerType::TCP;
 #if QT_CONFIG(ssl)
-    if (QSslSocket::supportsSsl() && !sslServerIsBlockingKeychain())
+    if (QSslSocket::supportsSsl() && !QTestPrivate::isSecureTransportBlockingTest())
         QTest::addRow("SSL") << ServerType::SSL;
     else if (QSslSocket::supportsSsl())
         qInfo("Not testing TLS, keychain access will block the test");