diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2020-08-12 09:41:40 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2020-08-18 12:10:55 +0200 |
| commit | 09222ab2cd57d2412ce6cbf9b32a6b1d88cd719a (patch) | |
| tree | 2e58e0538452187ed7f1d06e3800e1e85bda567e /tests/auto/quick/qmltests | |
| parent | 7b6f30c13717654ec3b95e67edde88a03da45e22 (diff) | |
Check for ssl when compling qml tests
Do not include certificate error qml test if no ssl.
This change does some copy-paste but this will
be handled in qt6.
Change-Id: I8cc6d37074d78ca9f55333f479fb410ef927385d
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'tests/auto/quick/qmltests')
| -rw-r--r-- | tests/auto/quick/qmltests/data/tst_certificateError.qml | 114 | ||||
| -rw-r--r-- | tests/auto/quick/qmltests/qmltests.pro | 1 | ||||
| -rw-r--r-- | tests/auto/quick/qmltests/tst_qmltests.cpp | 5 |
3 files changed, 0 insertions, 120 deletions
diff --git a/tests/auto/quick/qmltests/data/tst_certificateError.qml b/tests/auto/quick/qmltests/data/tst_certificateError.qml deleted file mode 100644 index 0629be175..000000000 --- a/tests/auto/quick/qmltests/data/tst_certificateError.qml +++ /dev/null @@ -1,114 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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$ -** -****************************************************************************/ - -import QtQuick 2.2 -import QtTest 1.0 -import QtWebEngine 1.9 - -import Test.Shared 1.0 as Shared - -TestWebEngineView { - id: view; width: 320; height: 320 - - property bool deferError: false - property bool acceptCertificate: false - - onCertificateError: function(error) { - if (deferError) - error.defer() - else if (acceptCertificate) - error.ignoreCertificateError() - else - error.rejectCertificate() - } - - SignalSpy { - id: spyError - target: view - signalName: 'certificateError' - } - - TestCase { - name: 'CertificateError' - when: windowShown - - function initTestCase() { - Shared.HttpsServer.setExpectError(true) - Shared.HttpsServer.newRequest.connect(function (request) { - request.setResponseBody('<html><body>Test</body></html>') - request.sendResponse() - }) - view.settings.errorPageEnabled = false - } - - function init() { - verify(Shared.HttpsServer.start()) - } - - function cleanup() { - Shared.HttpsServer.stop() - view.deferError = false - view.acceptCertificate = false - spyError.clear() - } - - function test_error_data() { - return [ - { tag: 'reject', deferError: false, acceptCertificate: false, expectedContent: '' }, - { tag: 'defer_reject', deferError: true, acceptCertificate: false, expectedContent: '' }, - { tag: 'defer_accept', deferError: true, acceptCertificate: true, expectedContent: 'Test' }, - ] - } - - function test_error(data) { - view.deferError = data.deferError - view.acceptCertificate = data.acceptCertificate - view.url = Shared.HttpsServer.url() - - if (data.deferError) { - spyError.wait() - compare(spyError.count, 1) - compare('', view.getBodyText()) - - let error = spyError.signalArguments[0][0] - if (data.acceptCertificate) - error.ignoreCertificateError() - else - error.rejectCertificate() - } - - if (data.acceptCertificate) - verify(view.waitForLoadSucceeded()) - else - verify(view.waitForLoadFailed()) - - compare(spyError.count, 1) - compare(data.expectedContent, view.getBodyText()) - } - } -} diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro index 6bec6dc0d..5c57f7ad9 100644 --- a/tests/auto/quick/qmltests/qmltests.pro +++ b/tests/auto/quick/qmltests/qmltests.pro @@ -1,5 +1,4 @@ include(../tests.pri) -include(../../shared/https.pri) QT += qmltest diff --git a/tests/auto/quick/qmltests/tst_qmltests.cpp b/tests/auto/quick/qmltests/tst_qmltests.cpp index 0d830931d..819f0b07c 100644 --- a/tests/auto/quick/qmltests/tst_qmltests.cpp +++ b/tests/auto/quick/qmltests/tst_qmltests.cpp @@ -26,8 +26,6 @@ ** ****************************************************************************/ -#include <httpsserver.h> - #include <QtCore/QScopedPointer> #include <QTemporaryDir> #include <QtQuickTest/quicktest.h> @@ -145,9 +143,6 @@ int main(int argc, char **argv) qmlRegisterType<TempDir>("Test.util", 1, 0, "TempDir"); QTEST_SET_MAIN_SOURCE_PATH - - qmlRegisterSingletonType<HttpsServer>("Test.Shared", 1, 0, "HttpsServer", [&] (QQmlEngine *, QJSEngine *) { return new HttpsServer; }); - int i = quick_test_main(argc, argv, "qmltests", QUICK_TEST_SOURCE_DIR); return i; } |