21776e9260
The newer test logger did not produce the same light XML output as the logger that it replaced. In particular, it did not output the <DataTag> tag and it incorrectly nested a <Message> tag inside the <Incident> tag when a fatal error occured in a test. Unfortunately, it appears that the expected lightxml output for the selftests was produced by running tests using the newer logger, while the selftests did not use the older lightxml logger. Thus the errors were not detected by the selftests. This commit adds the older lightxml logger to the selftests, updates the expected test data accordingly, and modifies the newer lightxml logger to behave correctly. This last item is achieved by making the lightxml streamer copy most of the code from the xml streamer -- lightxml output is supposed to be same as xml, except for the omission of the root and <TestCase> tags. Change-Id: Ie6e1f69dd6000df2b9d0c5c8e2109fe7bbff3956 Reviewed-on: http://codereview.qt.nokia.com/3902 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
73 lines
3.7 KiB
Plaintext
73 lines
3.7 KiB
Plaintext
<Environment>
|
|
<QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
|
|
<QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
|
|
</Environment>
|
|
<TestFunction name="initTestCase">
|
|
<Incident type="pass" file="" line="0" />
|
|
</TestFunction>
|
|
<TestFunction name="badDataTag">
|
|
<Message type="qdebug" file="" line="0">
|
|
<DataTag><![CDATA[end cdata ]]]><![CDATA[]> text ]]]><![CDATA[]> more text]]></DataTag>
|
|
<Description><![CDATA[a message]]></Description>
|
|
</Message>
|
|
<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/badxml/tst_badxml.cpp" line="109">
|
|
<DataTag><![CDATA[end cdata ]]]><![CDATA[]> text ]]]><![CDATA[]> more text]]></DataTag>
|
|
<Description><![CDATA[a failure]]></Description>
|
|
</Incident>
|
|
<BenchmarkResult metric="Events" tag="end cdata ]]> text ]]> more text" value="0" iterations="1" />
|
|
<Message type="qdebug" file="" line="0">
|
|
<DataTag><![CDATA[quotes " text" more text]]></DataTag>
|
|
<Description><![CDATA[a message]]></Description>
|
|
</Message>
|
|
<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/badxml/tst_badxml.cpp" line="109">
|
|
<DataTag><![CDATA[quotes " text" more text]]></DataTag>
|
|
<Description><![CDATA[a failure]]></Description>
|
|
</Incident>
|
|
<BenchmarkResult metric="Events" tag="quotes " text" more text" value="0" iterations="1" />
|
|
<Message type="qdebug" file="" line="0">
|
|
<DataTag><![CDATA[xml close > open < tags < text]]></DataTag>
|
|
<Description><![CDATA[a message]]></Description>
|
|
</Message>
|
|
<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/badxml/tst_badxml.cpp" line="109">
|
|
<DataTag><![CDATA[xml close > open < tags < text]]></DataTag>
|
|
<Description><![CDATA[a failure]]></Description>
|
|
</Incident>
|
|
<BenchmarkResult metric="Events" tag="xml close > open < tags < text" value="0" iterations="1" />
|
|
<Message type="qdebug" file="" line="0">
|
|
<DataTag><![CDATA[all > " mixed ]]]><![CDATA[]> up > " in < the ]]]><![CDATA[]> hopes < of triggering "< ]]]><![CDATA[]> bugs]]></DataTag>
|
|
<Description><![CDATA[a message]]></Description>
|
|
</Message>
|
|
<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/badxml/tst_badxml.cpp" line="109">
|
|
<DataTag><![CDATA[all > " mixed ]]]><![CDATA[]> up > " in < the ]]]><![CDATA[]> hopes < of triggering "< ]]]><![CDATA[]> bugs]]></DataTag>
|
|
<Description><![CDATA[a failure]]></Description>
|
|
</Incident>
|
|
<BenchmarkResult metric="Events" tag="all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs" value="0" iterations="1" />
|
|
</TestFunction>
|
|
<TestFunction name="badMessage">
|
|
<Message type="qdebug" file="" line="0">
|
|
<DataTag><![CDATA[string 0]]></DataTag>
|
|
<Description><![CDATA[end cdata ]]]><![CDATA[]> text ]]]><![CDATA[]> more text]]></Description>
|
|
</Message>
|
|
<Message type="qdebug" file="" line="0">
|
|
<DataTag><![CDATA[string 1]]></DataTag>
|
|
<Description><![CDATA[quotes " text" more text]]></Description>
|
|
</Message>
|
|
<Message type="qdebug" file="" line="0">
|
|
<DataTag><![CDATA[string 2]]></DataTag>
|
|
<Description><![CDATA[xml close > open < tags < text]]></Description>
|
|
</Message>
|
|
<Message type="qdebug" file="" line="0">
|
|
<DataTag><![CDATA[string 3]]></DataTag>
|
|
<Description><![CDATA[all > " mixed ]]]><![CDATA[]> up > " in < the ]]]><![CDATA[]> hopes < of triggering "< ]]]><![CDATA[]> bugs]]></Description>
|
|
</Message>
|
|
<Incident type="pass" file="" line="0" />
|
|
</TestFunction>
|
|
<TestFunction name="failWithNoFile">
|
|
<Incident type="fail" file="" line="0">
|
|
<Description><![CDATA[failure message]]></Description>
|
|
</Incident>
|
|
</TestFunction>
|
|
<TestFunction name="cleanupTestCase">
|
|
<Incident type="pass" file="" line="0" />
|
|
</TestFunction>
|