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

Remove Q_ASSERT's from QXmlStream autotest

Browse Source 
Report fatal errors rather than ignoring them in non-debug builds.

Change-Id: I62dd177e2f391e64c12314bf224f8952ed6f3144
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 4793c3bd1dfddcc98eae12e5caf29ff6aabd31b2)
This commit is contained in:
Jason McDonald 2011-05-10 11:43:08 +10:00 committed by Rohan McGovern
parent fa42ba9b62
commit d35fcd3053
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/auto/qxmlstream/tst_qxmlstream.cpp
View File

@ -264,7 +264,8 @@ public:
expected(aExpected),
output(aOutput)
{
Q_ASSERT(!aId.isEmpty());
if (aId.isEmpty())
qFatal("%s: aId must not be an empty string", Q_FUNC_INFO);
}
QString id;
@ -288,7 +289,8 @@ public:
TestSuiteHandler(const QUrl &baseURI) : runCount(0),
skipCount(0)
{
Q_ASSERT(baseURI.isValid());
if (!baseURI.isValid())
qFatal("%s: baseURI must be valid", Q_FUNC_INFO);
m_baseURI.push(baseURI);
}
@ -480,9 +482,12 @@ public:
static bool isWellformed(QIODevice *const inputFile, const ParseMode mode)
{
Q_ASSERT(inputFile);
Q_ASSERT_X(inputFile->isOpen(), Q_FUNC_INFO, "The caller is responsible for opening the device.");
Q_ASSERT(mode == ParseIncrementally || mode == ParseSinglePass);
if (!inputFile)
qFatal("%s: inputFile must be a valid QIODevice pointer", Q_FUNC_INFO);
if (!inputFile->isOpen())
qFatal("%s: inputFile must be opened by the caller", Q_FUNC_INFO);
if (mode != ParseIncrementally && mode != ParseSinglePass)
qFatal("%s: mode must be either ParseIncrementally or ParseSinglePass", Q_FUNC_INFO);
if(mode == ParseIncrementally)
{