1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Autotest details of QAccessibleEvent.

Browse Source 
Change-Id: Ieec33c23e7b18cfedf061088d6561203a5e7ac39
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
This commit is contained in:
Frederik Gladhorn 2012-03-07 19:09:33 +01:00 committed by Qt by Nokia
parent c68737add3
commit 76ddc9bc0c
2 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/testlib/qtestaccessible.h
View File

@ -63,7 +63,8 @@ QT_BEGIN_NAMESPACE
class QObject; class QObject;
typedef QList<QAccessibleEvent> EventList; // Use pointers since we subclass QAccessibleEvent
typedef QList<QAccessibleEvent*> EventList;
bool operator==(const QAccessibleEvent &l, const QAccessibleEvent &r) bool operator==(const QAccessibleEvent &l, const QAccessibleEvent &r)
{ {
@ -100,8 +101,18 @@ public:
static bool verifyEvent(const QAccessibleEvent& ev) static bool verifyEvent(const QAccessibleEvent& ev)
{ {
if (eventList().isEmpty()) if (eventList().isEmpty())
return FALSE; return false;
return eventList().takeFirst() == ev; QAccessibleEvent *first = eventList().takeFirst();
bool res = *first == ev;
delete first;
return res;
}
static bool containsEvent(const QAccessibleEvent &event) {
Q_FOREACH (QAccessibleEvent *ev, eventList()) {
if (*ev == event)
return true;
}
return false;
} }
private: private:
@ -134,12 +145,12 @@ private:
eventList().append(copyEvent(event)); eventList().append(copyEvent(event));
} }
static QAccessibleEvent copyEvent(const QAccessibleEvent &event) static QAccessibleEvent *copyEvent(const QAccessibleEvent &event)
{ {
if (event.type() == QAccessible::StateChanged) if (event.type() == QAccessible::StateChanged)
return QAccessibleStateChangeEvent(static_cast<const QAccessibleStateChangeEvent*>(&event)->changedStates(), return new QAccessibleStateChangeEvent(static_cast<const QAccessibleStateChangeEvent*>(&event)->changedStates(),
event.object(), event.child()); event.object(), event.child());
return QAccessibleEvent(event.type(), event.object(), event.child()); return new QAccessibleEvent(event.type(), event.object(), event.child());
} }
static EventList &eventList() static EventList &eventList()

39
tests/auto/other/qaccessibility/tst_qaccessibility.cpp
View File

