QTest::qWaitForWindowShown(view);
-#ifdef QT_BUILD_INTERNAL
- QEXPECT_FAIL("", "QTBUG-21683 - Waiting for active window/focus fails for developer build", Abort);
-#endif
- QVERIFY(view->windowState() == Qt::WindowActive);
+ QTRY_VERIFY(view == qGuiApp->focusWindow());
QVERIFY(item0->hasActiveFocus() == true);
QVERIFY(item1->hasActiveFocus() == true);
QVERIFY(item2->hasActiveFocus() == false);
QVERIFY(item5->hasActiveFocus() == false);
QTest::keyClick(view, Qt::Key_5);
-#ifdef QT_BUILD_INTERNAL
- QEXPECT_FAIL("", "QTBUG-216823- Waiting for active window/focus fails for developer build", Abort);
-#endif
QVERIFY(item0->hasActiveFocus() == false);
QVERIFY(item1->hasActiveFocus() == false);
QVERIFY(item2->hasActiveFocus() == false);
QTest::qWaitForWindowShown(view);
-#ifdef QT_BUILD_INTERNAL
- QEXPECT_FAIL("", "QTBUG-21683 - Waiting for active window fails for developer build", Abort);
-#endif
- QVERIFY(view->windowState() == Qt::WindowActive);
+ QTRY_VERIFY(view == qGuiApp->focusWindow());
QVERIFY(view->rootObject()->property("noFocus").toBool());
view->rootObject()->setProperty("showRect", true);
QSignalSpy scope2ActiveFocusSpy(scope2, SIGNAL(activeFocusChanged(bool)));
QSignalSpy item2ActiveFocusSpy(item2, SIGNAL(activeFocusChanged(bool)));
- // until the canvas widget has gained focus, no one should have active focus
- QCOMPARE((view->windowState() == Qt::WindowActive), false);
-#ifdef QT_BUILD_INTERNAL
- QEXPECT_FAIL("", "QTBUG-21683 - Waiting for active window/focus fails for developer build", Abort);
-#endif
+ QEXPECT_FAIL("", "Root item hasFocus returns true already", Abort);
+
QCOMPARE(rootItem->hasFocus(), false);
QCOMPARE(rootItem->hasActiveFocus(), false);
QCOMPARE(scope1->hasFocus(), true);
QCOMPARE(item1ActiveFocusSpy.count(), 1);
- view->setWindowState(Qt::WindowNoState);
+ view->hide();
QCOMPARE(rootItem->hasFocus(), false);
QCOMPARE(rootItem->hasActiveFocus(), false);
QCOMPARE(scope1->hasFocus(), true);
QCOMPARE(item2ActiveFocusSpy.count(), 0);
// give the canvas focus, and item2 will get active focus
- view->setWindowState(Qt::WindowActive);
+ view->show();
QCOMPARE(rootItem->hasFocus(), true);
QCOMPARE(rootItem->hasActiveFocus(), true);
#include <QtDeclarative/private/qdeclarativelistmodel_p.h>
#include "../../../shared/util.h"
#include <QtOpenGL/QGLShaderProgram>
+#include <QtGui/qguiapplication.h>
Q_DECLARE_METATYPE(Qt::LayoutDirection)
Q_DECLARE_METATYPE(QSGGridView::Flow)
// Test keys
canvas->requestActivateWindow();
-#ifdef Q_WS_X11
- // to be safe and avoid failing setFocus with window managers
- qt_x11_wait_for_window_manager(canvas);
-#endif
-#ifdef QT_BUILD_INTERNAL
- QEXPECT_FAIL("", "QTBUG-21680 - Waiting for active window fails for Developer build", Abort);
-#endif
- QTRY_VERIFY(canvas->windowState() == Qt::WindowActive);
- qApp->processEvents();
+ QTest::qWaitForWindowShown(canvas);
+ QTRY_VERIFY(qGuiApp->focusWindow() == canvas);
gridview->setCurrentIndex(0);
gridview->setFlow(QSGGridView::TopToBottom);
canvas->requestActivateWindow();
-#ifdef Q_WS_X11
- // to be safe and avoid failing setFocus with window managers
- qt_x11_wait_for_window_manager(canvas);
-#endif
- QTRY_VERIFY((canvas->windowState() == Qt::WindowActive));
+ QTest::qWaitForWindowShown(canvas);
+ QVERIFY(qGuiApp->focusWindow() == canvas);
qApp->processEvents();
QTest::keyClick(canvas, Qt::Key_Right);
QTest::simulateEvent(canvas, true, Qt::Key_Right, Qt::NoModifier, "", true);
QTRY_COMPARE(gridview->currentIndex(), i*5 + 5);
}
+
QTest::keyRelease(canvas, Qt::Key_Right);
QTRY_COMPARE(gridview->currentIndex(), 55);
QTRY_COMPARE(gridview->contentX(), 720.0);
gridview->setLayoutDirection(Qt::RightToLeft);
canvas->requestActivateWindow();
-#ifdef Q_WS_X11
- // to be safe and avoid failing setFocus with window managers
- qt_x11_wait_for_window_manager(canvas);
-#endif
- QTRY_VERIFY(canvas->windowState() == Qt::WindowActive);
+ QTest::qWaitForWindowShown(canvas);
+ QTRY_VERIFY(qGuiApp->focusWindow() == canvas);
qApp->processEvents();
gridview->setCurrentIndex(35);
****************************************************************************/
#include "incrementalmodel.h"
-#include <QApplication>
+#include <QGuiApplication>
#include <QDebug>
IncrementalModel::IncrementalModel(QObject *parent)
// Test keys
canvas->show();
canvas->requestActivateWindow();
-#ifdef Q_WS_X11
- // to be safe and avoid failing setFocus with window managers
- qt_x11_wait_for_window_manager(canvas);
-#endif
-
- qApp->processEvents();
+ QTest::qWaitForWindowShown(canvas);
+ QTRY_VERIFY(qGuiApp->focusWindow() == canvas);
listview->setCurrentIndex(0);
QTest::keyClick(canvas, Qt::Key_Down);
-#ifdef QT_BUILD_INTERNAL
- QEXPECT_FAIL("", "QTBUG-21682 - Waiting for active window fails for developer build", Abort);
-#endif
QCOMPARE(listview->currentIndex(), 1);
QTest::keyClick(canvas, Qt::Key_Up);
canvas->show();
canvas->requestActivateWindow();
QTest::qWaitForWindowShown(canvas);
-#ifdef QT_BUILD_INTERNAL
- QEXPECT_FAIL("", "QTBUG-21687 - Waiting for active window fails for developer build", Abort);
-#endif
- QTRY_COMPARE(canvas->windowState(), Qt::WindowActive);
+ QTRY_COMPARE(canvas, qGuiApp->focusWindow());
QSGPathView *pathview = qobject_cast<QSGPathView*>(canvas->rootObject());
QVERIFY(pathview != 0);
int current = pathview->currentIndex();
QTest::mousePress(canvas, Qt::LeftButton, 0, QPoint(10,100));
+ QTest::qWait(100);
{
QMouseEvent mv(QEvent::MouseMove, QPoint(30,100), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
canvas->show();
canvas->requestActivateWindow();
QTest::qWaitForWindowShown(canvas);
-#ifdef QT_BUILD_INTERNAL
- QEXPECT_FAIL("", "QTBUG-21687 - Waiting for active window fails for developer build", Abort);
-#endif
- QTRY_COMPARE(canvas->windowState(), Qt::WindowActive);
+ QTRY_COMPARE(canvas, qGuiApp->focusWindow());
QSGPathView *pathview = qobject_cast<QSGPathView*>(canvas->rootObject());
QVERIFY(pathview != 0);
#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)
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);
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);
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); }
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);
canvas.show();
canvas.requestActivateWindow();
QTest::qWaitForWindowShown(&canvas);
+ QTRY_COMPARE(&canvas, qGuiApp->focusWindow());
QVERIFY(canvas.rootObject() != 0);
QSGTextEdit *textEditObject = qobject_cast<QSGTextEdit *>(canvas.rootObject());
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());
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());
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)));
// 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);
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);
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);
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);
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);
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()));
#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"
QString createExpectedFileIfNotFound(const QString& filebasename, const QImage& actual)
{
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);
QSGTextInput *textInputObject = qobject_cast<QSGTextInput *>(canvas.rootObject());
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);
QSGTextInput *textInputObject = qobject_cast<QSGTextInput *>(canvas.rootObject());
void tst_qsgtextinput::horizontalAlignment()
{
+ QSKIP("Image comparison of text is almost guaranteed to fail during development", SkipAll);
+
QFETCH(int, hAlign);
QFETCH(QString, expectfile);
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);
ob->setProperty("horizontalAlignment",hAlign);
canvas.requestActivateWindow();
QTest::qWaitForWindowShown(&canvas);
- QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue);
- QTRY_COMPARE(canvas.windowState(), Qt::WindowActive);
+ QTRY_COMPARE(&canvas, qGuiApp->focusWindow());
// If there is no commited text, the preedit text should determine the alignment.
textInput->setText(QString());
view.show();
view.requestActivateWindow();
QTest::qWaitForWindowShown(&view);
- QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue);
- QTRY_COMPARE(view.windowState(), Qt::WindowActive);
+ QTRY_COMPARE(&view, qGuiApp->focusWindow());
QSGTextInput input;
QSignalSpy spy(&input, SIGNAL(cursorVisibleChanged(bool)));
// QGuiApplication has no equivalent of setActiveWindow(0). Is this different to clearing the
// active state of the window or can it be removed?
// QApplication::setActiveWindow(0);
-// QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(0));
+// QTRY_COMPARE(QApplication::focusWindow(), static_cast<QWidget *>(0));
// QCOMPARE(input.isCursorVisible(), false);
// QCOMPARE(spy.count(), 8);
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);
canvas.setFocus();
QGuiApplication::setActiveWindow(&canvas);
QTest::qWaitForWindowShown(&canvas);
- QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue);
- QTRY_COMPARE(canvas.windowState(), Qt::WindowActive);
+ QTRY_COMPARE(&canvas, qGuiApp->focusWindow());
QVERIFY(canvas.rootObject() != 0);
view.show();
view.requestActivateWindow();
QTest::qWaitForWindowShown(&view);
- QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue);
- QTRY_COMPARE(view.windowState(), Qt::WindowActive);
+ QTRY_COMPARE(&view, qGuiApp->focusWindow());
QSGTextInput *input = qobject_cast<QSGTextInput *>(view.rootObject());
QVERIFY(input);
view.show();
view.requestActivateWindow();
QTest::qWaitForWindowShown(&view);
- QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue);
- QTRY_COMPARE(view.windowState(), Qt::WindowActive);
+ QTRY_COMPARE(&view, qGuiApp->focusWindow());
QSGTextInput *input = qobject_cast<QSGTextInput *>(view.rootObject());
QVERIFY(input);
view.show();
view.requestActivateWindow();
QTest::qWaitForWindowShown(&view);
- QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue);
- QTRY_COMPARE(view.windowState(), Qt::WindowActive);
+ QTRY_COMPARE(&view, qGuiApp->focusWindow());
QSGTextInput *input = qobject_cast<QSGTextInput *>(view.rootObject());
QVERIFY(input);
view.show();
view.requestActivateWindow();
QTest::qWaitForWindowShown(&view);
- QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue);
- QTRY_COMPARE(view.windowState(), Qt::WindowActive);
+ QTRY_COMPARE(&view, qGuiApp->focusWindow());
QSGTextInput *input = qobject_cast<QSGTextInput *>(view.rootObject());
QVERIFY(input);
view.show();
view.requestActivateWindow();
QTest::qWaitForWindowShown(&view);
- QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue);
- QTRY_COMPARE(view.windowState(), Qt::WindowActive);
+ QTRY_COMPARE(&view, qGuiApp->focusWindow());
QSGTextInput *input = qobject_cast<QSGTextInput *>(view.rootObject());
QVERIFY(input);
QSignalSpy spy(input, SIGNAL(inputMethodComposingChanged()));
{
QString qmlfile = SRCDIR "/data/positionAt.qml";
QSGView view(QUrl::fromLocalFile(qmlfile));
- view.requestActivateWindow();
view.show();
+ view.requestActivateWindow();
QTest::qWaitForWindowShown(&view);
- QEXPECT_FAIL("", QTBUG_21489_MESSAGE, Continue);
- QTRY_COMPARE(view.windowState(), Qt::WindowActive);
+ QTRY_COMPARE(&view, qGuiApp->focusWindow());
QSGTextInput* input = qobject_cast<QSGTextInput*>(view.rootObject());
QVERIFY(input);