diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-09-23 12:01:53 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-09-26 20:52:14 +0000 |
| commit | 65c264f58969281392d4a4b42b35be9a352c7f7e (patch) | |
| tree | 432dff537851bb6712e8aa68e78647c9234376e6 /tests | |
| parent | 0eb9a4233d7ec6bbcf66944927eb6198b3f20c90 (diff) | |
Minor cleanup of m_view/m_page use
Don't change the page of m_view, and don't make both page and view if
not necessary.
Change-Id: I27a4ecbc548e9b970bd561750cf15fb5490931ff
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp index 2d56d3521..4c3a47bed 100644 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp +++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp @@ -332,25 +332,25 @@ protected: void tst_QWebEnginePage::acceptNavigationRequest() { - QSignalSpy loadSpy(m_view, SIGNAL(loadFinished(bool))); + QWebEngineView *view = new QWebEngineView(); + QSignalSpy loadSpy(view, SIGNAL(loadFinished(bool))); - NavigationRequestOverride* newPage = new NavigationRequestOverride(m_view, false); - m_view->setPage(newPage); + NavigationRequestOverride* newPage = new NavigationRequestOverride(view, false); + view->setPage(newPage); - m_view->setHtml(QString("<html><body><form name='tstform' action='data:text/html,foo'method='get'>" + view->setHtml(QString("<html><body><form name='tstform' action='data:text/html,foo'method='get'>" "<input type='text'><input type='submit'></form></body></html>"), QUrl()); QTRY_COMPARE(loadSpy.count(), 1); - evaluateJavaScriptSync(m_view->page(), "tstform.submit();"); + evaluateJavaScriptSync(view->page(), "tstform.submit();"); newPage->m_acceptNavigationRequest = true; - evaluateJavaScriptSync(m_view->page(), "tstform.submit();"); + evaluateJavaScriptSync(view->page(), "tstform.submit();"); QTRY_COMPARE(loadSpy.count(), 2); - QCOMPARE(toPlainTextSync(m_view->page()), QString("foo?")); + QCOMPARE(toPlainTextSync(view->page()), QString("foo?")); - // Restore default page - m_view->setPage(0); + delete view; } class JSTestPage : public QWebEnginePage @@ -461,12 +461,10 @@ void tst_QWebEnginePage::loadFinished() void tst_QWebEnginePage::actionStates() { - QWebEnginePage* page = m_view->page(); + m_page->load(QUrl("qrc:///resources/script.html")); - page->load(QUrl("qrc:///resources/script.html")); - - QAction* reloadAction = page->action(QWebEnginePage::Reload); - QAction* stopAction = page->action(QWebEnginePage::Stop); + QAction* reloadAction = m_page->action(QWebEnginePage::Reload); + QAction* stopAction = m_page->action(QWebEnginePage::Stop); QTRY_VERIFY(reloadAction->isEnabled()); QTRY_VERIFY(!stopAction->isEnabled()); @@ -1424,7 +1422,7 @@ void tst_QWebEnginePage::cursorMovements() void tst_QWebEnginePage::textSelection() { QWebEngineView *view = new QWebEngineView; - CursorTrackedPage *page = new CursorTrackedPage; + CursorTrackedPage *page = new CursorTrackedPage(view); QString content("<html><body><p id=one>The quick brown fox</p>" \ "<p id=two>jumps over the lazy dog</p>" \ "<p>May the source<br/>be with you!</p></body></html>"); @@ -1524,7 +1522,6 @@ void tst_QWebEnginePage::textSelection() QCOMPARE(page->action(QWebEnginePage::SelectEndOfDocument)->isEnabled(), true); #endif - delete page; delete view; } @@ -3703,9 +3700,8 @@ void tst_QWebEnginePage::runJavaScript() void tst_QWebEnginePage::fullScreenRequested() { JavaScriptCallbackWatcher watcher; - QWebEnginePage* page = new QWebEnginePage; QWebEngineView* view = new QWebEngineView; - view->setPage(page); + QWebEnginePage* page = view->page(); view->show(); page->settings()->setAttribute(QWebEngineSettings::FullScreenSupportEnabled, true); @@ -3739,7 +3735,6 @@ void tst_QWebEnginePage::fullScreenRequested() QVERIFY(watcher.wait()); delete view; - delete page; } void tst_QWebEnginePage::symmetricUrl() |