diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-09-13 10:54:18 +0200 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2023-09-29 14:02:06 +0200 |
| commit | 3cbb895954e0d22efc20700a1e66413a8a483124 (patch) | |
| tree | 04d5a8f683f682719805f6f5d59df4b52c49f667 /tests | |
| parent | f19aa5e343db66e5baacacd3c360c4cb00a01c7c (diff) | |
Do more WE processing before returning to the Qt event-loop
Fix a race-condition in our tests that the change exposed
Pick-to: 6.6
Task-number: QTBUG-116478
Change-Id: Id21c6b0bc9934fdcb69bd85350f5f263a9b96914
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/core/origins/tst_origins.cpp | 8 | ||||
| -rw-r--r-- | tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp | 15 |
3 files changed, 14 insertions, 13 deletions
diff --git a/tests/auto/core/origins/tst_origins.cpp b/tests/auto/core/origins/tst_origins.cpp index c77a4bc26..091ce8651 100644 --- a/tests/auto/core/origins/tst_origins.cpp +++ b/tests/auto/core/origins/tst_origins.cpp @@ -1692,11 +1692,11 @@ void tst_Origins::fetchApiCustomUrl() } page.load(url); - QVERIFY(loadSpy.wait()); + QTRY_VERIFY(loadSpy.count() > 0); QTRY_COMPARE(handler.fetchWasAllowed, expectedFetchWasAllowed); if (fetchApiScheme == "fetchapi-not-allowed") { - QVERIFY(jsSpy.wait()); + QTRY_VERIFY(jsSpy.count() > 0); } } @@ -1722,8 +1722,8 @@ void tst_Origins::fetchApiHttpUrl() + httpServer.url("/somepage.html").toEncoded(); page.load(QUrl(fullUrl)); - QVERIFY(loadSpy.wait()); - QVERIFY(jsSpy.wait()); + QTRY_VERIFY(loadSpy.count() > 0); + QTRY_VERIFY(jsSpy.count() > 0); QVERIFY(httpServer.stop()); } diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp index 34f7875a9..b822cbbd5 100644 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp +++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp @@ -1362,7 +1362,7 @@ void tst_QWebEnginePage::comboBoxPopupPositionAfterMove_data() void tst_QWebEnginePage::comboBoxPopupPositionAfterMove() { QWebEngineView view; - Q_ASSERT(QGuiApplication::primaryScreen()); + QTRY_VERIFY(QGuiApplication::primaryScreen()); view.move(QGuiApplication::primaryScreen()->availableGeometry().topLeft()); view.resize(640, 480); view.show(); @@ -3081,7 +3081,7 @@ void tst_QWebEnginePage::loadInSignalHandlers() URLSetter setter(m_page, signal, type, urlForSetter); QSignalSpy spy(&setter, &URLSetter::finished); m_page->load(url); - QTRY_COMPARE_WITH_TIMEOUT(spy.size(), 1, 20000); + QTRY_VERIFY_WITH_TIMEOUT(spy.size() >= 1, 20000); QCOMPARE(m_page->url(), urlForSetter); } diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp index c2eecc224..0100437eb 100644 --- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp +++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp @@ -1363,18 +1363,19 @@ void tst_QWebEngineView::inputMethodsTextFormat_data() void tst_QWebEngineView::inputMethodsTextFormat() { - QWebEngineView view; - view.settings()->setAttribute(QWebEngineSettings::FocusOnNavigationEnabled, true); - QSignalSpy loadFinishedSpy(&view, SIGNAL(loadFinished(bool))); + QWebEnginePage page; + QWebEngineView view(&page); + page.settings()->setAttribute(QWebEngineSettings::FocusOnNavigationEnabled, true); + QSignalSpy loadFinishedSpy(&page, SIGNAL(loadFinished(bool))); - view.setHtml("<html><body>" + page.setHtml("<html><body>" " <input type='text' id='input1' style='font-family: serif' value='' maxlength='20'/>" "</body></html>"); QTRY_COMPARE(loadFinishedSpy.size(), 1); - evaluateJavaScriptSync(view.page(), "document.getElementById('input1').focus()"); view.show(); QVERIFY(QTest::qWaitForWindowExposed(&view)); + evaluateJavaScriptSync(&page, "document.getElementById('input1').focus()"); QFETCH(QString, string); QFETCH(int, start); @@ -1398,8 +1399,8 @@ void tst_QWebEngineView::inputMethodsTextFormat() attrs.append(QInputMethodEvent::Attribute(QInputMethodEvent::TextFormat, start, length, format)); QInputMethodEvent im(string, attrs); - QVERIFY(QApplication::sendEvent(view.focusProxy(), &im)); - QTRY_COMPARE(evaluateJavaScriptSync(view.page(), "document.getElementById('input1').value").toString(), string); + QApplication::sendEvent(view.focusProxy(), &im); + QTRY_COMPARE_WITH_TIMEOUT(evaluateJavaScriptSync(&page, "document.getElementById('input1').value").toString(), string, 20000); } void tst_QWebEngineView::keyboardEvents() |