From 21776e926074a572316dfb4e3346423f3111d7f7 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 31 Aug 2011 12:52:27 +1000 Subject: 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 tag and it incorrectly nested a tag inside the 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 tags. Change-Id: Ie6e1f69dd6000df2b9d0c5c8e2109fe7bbff3956 Reviewed-on: http://codereview.qt.nokia.com/3902 Reviewed-by: Qt Sanity Bot Reviewed-by: Rohan McGovern --- tests/auto/selftests/expected_assert.lightxml | 2 +- tests/auto/selftests/expected_badxml.lightxml | 25 ++++++++++++++++--- .../selftests/expected_benchlibcallgrind.lightxml | 3 +-- .../expected_benchlibeventcounter.lightxml | 3 +-- tests/auto/selftests/expected_cmptest.lightxml | 10 ++++++++ .../selftests/expected_commandlinedata.lightxml | 12 ++++++--- tests/auto/selftests/expected_datatable.lightxml | 29 ++++++++++++++++++++++ tests/auto/selftests/expected_datetime.lightxml | 2 ++ tests/auto/selftests/expected_expectfail.lightxml | 11 +++++--- tests/auto/selftests/expected_fetchbogus.lightxml | 4 ++- tests/auto/selftests/expected_globaldata.lightxml | 6 +++-- tests/auto/selftests/expected_maxwarnings.lightxml | 3 +-- tests/auto/selftests/expected_skip.lightxml | 5 ++-- tests/auto/selftests/expected_strcmp.lightxml | 8 +++++- tests/auto/selftests/expected_warnings.lightxml | 5 ++-- tests/auto/selftests/expected_xunit.lightxml | 7 +++--- tests/auto/selftests/tst_selftests.cpp | 22 ++++++++-------- 17 files changed, 117 insertions(+), 40 deletions(-) (limited to 'tests') diff --git a/tests/auto/selftests/expected_assert.lightxml b/tests/auto/selftests/expected_assert.lightxml index e24545f086..9062ca69a8 100644 --- a/tests/auto/selftests/expected_assert.lightxml +++ b/tests/auto/selftests/expected_assert.lightxml @@ -9,10 +9,10 @@ - + diff --git a/tests/auto/selftests/expected_badxml.lightxml b/tests/auto/selftests/expected_badxml.lightxml index 57bcf84e29..19bec33e1e 100644 --- a/tests/auto/selftests/expected_badxml.lightxml +++ b/tests/auto/selftests/expected_badxml.lightxml @@ -6,44 +6,61 @@ - + text ]]]> more text]]> + + text ]]]> more text]]> + + + + + + open < tags < text]]> + + open < tags < text]]> + + " mixed ]]]> up > " in < the ]]]> hopes < of triggering "< ]]]> bugs]]> + + " mixed ]]]> up > " in < the ]]]> hopes < of triggering "< ]]]> bugs]]> - + - + text ]]]> more text]]> + + open < tags < text]]> + " mixed ]]]> up > " in < the ]]]> hopes < of triggering "< ]]]> bugs]]> - + diff --git a/tests/auto/selftests/expected_benchlibcallgrind.lightxml b/tests/auto/selftests/expected_benchlibcallgrind.lightxml index dd5319f55e..c2394e545e 100644 --- a/tests/auto/selftests/expected_benchlibcallgrind.lightxml +++ b/tests/auto/selftests/expected_benchlibcallgrind.lightxml @@ -6,9 +6,8 @@ - - + diff --git a/tests/auto/selftests/expected_benchlibeventcounter.lightxml b/tests/auto/selftests/expected_benchlibeventcounter.lightxml index a6150a90af..3bede6de83 100644 --- a/tests/auto/selftests/expected_benchlibeventcounter.lightxml +++ b/tests/auto/selftests/expected_benchlibeventcounter.lightxml @@ -6,7 +6,6 @@ - @@ -14,7 +13,7 @@ - + diff --git a/tests/auto/selftests/expected_cmptest.lightxml b/tests/auto/selftests/expected_cmptest.lightxml index 910d81295d..72d1caf5f8 100644 --- a/tests/auto/selftests/expected_cmptest.lightxml +++ b/tests/auto/selftests/expected_cmptest.lightxml @@ -13,15 +13,25 @@ + + + + + + + + + + ) Expected (expected): QVariant(PhonyClass,)]]> diff --git a/tests/auto/selftests/expected_commandlinedata.lightxml b/tests/auto/selftests/expected_commandlinedata.lightxml index b6ca8693ae..6907b7211f 100644 --- a/tests/auto/selftests/expected_commandlinedata.lightxml +++ b/tests/auto/selftests/expected_commandlinedata.lightxml @@ -6,30 +6,34 @@ - + + + + + - + - + - + diff --git a/tests/auto/selftests/expected_datatable.lightxml b/tests/auto/selftests/expected_datatable.lightxml index 7e737620bf..e14d1e2abb 100644 --- a/tests/auto/selftests/expected_datatable.lightxml +++ b/tests/auto/selftests/expected_datatable.lightxml @@ -16,34 +16,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/auto/selftests/expected_datetime.lightxml b/tests/auto/selftests/expected_datetime.lightxml index abc2930f4c..49f8546e6a 100644 --- a/tests/auto/selftests/expected_datetime.lightxml +++ b/tests/auto/selftests/expected_datetime.lightxml @@ -17,6 +17,8 @@ + + diff --git a/tests/auto/selftests/expected_expectfail.lightxml b/tests/auto/selftests/expected_expectfail.lightxml index 1b77cf6230..003b8e866d 100644 --- a/tests/auto/selftests/expected_expectfail.lightxml +++ b/tests/auto/selftests/expected_expectfail.lightxml @@ -6,29 +6,34 @@ - + + - + - + + + + + diff --git a/tests/auto/selftests/expected_fetchbogus.lightxml b/tests/auto/selftests/expected_fetchbogus.lightxml index b8ecaef782..1812c0e6b5 100644 --- a/tests/auto/selftests/expected_fetchbogus.lightxml +++ b/tests/auto/selftests/expected_fetchbogus.lightxml @@ -6,10 +6,12 @@ - + + + diff --git a/tests/auto/selftests/expected_globaldata.lightxml b/tests/auto/selftests/expected_globaldata.lightxml index 7e245896f2..c4db4bc90c 100644 --- a/tests/auto/selftests/expected_globaldata.lightxml +++ b/tests/auto/selftests/expected_globaldata.lightxml @@ -10,20 +10,22 @@ + + - + - + 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 @@ - @@ -6013,7 +6012,7 @@ - + diff --git a/tests/auto/selftests/expected_skip.lightxml b/tests/auto/selftests/expected_skip.lightxml index 474fccc9c6..61cfe7db72 100644 --- a/tests/auto/selftests/expected_skip.lightxml +++ b/tests/auto/selftests/expected_skip.lightxml @@ -16,14 +16,15 @@ - + + - + diff --git a/tests/auto/selftests/expected_strcmp.lightxml b/tests/auto/selftests/expected_strcmp.lightxml index ede19b8171..28dc9335ec 100644 --- a/tests/auto/selftests/expected_strcmp.lightxml +++ b/tests/auto/selftests/expected_strcmp.lightxml @@ -9,10 +9,16 @@ - + + + + + + + diff --git a/tests/auto/selftests/expected_warnings.lightxml b/tests/auto/selftests/expected_warnings.lightxml index c91d9d5da6..116156ed8a 100644 --- a/tests/auto/selftests/expected_warnings.lightxml +++ b/tests/auto/selftests/expected_warnings.lightxml @@ -6,7 +6,6 @@ - @@ -25,16 +24,16 @@ - + - + diff --git a/tests/auto/selftests/expected_xunit.lightxml b/tests/auto/selftests/expected_xunit.lightxml index f276c051be..92772015c8 100644 --- a/tests/auto/selftests/expected_xunit.lightxml +++ b/tests/auto/selftests/expected_xunit.lightxml @@ -6,17 +6,16 @@ - - + - ]]> + @@ -36,11 +35,13 @@ + + diff --git a/tests/auto/selftests/tst_selftests.cpp b/tests/auto/selftests/tst_selftests.cpp index 78f0620779..320d993426 100644 --- a/tests/auto/selftests/tst_selftests.cpp +++ b/tests/auto/selftests/tst_selftests.cpp @@ -173,11 +173,12 @@ Logger::Logger(QString const& _name, QString const& _testdata_suffix, QStringLis static QList allLoggers() { return QList() - << Logger("plain", "txt", QStringList()) - << Logger("xml", "xml", QStringList() << "-xml") - << Logger("xml flush", "xml", QStringList() << "-xml" << "-flush") - << Logger("xunitxml", "xunitxml", QStringList() << "-xunitxml") - << Logger("lightxml", "lightxml", QStringList() << "-lightxml") + << Logger("plain", "txt", QStringList()) + << Logger("xml", "xml", QStringList() << "-xml") + << Logger("xml flush", "xml", QStringList() << "-xml" << "-flush") + << Logger("xunitxml", "xunitxml", QStringList() << "-xunitxml") + << Logger("lightxml", "lightxml", QStringList() << "-lightxml") + << Logger("lightxml flush", "lightxml", QStringList() << "-lightxml" << "-flush") ; } @@ -416,11 +417,12 @@ void tst_Selftests::doRunSubTest(QString const& subdir, QString const& logger, Q const QString expected(QString::fromLatin1(exp.at(i)).replace("@INSERT_QT_VERSION_HERE@", QT_VERSION_STR)); if (line.contains("ASSERT") && output != expected) { - QEXPECT_FAIL("assert", "QTestLib prints out the absolute path.", Continue); - QEXPECT_FAIL("assert xml", "QTestLib prints out the absolute path.", Continue); - QEXPECT_FAIL("assert xml flush","QTestLib prints out the absolute path.", Continue); - QEXPECT_FAIL("assert lightxml", "QTestLib prints out the absolute path.", Continue); - QEXPECT_FAIL("assert xunitxml", "QTestLib prints out the absolute path.", Continue); + QEXPECT_FAIL("assert", "QTestLib prints out the absolute path.", Continue); + QEXPECT_FAIL("assert xml", "QTestLib prints out the absolute path.", Continue); + QEXPECT_FAIL("assert xml flush", "QTestLib prints out the absolute path.", Continue); + QEXPECT_FAIL("assert lightxml", "QTestLib prints out the absolute path.", Continue); + QEXPECT_FAIL("assert lightxml flush", "QTestLib prints out the absolute path.", Continue); + QEXPECT_FAIL("assert xunitxml", "QTestLib prints out the absolute path.", Continue); } /* On some platforms we compile without RTTI, and as a result we never throw an exception. */ -- cgit v1.2.3