diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-05-06 13:12:10 +1000 |
---|---|---|
committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-05-18 10:46:46 +1000 |
commit | 51b23f75df6474cb5a185d482f99c6ff663215f5 (patch) | |
tree | 5d9f7c577a43e2986427636883f1e80466e121da /tests/auto/qabstractfileengine | |
parent | 97e0db61c788a59bff48e33800802d4c4a0b0e70 (diff) |
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)
Diffstat (limited to 'tests/auto/qabstractfileengine')
-rw-r--r-- | tests/auto/qabstractfileengine/tst_qabstractfileengine.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qabstractfileengine/tst_qabstractfileengine.cpp b/tests/auto/qabstractfileengine/tst_qabstractfileengine.cpp index fc4835a331..e77b7bb95e 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; |