Add tests to the cmake build

Use QT_TESTCASE_SOURCEDIR instead of TESTS_SOURCE_DIR.
Introduce Test::HttpServer and Test::Util targets.
Query shared data location from server.

Clean up "shared" resources.

Note QT_TESTCASE_SOURCEDIR must be turned into the canonical form
since the user can call on windows:

"cmake \path\to\foo" instead of "cmake c:\path\to\foo" which
will break all file:// urls.

Note this patch breaks qmake builds.

Task-number: QTBUG-91760
Change-Id: Ibc1f904ac9acd375d1ff70ff80f0c533497e3f20
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

3 files changed, 9 insertions, 166 deletions

diff --git a/tests/auto/widgets/proxy/CMakeLists.txt b/tests/auto/widgets/proxy/CMakeLists.txt
new file mode 100644
index 000000000..0929c050c
--- /dev/null
+++ b/tests/auto/widgets/proxy/CMakeLists.txt
@@ -0,0 +1,9 @@
+include(../../httpserver/httpserver.cmake)
+
+qt_internal_add_test(tst_proxy
+    SOURCES
+        tst_proxy.cpp
+    LIBRARIES
+        Qt::WebEngineWidgets
+       Test::HttpServer
+)
diff --git a/tests/auto/widgets/proxy/proxy_server.cpp b/tests/auto/widgets/proxy/proxy_server.cpp
deleted file mode 100644
index 3e52de4f2..000000000
--- a/tests/auto/widgets/proxy/proxy_server.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2019 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module 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 "proxy_server.h"
-#include <QDataStream>
-#include <QTcpSocket>
-#include <QDebug>
-
-ProxyServer::ProxyServer(QObject *parent) : QObject(parent)
-{
-    connect(&m_server, &QTcpServer::newConnection, this, &ProxyServer::handleNewConnection);
-}
-
-void ProxyServer::setCredentials(const QByteArray &user, const QByteArray password)
-{
-    m_auth.append(user);
-    m_auth.append(':');
-    m_auth.append(password);
-    m_auth = m_auth.toBase64();
-    m_authenticate = true;
-}
-
-void ProxyServer::setCookie(const QByteArray &cookie)
-{
-    m_cookie.append(QByteArrayLiteral("Cookie: "));
-    m_cookie.append(cookie);
-}
-
-
-bool ProxyServer::isListening()
-{
-    return m_server.isListening();
-}
-
-void ProxyServer::run()
-{
-    if (!m_server.listen(QHostAddress::LocalHost, 5555))
-        qFatal("Could not start the test server");
-}
-
-void ProxyServer::handleNewConnection()
-{
-    // do one connection at the time
-    Q_ASSERT(m_data.isEmpty());
-    QTcpSocket *socket = m_server.nextPendingConnection();
-    Q_ASSERT(socket);
-    connect(socket, &QAbstractSocket::disconnected, socket, &QObject::deleteLater);
-    connect(socket, &QAbstractSocket::readyRead, this, &ProxyServer::handleReadReady);
-}
-
-void ProxyServer::handleReadReady()
-{
-    QTcpSocket *socket = qobject_cast<QTcpSocket*>(sender());
-    Q_ASSERT(socket);
-
-    m_data.append(socket->readAll());
-
-    if (!m_data.endsWith("\r\n\r\n"))
-        return;
-
-    if (m_authenticate && !m_data.contains(QByteArrayLiteral("Proxy-Authorization: Basic"))) {
-        socket->write("HTTP/1.1 407 Proxy Authentication Required\nProxy-Authenticate: "
-                      "Basic realm=\"Proxy requires authentication\"\r\n"
-                      "content-length: 0\r\n"
-                      "\r\n");
-        return;
-    }
-
-    if (m_authenticate && m_data.contains(m_auth)) {
-        emit authenticationSuccess();
-    }
-
-    if (m_data.contains(m_cookie)) {
-        emit cookieMatch();
-    }
-    m_data.clear();
-}
diff --git a/tests/auto/widgets/proxy/proxy_server.h b/tests/auto/widgets/proxy/proxy_server.h
deleted file mode 100644
index 7bc7b100b..000000000
--- a/tests/auto/widgets/proxy/proxy_server.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2019 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module 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$
-**
-****************************************************************************/
-
-#ifndef PROXY_SERVER_H
-#define PROXY_SERVER_H
-
-#include <QObject>
-#include <QTcpServer>
-
-class ProxyServer : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit ProxyServer(QObject *parent = nullptr);
-    void setCredentials(const QByteArray &user, const QByteArray password);
-    void setCookie(const QByteArray &cookie);
-    bool isListening();
-
-public slots:
-    void run();
-
-private slots:
-    void handleNewConnection();
-    void handleReadReady();
-
-signals:
-    void authenticationSuccess();
-    void cookieMatch();
-
-private:
-    QByteArray m_data;
-    QTcpServer m_server;
-    QByteArray m_auth;
-    QByteArray m_cookie;
-    bool m_authenticate = false;
-};
-
-#endif // PROXY_SERVER_H