From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Tue, 19 Apr 2011 03:55:05 +0000 (+1000)
Subject: Remove Q_ASSERT from accessibility autotest
X-Git-Tag: qt-v5.0.0-alpha1~4297^2~75
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6bc4d8b58fb3bc152c00ac75f67eb6a460ae639a;p=profile%2Fivi%2Fqtbase.git

Remove Q_ASSERT from accessibility autotest

Instead of crashing when we can't get a QAccessibleInterface for a
widget, output a useful warning and return a value that makes the test
fail gracefully.

Change-Id: I0b292cdd8f5a59e26bdc9b0b67cea2b58591df7d
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit d8dc5bfdff25d72e8276c6e80080d72315abe7e0)
---

diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp
index 6e580cb..5841e95 100644
--- a/tests/auto/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp
@@ -371,8 +371,9 @@ static QString stateNames(int state)
 QAccessible::State state(QWidget * const widget)
 {
     QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(widget);
-    Q_ASSERT(iface);
-    QAccessible::State state = iface->state(0);
+    if (!iface)
+        qWarning() << "Cannot get QAccessibleInterface for widget";
+    QAccessible::State state = (iface ? iface->state(0) : static_cast<QAccessible::State>(0));
     delete iface;
     return state;
 }