@ -403,8 +403,8 @@ void tst_QAccessibility::cleanup()
qWarning("%d accessibility event(s) were not handled in testfunction '%s':", list.count(), qWarning("%d accessibility event(s) were not handled in testfunction '%s':", list.count(),
QString(QTest::currentTestFunction()).toAscii().constData()); QString(QTest::currentTestFunction()).toAscii().constData());
for (int i = 0; i < list.count(); ++i) for (int i = 0; i < list.count(); ++i)
qWarning(" %d: Object: %p Event: '%s' Child: %d", i + 1, list.at(i).object(), qWarning(" %d: Object: %p Event: '%s' Child: %d", i + 1, list.at(i)->object(),
eventName(list.at(i).type()).toAscii().constData(), list.at(i).child()); eventName(list.at(i)->type()).toAscii().constData(), list.at(i)->child());
} }
QTestAccessibility::clearEvents(); QTestAccessibility::clearEvents();
} }
@ -730,16 +730,16 @@ void tst_QAccessibility::hideShowTest()
window->show(); window->show();
QVERIFY(!state(window).invisible); QVERIFY(!state(window).invisible);
QVERIFY(!state(child).invisible); QVERIFY(!state(child).invisible);
QVERIFY(QTestAccessibility::events().contains(QAccessibleEvent(QAccessible::ObjectShow, window))); QVERIFY(QTestAccessibility::containsEvent(QAccessibleEvent(QAccessible::ObjectShow, window)));
QVERIFY(QTestAccessibility::events().contains(QAccessibleEvent(QAccessible::ObjectShow, child))); QVERIFY(QTestAccessibility::containsEvent(QAccessibleEvent(QAccessible::ObjectShow, child)));
QTestAccessibility::clearEvents(); QTestAccessibility::clearEvents();
// hide() and veryfy that both window and child are invisible and get ObjectHide events. // hide() and veryfy that both window and child are invisible and get ObjectHide events.
window->hide(); window->hide();
QVERIFY(state(window).invisible); QVERIFY(state(window).invisible);
QVERIFY(state(child).invisible); QVERIFY(state(child).invisible);
QVERIFY(QTestAccessibility::events().contains(QAccessibleEvent(QAccessible::ObjectHide, window))); QVERIFY(QTestAccessibility::containsEvent(QAccessibleEvent(QAccessible::ObjectHide, window)));
QVERIFY(QTestAccessibility::events().contains(QAccessibleEvent(QAccessible::ObjectHide, child))); QVERIFY(QTestAccessibility::containsEvent(QAccessibleEvent(QAccessible::ObjectHide, child)));
QTestAccessibility::clearEvents(); QTestAccessibility::clearEvents();
delete window; delete window;
@ -963,6 +963,9 @@ void tst_QAccessibility::buttonTest()
delete menu; delete menu;
} }
QTestAccessibility::clearEvents();
{
// test check box // test check box
interface = QAccessible::queryAccessibleInterface(&checkBox); interface = QAccessible::queryAccessibleInterface(&checkBox);
actionInterface = interface->actionInterface(); actionInterface = interface->actionInterface();
@ -970,11 +973,16 @@ void tst_QAccessibility::buttonTest()
QCOMPARE(actionInterface->actionNames(), QStringList() << QAccessibleActionInterface::checkAction() << QAccessibleActionInterface::setFocusAction()); QCOMPARE(actionInterface->actionNames(), QStringList() << QAccessibleActionInterface::checkAction() << QAccessibleActionInterface::setFocusAction());
QVERIFY(!interface->state().checked); QVERIFY(!interface->state().checked);
actionInterface->doAction(QAccessibleActionInterface::checkAction()); actionInterface->doAction(QAccessibleActionInterface::checkAction());
QTest::qWait(500); QTest::qWait(500);
QCOMPARE(actionInterface->actionNames(), QStringList() << QAccessibleActionInterface::uncheckAction() << QAccessibleActionInterface::setFocusAction()); QCOMPARE(actionInterface->actionNames(), QStringList() << QAccessibleActionInterface::uncheckAction() << QAccessibleActionInterface::setFocusAction());
QVERIFY(interface->state().checked); QVERIFY(interface->state().checked);
QVERIFY(checkBox.isChecked()); QVERIFY(checkBox.isChecked());
QAccessible::State st;
st.checked = true;
QVERIFY_EVENT(QAccessibleStateChangeEvent(st, &checkBox));
delete interface; delete interface;
}
// test radiobutton // test radiobutton
interface = QAccessible::queryAccessibleInterface(&radio); interface = QAccessible::queryAccessibleInterface(&radio);
@ -1050,12 +1058,12 @@ void tst_QAccessibility::scrollBarTest()
scrollBar->resize(200, 50); scrollBar->resize(200, 50);
scrollBar->show(); scrollBar->show();
QVERIFY(!scrollBarInterface->state().invisible); QVERIFY(!scrollBarInterface->state().invisible);
QVERIFY(QTestAccessibility::events().contains(QAccessibleEvent(QAccessible::ObjectShow, scrollBar))); QVERIFY(QTestAccessibility::containsEvent(QAccessibleEvent(QAccessible::ObjectShow, scrollBar)));
QTestAccessibility::clearEvents(); QTestAccessibility::clearEvents();
scrollBar->hide(); scrollBar->hide();
QVERIFY(scrollBarInterface->state().invisible); QVERIFY(scrollBarInterface->state().invisible);
QVERIFY(QTestAccessibility::events().contains(QAccessibleEvent(QAccessible::ObjectHide, scrollBar))); QVERIFY(QTestAccessibility::containsEvent(QAccessibleEvent(QAccessible::ObjectHide, scrollBar)));
QTestAccessibility::clearEvents(); QTestAccessibility::clearEvents();
// Test that the left/right subcontrols are set to unavailable when the scrollBar is at the minimum/maximum. // Test that the left/right subcontrols are set to unavailable when the scrollBar is at the minimum/maximum.
@ -1495,9 +1503,8 @@ void tst_QAccessibility::spinBoxTest()
QTestAccessibility::clearEvents(); QTestAccessibility::clearEvents();
QTest::keyPress(spinBox, Qt::Key_Up); QTest::keyPress(spinBox, Qt::Key_Up);
QTest::qWait(200); QTest::qWait(200);
EventList events = QTestAccessibility::events();
QAccessibleEvent expectedEvent(QAccessible::ValueChanged, spinBox); QAccessibleEvent expectedEvent(QAccessible::ValueChanged, spinBox);
QVERIFY(events.contains(expectedEvent)); QVERIFY(QTestAccessibility::containsEvent(expectedEvent));
delete spinBox; delete spinBox;
QTestAccessibility::clearEvents(); QTestAccessibility::clearEvents();
} }
@ -1767,7 +1774,7 @@ void tst_QAccessibility::lineEditTest()
le->setFocus(Qt::TabFocusReason); le->setFocus(Qt::TabFocusReason);
QTestAccessibility::clearEvents(); QTestAccessibility::clearEvents();
le2->setFocus(Qt::TabFocusReason); le2->setFocus(Qt::TabFocusReason);
QTRY_VERIFY(QTestAccessibility::events().contains(QAccessibleEvent(QAccessible::Focus, le2))); QTRY_VERIFY(QTestAccessibility::containsEvent(QAccessibleEvent(QAccessible::Focus, le2)));
le->setText(QLatin1String("500")); le->setText(QLatin1String("500"));
le->setValidator(new QIntValidator()); le->setValidator(new QIntValidator());
@ -1787,7 +1794,7 @@ void tst_QAccessibility::lineEditTest()
le3->deselect(); le3->deselect();
le3->setCursorPosition(3); le3->setCursorPosition(3);
QCOMPARE(textIface->cursorPosition(), 3); QCOMPARE(textIface->cursorPosition(), 3);
QTRY_VERIFY(QTestAccessibility::events().contains(QAccessibleEvent(QAccessible::TextCaretMoved, le3))); QTRY_VERIFY(QTestAccessibility::containsEvent(QAccessibleEvent(QAccessible::TextCaretMoved, le3)));
QCOMPARE(textIface->selectionCount(), 0); QCOMPARE(textIface->selectionCount(), 0);
QTestAccessibility::clearEvents(); QTestAccessibility::clearEvents();
@ -2158,11 +2165,11 @@ void tst_QAccessibility::listTest()
// Check for events // Check for events
QTest::mouseClick(listView->viewport(), Qt::LeftButton, 0, listView->visualItemRect(listView->item(1)).center()); QTest::mouseClick(listView->viewport(), Qt::LeftButton, 0, listView->visualItemRect(listView->item(1)).center());
QVERIFY(QTestAccessibility::events().contains(QAccessibleEvent(QAccessible::Selection, listView, 2))); QVERIFY(QTestAccessibility::containsEvent(QAccessibleEvent(QAccessible::Selection, listView, 2)));
QVERIFY(QTestAccessibility::events().contains(QAccessibleEvent(QAccessible::Focus, listView, 2))); QVERIFY(QTestAccessibility::containsEvent(QAccessibleEvent(QAccessible::Focus, listView, 2)));
QTest::mouseClick(listView->viewport(), Qt::LeftButton, 0, listView->visualItemRect(listView->item(2)).center()); QTest::mouseClick(listView->viewport(), Qt::LeftButton, 0, listView->visualItemRect(listView->item(2)).center());
QVERIFY(QTestAccessibility::events().contains(QAccessibleEvent(QAccessible::Selection, listView, 3))); QVERIFY(QTestAccessibility::containsEvent(QAccessibleEvent(QAccessible::Selection, listView, 3)));
QVERIFY(QTestAccessibility::events().contains(QAccessibleEvent(QAccessible::Focus, listView, 3))); QVERIFY(QTestAccessibility::containsEvent(QAccessibleEvent(QAccessible::Focus, listView, 3)));
listView->addItem("Munich"); listView->addItem("Munich");
QCOMPARE(iface->childCount(), 4); QCOMPARE(iface->childCount(), 4);