From 530163577bdbdb73920dcb97d3c231f3f858e649 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 1 Mar 2016 15:18:19 +0100 Subject: Remove test for QWebEnginePage::metaData This API doesn't exist. Meta data can be read by evaluating JavaScript. Change-Id: I6089de34b463d34d94d4d05e723e12bc163d288d Reviewed-by: Allan Sandfeld Jensen --- .../widgets/qwebenginepage/tst_qwebenginepage.cpp | 42 ---------------------- 1 file changed, 42 deletions(-) (limited to 'tests') diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp index d0252f5b8..07b1cfdfe 100644 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp +++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp @@ -212,7 +212,6 @@ private Q_SLOTS: void setHtmlWithStylesheetResource(); void setHtmlWithBaseURL(); void setHtmlWithJSAlert(); - void metaData(); void inputFieldFocus(); void hitTestContent(); void baseUrl_data(); @@ -4097,47 +4096,6 @@ void tst_QWebEnginePage::setHtmlWithJSAlert() QCOMPARE(toHtmlSync(&page), html); } -void tst_QWebEnginePage::metaData() -{ -#if !defined(QWEBENGINEPAGE_METADATA) - QSKIP("QWEBENGINEPAGE_METADATA"); -#else - m_view->setHtml("" - " " - " " - " " - " " - ""); - - QMultiMap 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("" - " " - " " - " " - " " - ""); - - 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) -- cgit v1.2.3 From a4175559acdef0f22203ce31486df626cee9d6fc Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 14 Mar 2016 18:47:44 +0100 Subject: Remove tst_QWebEnginePage::viewModes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This tested semi-public API. History points to a WRT-related feature. Change-Id: I974feec55c5b243701bb2fa481ca16273088e438 Reviewed-by: Michael Brüning --- .../widgets/qwebenginepage/tst_qwebenginepage.cpp | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'tests') diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp index 07b1cfdfe..06b19216d 100644 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp +++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp @@ -158,8 +158,6 @@ private Q_SLOTS: void renderWidgetHostViewNotShowTopLevel(); void getUserMediaRequest(); - void viewModes(); - void crashTests_LazyInitializationOfMainFrame(); void screenshot_data(); @@ -666,25 +664,6 @@ void tst_QWebEnginePage::loadHtml5Video() #endif } -void tst_QWebEnginePage::viewModes() -{ -#if !defined(QWEBENGINEPAGE_VIEW_MODES) - QSKIP("QWEBENGINEPAGE_VIEW_MODES"); -#else - m_view->setHtml(""); - 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) -- cgit v1.2.3