QTestlib: Enable comparing QList against initializer lists/arrays

It is unnecessary to create a QList container just for comparison.

Split out helpers for comparing sequence sizes and sequences from
qCompare(QList) and add a template for an array with a non-type template
parameter for the size.

One can then write something like:

const int expected[] = {10, 12,...};
QCOMPARE(QFontDatabase.pointSizes(...), expected)

Unfortunately, any commas in such an array will be misread by macro expansion
as macro argument separators, so any expected array with more than one entry
needs an extra macro expanding __VA_ARGS__.

Change-Id: Ie7c8dc20bf669bbb25f6d7f8562455f8d03968c8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

1 files changed, 23 insertions, 4 deletions

diff --git a/tests/auto/testlib/selftests/expected_cmptest.junitxml b/tests/auto/testlib/selftests/expected_cmptest.junitxml
index 397db4c3e4..937003466e 100644
--- a/tests/auto/testlib/selftests/expected_cmptest.junitxml
+++ b/tests/auto/testlib/selftests/expected_cmptest.junitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" failures="40" tests="26" name="tst_Cmptest">
+<testsuite errors="0" failures="45" tests="28" name="tst_Cmptest">
   <properties>
     <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
     <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
@@ -70,9 +70,28 @@
    Expected (opB) size: 12" result="fail"/>
   </testcase>
   <testcase result="fail" name="compareQListInt">
-    <failure message="Compared lists differ at index 2.
-   Actual   (int1): 3
-   Expected (int2): 4" result="fail"/>
+    <failure tag="size mismatch" message="Compared lists have different sizes.
+   Actual   (actual) size: 2
+   Expected (expected) size: 3" result="fail"/>
+    <failure tag="value mismatch" message="Compared lists differ at index 2.
+   Actual   (actual): 4
+   Expected (expected): 3" result="fail"/>
+  </testcase>
+  <testcase result="fail" name="compareQListIntToArray">
+    <failure tag="size mismatch" message="Compared lists have different sizes.
+   Actual   (actual) size: 2
+   Expected (expected) size: 3" result="fail"/>
+    <failure tag="value mismatch" message="Compared lists differ at index 2.
+   Actual   (actual): 4
+   Expected (expected): 3" result="fail"/>
+  </testcase>
+  <testcase result="fail" name="compareQListIntToInitializerList">
+    <failure tag="size mismatch" message="Compared lists have different sizes.
+   Actual   (actual) size: 2
+   Expected (ARG({1, 2, 3})) size: 3" result="fail"/>
+    <failure tag="value mismatch" message="Compared lists differ at index 2.
+   Actual   (actual): 4
+   Expected (ARG({1, 2, 3})): 3" result="fail"/>
   </testcase>
   <testcase result="fail" name="compareQListDouble">
     <failure message="Compared lists differ at index 0.