1 files changed, 172 insertions, 0 deletions

diff --git a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
index 78ae94e53e..bce1f9e4a2 100644
--- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
+++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
@@ -117,6 +117,7 @@ private slots:
     void color();
     void textMargin();
     void persistentSelection();
+    void selectionOnFocusOut();
     void focusOnPress();
     void selection();
     void isRightToLeft_data();
@@ -133,6 +134,9 @@ private slots:
     void dragMouseSelection();
     void mouseSelectionMode_accessors();
     void selectByMouse();
+    void selectByKeyboard();
+    void keyboardSelection_data();
+    void keyboardSelection();
     void renderType();
     void inputMethodHints();
 
@@ -1163,6 +1167,48 @@ void tst_qquicktextedit::persistentSelection()
 
 }
 
+void tst_qquicktextedit::selectionOnFocusOut()
+{
+    QQuickView window(testFileUrl("focusOutSelection.qml"));
+    window.show();
+    window.requestActivate();
+    QTest::qWaitForWindowActive(&window);
+
+    QPoint p1(25, 35);
+    QPoint p2(25, 85);
+
+    QQuickTextEdit *edit1 = window.rootObject()->findChild<QQuickTextEdit*>("text1");
+    QQuickTextEdit *edit2 = window.rootObject()->findChild<QQuickTextEdit*>("text2");
+
+    QTest::mouseClick(&window, Qt::LeftButton, 0, p1);
+    QVERIFY(edit1->hasActiveFocus());
+    QVERIFY(!edit2->hasActiveFocus());
+
+    edit1->selectAll();
+    QCOMPARE(edit1->selectedText(), QLatin1String("text 1"));
+
+    QTest::mouseClick(&window, Qt::LeftButton, 0, p2);
+
+    QCOMPARE(edit1->selectedText(), QLatin1String(""));
+    QVERIFY(!edit1->hasActiveFocus());
+    QVERIFY(edit2->hasActiveFocus());
+
+    edit2->selectAll();
+    QCOMPARE(edit2->selectedText(), QLatin1String("text 2"));
+
+
+    edit2->setFocus(false, Qt::ActiveWindowFocusReason);
+    QVERIFY(!edit2->hasActiveFocus());
+    QCOMPARE(edit2->selectedText(), QLatin1String("text 2"));
+
+    edit2->setFocus(true);
+    QVERIFY(edit2->hasActiveFocus());
+
+    edit2->setFocus(false, Qt::PopupFocusReason);
+    QVERIFY(!edit2->hasActiveFocus());
+    QCOMPARE(edit2->selectedText(), QLatin1String("text 2"));
+}
+
 void tst_qquicktextedit::focusOnPress()
 {
     QString componentStr =
@@ -1872,6 +1918,8 @@ void tst_qquicktextedit::mouseSelection()
     QTest::mouseRelease(&window, Qt::LeftButton, Qt::NoModifier, p2);
     QTRY_COMPARE(textEditObject->selectedText(), selectedText);
 
+    QTest::qWait(QGuiApplication::styleHints()->mouseDoubleClickInterval() + 10);
+
     // Clicking and shift to clicking between the same points should select the same text.
     textEditObject->setCursorPosition(0);
     if (clicks > 1)
@@ -2018,6 +2066,127 @@ void tst_qquicktextedit::selectByMouse()
     QCOMPARE(spy.at(1).at(0).toBool(), false);
 }
 
