diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-10 11:41:33 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-21 22:01:20 +0200 |
| commit | d25589e0529732996e405aaff8d6c46b012e1601 (patch) | |
| tree | 29b596d0c2ca0e36aa9aea65f426ed393c660e78 /tests/auto/testlib/selftests/expected_cmptest.lightxml | |
| parent | b50daef9771d8829fc7f808898cbe051a5464b79 (diff) | |
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>
Diffstat (limited to 'tests/auto/testlib/selftests/expected_cmptest.lightxml')
| -rw-r--r-- | tests/auto/testlib/selftests/expected_cmptest.lightxml | 50 |
1 files changed, 48 insertions, 2 deletions
diff --git a/tests/auto/testlib/selftests/expected_cmptest.lightxml b/tests/auto/testlib/selftests/expected_cmptest.lightxml index f108933585..ee2ca716a3 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.lightxml +++ b/tests/auto/testlib/selftests/expected_cmptest.lightxml @@ -147,10 +147,56 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="compareQListInt"> +<Incident type="pass" file="" line="0"> + <DataTag><![CDATA[match]]></DataTag> +</Incident> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> + <DataTag><![CDATA[size mismatch]]></DataTag> + <Description><![CDATA[Compared lists have different sizes. + Actual (actual) size: 2 + Expected (expected) size: 3]]></Description> +</Incident> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> + <DataTag><![CDATA[value mismatch]]></DataTag> + <Description><![CDATA[Compared lists differ at index 2. + Actual (actual): 4 + Expected (expected): 3]]></Description> +</Incident> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="compareQListIntToArray"> +<Incident type="pass" file="" line="0"> + <DataTag><![CDATA[match]]></DataTag> +</Incident> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> + <DataTag><![CDATA[size mismatch]]></DataTag> + <Description><![CDATA[Compared lists have different sizes. + Actual (actual) size: 2 + Expected (expected) size: 3]]></Description> +</Incident> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> + <DataTag><![CDATA[value mismatch]]></DataTag> + <Description><![CDATA[Compared lists differ at index 2. + Actual (actual): 4 + Expected (expected): 3]]></Description> +</Incident> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="compareQListIntToInitializerList"> +<Incident type="pass" file="" line="0"> + <DataTag><![CDATA[match]]></DataTag> +</Incident> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> + <DataTag><![CDATA[size mismatch]]></DataTag> + <Description><![CDATA[Compared lists have different sizes. + Actual (actual) size: 2 + Expected (ARG({1, 2, 3})) size: 3]]></Description> +</Incident> <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> + <DataTag><![CDATA[value mismatch]]></DataTag> <Description><![CDATA[Compared lists differ at index 2. - Actual (int1): 3 - Expected (int2): 4]]></Description> + Actual (actual): 4 + Expected (ARG({1, 2, 3})): 3]]></Description> </Incident> <Duration msecs="0"/> </TestFunction> |