summaryrefslogtreecommitdiffstats
path: root/tests/auto/selftests/expected_maxwarnings.lightxml
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-08-31 12:52:27 +1000
committerQt by Nokia <qt-info@nokia.com>2011-08-31 07:40:06 +0200
commit21776e926074a572316dfb4e3346423f3111d7f7 (patch)
treea4a3de01cb736edc563dc5023aab0f6f8f0089c3 /tests/auto/selftests/expected_maxwarnings.lightxml
parentb94eba6899e4162ce2b5a98b5603289e8ec2f66e (diff)
Fix errors in lightxml test logger
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>
Diffstat (limited to 'tests/auto/selftests/expected_maxwarnings.lightxml')
-rw-r--r--tests/auto/selftests/expected_maxwarnings.lightxml3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/selftests/expected_maxwarnings.lightxml b/tests/auto/selftests/expected_maxwarnings.lightxml
index a5475c4b72..054108fe6d 100644
--- a/tests/auto/selftests/expected_maxwarnings.lightxml
+++ b/tests/auto/selftests/expected_maxwarnings.lightxml
@@ -6,7 +6,6 @@
<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="warn">
-<Incident type="pass" file="" line="0">
<Message type="qwarn" file="" line="0">
<Description><![CDATA[0]]></Description>
</Message>
@@ -6013,7 +6012,7 @@
<Message type="system" file="" line="0">
<Description><![CDATA[Maximum amount of warnings exceeded. Use -maxwarnings to override.]]></Description>
</Message>
-</Incident>
+<Incident type="pass" file="" line="0" />
</TestFunction>
<TestFunction name="cleanupTestCase">
<Incident type="pass" file="" line="0" />