From 67a3698b3c558b5bd9fbd2e3b0121bab8c949c95 Mon Sep 17 00:00:00 2001
From: Jan-Arve Saether <jan-arve.saether@nokia.com>
Date: Wed, 18 Jan 2012 14:02:23 +0100
Subject: Remove all references to QAccessible::(Covers|Covered)

These were not used in any bridges, and none of the bridges
(MSAA, Cocoa, AT-SPI/IA2) can hardly make use of this information.

Change-Id: If3cad6b6c1928535dd932f46c9ec6883a4a19c76
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
---
 .../other/qaccessibility/tst_qaccessibility.cpp    | 107 ---------------------
 1 file changed, 107 deletions(-)

(limited to 'tests/auto/other/qaccessibility/tst_qaccessibility.cpp')

diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
index 90ab5b4c67..62bc043080 100644
--- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
@@ -233,7 +233,6 @@ private slots:
     void statesStructTest();
     void navigateHierarchy();
     void sliderTest();
-    void navigateCovered();
     void textAttributes();
     void hideShowTest();
 
@@ -515,112 +514,6 @@ void tst_QAccessibility::sliderTest()
     QTestAccessibility::clearEvents();
 }
 
-void tst_QAccessibility::navigateCovered()
-{
-    {
-    QWidget *w = new QWidget(0);
-    w->setObjectName(QString("Harry"));
-    QWidget *w1 = new QWidget(w);
-    w1->setObjectName(QString("1"));
-    QWidget *w2 = new QWidget(w);
-    w2->setObjectName(QString("2"));
-    w->show();
-#if defined(Q_OS_UNIX)
-    QCoreApplication::processEvents();
-    QTest::qWait(100);
-#endif
-
-    w->setFixedSize(6, 6);
-    w1->setFixedSize(5, 5);
-    w2->setFixedSize(5, 5);
-    w2->move(0, 0);
-    w1->raise();
-
-    QAccessibleInterface *iface1 = QAccessible::queryAccessibleInterface(w1);
-    QVERIFY(iface1 != 0);
-    QVERIFY(iface1->isValid());
-    QAccessibleInterface *iface2 = QAccessible::queryAccessibleInterface(w2);
-    QVERIFY(iface2 != 0);
-    QVERIFY(iface2->isValid());
-    QAccessibleInterface *iface3 = 0;
-
-    QCOMPARE(iface1->navigate(QAccessible::Covers, -42, &iface3), -1);
-    QVERIFY(iface3 == 0);
-    QCOMPARE(iface1->navigate(QAccessible::Covers, 0, &iface3), -1);
-    QVERIFY(iface3 == 0);
-    QCOMPARE(iface1->navigate(QAccessible::Covers, 2, &iface3), -1);
-    QVERIFY(iface3 == 0);
-
-    for (int loop = 0; loop < 2; ++loop) {
-        for (int x = 0; x < w->width(); ++x) {
-            for (int y = 0; y < w->height(); ++y) {
-                w1->move(x, y);
-                if (w1->geometry().intersects(w2->geometry())) {
-                    QVERIFY(iface1->relationTo(iface2) & QAccessible::Covers);
-                    QVERIFY(iface2->relationTo(iface1) & QAccessible::Covered);
-                    QCOMPARE(iface1->navigate(QAccessible::Covered, 1, &iface3), 0);
-                    QVERIFY(iface3 != 0);
-                    QVERIFY(iface3->isValid());
-                    QCOMPARE(iface3->object(), iface2->object());
-                    delete iface3; iface3 = 0;
-                    QCOMPARE(iface2->navigate(QAccessible::Covers, 1, &iface3), 0);
-                    QVERIFY(iface3 != 0);
-                    QVERIFY(iface3->isValid());
-                    QCOMPARE(iface3->object(), iface1->object());
-                    delete iface3; iface3 = 0;
-                } else {
-                    QVERIFY(!(iface1->relationTo(iface2) & QAccessible::Covers));
-                    QVERIFY(!(iface2->relationTo(iface1) & QAccessible::Covered));
-                    QCOMPARE(iface1->navigate(QAccessible::Covered, 1, &iface3), -1);
-                    QVERIFY(iface3 == 0);
-                    QCOMPARE(iface1->navigate(QAccessible::Covers, 1, &iface3), -1);
-                    QVERIFY(iface3 == 0);
-                    QCOMPARE(iface2->navigate(QAccessible::Covered, 1, &iface3), -1);
-                    QVERIFY(iface3 == 0);
-                    QCOMPARE(iface2->navigate(QAccessible::Covers, 1, &iface3), -1);
-                    QVERIFY(iface3 == 0);
-                }
-            }
-        }
-        if (!loop) {
-            // switch children for second loop
-            w2->raise();
-            QAccessibleInterface *temp = iface1;
-            iface1 = iface2;
-            iface2 = temp;
-        }
-    }
-    delete iface1; iface1 = 0;
-    delete iface2; iface2 = 0;
-    iface1 = QAccessible::queryAccessibleInterface(w1);
-    QVERIFY(iface1 != 0);
-    QVERIFY(iface1->isValid());
-    iface2 = QAccessible::queryAccessibleInterface(w2);
-    QVERIFY(iface2 != 0);
-    QVERIFY(iface2->isValid());
-
-    w1->move(0,0);
-    w2->move(0,0);
-    w1->raise();
-    QVERIFY(iface1->relationTo(iface2) & QAccessible::Covers);
-    QVERIFY(iface2->relationTo(iface1) & QAccessible::Covered);
-    QVERIFY(!iface1->state().invisible);
-    w1->hide();
-    QVERIFY(iface1->state().invisible);
-    QVERIFY(!(iface1->relationTo(iface2) & QAccessible::Covers));
-    QVERIFY(!(iface2->relationTo(iface1) & QAccessible::Covered));
-    QCOMPARE(iface2->navigate(QAccessible::Covered, 1, &iface3), -1);
-    QVERIFY(iface3 == 0);
-    QCOMPARE(iface1->navigate(QAccessible::Covers, 1, &iface3), -1);
-    QVERIFY(iface3 == 0);
-
-    delete iface1; iface1 = 0;
-    delete iface2; iface2 = 0;
-    delete w;
-    }
-    QTestAccessibility::clearEvents();
-}
-
 void tst_QAccessibility::navigateHierarchy()
 {
     {
-- 
cgit v1.2.3