diff options
| author | Samuel Gaist <samuel.gaist@edeltech.ch> | 2017-12-07 09:46:30 +0100 |
|---|---|---|
| committer | Samuel Gaist <samuel.gaist@edeltech.ch> | 2018-06-03 20:26:38 +0000 |
| commit | 04b180f7f25d73d002df31085cf1c352e075d4e5 (patch) | |
| tree | 63b20b4fb53704192e231b1fa208885698066c23 /src/testlib/qtestcase.h | |
| parent | 9998654eacfa07a567e25ac5f2e557f61091145d (diff) | |
Improve std::tuple handling in tests
Currently when doing comparison with std::tuple the fallback toString
method is called which returns a Q_NULLPTR thus not allowing proper
diagnostic of the values that triggered an error. This patch
adds support for std::tuple to improve the tests output readability.
[ChangeLog][QtTest][QCOMPARE] Now outputs contents of std::tuple on
failure.
Change-Id: I046a55e2ce44c3f7728d51e4745120d38aa5e007
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/testlib/qtestcase.h')
| -rw-r--r-- | src/testlib/qtestcase.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index 4bf816a850..f6891dc941 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -283,6 +283,9 @@ namespace QTest template <typename T1, typename T2> inline char *toString(const std::pair<T1, T2> &pair); + template <class... Types> + inline char *toString(const std::tuple<Types...> &tuple); + Q_TESTLIB_EXPORT char *toHexRepresentation(const char *ba, int length); Q_TESTLIB_EXPORT char *toPrettyCString(const char *unicode, int length); Q_TESTLIB_EXPORT char *toPrettyUnicode(QStringView string); @@ -388,6 +391,8 @@ namespace QTest Q_TESTLIB_EXPORT bool compare_string_helper(const char *t1, const char *t2, const char *actual, const char *expected, const char *file, int line); + Q_TESTLIB_EXPORT char *formatString(const char *prefix, const char *suffix, size_t numArguments, ...); + #ifndef Q_QDOC QTEST_COMPARE_DECL(short) QTEST_COMPARE_DECL(ushort) |