diff options
Diffstat (limited to 'tests')
9 files changed, 275 insertions, 20 deletions
diff --git a/tests/auto/quick/qquickwebenginedefaultsurfaceformat/qquickwebenginedefaultsurfaceformat.pro b/tests/auto/quick/qquickwebenginedefaultsurfaceformat/qquickwebenginedefaultsurfaceformat.pro new file mode 100644 index 000000000..826b47de7 --- /dev/null +++ b/tests/auto/quick/qquickwebenginedefaultsurfaceformat/qquickwebenginedefaultsurfaceformat.pro @@ -0,0 +1,6 @@ +include(../tests.pri) + +exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc +QT_PRIVATE += webengine-private + +HEADERS += ../shared/util.h diff --git a/tests/auto/quick/qquickwebenginedefaultsurfaceformat/tst_qquickwebenginedefaultsurfaceformat.cpp b/tests/auto/quick/qquickwebenginedefaultsurfaceformat/tst_qquickwebenginedefaultsurfaceformat.cpp new file mode 100644 index 000000000..9f2060898 --- /dev/null +++ b/tests/auto/quick/qquickwebenginedefaultsurfaceformat/tst_qquickwebenginedefaultsurfaceformat.cpp @@ -0,0 +1,148 @@ +/**************************************************************************** +** +** Copyright (C) 2016 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 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later 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 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "testwindow.h" +#include "util.h" + +#include <QGuiApplication> +#include <QtQml/QQmlEngine> +#include <QScopedPointer> +#include <QSurfaceFormat> +#include <QtTest/QtTest> +#include <QTimer> +#include <private/qquickwebengineview_p.h> + +class tst_QQuickWebEngineDefaultSurfaceFormat : public QObject +{ + Q_OBJECT + +private Q_SLOTS: + void customDefaultSurfaceFormat(); + +private: + inline void initEngineAndViewComponent(); + inline void initWindow(); + inline void deleteWindow(); + + inline QQuickWebEngineView *newWebEngineView(); + inline QQuickWebEngineView *webEngineView() const; + QUrl urlFromTestPath(const char *localFilePath); + + QQmlEngine *m_engine; + TestWindow *m_window; + QScopedPointer<QQmlComponent> m_component; +}; + +void tst_QQuickWebEngineDefaultSurfaceFormat::initEngineAndViewComponent() { + m_engine = new QQmlEngine(this); + m_component.reset(new QQmlComponent(m_engine, this)); + m_component->setData(QByteArrayLiteral("import QtQuick 2.0\n" + "import QtWebEngine 1.2\n" + "WebEngineView {}") + , QUrl()); +} + +void tst_QQuickWebEngineDefaultSurfaceFormat::initWindow() +{ + m_window = new TestWindow(newWebEngineView()); +} + +void tst_QQuickWebEngineDefaultSurfaceFormat::deleteWindow() +{ + delete m_window; +} + +QQuickWebEngineView *tst_QQuickWebEngineDefaultSurfaceFormat::newWebEngineView() +{ + QObject *viewInstance = m_component->create(); + QQuickWebEngineView *webEngineView = qobject_cast<QQuickWebEngineView*>(viewInstance); + return webEngineView; +} + +inline QQuickWebEngineView *tst_QQuickWebEngineDefaultSurfaceFormat::webEngineView() const +{ + return static_cast<QQuickWebEngineView*>(m_window->webEngineView.data()); +} + +QUrl tst_QQuickWebEngineDefaultSurfaceFormat::urlFromTestPath(const char *localFilePath) +{ + QString testSourceDirPath = QString::fromLocal8Bit(TESTS_SOURCE_DIR); + if (!testSourceDirPath.endsWith(QLatin1Char('/'))) + testSourceDirPath.append(QLatin1Char('/')); + + return QUrl::fromLocalFile(testSourceDirPath + QString::fromUtf8(localFilePath)); +} + +void tst_QQuickWebEngineDefaultSurfaceFormat::customDefaultSurfaceFormat() +{ + // Setting a new default QSurfaceFormat with a core OpenGL profile, before + // app instantiation should succeed, without abort() being called. + int argc = 1; + char *argv[] = { const_cast<char*>("tst_QQuickWebEngineDefaultSurfaceFormat") }; + + QSurfaceFormat format; + format.setVersion( 3, 3 ); + format.setProfile( QSurfaceFormat::CoreProfile ); + QSurfaceFormat::setDefaultFormat( format ); + + QGuiApplication app(argc, argv); + QtWebEngine::initialize(); + + initEngineAndViewComponent(); + initWindow(); + QQuickWebEngineView* view = webEngineView(); + view->setUrl(urlFromTestPath("html/basic_page.html")); + m_window->show(); + + QObject::connect( + view, + &QQuickWebEngineView::loadingChanged, [](QQuickWebEngineLoadRequest* request) + { + if (request->status() == QQuickWebEngineView::LoadSucceededStatus + || request->status() == QQuickWebEngineView::LoadFailedStatus) + QTimer::singleShot(100, qApp, &QCoreApplication::quit); + } + ); + + QObject::connect(qApp, &QCoreApplication::aboutToQuit, [this]() { + this->deleteWindow(); + }); + + QCOMPARE(app.exec(), 0); +} + +QTEST_APPLESS_MAIN(tst_QQuickWebEngineDefaultSurfaceFormat) +#include "tst_qquickwebenginedefaultsurfaceformat.moc" diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro index 33821e20b..b278808f6 100644 --- a/tests/auto/quick/quick.pro +++ b/tests/auto/quick/quick.pro @@ -3,6 +3,7 @@ TEMPLATE = subdirs SUBDIRS += \ inspectorserver \ publicapi \ + qquickwebenginedefaultsurfaceformat \ qquickwebengineview \ qquickwebengineviewgraphics diff --git a/tests/auto/widgets/qwebenginedefaultsurfaceformat/qwebenginedefaultsurfaceformat.pro b/tests/auto/widgets/qwebenginedefaultsurfaceformat/qwebenginedefaultsurfaceformat.pro new file mode 100644 index 000000000..e99c7f493 --- /dev/null +++ b/tests/auto/widgets/qwebenginedefaultsurfaceformat/qwebenginedefaultsurfaceformat.pro @@ -0,0 +1 @@ +include(../tests.pri) diff --git a/tests/auto/widgets/qwebenginedefaultsurfaceformat/resources/index.html b/tests/auto/widgets/qwebenginedefaultsurfaceformat/resources/index.html new file mode 100644 index 000000000..53726e4a6 --- /dev/null +++ b/tests/auto/widgets/qwebenginedefaultsurfaceformat/resources/index.html @@ -0,0 +1,6 @@ +<html> +<head> +<title> Basic Page </title> +</head> +<h1>Basic page</h1> +</html> diff --git a/tests/auto/widgets/qwebenginedefaultsurfaceformat/tst_qwebenginedefaultsurfaceformat.cpp b/tests/auto/widgets/qwebenginedefaultsurfaceformat/tst_qwebenginedefaultsurfaceformat.cpp new file mode 100644 index 000000000..e42a8a75e --- /dev/null +++ b/tests/auto/widgets/qwebenginedefaultsurfaceformat/tst_qwebenginedefaultsurfaceformat.cpp @@ -0,0 +1,77 @@ +/**************************************************************************** +** +** Copyright (C) 2016 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 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later 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 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <qtest.h> +#include "../util.h" + +#include <QSurfaceFormat> +#include <QTimer> +#include <qwebengineview.h> + +class tst_QWebEngineDefaultSurfaceFormat : public QObject +{ + Q_OBJECT + +private Q_SLOTS: + void customDefaultSurfaceFormat(); +}; + +void tst_QWebEngineDefaultSurfaceFormat::customDefaultSurfaceFormat() +{ + // Setting a new default QSurfaceFormat with a core OpenGL profile before + // app instantiation should succeed, without abort() being called. + int argc = 1; + char *argv[] = { const_cast<char*>("tst_QWebEngineDefaultSurfaceFormat") }; + + QSurfaceFormat format; + format.setVersion( 3, 3 ); + format.setProfile( QSurfaceFormat::CoreProfile ); + QSurfaceFormat::setDefaultFormat( format ); + + QApplication app(argc, argv); + + QWebEngineView view; + view.load(QUrl("qrc:///resources/index.html")); + view.show(); + QObject::connect(&view, &QWebEngineView::loadFinished, []() { + QTimer::singleShot(100, qApp, &QCoreApplication::quit); + }); + + QCOMPARE(app.exec(), 0); +} + +QTEST_APPLESS_MAIN(tst_QWebEngineDefaultSurfaceFormat) +#include "tst_qwebenginedefaultsurfaceformat.moc" diff --git a/tests/auto/widgets/qwebenginedefaultsurfaceformat/tst_qwebenginedefaultsurfaceformat.qrc b/tests/auto/widgets/qwebenginedefaultsurfaceformat/tst_qwebenginedefaultsurfaceformat.qrc new file mode 100644 index 000000000..3d5f1b3b2 --- /dev/null +++ b/tests/auto/widgets/qwebenginedefaultsurfaceformat/tst_qwebenginedefaultsurfaceformat.qrc @@ -0,0 +1,5 @@ +<!DOCTYPE RCC><RCC version="1.0"> +<qresource> + <file>resources/index.html</file> +</qresource> +</RCC> diff --git a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp index 8c23af7ee..26980df7b 100644 --- a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp +++ b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp @@ -31,9 +31,10 @@ #include <QtTest/QtTest> #include <QtWebEngineCore/qwebengineurlrequestjob.h> #include <QtWebEngineCore/qwebengineurlschemehandler.h> +#include <QtWebEngineWidgets/qwebengineprofile.h> +#include <QtWebEngineWidgets/qwebenginepage.h> +#include <QtWebEngineWidgets/qwebenginesettings.h> #include <QtWebEngineWidgets/qwebengineview.h> -#include <qwebengineprofile.h> -#include <qwebenginepage.h> class tst_QWebEngineProfile : public QObject { @@ -171,52 +172,61 @@ public: } }; +static bool loadSync(QWebEngineView *view, const QUrl &url, int timeout = 5000) +{ + // Ripped off QTRY_VERIFY. + QSignalSpy loadFinishedSpy(view, SIGNAL(loadFinished(bool))); + view->load(url); + if (loadFinishedSpy.isEmpty()) + QTest::qWait(0); + for (int i = 0; i < timeout; i += 50) { + if (!loadFinishedSpy.isEmpty()) + return true; + QTest::qWait(50); + } + return false; +} + void tst_QWebEngineProfile::urlSchemeHandlers() { - RedirectingUrlSchemeHandler mailtoHandler; + RedirectingUrlSchemeHandler lettertoHandler; QWebEngineProfile profile(QStringLiteral("urlSchemeHandlers")); - profile.installUrlSchemeHandler("mailto", &mailtoHandler); + profile.installUrlSchemeHandler("letterto", &lettertoHandler); QWebEngineView view; - QSignalSpy loadFinishedSpy(&view, SIGNAL(loadFinished(bool))); view.setPage(new QWebEnginePage(&profile, &view)); + view.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, false); QString emailAddress = QStringLiteral("egon@olsen-banden.dk"); - view.load(QUrl(QStringLiteral("mailto:") + emailAddress)); - QVERIFY(loadFinishedSpy.wait()); + QVERIFY(loadSync(&view, QUrl(QStringLiteral("letterto:") + emailAddress))); QCOMPARE(toPlainTextSync(view.page()), emailAddress); // Install a gopher handler after the view has been fully initialized. ReplyingUrlSchemeHandler gopherHandler; profile.installUrlSchemeHandler("gopher", &gopherHandler); QUrl url = QUrl(QStringLiteral("gopher://olsen-banden.dk/benny")); - view.load(url); - QVERIFY(loadFinishedSpy.wait()); + QVERIFY(loadSync(&view, url)); QCOMPARE(toPlainTextSync(view.page()), url.toString()); - // Remove the mailto scheme, and check whether it is not handled anymore. - profile.removeUrlScheme("mailto"); + // Remove the letterto scheme, and check whether it is not handled anymore. + profile.removeUrlScheme("letterto"); emailAddress = QStringLiteral("kjeld@olsen-banden.dk"); - view.load(QUrl(QStringLiteral("mailto:") + emailAddress)); - QVERIFY(loadFinishedSpy.wait()); + QVERIFY(loadSync(&view, QUrl(QStringLiteral("letterto:") + emailAddress))); QVERIFY(toPlainTextSync(view.page()) != emailAddress); - // Check if gopher is still working after removing mailto. + // Check if gopher is still working after removing letterto. url = QUrl(QStringLiteral("gopher://olsen-banden.dk/yvonne")); - view.load(url); - QVERIFY(loadFinishedSpy.wait()); + QVERIFY(loadSync(&view, url)); QCOMPARE(toPlainTextSync(view.page()), url.toString()); // Does removeAll work? profile.removeAllUrlSchemeHandlers(); url = QUrl(QStringLiteral("gopher://olsen-banden.dk/harry")); - view.load(url); - QVERIFY(loadFinishedSpy.wait()); + QVERIFY(loadSync(&view, url)); QVERIFY(toPlainTextSync(view.page()) != url.toString()); // Install a handler that is owned by the view. Make sure this doesn't crash on shutdown. profile.installUrlSchemeHandler("aviancarrier", new ReplyingUrlSchemeHandler(&view)); url = QUrl(QStringLiteral("aviancarrier:inspector.mortensen@politistyrke.dk")); - view.load(url); - QVERIFY(loadFinishedSpy.wait()); + QVERIFY(loadSync(&view, url)); QCOMPARE(toPlainTextSync(view.page()), url.toString()); } diff --git a/tests/auto/widgets/widgets.pro b/tests/auto/widgets/widgets.pro index c65d7dd6c..6c516b38f 100644 --- a/tests/auto/widgets/widgets.pro +++ b/tests/auto/widgets/widgets.pro @@ -2,6 +2,7 @@ TEMPLATE = subdirs SUBDIRS += \ qwebengineaccessibility \ + qwebenginedefaultsurfaceformat \ qwebenginefaviconmanager \ qwebenginepage \ qwebenginehistory \ |