whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix XFAIL in testlib selftest 

Commit 949be8cbdd modified the assert test
case but failed to update the line number of the assert in the expected
test output files.

Change-Id: I0d4f55c0b8bc1de8487dd8c6267aa459000cda26
Reviewed-on: http://codereview.qt-project.org/5048
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
bb10
Jason McDonald 2011-09-16 11:25:29 +10:00 committed by Qt by Nokia
parent 1efd2de047
commit 0676e51793
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/testlib/selftests/expected_assert.lightxml
View File

@ -10,7 +10,7 @@
</TestFunction>
<TestFunction name="testNumber2">
<Message type="qfatal" file="" line="0">
<Description><![CDATA[ASSERT: "false" in file tst_assert.cpp, line 62]]></Description>
<Description><![CDATA[ASSERT: "false" in file tst_assert.cpp, line 66]]></Description>
</Message>
<Incident type="fail" file="Unknown file" line="0">
<Description><![CDATA[Received a fatal error.]]></Description>

2
tests/auto/testlib/selftests/expected_assert.txt
View File

@ -2,7 +2,7 @@
Config: Using QTest library 4.3.0, Qt 4.3.0
PASS : tst_Assert::initTestCase()
PASS : tst_Assert::testNumber1()
QFATAL : tst_Assert::testNumber2() ASSERT: "false" in file tst_assert.cpp, line 62
QFATAL : tst_Assert::testNumber2() ASSERT: "false" in file tst_assert.cpp, line 66
FAIL! : tst_Assert::testNumber2() Received a fatal error.
Loc: [Unknown file(0)]
Totals: 2 passed, 1 failed, 0 skipped

2
tests/auto/testlib/selftests/expected_assert.xml
View File

@ -12,7 +12,7 @@
</TestFunction>
<TestFunction name="testNumber2">
<Message type="qfatal" file="" line="0">
<Description><![CDATA[ASSERT: "false" in file tst_assert.cpp, line 62]]></Description>
<Description><![CDATA[ASSERT: "false" in file tst_assert.cpp, line 66]]></Description>
</Message>
<Incident type="fail" file="Unknown file" line="0">
<Description><![CDATA[Received a fatal error.]]></Description>

4
tests/auto/testlib/selftests/expected_assert.xunitxml
View File

@ -7,10 +7,10 @@
<testcase result="pass" name="initTestCase"/>
<testcase result="pass" name="testNumber1"/>
<testcase result="fail" name="testNumber2">
<!-- message="ASSERT: &quot;false&quot; in file tst_assert.cpp, line 62" type="qfatal" -->
<!-- message="ASSERT: &quot;false&quot; in file tst_assert.cpp, line 66" type="qfatal" -->
<failure message="Received a fatal error." result="fail"/>
</testcase>
<system-err>
<![CDATA[ASSERT: "false" in file tst_assert.cpp, line 62]]>
<![CDATA[ASSERT: "false" in file tst_assert.cpp, line 66]]>
</system-err>
</testsuite>