diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-11-17 13:29:36 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-17 07:21:03 +0100 |
| commit | 2b883dc9bb6cfd186a23a945597f67a9f9fc270e (patch) | |
| tree | 831226ed5343e6afffc509b1191e67b658213bad /tests/auto/corelib | |
| parent | 577feb71ca98021804bd0111858a48f8421e08f0 (diff) | |
Improve Q_FUNC_INFO autotest.
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>
Diffstat (limited to 'tests/auto/corelib')
| -rw-r--r-- | tests/auto/corelib/global/q_func_info/tst_q_func_info.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tests/auto/corelib/global/q_func_info/tst_q_func_info.cpp b/tests/auto/corelib/global/q_func_info/tst_q_func_info.cpp index 0a2a259462..e4949348f4 100644 --- a/tests/auto/corelib/global/q_func_info/tst_q_func_info.cpp +++ b/tests/auto/corelib/global/q_func_info/tst_q_func_info.cpp @@ -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 } |