diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2012-02-01 16:39:14 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-08 03:13:23 +0100 |
| commit | 26c41ed918142a6fadac142b4f7e63426bebc4a1 (patch) | |
| tree | 89dc66f7cb9cf94a8ad699127109f7da94081622 /tests/auto/testlib/selftests/expected_warnings.xunitxml | |
| parent | da18ada6bf60e0a6724ee55abb619d367f8c4633 (diff) | |
testlib: Clear ignored messages after every data row
Previously, ignored messages were only cleared at the end of each test
function, i.e. after all data rows were finished. This meant that if a
data row in a data-driven test function didn't cause all of the expected
messages to be generated, the remaining messages would be carried over
to the next data row. This would result in errors about missing
messages being associated with the last data row rather than with the
correct data row.
This commit makes testlib check for missing ignored messages after
running each data row rather than only doing so after the last data
row.
This commit also adds a regression test to demonstrate that ignored
messages can no longer be carried over from one data row to another.
Change-Id: Ibee51aa6e96866fbcbcb4acee1a8340a86a6a4ba
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/testlib/selftests/expected_warnings.xunitxml')
| -rw-r--r-- | tests/auto/testlib/selftests/expected_warnings.xunitxml | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/tests/auto/testlib/selftests/expected_warnings.xunitxml b/tests/auto/testlib/selftests/expected_warnings.xunitxml index a96393d648..3e3b9ce18e 100644 --- a/tests/auto/testlib/selftests/expected_warnings.xunitxml +++ b/tests/auto/testlib/selftests/expected_warnings.xunitxml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite errors="8" failures="1" tests="4" name="tst_Warnings"> +<testsuite errors="12" failures="3" tests="5" name="tst_Warnings"> <properties> <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/> <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/> @@ -18,6 +18,14 @@ <!-- message="Did not receive message: "Warning1"" type="info" --> <failure message="Not all expected messages were received" result="fail"/> </testcase> + <testcase result="fail" name="testMissingWarningsWithData"> + <!-- tag="first row" message="Did not receive message: "Warning0"" type="info" --> + <!-- tag="first row" message="Did not receive message: "Warning1"" type="info" --> + <failure tag="first row" message="Not all expected messages were received" result="fail"/> + <!-- tag="second row" message="Did not receive message: "Warning0"" type="info" --> + <!-- tag="second row" message="Did not receive message: "Warning1"" type="info" --> + <failure tag="second row" message="Not all expected messages were received" result="fail"/> + </testcase> <testcase result="pass" name="cleanupTestCase"/> <system-err> <![CDATA[Warning]]> @@ -28,5 +36,9 @@ <![CDATA[Baba]]> <![CDATA[Did not receive message: "Warning0"]]> <![CDATA[Did not receive message: "Warning1"]]> +<![CDATA[Did not receive message: "Warning0"]]> +<![CDATA[Did not receive message: "Warning1"]]> +<![CDATA[Did not receive message: "Warning0"]]> +<![CDATA[Did not receive message: "Warning1"]]> </system-err> </testsuite> |