From f5b609cac864e010085d5965b84832b2d85643e6 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Mon, 20 Jan 2014 16:03:30 -0800
Subject: Make the printing of complex byte arrays prettier

Similar to what we've done to QString, only we print each byte that is
not ASCII as \OOO (octal representation).

[ChangeLog][QtTest] QtTest now prints an escaped version of
QByteArrays that failed to compare with QCOMPARE, instead of the hex
dump.

Change-Id: I6a8c43f138c66c998280998a242b43cd579666a0
Reviewed-by: Richard J. Moore <rich@kde.org>
---
 tests/auto/testlib/selftests/expected_strcmp.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'tests/auto/testlib/selftests/expected_strcmp.xml')

diff --git a/tests/auto/testlib/selftests/expected_strcmp.xml b/tests/auto/testlib/selftests/expected_strcmp.xml
index 29208f9a87..9e14dddd7c 100644
--- a/tests/auto/testlib/selftests/expected_strcmp.xml
+++ b/tests/auto/testlib/selftests/expected_strcmp.xml
@@ -25,40 +25,40 @@
 </Incident>
 <Incident type="fail" file="tst_strcmp.cpp" line="109">
     <Description><![CDATA[Compared values are not the same
-   Actual   (a): 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 ...
-   Expected (b): 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 ...]]></Description>
+   Actual   (a): "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"...
+   Expected (b): "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"...]]></Description>
 </Incident>
 <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="failByteArray">
 <Incident type="fail" file="tst_strcmp.cpp" line="115">
     <Description><![CDATA[Compared values are not the same
-   Actual   (QByteArray("abc")): 61 62 63
-   Expected (QByteArray("cba")): 63 62 61]]></Description>
+   Actual   (QByteArray("abc")): "abc"
+   Expected (QByteArray("cba")): "cba"]]></Description>
 </Incident>
 <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="failByteArrayNull">
 <Incident type="fail" file="tst_strcmp.cpp" line="121">
     <Description><![CDATA[Compared values are not the same
-   Actual   (QByteArray("foo")): 66 6F 6F
-   Expected (QByteArray())     : ]]></Description>
+   Actual   (QByteArray("foo")): "foo"
+   Expected (QByteArray())     : ""]]></Description>
 </Incident>
 <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="failByteArrayEmpty">
 <Incident type="fail" file="tst_strcmp.cpp" line="126">
     <Description><![CDATA[Compared values are not the same
-   Actual   (QByteArray(""))   : 
-   Expected (QByteArray("foo")): 66 6F 6F]]></Description>
+   Actual   (QByteArray(""))   : ""
+   Expected (QByteArray("foo")): "foo"]]></Description>
 </Incident>
 <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="failByteArraySingleChars">
 <Incident type="fail" file="tst_strcmp.cpp" line="133">
     <Description><![CDATA[Compared values are not the same
-   Actual   (QByteArray("6")): 36
-   Expected (QByteArray("7")): 37]]></Description>
+   Actual   (QByteArray("6")): "6"
+   Expected (QByteArray("7")): "7"]]></Description>
 </Incident>
 <Duration msecs="0"/>
 </TestFunction>
-- 
cgit v1.2.3