1 files changed, 119 insertions, 0 deletions
diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
index 2a2ccfbf8d..97ffafc9a5 100644
--- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
@@ -38,6 +38,7 @@
 # include <winuser.h>
 #endif
 #include <QtTest/QtTest>
+#include <QSignalSpy>
 #include <QtGui>
 #include <QtWidgets>
 #include <math.h>
@@ -4079,6 +4080,124 @@ void tst_QAccessibility::focusChild()
         delete tabBar;
         QTestAccessibility::clearEvents();
     }
+
+    {
+        QMainWindow mainWindow;
+        QTableWidget *tableView = new QTableWidget(3, 3);
+
+        QSignalSpy spy(tableView, SIGNAL(currentCellChanged(int,int,int,int)));
+
+        tableView->setColumnCount(3);
+        QStringList hHeader;
+        hHeader << "h1" << "h2" << "h3";
+        tableView->setHorizontalHeaderLabels(hHeader);
+
+        QStringList vHeader;
+        vHeader << "v1" << "v2" << "v3";
+        tableView->setVerticalHeaderLabels(vHeader);
+
+        for (int i = 0; i < 9; ++i) {
+            QTableWidgetItem *item = new QTableWidgetItem;
+            item->setText(QString::number(i/3) + QString(".") + QString::number(i%3));
+            tableView->setItem(i/3, i%3, item);
+        }
+
+        mainWindow.setCentralWidget(tableView);
+        mainWindow.resize(600, 600);
+        mainWindow.show();
+
+        QVERIFY(QTest::qWaitForWindowExposed(tableView));
+
+        tableView->setFocus();
+
+        QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(tableView);
+        QVERIFY(iface);
+
+        spy.clear();
+        tableView->setCurrentCell(2, 1);
+        QTRY_COMPARE(spy.count(), 1);
+
+        QAccessibleInterface *child = iface->focusChild();
+        QVERIFY(child);
+        QCOMPARE(child->text(QAccessible::Name), QStringLiteral("2.1"));
+
+        spy.clear();
+        tableView->setCurrentCell(1, 2);
+        QTRY_COMPARE(spy.count(), 1);
+
+        child = iface->focusChild();
+        QVERIFY(child);
+        QCOMPARE(child->text(QAccessible::Name), QStringLiteral("1.2"));
+
+        delete tableView;
+        QTestAccessibility::clearEvents();
+    }
+
+    {
+        QMainWindow mainWindow;
+        QTreeWidget *treeView = new QTreeWidget();
+
+        QSignalSpy spy(treeView, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)));
+
+        treeView->setColumnCount(2);
+        QTreeWidgetItem *header = new QTreeWidgetItem;
+        header->setText(0, "Artist");
+        header->setText(1, "Work");
+        treeView->setHeaderItem(header);
+
+        QTreeWidgetItem *root1 = new QTreeWidgetItem;
+        root1->setText(0, "Spain");
+        treeView->addTopLevelItem(root1);
+
+        QTreeWidgetItem *item1 = new QTreeWidgetItem;
+        item1->setText(0, "Picasso");
+        item1->setText(1, "Guernica");
+        root1->addChild(item1);
+
+        QTreeWidgetItem *item2 = new QTreeWidgetItem;
+        item2->setText(0, "Tapies");
+        item2->setText(1, "Ambrosia");
+        root1->addChild(item2);
+
+        QTreeWidgetItem *root2 = new QTreeWidgetItem;
+        root2->setText(0, "Austria");
+        treeView->addTopLevelItem(root2);
+
+        QTreeWidgetItem *item3 = new QTreeWidgetItem;
+        item3->setText(0, "Klimt");
+        item3->setText(1, "The Kiss");
+        root2->addChild(item3);
+
+        mainWindow.setCentralWidget(treeView);
+        mainWindow.resize(600, 600);
+        mainWindow.show();
+
+        QVERIFY(QTest::qWaitForWindowExposed(treeView));
+
+        treeView->setFocus();
+
+        QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(treeView);
+        QVERIFY(iface);
+
+        spy.clear();
+        treeView->setCurrentItem(item2);
+        QTRY_COMPARE(spy.count(), 1);
+
+        QAccessibleInterface *child = iface->focusChild();
+        QVERIFY(child);
+        QCOMPARE(child->text(QAccessible::Name), QStringLiteral("Tapies"));
+
+        spy.clear();
+        treeView->setCurrentItem(item3);
+        QTRY_COMPARE(spy.count(), 1);
+
+        child = iface->focusChild();
+        QVERIFY(child);
+        QCOMPARE(child->text(QAccessible::Name), QStringLiteral("Klimt"));
+
+        delete treeView;
+        QTestAccessibility::clearEvents();
+    }
 }