diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-05-04 10:56:50 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-05-18 10:46:44 +1000 |
| commit | b1b8d0305493e6efcf3093e7e857aa597be87b88 (patch) | |
| tree | 5bb3bd13152e1945ac5718139cdb3b0e0ed709b9 /tests | |
| parent | 48ab5a8d25ff5d5c706763f65024d5b05ba7fcd0 (diff) | |
Remove Q_ASSERT's from qtestlib selftests
Report a fatal error in all builds rather than just in debug mode
builds.
Change-Id: Ie54e55ea2dd13bbb12e4265278db832ac1297c28
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 8a1279b0ae180fae94d3da1a4eeb20df5a748d33)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/selftests/alive/qtestalive.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/auto/selftests/alive/qtestalive.cpp b/tests/auto/selftests/alive/qtestalive.cpp index ba4236744d..e743eaedce 100644 --- a/tests/auto/selftests/alive/qtestalive.cpp +++ b/tests/auto/selftests/alive/qtestalive.cpp @@ -78,7 +78,8 @@ private: QTestAlivePinger::QTestAlivePinger(QObject *receiver, QObject *parent) : QObject(parent), rec(receiver), currentSequenceId(0), lastSequenceId(0) { - Q_ASSERT(rec); + if (!rec) + qFatal("Null receiver object passed to QTestAlivePinger::QTestAlivePinger()"); timerId = startTimer(850); } @@ -147,8 +148,8 @@ bool QTestAlive::event(QEvent *e) void QTestAlive::run() { - Q_ASSERT_X(QCoreApplication::instance(), "QTestAlive::run()", - "Cannot start QTestAlive without a QCoreApplication instance."); + if (!QCoreApplication::instance()) + qFatal("QTestAlive::run(): Cannot start QTestAlive without a QCoreApplication instance."); QTestAlivePinger p(this); pinger = &p; |