From 3543801a5653aeb68e3b05c892a1136319a0110d Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 29 Feb 2016 16:14:44 +0100 Subject: Remove test for unimplemented Web SQL Database API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QWebEngine will not provide a wrapper API for the now deprecated Web SQL Database HTML5 API. Change-Id: I8864b202ce9200145953ba5273f86eddff9e133a Task-number: QTBUG-51346 Reviewed-by: Michael Brüning Reviewed-by: Allan Sandfeld Jensen --- .../widgets/qwebenginepage/tst_qwebenginepage.cpp | 59 ---------------------- 1 file changed, 59 deletions(-) (limited to 'tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp') diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp index 207eb019a..75672825c 100644 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp +++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp @@ -128,7 +128,6 @@ private Q_SLOTS: void modified(); void contextMenuCrash(); void updatePositionDependentActionsCrash(); - void database(); void createPluginWithPluginsEnabled(); void createPluginWithPluginsDisabled(); void destroyPlugin_data(); @@ -792,64 +791,6 @@ void tst_QWebEnginePage::contextMenuCrash() #endif } -void tst_QWebEnginePage::database() -{ -#if !defined(QWEBENGINEDATABASE) - QSKIP("QWEBENGINEDATABASE"); -#else - QString path = tmpDirPath(); - m_page->settings()->setOfflineStoragePath(path); - QVERIFY(m_page->settings()->offlineStoragePath() == path); - - QWebEngineSettings::setOfflineStorageDefaultQuota(1024 * 1024); - QVERIFY(QWebEngineSettings::offlineStorageDefaultQuota() == 1024 * 1024); - - m_page->settings()->setAttribute(QWebEngineSettings::LocalStorageEnabled, true); - m_page->settings()->setAttribute(QWebEngineSettings::OfflineStorageDatabaseEnabled, true); - - QString dbFileName = path + "Databases.db"; - - if (QFile::exists(dbFileName)) - QFile::remove(dbFileName); - - qRegisterMetaType("QWebEngineFrame*"); - QSignalSpy spy(m_page, SIGNAL(databaseQuotaExceeded(QWebEngineFrame*,QString))); - m_view->setHtml(QString("

"), QUrl("http://www.myexample.com")); - QTRY_COMPARE(spy.count(), 1); - evaluateJavaScriptSync(m_page, "var db2; db2=openDatabase('testdb', '1.0', 'test database API', 50000);"); - QTRY_COMPARE(spy.count(),1); - - evaluateJavaScriptSync(m_page, "localStorage.test='This is a test for local storage';"); - m_view->setHtml(QString("text"), QUrl("http://www.myexample.com")); - - QVariant s1 = evaluateJavaScriptSync(m_page, "localStorage.test"); - QCOMPARE(s1.toString(), QString("This is a test for local storage")); - - evaluateJavaScriptSync(m_page, "sessionStorage.test='This is a test for session storage';"); - m_view->setHtml(QString("text"), QUrl("http://www.myexample.com")); - QVariant s2 = evaluateJavaScriptSync(m_page, "sessionStorage.test"); - QCOMPARE(s2.toString(), QString("This is a test for session storage")); - - m_view->setHtml(QString("

"), QUrl("http://www.myexample.com")); - evaluateJavaScriptSync(m_page, "var db3; db3=openDatabase('testdb', '1.0', 'test database API', 50000);db3.transaction(function(tx) { tx.executeSql('CREATE TABLE IF NOT EXISTS Test (text TEXT)', []); }, function(tx, result) { }, function(tx, error) { });"); - QTest::qWait(200); - - // Remove all databases. - QWebEngineSecurityOrigin origin = m_page->mainFrame()->securityOrigin(); - QList dbs = origin.databases(); - for (int i = 0; i < dbs.count(); i++) { - QString fileName = dbs[i].fileName(); - QVERIFY(QFile::exists(fileName)); - QWebEngineDatabase::removeDatabase(dbs[i]); - QVERIFY(!QFile::exists(fileName)); - } - QVERIFY(!origin.databases().size()); - // Remove removed test :-) - QWebEngineDatabase::removeAllDatabases(); - QVERIFY(!origin.databases().size()); -#endif -} - #if defined(QWEBENGINEPAGE_CREATEPLUGIN) class PluginPage : public QWebEnginePage { -- cgit v1.2.3 From 0110b93af4ab61a5b86643c2be8c6f34648bbaaf Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 29 Feb 2016 18:49:24 +0100 Subject: Remove skipped test tst_QWebEnginePage::popupFocus This test makes only sense in QtWebKit where HTML input elements are implemented with Qt widgets (e.g. QComboBox). Change-Id: I0fdd63530db762595df7ca370ff2f9b1d73cc0a8 Reviewed-by: Allan Sandfeld Jensen --- .../widgets/qwebenginepage/tst_qwebenginepage.cpp | 46 ---------------------- 1 file changed, 46 deletions(-) (limited to 'tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp') diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp index 75672825c..d0252f5b8 100644 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp +++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp @@ -213,9 +213,6 @@ private Q_SLOTS: void setHtmlWithBaseURL(); void setHtmlWithJSAlert(); void metaData(); -#if !defined(QT_NO_COMBOBOX) - void popupFocus(); -#endif void inputFieldFocus(); void hitTestContent(); void baseUrl_data(); @@ -4141,49 +4138,6 @@ void tst_QWebEnginePage::metaData() #endif } -#if !defined(QT_NO_COMBOBOX) -void tst_QWebEnginePage::popupFocus() -{ -#if !defined(QWEBENGINEELEMENT) - QSKIP("QWEBENGINEELEMENT"); -#else - QWebEngineView view; - view.setHtml("" - " " - " " - " " - " " - " " - ""); - view.resize(400, 100); - // Call setFocus before show to work around http://bugreports.qt.nokia.com/browse/QTBUG-14762 - view.setFocus(); - view.show(); - QTest::qWaitForWindowExposed(&view); - view.activateWindow(); - QTRY_VERIFY(view.hasFocus()); - - // open the popup by clicking. check if focus is on the popup - const QWebEngineElement webCombo = view.page()->documentElement().findFirst(QLatin1String("select[name=select]")); - QTest::mouseClick(&view, Qt::LeftButton, 0, webCombo.geometry().center()); - - QComboBox* combo = view.findChild(); - QVERIFY(combo != 0); - QTRY_VERIFY(!view.hasFocus() && combo->view()->hasFocus()); // Focus should be on the popup - - // hide the popup and check if focus is on the page - combo->hidePopup(); - QTRY_VERIFY(view.hasFocus()); // Focus should be back on the WebView -#endif -} -#endif - void tst_QWebEnginePage::inputFieldFocus() { #if !defined(QWEBENGINEELEMENT) -- cgit v1.2.3