diff options
| author | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2012-03-20 19:08:04 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-23 11:25:06 +0100 |
| commit | a7b68bf189fbae3a0add5660f8a95ed4359a67d5 (patch) | |
| tree | 3968019247bb57b56317fbc3884ea51056ae68fa /tests | |
| parent | b6c332107372fdcbe64c47eb458d8820e499fd16 (diff) | |
Fix text editor mouse handler unit tests
QTBUG-24035 - tst_qdeclarativetextedit::inputContextMouseHandler test fails.
Change-Id: I61ae74f1f4f19586abbdcae79f05f556a9904740
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp index 62a3a561..5aaea511 100644 --- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp +++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp @@ -2513,8 +2513,7 @@ void tst_qdeclarativetextedit::inputContextMouseHandler() edit.setPos(0, 0); edit.setWidth(200); edit.setText(text.mid(0, 12)); - edit.setPos(0, 0); - edit.setCursorPosition(12); + edit.setCursorPosition(0); edit.setFocus(true); scene.addItem(&edit); view.show(); @@ -2535,7 +2534,6 @@ void tst_qdeclarativetextedit::inputContextMouseHandler() QTest::mouseRelease(view.viewport(), Qt::RightButton, Qt::ControlModifier, position2); QApplication::processEvents(); - QEXPECT_FAIL("", "QTBUG-24035", Abort); QCOMPARE(ic.m_action, QInputMethod::Click); QCOMPARE(ic.m_invokeActionCallCount, 1); QCOMPARE(ic.m_cursorPosition, 2); diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp index 06d1604d..c785f4e3 100644 --- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp +++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp @@ -2610,7 +2610,7 @@ void tst_qdeclarativetextinput::inputContextMouseHandler() QDeclarativeTextInput input; input.setWidth(200); input.setText(text.mid(0, 12)); - input.setCursorPosition(12); + input.setCursorPosition(0); input.setPos(0, 0); input.setFocus(true); scene.addItem(&input); @@ -2631,7 +2631,6 @@ void tst_qdeclarativetextinput::inputContextMouseHandler() QTest::mouseRelease(view.viewport(), Qt::LeftButton, Qt::NoModifier, position2); QApplication::processEvents(); - QEXPECT_FAIL("", "QTBUG-24035", Abort); QCOMPARE(platformInputContext.m_action, QInputMethod::Click); QCOMPARE(platformInputContext.m_invokeActionCallCount, 1); QCOMPARE(platformInputContext.m_cursorPosition, 2); |