+void tst_qquicktextedit::selectByKeyboard()
+{
+    QQmlComponent oldComponent(&engine);
+    oldComponent.setData("import QtQuick 2.0\n TextEdit { selectByKeyboard: true }", QUrl());
+    QVERIFY(!oldComponent.create());
+
+    QQmlComponent component(&engine);
+    component.setData("import QtQuick 2.1\n TextEdit { }", QUrl());
+    QScopedPointer<QObject> object(component.create());
+    QQuickTextEdit *edit = qobject_cast<QQuickTextEdit *>(object.data());
+    QVERIFY(edit);
+
+    QSignalSpy spy(edit, SIGNAL(selectByKeyboardChanged(bool)));
+
+    QCOMPARE(edit->isReadOnly(), false);
+    QCOMPARE(edit->selectByKeyboard(), true);
+
+    edit->setReadOnly(true);
+    QCOMPARE(edit->selectByKeyboard(), false);
+    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.at(0).at(0).toBool(), false);
+
+    edit->setSelectByKeyboard(true);
+    QCOMPARE(edit->selectByKeyboard(), true);
+    QCOMPARE(spy.count(), 2);
+    QCOMPARE(spy.at(1).at(0).toBool(), true);
+
+    edit->setReadOnly(false);
+    QCOMPARE(edit->selectByKeyboard(), true);
+    QCOMPARE(spy.count(), 2);
+
+    edit->setSelectByKeyboard(false);
+    QCOMPARE(edit->selectByKeyboard(), false);
+    QCOMPARE(spy.count(), 3);
+    QCOMPARE(spy.at(2).at(0).toBool(), false);
+}
+
+Q_DECLARE_METATYPE(QKeySequence::StandardKey)
+
+void tst_qquicktextedit::keyboardSelection_data()
+{
+    QTest::addColumn<QString>("text");
+    QTest::addColumn<bool>("readOnly");
+    QTest::addColumn<bool>("selectByKeyboard");
+    QTest::addColumn<int>("cursorPosition");
+    QTest::addColumn<QKeySequence::StandardKey>("standardKey");
+    QTest::addColumn<QString>("selectedText");
+
+    QTest::newRow("editable - select first char")
+            << QStringLiteral("editable - select first char") << false << true << 0 << QKeySequence::SelectNextChar << QStringLiteral("e");
+    QTest::newRow("editable - select first word")
+            << QStringLiteral("editable - select first char") << false << true << 0 << QKeySequence::SelectNextWord << QStringLiteral("editable ");
+
+    QTest::newRow("editable - cannot select first char")
+            << QStringLiteral("editable - cannot select first char") << false << false << 0 << QKeySequence::SelectNextChar << QStringLiteral("");
+    QTest::newRow("editable - cannot select first word")
+            << QStringLiteral("editable - cannot select first word") << false << false << 0 << QKeySequence::SelectNextWord << QStringLiteral("");
+
+    QTest::newRow("editable - select last char")
+            << QStringLiteral("editable - select last char") << false << true << 27 << QKeySequence::SelectPreviousChar << QStringLiteral("r");
+    QTest::newRow("editable - select last word")
+            << QStringLiteral("editable - select last word") << false << true << 27 << QKeySequence::SelectPreviousWord << QStringLiteral("word");
+
+    QTest::newRow("editable - cannot select last char")
+            << QStringLiteral("editable - cannot select last char") << false << false << 35 << QKeySequence::SelectPreviousChar << QStringLiteral("");
+    QTest::newRow("editable - cannot select last word")
+            << QStringLiteral("editable - cannot select last word") << false << false << 35 << QKeySequence::SelectPreviousWord << QStringLiteral("");
+
+    QTest::newRow("read-only - cannot select first char")
+            << QStringLiteral("read-only - cannot select first char") << true << false << 0 << QKeySequence::SelectNextChar << QStringLiteral("");
+    QTest::newRow("read-only - cannot select first word")
+            << QStringLiteral("read-only - cannot select first word") << true << false << 0 << QKeySequence::SelectNextWord << QStringLiteral("");
+
+    QTest::newRow("read-only - cannot select last char")
+            << QStringLiteral("read-only - cannot select last char") << true << false << 35 << QKeySequence::SelectPreviousChar << QStringLiteral("");
+    QTest::newRow("read-only - cannot select last word")
+            << QStringLiteral("read-only - cannot select last word") << true << false << 35 << QKeySequence::SelectPreviousWord << QStringLiteral("");
+
+    QTest::newRow("read-only - select first char")
+            << QStringLiteral("read-only - select first char") << true << true << 0 << QKeySequence::SelectNextChar << QStringLiteral("r");
+    QTest::newRow("read-only - select first word")
+            << QStringLiteral("read-only - select first word") << true << true << 0 << QKeySequence::SelectNextWord << QStringLiteral("read");
+
+    QTest::newRow("read-only - select last char")
+            << QStringLiteral("read-only - select last char") << true << true << 28 << QKeySequence::SelectPreviousChar << QStringLiteral("r");
+    QTest::newRow("read-only - select last word")
+            << QStringLiteral("read-only - select last word") << true << true << 28 << QKeySequence::SelectPreviousWord << QStringLiteral("word");
+}
+
+void tst_qquicktextedit::keyboardSelection()
+{
+    QFETCH(QString, text);
+    QFETCH(bool, readOnly);
+    QFETCH(bool, selectByKeyboard);
+    QFETCH(int, cursorPosition);
+    QFETCH(QKeySequence::StandardKey, standardKey);
+    QFETCH(QString, selectedText);
+
+    QQmlComponent component(&engine);
+    component.setData("import QtQuick 2.1\n TextEdit { focus: true }", QUrl());
+    QScopedPointer<QObject> object(component.create());
+    QQuickTextEdit *edit = qobject_cast<QQuickTextEdit *>(object.data());
+    QVERIFY(edit);
+
+    edit->setText(text);
+    edit->setSelectByKeyboard(selectByKeyboard);
+    edit->setReadOnly(readOnly);
+    edit->setCursorPosition(cursorPosition);
+
+    QQuickWindow window;
+    edit->setParentItem(window.contentItem());
+    window.show();
+    window.requestActivate();
+    QTest::qWaitForWindowActive(&window);
+    QVERIFY(edit->hasActiveFocus());
+
+    simulateKeys(&window, standardKey);
+
+    QCOMPARE(edit->selectedText(), selectedText);
+}
+
 void tst_qquicktextedit::renderType()
 {
     QQmlComponent component(&engine);
@@ -2223,6 +2392,7 @@ void tst_qquicktextedit::cursorDelegate()
     QQuickView view(source);
     view.show();
     view.requestActivate();
+    QTest::qWaitForWindowActive(&view);
     QQuickTextEdit *textEditObject = view.rootObject()->findChild<QQuickTextEdit*>("textEditObject");
     QVERIFY(textEditObject != 0);
     // Delegate creation is deferred until focus in or cursor visibility is forced.
@@ -2338,6 +2508,7 @@ void tst_qquicktextedit::remoteCursorDelegate()
     view.setSource(testFileUrl("cursorTestRemote.qml"));
     view.show();
     view.requestActivate();
+    QTest::qWaitForWindowActive(&view);
     QQuickTextEdit *textEditObject = view.rootObject()->findChild<QQuickTextEdit*>("textEditObject");
     QVERIFY(textEditObject != 0);
 
@@ -2351,6 +2522,7 @@ void tst_qquicktextedit::remoteCursorDelegate()
 
     QCOMPARE(component.status(), QQmlComponent::Loading);
     QVERIFY(!textEditObject->findChild<QQuickItem*>("cursorInstance"));
+    server.sendDelayedItem();
 
     // Wait for component to load.
     QTRY_COMPARE(component.status(), QQmlComponent::Ready);