Improve pair-like class handling in tests

Currently when doing comparison with pair-like classes 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 QPair and std::pair to improve the tests output
readability.

[ChangeLog][QtTest][QCOMPARE] Now outputs contents of QPair and
std::pair on failure.

Change-Id: Ib0b4aad7640590d56275b6f1306fb9fb39fa81bc
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 16 insertions, 0 deletions

diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h
index a7e825396a..8347b99f17 100644
--- a/src/testlib/qtestcase.h
+++ b/src/testlib/qtestcase.h
@@ -259,6 +259,22 @@ namespace QTest
         return Internal::toString(t);
     }
 
+    template <typename T1, typename T2>
+    inline char *toString(const QPair<T1, T2> &pair)
+    {
+        const QScopedArrayPointer<char> first(toString(pair.first));
+        const QScopedArrayPointer<char> second(toString(pair.second));
+        return toString(QString::asprintf("QPair(%s,%s)", first.data(), second.data()));
+    }
+
+    template <typename T1, typename T2>
+    inline char *toString(const std::pair<T1, T2> &pair)
+    {
+        const QScopedArrayPointer<char> first(toString(pair.first));
+        const QScopedArrayPointer<char> second(toString(pair.second));
+        return toString(QString::asprintf("std::pair(%s,%s)", first.data(), second.data()));
+    }
+
     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(const ushort *unicode, int length);