AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Q_ASSERT's from QAbstractFileEngine autotest

Browse Source 
Rather than aborting in debug builds and ignoring failures in release
builds, report meaningful warnings into the test output and return
sentinel values that will cause QVERIFY/QCOMPARE of the returned values
to fail the test.

Change-Id: I2c5a820637337d0762c71db10a4f270d36b31662
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 524bd6b7120f70a178b03bc6d337e08abd327076)
This commit is contained in:
Jason McDonald 2011-05-05 14:40:40 +10:00 committed by Rohan McGovern
parent 6aca191e10
commit 8e9644a67e
1 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
tests/auto/qabstractfileengine/tst_qabstractfileengine.cpp
View File

@ -83,8 +83,12 @@ public:
bool open(QIODevice::OpenMode openMode) bool open(QIODevice::OpenMode openMode)
{ {
Q_ASSERT(!openForRead_); if (openForRead_ || openForWrite_) {
Q_ASSERT(!openForWrite_); qWarning("%s: file is already open for %s",
Q_FUNC_INFO,
(openForRead_ ? "reading" : "writing"));
return false;
}
openFile_ = resolveFile(openMode & QIODevice::WriteOnly); openFile_ = resolveFile(openMode & QIODevice::WriteOnly);
if (!openFile_) if (!openFile_)
@ -132,13 +136,19 @@ public:
qint64 pos() const qint64 pos() const
{ {
Q_ASSERT(openForRead_ || openForWrite_); if (!openForRead_ && !openForWrite_) {
qWarning("%s: file is not open", Q_FUNC_INFO);
return -1;
}
return position_; return position_;
} }
bool seek(qint64 pos) bool seek(qint64 pos)
{ {
Q_ASSERT(openForRead_ || openForWrite_); if (!openForRead_ && !openForWrite_) {
qWarning("%s: file is not open", Q_FUNC_INFO);
return false;
}
if (pos >= 0) { if (pos >= 0) {
position_ = pos; position_ = pos;
@ -150,7 +160,11 @@ public:
bool flush() bool flush()
{ {
Q_ASSERT(openForRead_ || openForWrite_); if (!openForRead_ && !openForWrite_) {
qWarning("%s: file is not open", Q_FUNC_INFO);
return false;
}
return true; return true;
} }
@ -368,9 +382,16 @@ public:
qint64 read(char *data, qint64 maxLen) qint64 read(char *data, qint64 maxLen)
{ {
Q_ASSERT(openForRead_); if (!openForRead_) {
qWarning("%s: file must be open for reading", Q_FUNC_INFO);
return -1;
}
if (openFile_.isNull()) {
qWarning("%s: file must not be null", Q_FUNC_INFO);
return -1;
}
Q_ASSERT(!openFile_.isNull());
QMutexLocker lock(&openFile_->mutex); QMutexLocker lock(&openFile_->mutex);
qint64 readSize = qMin(openFile_->content.size() - position_, maxLen); qint64 readSize = qMin(openFile_->content.size() - position_, maxLen);
if (readSize < 0) if (readSize < 0)
@ -384,12 +405,19 @@ public:
qint64 write(const char *data, qint64 length) qint64 write(const char *data, qint64 length)
{ {
Q_ASSERT(openForWrite_); if (!openForWrite_) {
qWarning("%s: file must be open for writing", Q_FUNC_INFO);
return -1;
}
if (openFile_.isNull()) {
qWarning("%s: file must not be null", Q_FUNC_INFO);
return -1;
}
if (length < 0) if (length < 0)
return -1; return -1;
Q_ASSERT(!openFile_.isNull());
QMutexLocker lock(&openFile_->mutex); QMutexLocker lock(&openFile_->mutex);
if (openFile_->content.size() == position_) if (openFile_->content.size() == position_)
openFile_->content.append(data, length); openFile_->content.append(data, length);
@ -434,7 +462,8 @@ protected:
QSharedPointer<File> resolveFile(bool create) const QSharedPointer<File> resolveFile(bool create) const
{ {
if (openForRead_ || openForWrite_) { if (openForRead_ || openForWrite_) {
Q_ASSERT(openFile_); if (!openFile_)
qWarning("%s: file should not be null", Q_FUNC_INFO);
return openFile_; return openFile_;
} }