From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Fri, 6 May 2011 03:12:10 +0000 (+1000)
Subject: Remove Q_ASSERT's from qabstractfileengine test
X-Git-Tag: qt-v5.0.0-alpha1~4297^2~22
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=51b23f75df6474cb5a185d482f99c6ff663215f5;p=profile%2Fivi%2Fqtbase.git

Remove Q_ASSERT's from qabstractfileengine test

Rather than aborting in debug builds and failing silently in release
builds, report a meaningful warning message and skip setting the
filename, which should cause a subsequent test failure.

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

diff --git a/tests/auto/qabstractfileengine/tst_qabstractfileengine.cpp b/tests/auto/qabstractfileengine/tst_qabstractfileengine.cpp
index fc4835a..e77b7bb 100644
--- a/tests/auto/qabstractfileengine/tst_qabstractfileengine.cpp
+++ b/tests/auto/qabstractfileengine/tst_qabstractfileengine.cpp
@@ -360,10 +360,10 @@ public:
 
     void setFileName(const QString &file)
     {
-        Q_ASSERT(!openForRead_);
-        Q_ASSERT(!openForWrite_);
-
-        fileName_ = file;
+        if (openForRead_ || openForWrite_)
+            qWarning("%s: Can't set file name while file is open", Q_FUNC_INFO);
+        else
+            fileName_ = file;
     }
 
     //  typedef QAbstractFileEngineIterator Iterator;