diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-25 15:33:01 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-25 14:41:02 +0000 |
| commit | 448478729cfdf5098dd24a6a870bacdbcd8cf9a7 (patch) | |
| tree | 546386ed2957dfc39725180a992191745dbef177 /tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | |
| parent | 5ab157588214bfbbc1d1f258a461b1cab4cc3991 (diff) | |
Adaptations for Chromium 62
Change-Id: I49cd3c419d4dd1180144c3c07bdd9a628ab73caa
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp')
| -rw-r--r-- | tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp index 7d6921368..c41b07b47 100644 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp +++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp @@ -4053,10 +4053,8 @@ void tst_QWebEnginePage::setUrlUsingStateObject() url = QUrl("qrc:/resources/test1.html"); m_page->setUrl(url); - QSignalSpy spyFinished(m_page, &QWebEnginePage::loadFinished); - QVERIFY(spyFinished.wait()); expectedUrlChangeCount++; - QCOMPARE(urlChangedSpy.count(), expectedUrlChangeCount); + QTRY_COMPARE(urlChangedSpy.count(), expectedUrlChangeCount); QCOMPARE(m_page->url(), url); QCOMPARE(m_page->history()->count(), 1); @@ -4076,9 +4074,8 @@ void tst_QWebEnginePage::setUrlUsingStateObject() QVERIFY(m_page->history()->canGoBack()); evaluateJavaScriptSync(m_page, "window.history.back()"); - QTest::qWait(100); expectedUrlChangeCount++; - QCOMPARE(urlChangedSpy.count(), expectedUrlChangeCount); + QTRY_COMPARE(urlChangedSpy.count(), expectedUrlChangeCount); QCOMPARE(m_page->url(), QUrl("qrc:/resources/test1.html")); QVERIFY(m_page->history()->canGoForward()); QVERIFY(!m_page->history()->canGoBack()); |