From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Tue, 3 May 2011 00:38:03 +0000 (+1000)
Subject: Remove Q_ASSERT from qgraphicsanchorlayout test
X-Git-Tag: qt-v5.0.0-alpha1~4297^2~59
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=319197880eb8a5d92d2afa4bb22cbdf5193c88de;p=profile%2Fivi%2Fqtbase.git

Remove Q_ASSERT from qgraphicsanchorlayout test

Q_ASSERT will only catch a violation of the precondition of the
checkReverseDirection function in a debug build.  This commit replaces
the Q_ASSERT with QVERIFY'ing the precondition (that the widget has a
layout) before calling the function.

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

diff --git a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
index a0360a3..55d6fc9 100644
--- a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
+++ b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
@@ -135,7 +135,6 @@ static void setAnchor(QGraphicsAnchorLayout *l,
 static bool checkReverseDirection(QGraphicsWidget *widget)
 {
     QGraphicsLayout *layout = widget->layout();
-    Q_ASSERT(layout);
     qreal left, top, right, bottom;
     layout->getContentsMargins(&left, &top, &right, &bottom);
     widget->setLayoutDirection(Qt::LeftToRight);
@@ -345,6 +344,7 @@ void tst_QGraphicsAnchorLayout::layoutDirection()
     p->show();
     view->show();
 
+    QVERIFY(p->layout());
     QCOMPARE(checkReverseDirection(p), true);
 
     if (hasSimplification) {
@@ -445,6 +445,7 @@ void tst_QGraphicsAnchorLayout::diagonal()
         QVERIFY(!usedSimplex(l, Qt::Vertical));
     }
 
+    QVERIFY(p.layout());
     QCOMPARE(checkReverseDirection(&p), true);
 
     c->setMinimumWidth(300);
@@ -735,6 +736,7 @@ void tst_QGraphicsAnchorLayout::snakeOppositeDirections()
     QCOMPARE(c->geometry(), QRectF(90.0, 200.0, 100.0, 100.0));
     QCOMPARE(p.size(), layoutMaximumSize);
 
+    QVERIFY(p.layout());
     QCOMPARE(checkReverseDirection(&p), true);
 }