diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-09-25 18:55:42 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-09-25 18:55:42 +0200 |
| commit | fb639faa8898ce6b8fbcc8870ec316114a79f975 (patch) | |
| tree | 49bf84b2528b53ee07db29e076bf08b2709f1671 /tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp | |
| parent | abb6af14fb632d32d8cce83b4042acd6f9a4767e (diff) | |
| parent | 7f56ce273a90aaa2273d9438f16678716275d803 (diff) | |
Merge 5.9 into 5.9.2
Change-Id: I57f1969bd51857113179dd03816a883087405ebb
Diffstat (limited to 'tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp')
| -rw-r--r-- | tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp index c9d5cda90..7f9e1cff5 100644 --- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp +++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp @@ -1814,8 +1814,8 @@ void tst_QWebEngineView::emptyInputMethodEvent() QApplication::sendEvent(view.focusProxy(), &emptyEvent); QString inputValue = evaluateJavaScriptSync(view.page(), "document.getElementById('input1').value").toString(); - QCOMPARE(inputValue, QStringLiteral("QtWebEngine")); - QCOMPARE(view.focusProxy()->inputMethodQuery(Qt::ImSurroundingText).toString(), QStringLiteral("QtWebEngine")); + QTRY_COMPARE(inputValue, QStringLiteral("QtWebEngine")); + QTRY_COMPARE(view.focusProxy()->inputMethodQuery(Qt::ImSurroundingText).toString(), QStringLiteral("QtWebEngine")); // Reset: clear input field evaluateJavaScriptSync(view.page(), "var inputEle = document.getElementById('input1').value = ''"); @@ -1828,12 +1828,12 @@ void tst_QWebEngineView::emptyInputMethodEvent() QInputMethodEvent eventComposition("a", attributes); QApplication::sendEvent(view.focusProxy(), &eventComposition); QTRY_COMPARE(evaluateJavaScriptSync(view.page(), "document.getElementById('input1').value").toString(), QStringLiteral("a")); - QVERIFY(view.focusProxy()->inputMethodQuery(Qt::ImSurroundingText).toString().isEmpty()); + QTRY_VERIFY(view.focusProxy()->inputMethodQuery(Qt::ImSurroundingText).toString().isEmpty()); // Cancel IME composition QApplication::sendEvent(view.focusProxy(), &emptyEvent); QTRY_VERIFY(evaluateJavaScriptSync(view.page(), "document.getElementById('input1').value").toString().isEmpty()); - QVERIFY(view.focusProxy()->inputMethodQuery(Qt::ImSurroundingText).toString().isEmpty()); + QTRY_VERIFY(view.focusProxy()->inputMethodQuery(Qt::ImSurroundingText).toString().isEmpty()); // Try key press after cancelled IME composition QTest::keyClick(view.focusProxy(), Qt::Key_B); |