aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qsgtextedit/tst_qsgtextedit.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/declarative/qsgtextedit/tst_qsgtextedit.cpp')
-rw-r--r--tests/auto/declarative/qsgtextedit/tst_qsgtextedit.cpp41
1 files changed, 15 insertions, 26 deletions
diff --git a/tests/auto/declarative/qsgtextedit/tst_qsgtextedit.cpp b/tests/auto/declarative/qsgtextedit/tst_qsgtextedit.cpp
index b3577f1084..e77b786430 100644
--- a/tests/auto/declarative/qsgtextedit/tst_qsgtextedit.cpp
+++ b/tests/auto/declarative/qsgtextedit/tst_qsgtextedit.cpp
@@ -71,8 +71,6 @@
#define QTBUG_21691
#define QTBUG_21691_MESSAGE "QTBUG-21691: The test needs to be rewritten to not use QInputContext"
-#define QTBUG_21489_MESSAGE "Pre-condition failure because of QTBUG-21489. This can be safely ignored if there no subsequent failures"
-
Q_DECLARE_METATYPE(QSGTextEdit::SelectionMode)
DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD)
@@ -421,6 +419,8 @@ void tst_qsgtextedit::alignments_data()
void tst_qsgtextedit::alignments()
{
+ QSKIP("Image comparison of text is almost guaranteed to fail during development", SkipAll);
+
QFETCH(int, hAlign);
QFETCH(int, vAlign);
QFETCH(QString, expectfile);
@@ -430,8 +430,7 @@ void tst_qsgtextedit::alignments()
canvas.show();
canvas.requestActivateWindow();
QTest::qWaitForWindowShown(&canvas);
- QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue);
- QTRY_COMPARE(canvas.windowState(), Qt::WindowActive);
+ QTRY_COMPARE(&canvas, qGuiApp->focusWindow());
QObject *ob = canvas.rootObject();
QVERIFY(ob != 0);
@@ -570,8 +569,7 @@ void tst_qsgtextedit::hAlign_RightToLeft()
canvas.requestActivateWindow();
QTest::qWaitForWindowShown(&canvas);
- QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue);
- QTRY_COMPARE(canvas.windowState(), Qt::WindowActive);
+ QTRY_COMPARE(&canvas, qGuiApp->focusWindow());
textEdit->setText(QString());
{ QInputMethodEvent ev(rtlText, QList<QInputMethodEvent::Attribute>()); QGuiApplication::sendEvent(&canvas, &ev); }
@@ -970,8 +968,7 @@ void tst_qsgtextedit::keySelection()
canvas.show();
canvas.requestActivateWindow();
QTest::qWaitForWindowShown(&canvas);
- QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue);
- QTRY_COMPARE(canvas.windowState(), Qt::WindowActive);
+ QTRY_COMPARE(&canvas, qGuiApp->focusWindow());
canvas.requestActivateWindow();
QVERIFY(canvas.rootObject() != 0);
@@ -1384,6 +1381,7 @@ void tst_qsgtextedit::mouseSelection()
canvas.show();
canvas.requestActivateWindow();
QTest::qWaitForWindowShown(&canvas);
+ QTRY_COMPARE(&canvas, qGuiApp->focusWindow());
QVERIFY(canvas.rootObject() != 0);
QSGTextEdit *textEditObject = qobject_cast<QSGTextEdit *>(canvas.rootObject());
@@ -1417,8 +1415,7 @@ void tst_qsgtextedit::dragMouseSelection()
canvas.show();
canvas.requestActivateWindow();
QTest::qWaitForWindowShown(&canvas);
- QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue);
- QTRY_COMPARE(canvas.windowState(), Qt::WindowActive);
+ QTRY_COMPARE(&canvas, qGuiApp->focusWindow());
QVERIFY(canvas.rootObject() != 0);
QSGTextEdit *textEditObject = qobject_cast<QSGTextEdit *>(canvas.rootObject());
@@ -1471,8 +1468,7 @@ void tst_qsgtextedit::mouseSelectionMode()
canvas.show();
canvas.requestActivateWindow();
QTest::qWaitForWindowShown(&canvas);
- QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue);
- QTRY_COMPARE(canvas.windowState(), Qt::WindowActive);
+ QTRY_COMPARE(&canvas, qGuiApp->focusWindow());
QVERIFY(canvas.rootObject() != 0);
QSGTextEdit *textEditObject = qobject_cast<QSGTextEdit *>(canvas.rootObject());
@@ -1654,9 +1650,7 @@ void tst_qsgtextedit::cursorVisible()
view.show();
view.requestActivateWindow();
QTest::qWaitForWindowShown(&view);
- QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue);
- QTRY_COMPARE(view.windowState(), Qt::WindowActive);
- view.requestActivateWindow();
+ QTRY_COMPARE(&view, qGuiApp->focusWindow());
QSGTextEdit edit;
QSignalSpy spy(&edit, SIGNAL(cursorVisibleChanged(bool)));
@@ -1702,7 +1696,7 @@ void tst_qsgtextedit::cursorVisible()
// on mac, setActiveWindow(0) on mac does not deactivate the current application
// (you have to switch to a different app or hide the current app to trigger this)
// QApplication::setActiveWindow(0);
-// QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(0));
+// QTRY_COMPARE(QApplication::focusWindow(), static_cast<QWidget *>(0));
// QCOMPARE(edit.isCursorVisible(), false);
// QCOMPARE(spy.count(), 8);
@@ -1981,8 +1975,7 @@ void tst_qsgtextedit::textInput()
view.show();
view.requestActivateWindow();
QTest::qWaitForWindowShown(&view);
- QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue);
- QTRY_COMPARE(view.windowState(), Qt::WindowActive);
+ QTRY_COMPARE(&view, qGuiApp->focusWindow());
QSGTextEdit *edit = qobject_cast<QSGTextEdit *>(view.rootObject());
QVERIFY(edit);
QVERIFY(edit->hasActiveFocus() == true);
@@ -2006,8 +1999,7 @@ void tst_qsgtextedit::openInputPanel()
view.show();
view.requestActivateWindow();
QTest::qWaitForWindowShown(&view);
- QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue);
- QTRY_COMPARE(view.windowState(), Qt::WindowActive);
+ QTRY_COMPARE(&view, qGuiApp->focusWindow());
QSGTextEdit *edit = qobject_cast<QSGTextEdit *>(view.rootObject());
QVERIFY(edit);
@@ -2210,8 +2202,7 @@ void tst_qsgtextedit::preeditMicroFocus()
view.requestActivateWindow();
QTest::qWaitForWindowShown(&view);
- QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue);
- QTRY_COMPARE(view.windowState(), Qt::WindowActive);
+ QTRY_COMPARE(&view, qGuiApp->focusWindow());
QSGTextEdit *edit = qobject_cast<QSGTextEdit *>(view.rootObject());
QVERIFY(edit);
@@ -2280,8 +2271,7 @@ void tst_qsgtextedit::inputContextMouseHandler()
view.requestActivateWindow();
QTest::qWaitForWindowShown(&view);
- QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue);
- QTRY_COMPARE(view.windowState(), Qt::WindowActive);
+ QTRY_COMPARE(&view, qGuiApp->focusWindow());
QSGTextEdit *edit = qobject_cast<QSGTextEdit *>(view.rootObject());
QVERIFY(edit);
edit->setCursorPosition(12);
@@ -2393,8 +2383,7 @@ void tst_qsgtextedit::inputMethodComposing()
view.show();
view.requestActivateWindow();
QTest::qWaitForWindowShown(&view);
- QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue);
- QTRY_COMPARE(view.windowState(), Qt::WindowActive);
+ QTRY_COMPARE(&view, qGuiApp->focusWindow());
QSGTextEdit *edit = qobject_cast<QSGTextEdit *>(view.rootObject());
QVERIFY(edit);
QSignalSpy spy(edit, SIGNAL(inputMethodComposingChanged()));
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-15 03:45:28 +0000