diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-21 13:51:50 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-08-01 13:51:23 +0200 |
commit | f23f9ba041a790566ca1553d4dc138af3c49db80 (patch) | |
tree | 74334ca05199f5da0e253e1117701569bc630774 /src/testlib/qtestresult.cpp | |
parent | 10845315b714857c754c1de5360bba3b0386bdab (diff) |
QTestLib: Speed up QCOMPARE for QString
Add overloads for qCompare() for QStringView making use of the fast
formatting helper introduced by 94aa350621e8a5c4ad3b438c10fc1c0a9ed3bc8a
for int.
Speeds up the bug report example by a factor of 3..4.
Task-number: QTBUG-38890
Change-Id: Icc706618b2f1d23b37d354a04d4e1d1cc4b5aee3
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/testlib/qtestresult.cpp')
-rw-r--r-- | src/testlib/qtestresult.cpp | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/src/testlib/qtestresult.cpp b/src/testlib/qtestresult.cpp index eeae7ef0f4..88028aac6e 100644 --- a/src/testlib/qtestresult.cpp +++ b/src/testlib/qtestresult.cpp @@ -39,8 +39,10 @@ #include <QtTest/private/qtestresult_p.h> #include <QtCore/qglobal.h> +#include <QtCore/qstringview.h> #include <QtTest/private/qtestlog_p.h> +#include <QtTest/qtest.h> // toString() specializations for QStringView #include <QtTest/qtestdata.h> #include <QtTest/qtestcase.h> #include <QtTest/qtestassert.h> @@ -389,6 +391,30 @@ bool QTestResult::compare(bool success, const char *failureMsg, return compareHelper(success, failureMsg, val1, val2, actual, expected, file, line); } +bool QTestResult::compare(bool success, const char *failureMsg, + QStringView val1, QStringView val2, + const char *actual, const char *expected, + const char *file, int line) +{ + return compareHelper(success, failureMsg, val1, val2, actual, expected, file, line); +} + +bool QTestResult::compare(bool success, const char *failureMsg, + QStringView val1, const QLatin1String &val2, + const char *actual, const char *expected, + const char *file, int line) +{ + return compareHelper(success, failureMsg, val1, val2, actual, expected, file, line); +} + +bool QTestResult::compare(bool success, const char *failureMsg, + const QLatin1String & val1, QStringView val2, + const char *actual, const char *expected, + const char *file, int line) +{ + return compareHelper(success, failureMsg, val1, val2, actual, expected, file, line); +} + void QTestResult::addFailure(const char *message, const char *file, int line) { clearExpectFail(); |