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

Improve Q_FUNC_INFO autotest.

Browse Source 
The availableWithoutDebug() test was trying to force QT_NO_DEBUG to be
defined, but was actually doing the opposite.  While I'm not satisfied
with the way this test works (it would be better to test with
QT_NO_DEBUG already defined when Q_FUNC_INFO is included). at least this
test now does what it says it does.

Additionally, the test has been improved by checking that Q_FUNC_INFO
returns a non-empty string, as opposed to just compiling.

Change-Id: I9175e3a7406152b6250b507a61b5062e3cfabeb8
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Jason McDonald 2011-11-17 13:29:36 +10:00 committed by Qt by Nokia
parent 577feb71ca
commit 2b883dc9bb
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/auto/corelib/global/q_func_info/tst_q_func_info.cpp
View File

@ -123,20 +123,19 @@ void tst_q_func_info::isOfTypeConstChar() const
/* \internal
Ensure that the macro is available even though QT_NO_DEBUG
is defined. We do this by undefining it, and turning it on again
backwards(just so we don't break stuff), if it was in fact defined.
is defined. If QT_NO_DEBUG is not defined, we define it
just for this function then undef it again afterwards.
*/
void tst_q_func_info::availableWithoutDebug() const
{
#ifndef QT_NO_DEBUG
# define USE_DEBUG
# define UNDEF_NO_DEBUG
# define QT_NO_DEBUG
#endif
#undef QT_NO_DEBUG
QString::fromLatin1(Q_FUNC_INFO);
#ifdef USE_DEBUG
QVERIFY(!QString::fromLatin1(Q_FUNC_INFO).isEmpty());
#ifdef UNDEF_NO_DEBUG
# undef QT_NO_DEBUG
# undef USE_DEBUG
# undef UNDEF_NO_DEBUG
#endif
}