diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2021-06-14 15:34:40 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2021-06-15 01:36:56 +0200 |
| commit | 66d080af31f1409e2011661db9024c1d81ceec87 (patch) | |
| tree | 86f8cb5211856c52ebce5ead28b30404d54ef085 /src/testlib/qtestcase.h | |
| parent | fb3f90398001b2f0acbf2a12ec22cc2708a2d29b (diff) | |
QtTest: move QTRY_X error message formatting out-of-line
Clazy warns about the fromUtf8() call with a constant argument, for
every use of the macro, so hide the stuff behind a compiler firewall.
Also fix the format injection error by using QLatin1String::arg()
instead of QString::arg() chaining.
Change-Id: I4bb4d4af56443540efc0c38c75819aa152a441fc
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/testlib/qtestcase.h')
| -rw-r--r-- | src/testlib/qtestcase.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index b046232c65..25385b327a 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -143,9 +143,7 @@ do {\ if (!(expr)) { \ QTRY_LOOP_IMPL((expr), (2 * timeoutValue), step);\ if (expr) { \ - QString msg = QString::fromUtf8("QTestLib: This test case check (\"%1\") failed because the requested timeout (%2 ms) was too short, %3 ms would have been sufficient this time."); \ - msg = msg.arg(QString::fromUtf8(#expr)).arg(timeoutValue).arg(timeoutValue + qt_test_i); \ - QFAIL(qPrintable(msg)); \ + QFAIL(qPrintable(QTest::Internal::formatTryTimeoutDebugMessage(u8"" #expr, timeoutValue, timeoutValue + qt_test_i))); \ } \ } @@ -239,6 +237,8 @@ namespace QTest { namespace Internal { + Q_TESTLIB_EXPORT QString formatTryTimeoutDebugMessage(q_no_char8_t::QUtf8StringView expr, int timeout, int actual); + template<typename T> // Output registered enums inline typename std::enable_if<QtPrivate::IsQEnumHelper<T>::Value, char*>::type toString(T e) { |