diff options
author | Jan-Arve Saether <jan-arve.saether@nokia.com> | 2012-05-22 09:15:38 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-22 20:56:38 +0200 |
commit | 018cb899d482967eb7d8ebdc48cadf1743abe680 (patch) | |
tree | 9ef551fa2b02feeaae548fddded9ad4a416ecefa /tests/auto/other | |
parent | 25f40b2de2b1e284ca94beda68cbfd27a012839d (diff) |
Replace (un)checkAction with toggleAction (3/3)
Remove all references to (un)checkAction.
This commit finalizes the intended change.
Change-Id: I79d3b30b5c3d9fbe276c2c94fed5971bb21d6c02
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'tests/auto/other')
-rw-r--r-- | tests/auto/other/qaccessibility/tst_qaccessibility.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp index 68ad38deda..4607be4a7a 100644 --- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp +++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp @@ -949,14 +949,14 @@ void tst_QAccessibility::buttonTest() interface = QAccessible::queryAccessibleInterface(&toggleButton); actionInterface = interface->actionInterface(); QCOMPARE(interface->role(), QAccessible::CheckBox); - QCOMPARE(actionInterface->actionNames(), QStringList() << QAccessibleActionInterface::checkAction() << QAccessibleActionInterface::setFocusAction()); - QCOMPARE(actionInterface->localizedActionDescription(QAccessibleActionInterface::checkAction()), QString("Checks the checkbox")); + QCOMPARE(actionInterface->actionNames(), QStringList() << QAccessibleActionInterface::toggleAction() << QAccessibleActionInterface::setFocusAction()); + QCOMPARE(actionInterface->localizedActionDescription(QAccessibleActionInterface::toggleAction()), QString("Toggles the state")); QVERIFY(!toggleButton.isChecked()); QVERIFY(!interface->state().checked); - actionInterface->doAction(QAccessibleActionInterface::checkAction()); + actionInterface->doAction(QAccessibleActionInterface::toggleAction()); QTest::qWait(500); QVERIFY(toggleButton.isChecked()); - QCOMPARE(actionInterface->actionNames().at(0), QAccessibleActionInterface::uncheckAction()); + QCOMPARE(actionInterface->actionNames().at(0), QAccessibleActionInterface::toggleAction()); QVERIFY(interface->state().checked); delete interface; @@ -987,12 +987,12 @@ void tst_QAccessibility::buttonTest() interface = QAccessible::queryAccessibleInterface(&checkBox); actionInterface = interface->actionInterface(); QCOMPARE(interface->role(), QAccessible::CheckBox); - QCOMPARE(actionInterface->actionNames(), QStringList() << QAccessibleActionInterface::checkAction() << QAccessibleActionInterface::setFocusAction()); + QCOMPARE(actionInterface->actionNames(), QStringList() << QAccessibleActionInterface::toggleAction() << QAccessibleActionInterface::setFocusAction()); QVERIFY(!interface->state().checked); - actionInterface->doAction(QAccessibleActionInterface::checkAction()); + actionInterface->doAction(QAccessibleActionInterface::toggleAction()); QTest::qWait(500); - QCOMPARE(actionInterface->actionNames(), QStringList() << QAccessibleActionInterface::uncheckAction() << QAccessibleActionInterface::setFocusAction()); + QCOMPARE(actionInterface->actionNames(), QStringList() << QAccessibleActionInterface::toggleAction() << QAccessibleActionInterface::setFocusAction()); QVERIFY(interface->state().checked); QVERIFY(checkBox.isChecked()); QAccessible::State st; @@ -1009,11 +1009,11 @@ void tst_QAccessibility::buttonTest() interface = QAccessible::queryAccessibleInterface(&radio); actionInterface = interface->actionInterface(); QCOMPARE(interface->role(), QAccessible::RadioButton); - QCOMPARE(actionInterface->actionNames(), QStringList() << QAccessibleActionInterface::checkAction() << QAccessibleActionInterface::setFocusAction()); + QCOMPARE(actionInterface->actionNames(), QStringList() << QAccessibleActionInterface::toggleAction() << QAccessibleActionInterface::setFocusAction()); QVERIFY(!interface->state().checked); - actionInterface->doAction(QAccessibleActionInterface::checkAction()); + actionInterface->doAction(QAccessibleActionInterface::toggleAction()); QTest::qWait(500); - QCOMPARE(actionInterface->actionNames(), QStringList() << QAccessibleActionInterface::checkAction() << QAccessibleActionInterface::setFocusAction()); + QCOMPARE(actionInterface->actionNames(), QStringList() << QAccessibleActionInterface::toggleAction() << QAccessibleActionInterface::setFocusAction()); QVERIFY(interface->state().checked); QVERIFY(radio.isChecked()); QAccessible::State st; @@ -2045,8 +2045,8 @@ void tst_QAccessibility::groupBoxTest() QAccessible::State state = iface->state(); QVERIFY(state.checkable); QVERIFY(!state.checked); - QVERIFY(actionIface->actionNames().contains(QAccessibleActionInterface::checkAction())); - actionIface->doAction(QAccessibleActionInterface::checkAction()); + QVERIFY(actionIface->actionNames().contains(QAccessibleActionInterface::toggleAction())); + actionIface->doAction(QAccessibleActionInterface::toggleAction()); QVERIFY(groupBox->isChecked()); state = iface->state(); QVERIFY(state.checked); |