diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-07-19 14:41:54 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-07-29 10:34:10 +0000 |
| commit | 53d3d4b5968974160d30c333c9d4fe170e487866 (patch) | |
| tree | 35e2537e6ca643157ee565ba05bb608fad02b463 /tests | |
| parent | 707db02dcf0252f3a53ea327dedc2c4bd52b4037 (diff) | |
Enable and rename qwebengineinspector test
Also makes it a bit a more testing.
Change-Id: I5cb5fe5936cf94e8589e86637771082127d7a341
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/widgets/devtools/devtools.pro (renamed from tests/auto/widgets/qwebengineinspector/qwebengineinspector.pro) | 0 | ||||
| -rw-r--r-- | tests/auto/widgets/devtools/tst_devtools.cpp (renamed from tests/auto/widgets/qwebengineinspector/tst_qwebengineinspector.cpp) | 69 | ||||
| -rw-r--r-- | tests/auto/widgets/widgets.pro | 4 |
3 files changed, 30 insertions, 43 deletions
diff --git a/tests/auto/widgets/qwebengineinspector/qwebengineinspector.pro b/tests/auto/widgets/devtools/devtools.pro index e99c7f493..e99c7f493 100644 --- a/tests/auto/widgets/qwebengineinspector/qwebengineinspector.pro +++ b/tests/auto/widgets/devtools/devtools.pro diff --git a/tests/auto/widgets/qwebengineinspector/tst_qwebengineinspector.cpp b/tests/auto/widgets/devtools/tst_devtools.cpp index 000214b9a..8f3b90a14 100644 --- a/tests/auto/widgets/qwebengineinspector/tst_qwebengineinspector.cpp +++ b/tests/auto/widgets/devtools/tst_devtools.cpp @@ -28,73 +28,60 @@ #include <QtTest/QtTest> -#include <qdir.h> -#if defined(QWEBENGINEINSPECTOR) -#include <qwebengineinspector.h> -#endif #include <qwebenginepage.h> -#if defined(QWEBENGINESETTINGS) -#include <qwebenginesettings.h> -#endif -class tst_QWebEngineInspector : public QObject { +class tst_DevTools : public QObject { Q_OBJECT private Q_SLOTS: void attachAndDestroyPageFirst(); void attachAndDestroyInspectorFirst(); - void attachAndDestroyInternalInspector(); }; -void tst_QWebEngineInspector::attachAndDestroyPageFirst() +void tst_DevTools::attachAndDestroyPageFirst() { -#if !defined(QWEBENGINEINSPECTOR) - QSKIP("QWEBENGINEINSPECTOR"); -#else // External inspector + manual destruction of page first QWebEnginePage* page = new QWebEnginePage(); - page->settings()->setAttribute(QWebEngineSettings::DeveloperExtrasEnabled, true); - QWebEngineInspector* inspector = new QWebEngineInspector(); - inspector->setPage(page); - page->updatePositionDependentActions(QPoint(0, 0)); + QWebEnginePage* inspector = new QWebEnginePage(); + + QSignalSpy spy(page, &QWebEnginePage::loadFinished); + page->load(QUrl("data:text/plain,foobarbaz")); + QTRY_COMPARE(spy.count(), 1); + + inspector->setInspectedPage(page); page->triggerAction(QWebEnginePage::InspectElement); + // This is deliberately racy: + QTest::qWait(10); + delete page; delete inspector; -#endif } -void tst_QWebEngineInspector::attachAndDestroyInspectorFirst() +void tst_DevTools::attachAndDestroyInspectorFirst() { -#if !defined(QWEBENGINEINSPECTOR) - QSKIP("QWEBENGINEINSPECTOR"); -#else // External inspector + manual destruction of inspector first QWebEnginePage* page = new QWebEnginePage(); - page->settings()->setAttribute(QWebEngineSettings::DeveloperExtrasEnabled, true); - QWebEngineInspector* inspector = new QWebEngineInspector(); - inspector->setPage(page); - page->updatePositionDependentActions(QPoint(0, 0)); + QWebEnginePage* inspector = new QWebEnginePage(); + inspector->setInspectedPage(page); + + QSignalSpy spy(page, &QWebEnginePage::loadFinished); + page->setHtml(QStringLiteral("<body><h1>FOO BAR!</h1></body>")); + QTRY_COMPARE(spy.count(), 1); + page->triggerAction(QWebEnginePage::InspectElement); delete inspector; + + page->triggerAction(QWebEnginePage::InspectElement); + + // This is deliberately racy: + QTest::qWait(10); + delete page; -#endif } -void tst_QWebEngineInspector::attachAndDestroyInternalInspector() -{ -#if !defined(QWEBENGINEINSPECTOR) - QSKIP("QWEBENGINEINSPECTOR"); -#else - // Internal inspector - QWebEnginePage page; - page.settings()->setAttribute(QWebEngineSettings::DeveloperExtrasEnabled, true); - page.updatePositionDependentActions(QPoint(0, 0)); - page.triggerAction(QWebEnginePage::InspectElement); -#endif -} -QTEST_MAIN(tst_QWebEngineInspector) +QTEST_MAIN(tst_DevTools) -#include "tst_qwebengineinspector.moc" +#include "tst_devtools.moc" diff --git a/tests/auto/widgets/widgets.pro b/tests/auto/widgets/widgets.pro index 517a60566..05a4bfa59 100644 --- a/tests/auto/widgets/widgets.pro +++ b/tests/auto/widgets/widgets.pro @@ -5,6 +5,7 @@ TEMPLATE = subdirs SUBDIRS += \ defaultsurfaceformat \ + devtools \ faviconmanager \ loadsignals \ origins \ @@ -13,7 +14,6 @@ SUBDIRS += \ qwebenginedownloaditem \ qwebenginepage \ qwebenginehistory \ - qwebengineinspector \ qwebengineprofile \ qwebenginescript \ qwebenginesettings \ @@ -36,7 +36,7 @@ qtConfig(webengine-spellchecker):!cross_compile { } # QTBUG-60268 -boot2qt: SUBDIRS -= accessibility defaultsurfaceformat \ +boot2qt: SUBDIRS -= accessibility defaultsurfaceformat devtools \ faviconmanager qwebenginepage qwebenginehistory \ qwebengineprofile qwebenginescript \ qwebengineview qwebenginedownloaditem qwebenginesettings \ |