diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-18 09:47:34 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-18 10:08:28 +0200 |
commit | e53ddd7b7ec0ca766557d947031820986f11b1a2 (patch) | |
tree | 19f7d4c09af27da94bda2dd0ff647b1913b70a67 /tests | |
parent | 13d03ef21d3bd67595bd0b36be7401f6e6bcbbd6 (diff) | |
parent | dd7b409388949bc628af75a6e65474d699c416d3 (diff) |
Merge branch '5.5' into 5.6
Change-Id: I9977663123560a22f493b8c02d02de8897b38666
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/quick/qmltests/data/download.zip | bin | 0 -> 325 bytes | |||
-rw-r--r-- | tests/auto/quick/qmltests/data/tst_download.qml | 139 | ||||
-rw-r--r-- | tests/auto/quick/qmltests/qmltests.pro | 2 | ||||
-rw-r--r-- | tests/auto/widgets/tests.pri | 8 |
4 files changed, 141 insertions, 8 deletions
diff --git a/tests/auto/quick/qmltests/data/download.zip b/tests/auto/quick/qmltests/data/download.zip Binary files differnew file mode 100644 index 000000000..b5456351a --- /dev/null +++ b/tests/auto/quick/qmltests/data/download.zip diff --git a/tests/auto/quick/qmltests/data/tst_download.qml b/tests/auto/quick/qmltests/data/tst_download.qml new file mode 100644 index 000000000..ffd7041e3 --- /dev/null +++ b/tests/auto/quick/qmltests/data/tst_download.qml @@ -0,0 +1,139 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the QtWebEngine module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtTest 1.0 +import QtWebEngine 1.1 + +TestWebEngineView { + id: webEngineView + width: 200 + height: 200 + profile: testDownloadProfile + + property int totalBytes: 0 + property int receivedBytes: 0 + property bool cancelDownload: false + property var downloadState: [] + + SignalSpy { + id: downLoadRequestedSpy + target: testDownloadProfile + signalName: "downloadRequested" + } + + SignalSpy { + id: downloadFinishedSpy + target: testDownloadProfile + signalName: "downloadFinished" + } + + WebEngineProfile { + id: testDownloadProfile + + onDownloadRequested: { + downloadState.push(download.state) + if (cancelDownload) { + download.cancel() + downloadState.push(download.state) + } else { + totalBytes = download.totalBytes + download.path = "testfile.zip" + download.accept() + downloadState.push(download.state) + } + } + onDownloadFinished: { + downloadState.push(download.state) + receivedBytes = download.receivedBytes; + } + } + + TestCase { + name: "WebEngineViewDownload" + + function init() { + downLoadRequestedSpy.clear() + downloadFinishedSpy.clear() + totalBytes = 0 + receivedBytes = 0 + cancelDownload = false + downloadState = [] + } + + function test_downloadRequest() { + compare(downLoadRequestedSpy.count, 0) + webEngineView.url = Qt.resolvedUrl("download.zip") + downLoadRequestedSpy.wait() + compare(downLoadRequestedSpy.count, 1) + compare(downloadState[0], WebEngineDownloadItem.DownloadRequested) + } + + function test_totalFileLength() { + compare(downLoadRequestedSpy.count, 0) + webEngineView.url = Qt.resolvedUrl("download.zip") + downLoadRequestedSpy.wait() + compare(downLoadRequestedSpy.count, 1) + compare(totalBytes, 325) + } + + function test_downloadSucceeded() { + compare(downLoadRequestedSpy.count, 0) + webEngineView.url = Qt.resolvedUrl("download.zip") + downLoadRequestedSpy.wait() + compare(downLoadRequestedSpy.count, 1) + compare(downloadState[1], WebEngineDownloadItem.DownloadInProgress) + downloadFinishedSpy.wait() + compare(totalBytes, receivedBytes) + compare(downloadState[2], WebEngineDownloadItem.DownloadCompleted) + } + + function test_downloadCancelled() { + compare(downLoadRequestedSpy.count, 0) + cancelDownload = true + webEngineView.url = Qt.resolvedUrl("download.zip") + downLoadRequestedSpy.wait() + compare(downLoadRequestedSpy.count, 1) + compare(downloadFinishedSpy.count, 1) + compare(downloadState[2], WebEngineDownloadItem.DownloadCancelled) + } + } +} diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro index 6776c1aa6..aac0c449c 100644 --- a/tests/auto/quick/qmltests/qmltests.pro +++ b/tests/auto/quick/qmltests/qmltests.pro @@ -10,6 +10,7 @@ OTHER_FILES += \ $$PWD/data/append-document-title.js \ $$PWD/data/big-user-script.js \ $$PWD/data/change-document-title.js \ + $$PWD/data/download.zip \ $$PWD/data/confirm.html \ $$PWD/data/directoryupload.html \ $$PWD/data/favicon.html \ @@ -30,6 +31,7 @@ OTHER_FILES += \ $$PWD/data/keyboardModifierMapping.html \ $$PWD/data/titleupdate.js \ $$PWD/data/tst_desktopBehaviorLoadHtml.qml \ + $$PWD/data/tst_download.qml \ $$PWD/data/tst_favIconLoad.qml \ $$PWD/data/tst_filePicker.qml \ $$PWD/data/tst_formValidation.qml \ diff --git a/tests/auto/widgets/tests.pri b/tests/auto/widgets/tests.pri index f14afb598..8d86ac93e 100644 --- a/tests/auto/widgets/tests.pri +++ b/tests/auto/widgets/tests.pri @@ -8,14 +8,6 @@ CONFIG += c++11 VPATH += $$_PRO_FILE_PWD_ TARGET = tst_$$TARGET -# Load mobilityconfig if Qt Mobility is available -load(mobilityconfig, true) -contains(MOBILITY_CONFIG, multimedia) { - # This define is used by tests depending on Qt Multimedia - DEFINES -= WTF_USE_QT_MULTIMEDIA=0 - DEFINES += WTF_USE_QT_MULTIMEDIA=1 -} - SOURCES += $${TARGET}.cpp INCLUDEPATH += $$PWD |