diff options
author | Szabolcs David <davidsz@inf.u-szeged.hu> | 2014-05-30 06:37:23 -0700 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-05 00:23:00 +0200 |
commit | e3e23087e11d51112e8ce2c46e92927ce1309d2d (patch) | |
tree | cc9f6bbb7e05b971444328c16990a68a7822b853 /tests | |
parent | a81880e62c388c8840417a6cec1c67f43d4b5fd9 (diff) |
Fix typos and warnings in the Quick tests
- Add valid size to tst_faviconLoad.qml
- Add missing files to qmltests.pro
- Rename test cases and files from WebView to WebEngineView
Change-Id: I40163117a11672b18230046a1604624bc4620dba
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/quick/qmltests/data/tst_favIconLoad.qml | 2 | ||||
-rw-r--r-- | tests/auto/quick/qmltests/data/tst_navigationHistory.qml | 2 | ||||
-rw-r--r-- | tests/auto/quick/qmltests/qmltests.pro | 3 | ||||
-rw-r--r-- | tests/auto/quick/qquickwebengineviewgraphics/qquickwebengineviewgraphics.pro (renamed from tests/auto/quick/qquickwebviewgraphics/qquickwebviewgraphics.pro) | 0 | ||||
-rw-r--r-- | tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp (renamed from tests/auto/quick/qquickwebviewgraphics/tst_qquickwebviewgraphics.cpp) | 32 | ||||
-rw-r--r-- | tests/auto/quick/quick.pro | 2 |
6 files changed, 23 insertions, 18 deletions
diff --git a/tests/auto/quick/qmltests/data/tst_favIconLoad.qml b/tests/auto/quick/qmltests/data/tst_favIconLoad.qml index 38276f950..9df8bbb65 100644 --- a/tests/auto/quick/qmltests/data/tst_favIconLoad.qml +++ b/tests/auto/quick/qmltests/data/tst_favIconLoad.qml @@ -45,6 +45,8 @@ import QtWebEngine 0.9 TestWebEngineView { id: webEngineView + width: 200 + height: 400 SignalSpy { id: spy diff --git a/tests/auto/quick/qmltests/data/tst_navigationHistory.qml b/tests/auto/quick/qmltests/data/tst_navigationHistory.qml index 17472d2f1..8162bab5e 100644 --- a/tests/auto/quick/qmltests/data/tst_navigationHistory.qml +++ b/tests/auto/quick/qmltests/data/tst_navigationHistory.qml @@ -74,7 +74,7 @@ TestWebEngineView { } TestCase { - name: "WebViewNavigationHistory" + name: "WebEngineViewNavigationHistory" function test_navigationHistory() { compare(webEngineView.loadProgress, 0) diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro index b2661552d..e6a68b950 100644 --- a/tests/auto/quick/qmltests/qmltests.pro +++ b/tests/auto/quick/qmltests/qmltests.pro @@ -11,10 +11,12 @@ OTHER_FILES += \ $$PWD/data/favicon.html \ $$PWD/data/favicon.png \ $$PWD/data/favicon2.html \ + $$PWD/data/javascript.html \ $$PWD/data/link.html \ $$PWD/data/redirect.html \ $$PWD/data/small-favicon.png \ $$PWD/data/test1.html \ + $$PWD/data/test2.html \ $$PWD/data/test3.html \ $$PWD/data/tst_desktopBehaviorLoadHtml.qml \ $$PWD/data/tst_favIconLoad.qml \ @@ -24,6 +26,7 @@ OTHER_FILES += \ $$PWD/data/tst_loadProgress.qml \ $$PWD/data/tst_loadProgressSignal.qml \ $$PWD/data/tst_loadUrl.qml \ + $$PWD/data/tst_navigationHistory.qml \ $$PWD/data/tst_properties.qml \ $$PWD/data/tst_runJavaScript.qml \ $$PWD/data/tst_titleChanged.qml diff --git a/tests/auto/quick/qquickwebviewgraphics/qquickwebviewgraphics.pro b/tests/auto/quick/qquickwebengineviewgraphics/qquickwebengineviewgraphics.pro index ff6c49628..ff6c49628 100644 --- a/tests/auto/quick/qquickwebviewgraphics/qquickwebviewgraphics.pro +++ b/tests/auto/quick/qquickwebengineviewgraphics/qquickwebengineviewgraphics.pro diff --git a/tests/auto/quick/qquickwebviewgraphics/tst_qquickwebviewgraphics.cpp b/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp index 38a43f3b6..ad72ea0cc 100644 --- a/tests/auto/quick/qquickwebviewgraphics/tst_qquickwebviewgraphics.cpp +++ b/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp @@ -58,12 +58,12 @@ Q_SIGNALS: void exposeChanged(); }; -class tst_QQuickWebViewGraphics : public QObject +class tst_QQuickWebEngineViewGraphics : public QObject { Q_OBJECT public: - tst_QQuickWebViewGraphics(); - virtual ~tst_QQuickWebViewGraphics(); + tst_QQuickWebEngineViewGraphics(); + virtual ~tst_QQuickWebEngineViewGraphics(); public Q_SLOTS: void initTestCase(); @@ -97,37 +97,37 @@ static QImage get150x150GreenReferenceImage() return reference; } -tst_QQuickWebViewGraphics::tst_QQuickWebViewGraphics() +tst_QQuickWebEngineViewGraphics::tst_QQuickWebEngineViewGraphics() { } -tst_QQuickWebViewGraphics::~tst_QQuickWebViewGraphics() +tst_QQuickWebEngineViewGraphics::~tst_QQuickWebEngineViewGraphics() { } // This will be called before the first test function is executed. // It is only called once. -void tst_QQuickWebViewGraphics::initTestCase() +void tst_QQuickWebEngineViewGraphics::initTestCase() { QWebEngine::initialize(); } -void tst_QQuickWebViewGraphics::init() +void tst_QQuickWebEngineViewGraphics::init() { m_view.reset(new TestView); } -void tst_QQuickWebViewGraphics::cleanup() +void tst_QQuickWebEngineViewGraphics::cleanup() { } -void tst_QQuickWebViewGraphics::simpleGraphics() +void tst_QQuickWebEngineViewGraphics::simpleGraphics() { setHtml(greenSquare); QCOMPARE(m_view->grabWindow(), get150x150GreenReferenceImage()); } -void tst_QQuickWebViewGraphics::renderAfterNodeCleanup() +void tst_QQuickWebEngineViewGraphics::renderAfterNodeCleanup() { setHtml(greenSquare); @@ -137,7 +137,7 @@ void tst_QQuickWebViewGraphics::renderAfterNodeCleanup() QCOMPARE(m_view->grabWindow(), get150x150GreenReferenceImage()); } -void tst_QQuickWebViewGraphics::showHideShow() +void tst_QQuickWebEngineViewGraphics::showHideShow() { setHtml(greenSquare); QSignalSpy exposeSpy(m_view.data(), SIGNAL(exposeChanged())); @@ -152,13 +152,13 @@ void tst_QQuickWebViewGraphics::showHideShow() QCOMPARE(m_view->grabWindow(), get150x150GreenReferenceImage()); } -void tst_QQuickWebViewGraphics::simpleAcceleratedLayer() +void tst_QQuickWebEngineViewGraphics::simpleAcceleratedLayer() { setHtml(acLayerGreenSquare); QCOMPARE(m_view->grabWindow(), get150x150GreenReferenceImage()); } -void tst_QQuickWebViewGraphics::reparentToOtherWindow() +void tst_QQuickWebEngineViewGraphics::reparentToOtherWindow() { setHtml(greenSquare); QQuickWindow window; @@ -169,7 +169,7 @@ void tst_QQuickWebViewGraphics::reparentToOtherWindow() QCOMPARE(window.grabWindow(), get150x150GreenReferenceImage()); } -void tst_QQuickWebViewGraphics::setHtml(const QString &html) +void tst_QQuickWebEngineViewGraphics::setHtml(const QString &html) { QString htmlData = QUrl::toPercentEncoding(html); QString qmlData = QUrl::toPercentEncoding(QStringLiteral("import QtQuick 2.0; import QtWebEngine 0.9; WebEngineView { width: 150; height: 150; url: loadUrl }")); @@ -182,5 +182,5 @@ void tst_QQuickWebViewGraphics::setHtml(const QString &html) QCOMPARE(m_view->rootObject()->property("loading"), QVariant(false)); } -QTEST_MAIN(tst_QQuickWebViewGraphics) -#include "tst_qquickwebviewgraphics.moc" +QTEST_MAIN(tst_QQuickWebEngineViewGraphics) +#include "tst_qquickwebengineviewgraphics.moc" diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro index bc92de6e4..e9f83181e 100644 --- a/tests/auto/quick/quick.pro +++ b/tests/auto/quick/quick.pro @@ -3,4 +3,4 @@ TEMPLATE = subdirs SUBDIRS += \ publicapi \ qmltests \ - qquickwebviewgraphics + qquickwebengineviewgraphics |