1 files changed, 69 insertions, 0 deletions
diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp
index 92e3a8b..7b70a5e 100644
--- a/tests/auto/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp
@@ -238,6 +238,7 @@ private slots:
     void navigateControllers();
     void navigateLabels();
     void text();
+    void textAttributes();
     void setText();
     void hideShowTest();
 
@@ -1563,6 +1564,60 @@ void tst_QAccessibility::text()
 #endif // !QT3_SUPPORT
 }
 
+void tst_QAccessibility::textAttributes()
+{
+    QTextEdit textEdit;
+    int startOffset;
+    int endOffset;
+    QString attributes;
+    QString text("<html><head></head><body>"
+                 "Hello, <b>this</b> is an <i><b>example</b> text</i>."
+                 "<span style=\"font-family: monospace\">Multiple fonts are used.</span>"
+                 "Multiple <span style=\"font-size: 8pt\">text sizes</span> are used."
+                 "Let's give some color to <span style=\"color:#f0f1f2; background-color:#14f01e\">Qt</span>."
+                 "</body></html>");
+
+    textEdit.setText(text);
+    QAccessibleInterface *interface = QAccessible::queryAccessibleInterface(&textEdit);
+
+    QAccessibleTextInterface *textInterface=interface->textInterface();
+
+    QVERIFY(textInterface);
+    QCOMPARE(textInterface->characterCount(), 112);
+
+    attributes = textInterface->attributes(10, &startOffset, &endOffset);
+    QCOMPARE(startOffset, 7);
+    QCOMPARE(endOffset, 11);
+    attributes.prepend(';');
+    QVERIFY(attributes.contains(QLatin1String(";font-weight:bold;")));
+
+    attributes = textInterface->attributes(18, &startOffset, &endOffset);
+    QCOMPARE(startOffset, 18);
+    QCOMPARE(endOffset, 25);
+    attributes.prepend(';');
+    QVERIFY(attributes.contains(QLatin1String(";font-weight:bold;")));
+    QVERIFY(attributes.contains(QLatin1String(";font-style:italic;")));
+
+    attributes = textInterface->attributes(34, &startOffset, &endOffset);
+    QCOMPARE(startOffset, 31);
+    QCOMPARE(endOffset, 55);
+    attributes.prepend(';');
+    QVERIFY(attributes.contains(QLatin1String(";font-family:\"monospace\";")));
+
+    attributes = textInterface->attributes(65, &startOffset, &endOffset);
+    QCOMPARE(startOffset, 64);
+    QCOMPARE(endOffset, 74);
+    attributes.prepend(';');
+    QVERIFY(attributes.contains(QLatin1String(";font-size:8pt;")));
+
+    attributes = textInterface->attributes(110, &startOffset, &endOffset);
+    QCOMPARE(startOffset, 109);
+    QCOMPARE(endOffset, 111);
+    attributes.prepend(';');
+    QVERIFY(attributes.contains(QLatin1String(";background-color:rgb(20,240,30);")));
+    QVERIFY(attributes.contains(QLatin1String(";color:rgb(240,241,242);")));
+}
+
 void tst_QAccessibility::setText()
 {
 #if !defined(QT3_SUPPORT)
@@ -2645,6 +2700,8 @@ void tst_QAccessibility::textEditTest()
 {
     {
     QTextEdit edit;
+    int startOffset;
+    int endOffset;
     QString text = "hello world\nhow are you today?\n";
     edit.setText(text);
     edit.show();
@@ -2654,6 +2711,12 @@ void tst_QAccessibility::textEditTest()
     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());
@@ -2986,6 +3049,12 @@ void tst_QAccessibility::lineEditTest()
     QTestAccessibility::clearEvents();
     le2->setFocus(Qt::TabFocusReason);
     QTRY_VERIFY(QTestAccessibility::events().contains(QTestAccessibilityEvent(le2, 0, QAccessible::Focus)));
+
+    le->setText(QLatin1String("500"));
+    le->setValidator(new QIntValidator());
+    iface->setText(QAccessible::Value, 0, QLatin1String("This text is not a number"));
+    QCOMPARE(le->text(), QLatin1String("500"));
+
     delete iface;
     delete le;
     delete le2;