From e01b1634048ebf5858b77f2a6541a960babe232c Mon Sep 17 00:00:00 2001
From: David Faure <david.faure@kdab.com>
Date: Sat, 19 Jan 2013 11:52:03 +0100
Subject: QTestLib: improve output when comparing lists fails.

Only QStringList was handled before, now any QList is handled.
A specialization for QStringList is still needed though, due to the way
template matching works.

Example with QList<int>. Before:
FAIL!  : tst_QTextCodec::threadSafety() Compared values are not the same
   Loc: [../tst_qtextcodec.cpp(2057)]

After:
FAIL!  : tst_QTextCodec::threadSafety() Compared lists differ at index 0.
   Actual   (res2.toList()): '0'
   Expected (mibList): '3'
   Loc: [../tst_qtextcodec.cpp(2057)]

Change-Id: If0fdec3236ddb78a679ee549aba569ef5571c395
Reviewed-by: Jason McDonald <macadder1@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
 tests/auto/testlib/selftests/expected_cmptest.xml | 24 ++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

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

diff --git a/tests/auto/testlib/selftests/expected_cmptest.xml b/tests/auto/testlib/selftests/expected_cmptest.xml
index 0e5b6de335..ccab93d7c0 100644
--- a/tests/auto/testlib/selftests/expected_cmptest.xml
+++ b/tests/auto/testlib/selftests/expected_cmptest.xml
@@ -51,35 +51,49 @@
 </Incident>
 <Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="308">
     <DataTag><![CDATA[last item different]]></DataTag>
-    <Description><![CDATA[Compared QStringLists differ at index 2.
+    <Description><![CDATA[Compared lists differ at index 2.
    Actual   (opA): 'string3'
    Expected (opB): 'DIFFERS']]></Description>
 </Incident>
 <Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="308">
     <DataTag><![CDATA[second-last item different]]></DataTag>
-    <Description><![CDATA[Compared QStringLists differ at index 2.
+    <Description><![CDATA[Compared lists differ at index 2.
    Actual   (opA): 'string3'
    Expected (opB): 'DIFFERS']]></Description>
 </Incident>
 <Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="308">
     <DataTag><![CDATA[prefix]]></DataTag>
-    <Description><![CDATA[Compared QStringLists have different sizes.
+    <Description><![CDATA[Compared lists have different sizes.
    Actual   (opA) size: '2'
    Expected (opB) size: '1']]></Description>
 </Incident>
 <Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="308">
     <DataTag><![CDATA[short list second]]></DataTag>
-    <Description><![CDATA[Compared QStringLists have different sizes.
+    <Description><![CDATA[Compared lists have different sizes.
    Actual   (opA) size: '12'
    Expected (opB) size: '1']]></Description>
 </Incident>
 <Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="308">
     <DataTag><![CDATA[short list first]]></DataTag>
-    <Description><![CDATA[Compared QStringLists have different sizes.
+    <Description><![CDATA[Compared lists have different sizes.
    Actual   (opA) size: '1'
    Expected (opB) size: '12']]></Description>
 </Incident>
 </TestFunction>
+<TestFunction name="compareQListInt">
+<Incident type="fail" file="tst_cmptest.cpp" line="316">
+    <Description><![CDATA[Compared lists differ at index 2.
+   Actual   (int1): '3'
+   Expected (int2): '4']]></Description>
+</Incident>
+</TestFunction>
+<TestFunction name="compareQListDouble">
+<Incident type="fail" file="tst_cmptest.cpp" line="323">
+    <Description><![CDATA[Compared lists differ at index 0.
+   Actual   (double1): '1.5'
+   Expected (double2): '1']]></Description>
+</Incident>
+</TestFunction>
 <TestFunction name="compareQPixmaps">
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[both null]]></DataTag>
-- 
cgit v1.2.3