From c963c514ac7945433cab94db29b4619f881371db Mon Sep 17 00:00:00 2001 From: Vincas Dargis Date: Sun, 5 Jul 2015 19:16:42 +0300 Subject: [PATCH] Qt Test: Fix QCOMPARE message for signed and unsigned char. QCOMPARE did not print "Actual" and "Expected" values for quint8 and qint8 variables when they where not equal. QTest::toString() lacked specializations for signed and unsigned char types, that are actually distinct types from char. Change-Id: Iae789885c474c56441da45065992d7ccf1bc9f5c Task-number: QTBUG-45238 Reviewed-by: Jason McDonald --- src/testlib/qtestcase.cpp | 2 ++ src/testlib/qtestcase.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 6634597c5ee..4668c26934f 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -3337,6 +3337,8 @@ TO_STRING_IMPL(quint64, %llu) #endif TO_STRING_IMPL(bool, %d) TO_STRING_IMPL(char, %c) +TO_STRING_IMPL(signed char, %hhd) +TO_STRING_IMPL(unsigned char, %hhu) TO_STRING_IMPL(float, %g) TO_STRING_IMPL(double, %lg) diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index 9b0af186bc7..9f3c461cf06 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -340,6 +340,8 @@ namespace QTest QTEST_COMPARE_DECL(float) QTEST_COMPARE_DECL(double) QTEST_COMPARE_DECL(char) + QTEST_COMPARE_DECL(signed char) + QTEST_COMPARE_DECL(unsigned char) QTEST_COMPARE_DECL(bool) #endif