Split subtest selftest

This test was attempting to verify two completely unrelated things, so
this commit splits it into two tests.

Also, printf calls are replaced by qDebug so that the test does not
bypass the testlib loggers.

Change-Id: I1a202af38ce2c69690a32d93405ba604ec6cabee
Reviewed-on: http://codereview.qt-project.org/5178
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

1 files changed, 117 insertions, 36 deletions

diff --git a/tests/auto/testlib/selftests/expected_subtest.xml b/tests/auto/testlib/selftests/expected_subtest.xml
index 5ecb0a2e9f..d79242f061 100644
--- a/tests/auto/testlib/selftests/expected_subtest.xml
+++ b/tests/auto/testlib/selftests/expected_subtest.xml
@@ -5,63 +5,144 @@
     <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
 </Environment>
 <TestFunction name="initTestCase">
+<Message type="qdebug" file="" line="0">
+    <Description><![CDATA[initTestCase initTestCase (null) ]]></Description>
+</Message>
 <Incident type="pass" file="" line="0" />
 </TestFunction>
 <TestFunction name="test1">
+<Message type="qdebug" file="" line="0">
+    <Description><![CDATA[init test1 (null) ]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <Description><![CDATA[test1 test1 (null) ]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <Description><![CDATA[cleanup test1 (null) ]]></Description>
+</Message>
 <Incident type="pass" file="" line="0" />
 </TestFunction>
 <TestFunction name="test2">
+<Message type="qdebug" file="" line="0">
+    <Description><![CDATA[test2_data test2 (null) ]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <Description><![CDATA[test2_data end ]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <DataTag><![CDATA[data0]]></DataTag>
+    <Description><![CDATA[init test2 data0 ]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <DataTag><![CDATA[data0]]></DataTag>
+    <Description><![CDATA[test2 test2 data0 ]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <DataTag><![CDATA[data0]]></DataTag>
+    <Description><![CDATA[test2 end ]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <DataTag><![CDATA[data0]]></DataTag>
+    <Description><![CDATA[cleanup test2 data0 ]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <DataTag><![CDATA[data1]]></DataTag>
+    <Description><![CDATA[init test2 data1 ]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <DataTag><![CDATA[data1]]></DataTag>
+    <Description><![CDATA[test2 test2 data1 ]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <DataTag><![CDATA[data1]]></DataTag>
+    <Description><![CDATA[test2 end ]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <DataTag><![CDATA[data1]]></DataTag>
+    <Description><![CDATA[cleanup test2 data1 ]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <DataTag><![CDATA[data2]]></DataTag>
+    <Description><![CDATA[init test2 data2 ]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <DataTag><![CDATA[data2]]></DataTag>
+    <Description><![CDATA[test2 test2 data2 ]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <DataTag><![CDATA[data2]]></DataTag>
+    <Description><![CDATA[test2 end ]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <DataTag><![CDATA[data2]]></DataTag>
+    <Description><![CDATA[cleanup test2 data2 ]]></Description>
+</Message>
 <Incident type="pass" file="" line="0" />
 </TestFunction>
 <TestFunction name="test3">
-<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/subtest/tst_subtest.cpp" line="157">
+<Message type="qdebug" file="" line="0">
+    <Description><![CDATA[test3_data test3 (null) ]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <Description><![CDATA[test3_data end ]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <DataTag><![CDATA[data0]]></DataTag>
+    <Description><![CDATA[init test3 data0 ]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <DataTag><![CDATA[data0]]></DataTag>
+    <Description><![CDATA[test2 test3 data0 ]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <DataTag><![CDATA[data0]]></DataTag>
+    <Description><![CDATA[test2 end ]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <DataTag><![CDATA[data0]]></DataTag>
+    <Description><![CDATA[cleanup test3 data0 ]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <DataTag><![CDATA[data1]]></DataTag>
+    <Description><![CDATA[init test3 data1 ]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <DataTag><![CDATA[data1]]></DataTag>
+    <Description><![CDATA[test2 test3 data1 ]]></Description>
+</Message>
+<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp" line="154">
     <DataTag><![CDATA[data1]]></DataTag>
     <Description><![CDATA[Compared values are not the same
    Actual (str): hello1
    Expected (QString("hello0")): hello0]]></Description>
 </Incident>
-<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/subtest/tst_subtest.cpp" line="157">
+<Message type="qdebug" file="" line="0">
+    <DataTag><![CDATA[data1]]></DataTag>
+    <Description><![CDATA[cleanup test3 data1 ]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <DataTag><![CDATA[data2]]></DataTag>
+    <Description><![CDATA[init test3 data2 ]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <DataTag><![CDATA[data2]]></DataTag>
+    <Description><![CDATA[test2 test3 data2 ]]></Description>
+</Message>
+<Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp" line="154">
     <DataTag><![CDATA[data2]]></DataTag>
     <Description><![CDATA[Compared values are not the same
    Actual (str): hello2
    Expected (QString("hello0")): hello0]]></Description>
 </Incident>
-</TestFunction>
-<TestFunction name="floatComparisons">
-<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/subtest/tst_subtest.cpp" line="167">
-    <DataTag><![CDATA[should FAIL]]></DataTag>
-    <Description><![CDATA[Compared floats are not the same (fuzzy compare)
-   Actual (operandLeft): 1
-   Expected (operandRight): 3]]></Description>
-</Incident>
-<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/subtest/tst_subtest.cpp" line="167">
-    <DataTag><![CDATA[should FAIL]]></DataTag>
-    <Description><![CDATA[Compared floats are not the same (fuzzy compare)
-   Actual (operandLeft): 1e-07
-   Expected (operandRight): 3e-07]]></Description>
-</Incident>
-</TestFunction>
-<TestFunction name="compareFloatTests">
-<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/subtest/tst_subtest.cpp" line="206">
-    <DataTag><![CDATA[1e0]]></DataTag>
-    <Description><![CDATA[Compared floats are not the same (fuzzy compare)
-   Actual (t1): 1
-   Expected (t3): 3]]></Description>
-</Incident>
-<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/subtest/tst_subtest.cpp" line="206">
-    <DataTag><![CDATA[1e-7]]></DataTag>
-    <Description><![CDATA[Compared floats are not the same (fuzzy compare)
-   Actual (t1): 1e-07
-   Expected (t3): 3e-07]]></Description>
-</Incident>
-<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/subtest/tst_subtest.cpp" line="206">
-    <DataTag><![CDATA[1e+7]]></DataTag>
-    <Description><![CDATA[Compared floats are not the same (fuzzy compare)
-   Actual (t1): 1e+07
-   Expected (t3): 3e+07]]></Description>
-</Incident>
+<Message type="qdebug" file="" line="0">
+    <DataTag><![CDATA[data2]]></DataTag>
+    <Description><![CDATA[cleanup test3 data2 ]]></Description>
+</Message>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
+<Message type="qdebug" file="" line="0">
+    <Description><![CDATA[cleanupTestCase cleanupTestCase (null) ]]></Description>
+</Message>
 <Incident type="pass" file="" line="0" />
 </TestFunction>
 </TestCase>