diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 18:09:08 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 18:09:08 +0100 |
| commit | b1153753221513aa5687001c84a1c9ed69925dc6 (patch) | |
| tree | 3569ad54e433fee8244effe558ca52e567b6890d /tests | |
| parent | 4d6b2dc88bda15ade9d04e54d80b7e4693d59832 (diff) | |
| parent | c2687689ba42d6021ae3f220d9fd240609489d3a (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/3rdparty
src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
Change-Id: I90728e965399e51b626d538924de955f9abab5fe
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp index 4cfe4e580..8b93c7169 100644 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp +++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp @@ -159,8 +159,6 @@ private Q_SLOTS: void renderWidgetHostViewNotShowTopLevel(); void getUserMediaRequest(); - void viewModes(); - void crashTests_LazyInitializationOfMainFrame(); void screenshot_data(); @@ -213,7 +211,6 @@ private Q_SLOTS: void setHtmlWithStylesheetResource(); void setHtmlWithBaseURL(); void setHtmlWithJSAlert(); - void metaData(); void inputFieldFocus(); void hitTestContent(); void baseUrl_data(); @@ -670,25 +667,6 @@ void tst_QWebEnginePage::loadHtml5Video() #endif } -void tst_QWebEnginePage::viewModes() -{ -#if !defined(QWEBENGINEPAGE_VIEW_MODES) - QSKIP("QWEBENGINEPAGE_VIEW_MODES"); -#else - m_view->setHtml("<body></body>"); - m_page->setProperty("_q_viewMode", "minimized"); - - QVariant empty = evaluateJavaScriptSync(m_page, "window.styleMedia.matchMedium(\"(-webengine-view-mode)\")"); - QVERIFY(empty.type() == QVariant::Bool && empty.toBool()); - - QVariant minimized = evaluateJavaScriptSync(m_page, "window.styleMedia.matchMedium(\"(-webengine-view-mode: minimized)\")"); - QVERIFY(minimized.type() == QVariant::Bool && minimized.toBool()); - - QVariant maximized = evaluateJavaScriptSync(m_page, "window.styleMedia.matchMedium(\"(-webengine-view-mode: maximized)\")"); - QVERIFY(maximized.type() == QVariant::Bool && !maximized.toBool()); -#endif -} - void tst_QWebEnginePage::modified() { #if !defined(QWEBENGINEPAGE_ISMODIFIED) @@ -4100,47 +4078,6 @@ void tst_QWebEnginePage::setHtmlWithJSAlert() QCOMPARE(toHtmlSync(&page), html); } -void tst_QWebEnginePage::metaData() -{ -#if !defined(QWEBENGINEPAGE_METADATA) - QSKIP("QWEBENGINEPAGE_METADATA"); -#else - m_view->setHtml("<html>" - " <head>" - " <meta name=\"description\" content=\"Test description\">" - " <meta name=\"keywords\" content=\"HTML, JavaScript, Css\">" - " </head>" - "</html>"); - - QMultiMap<QString, QString> metaData = m_view->page()->metaData(); - - QCOMPARE(metaData.count(), 2); - - QCOMPARE(metaData.value("description"), QString("Test description")); - QCOMPARE(metaData.value("keywords"), QString("HTML, JavaScript, Css")); - QCOMPARE(metaData.value("nonexistent"), QString()); - - m_view->setHtml("<html>" - " <head>" - " <meta name=\"samekey\" content=\"FirstValue\">" - " <meta name=\"samekey\" content=\"SecondValue\">" - " </head>" - "</html>"); - - metaData = m_view->page()->metaData(); - - QCOMPARE(metaData.count(), 2); - - QStringList values = metaData.values("samekey"); - QCOMPARE(values.count(), 2); - - QVERIFY(values.contains("FirstValue")); - QVERIFY(values.contains("SecondValue")); - - QCOMPARE(metaData.value("nonexistent"), QString()); -#endif -} - void tst_QWebEnginePage::inputFieldFocus() { #if !defined(QWEBENGINEELEMENT) |