QQuickCanvas renames

[profile/ivi/qtdeclarative.git] / tests / auto / quick / qquickaccessible / tst_qquickaccessible.cpp

diff --git a/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp b/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp
index 45a9d11..a99a775 100644 (file)
--- a/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp
+++ b/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp
@@ -277,12 +277,12 @@ void tst_QQuickAccessible::basicPropertiesTest()
     QAI app = QAI(QAccessible::queryAccessibleInterface(qApp));
     QCOMPARE(app->childCount(), 0);
 
-    QQuickView *canvas = new QQuickView();
-    canvas->setSource(testFileUrl("statictext.qml"));
-    canvas->show();
+    QQuickView *window = new QQuickView();
+    window->setSource(testFileUrl("statictext.qml"));
+    window->show();
     QCOMPARE(app->childCount(), 1);
 
-    QAI iface = QAI(QAccessible::queryAccessibleInterface(canvas));
+    QAI iface = QAI(QAccessible::queryAccessibleInterface(window));
     QVERIFY(iface.data());
     QCOMPARE(iface->childCount(), 1);
 
@@ -318,7 +318,7 @@ void tst_QQuickAccessible::basicPropertiesTest()
     QCOMPARE(iface->indexOfChild(text2.data()), -1);
     QCOMPARE(text2->indexOfChild(item.data()), -1);
 
-    delete canvas;
+    delete window;
 }
 
 QAI topLevelChildAt(QAccessibleInterface *iface, int x, int y)
@@ -336,13 +336,13 @@ QAI topLevelChildAt(QAccessibleInterface *iface, int x, int y)
 
 void tst_QQuickAccessible::hitTest()
 {
-    QQuickView *canvas = new QQuickView;
-    canvas->setSource(testFileUrl("hittest.qml"));
-    canvas->show();
+    QQuickView *window = new QQuickView;
+    window->setSource(testFileUrl("hittest.qml"));
+    window->show();
 
-    QAI canvasIface = QAI(QAccessible::queryAccessibleInterface(canvas));
-    QVERIFY(canvasIface.data());
-    QAI rootItem = QAI(canvasIface->child(0));
+    QAI windowIface = QAI(QAccessible::queryAccessibleInterface(window));
+    QVERIFY(windowIface.data());
+    QAI rootItem = QAI(windowIface->child(0));
     QRect rootRect = rootItem->rect();
 
     // check the root item from app
@@ -378,37 +378,45 @@ void tst_QQuickAccessible::hitTest()
     QVERIFY(rect201);
 
     QRect rect201Rect = rect201->rect();
-    rootItemIface = QAI(canvasIface->childAt(rect201Rect.x() + 20, rect201Rect.y() + 20));
+    rootItemIface = QAI(windowIface->childAt(rect201Rect.x() + 20, rect201Rect.y() + 20));
     QVERIFY(rootItemIface);
     QCOMPARE(rootItemIface->rect(), rect201Rect);
     QCOMPARE(rootItemIface->text(QAccessible::Name), QLatin1String("rect201"));
 
-    delete canvas;
+    delete window;
 }
 
 void tst_QQuickAccessible::checkableTest()
 {
-    QQuickView *canvas = new QQuickView();
-    canvas->setSource(testFileUrl("checkbuttons.qml"));
-    canvas->show();
+    QQuickView *window = new QQuickView();
+    window->setSource(testFileUrl("checkbuttons.qml"));
+    window->show();
 
-    QAI iface = QAI(QAccessible::queryAccessibleInterface(canvas));
+    QAI iface = QAI(QAccessible::queryAccessibleInterface(window));
     QVERIFY(iface.data());
     QAI root = QAI(iface->child(0));
 
     QAI button1 = QAI(root->child(0));
     QCOMPARE(button1->role(), QAccessible::Button);
     QVERIFY(!(button1->state().checked));
+    QVERIFY(!(button1->state().checkable));
+
     QAI button2 = QAI(root->child(1));
     QVERIFY(!(button2->state().checked));
+    QVERIFY(button2->state().checkable);
+
     QAI button3 = QAI(root->child(2));
     QVERIFY(button3->state().checked);
+    QVERIFY(button3->state().checkable);
 
     QAI checkBox1 = QAI(root->child(3));
     QCOMPARE(checkBox1->role(), QAccessible::CheckBox);
     QVERIFY((checkBox1->state().checked));
+    QVERIFY(checkBox1->state().checkable);
+
     QAI checkBox2 = QAI(root->child(4));
     QVERIFY(!(checkBox2->state().checked));
+    QVERIFY(checkBox2->state().checkable);
 }
 
 QTEST_MAIN(tst_QQuickAccessible)