diff options
| author | Frederik Gladhorn <frederik.gladhorn@nokia.com> | 2011-09-27 14:28:19 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-28 03:17:28 +0200 |
| commit | e918598e2d525af1709045ff172e01075bbec662 (patch) | |
| tree | 8578b6b07442ca08fb3089daf112bf525320b338 /tests | |
| parent | 96b6a1622031bb243844642680257d0f73cfd233 (diff) | |
Simplify QAccessibleTextEdit.
Before the text edit tried to represent each line of text as a child
of itself. With the editable text interface this is no longer needed.
Change-Id: If9927e522f955e863e91fd0a529a1ce6fafaddc3
Reviewed-on: http://codereview.qt-project.org/5624
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qaccessibility/tst_qaccessibility.cpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp index b00a0e8372..4fb21068a2 100644 --- a/tests/auto/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp @@ -1773,16 +1773,12 @@ void tst_QAccessibility::textEditTest() QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(&edit); QCOMPARE(iface->text(QAccessible::Value, 0), text); - QCOMPARE(iface->childCount(), 6); - QCOMPARE(iface->text(QAccessible::Value, 4), QString("hello world")); - QCOMPARE(iface->text(QAccessible::Value, 5), QString("how are you today?")); QCOMPARE(iface->textInterface()->textAtOffset(8, QAccessible2::WordBoundary, &startOffset, &endOffset), QString("world")); QCOMPARE(startOffset, 6); QCOMPARE(endOffset, 11); QCOMPARE(iface->textInterface()->textAtOffset(14, QAccessible2::LineBoundary, &startOffset, &endOffset), QString("how are you today?")); QCOMPARE(startOffset, 12); QCOMPARE(endOffset, 30); - QCOMPARE(iface->text(QAccessible::Value, 6), QString()); QCOMPARE(iface->textInterface()->characterCount(), 31); QFontMetrics fm(edit.font()); QCOMPARE(iface->textInterface()->characterRect(0, QAccessible2::RelativeToParent).size(), QSize(fm.width("h"), fm.height())); @@ -1800,14 +1796,19 @@ void tst_QAccessibility::textBrowserTest() textBrowser.setText(text); textBrowser.show(); - QAccessibleInterface *interface = QAccessible::queryAccessibleInterface(&textBrowser); - QVERIFY(interface); - QCOMPARE(interface->role(0), QAccessible::StaticText); - QCOMPARE(interface->text(QAccessible::Value, 0), text); - QCOMPARE(interface->childCount(), 6); - QCOMPARE(interface->text(QAccessible::Value, 4), QString("Hello world")); - QCOMPARE(interface->text(QAccessible::Value, 5), QString("how are you today?")); - QCOMPARE(interface->text(QAccessible::Value, 6), QString()); + QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(&textBrowser); + QVERIFY(iface); + QCOMPARE(iface->role(0), QAccessible::StaticText); + QCOMPARE(iface->text(QAccessible::Value, 0), text); + int startOffset; + int endOffset; + QCOMPARE(iface->textInterface()->textAtOffset(8, QAccessible2::WordBoundary, &startOffset, &endOffset), QString("world")); + QCOMPARE(startOffset, 6); + QCOMPARE(endOffset, 11); + QCOMPARE(iface->textInterface()->textAtOffset(14, QAccessible2::LineBoundary, &startOffset, &endOffset), QString("how are you today?")); + QCOMPARE(startOffset, 12); + QCOMPARE(endOffset, 30); + QCOMPARE(iface->textInterface()->characterCount(), 31); } QTestAccessibility::clearEvents(); } |