diff options
Diffstat (limited to 'tests')
17 files changed, 117 insertions, 40 deletions
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 @@ <Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="testNumber2"> -<Incident type="fail" file="Unknown file" line="0"> <Message type="qfatal" file="" line="0"> <Description><![CDATA[ASSERT: "false" in file /local/user_builds/qt/4.6/tests/auto/selftests/assert/tst_assert.cpp, line 62]]></Description> </Message> +<Incident type="fail" file="Unknown file" line="0"> <Description><![CDATA[Received a fatal error.]]></Description> </Incident> </TestFunction> 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 @@ <Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="badDataTag"> -<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/badxml/tst_badxml.cpp" line="109"> <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> -<BenchmarkResult metric="Events" tag="all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs" value="0" iterations="1" /> </Incident> +<BenchmarkResult metric="Events" tag="all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs" value="0" iterations="1" /> </TestFunction> <TestFunction name="badMessage"> -<Incident type="pass" file="" line="0"> <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> +<Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="failWithNoFile"> <Incident type="fail" file="" line="0"> 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 @@ <Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="twoHundredMillionInstructions"> -<Incident type="pass" file="" line="0"> <BenchmarkResult metric="InstructionReads" tag="" value="200000000" iterations="1" /> -</Incident> +<Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> 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 @@ <Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="events"> -<Incident type="pass" file="" line="0"> <BenchmarkResult metric="Events" tag="0" value="0" iterations="1" /> <BenchmarkResult metric="Events" tag="1" value="1" iterations="1" /> <BenchmarkResult metric="Events" tag="10" value="10" iterations="1" /> @@ -14,7 +13,7 @@ <BenchmarkResult metric="Events" tag="500" value="500" iterations="1" /> <BenchmarkResult metric="Events" tag="5000" value="5000" iterations="1" /> <BenchmarkResult metric="Events" tag="100000" value="100000" iterations="1" /> -</Incident> +<Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> 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 @@ </TestFunction> <TestFunction name="compare_tostring"> <Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/cmptest/tst_cmptest.cpp" line="122"> + <DataTag><![CDATA[int, string]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (actual): QVariant(int,123) Expected (expected): QVariant(QString,hi)]]></Description> +</Incident> +<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/cmptest/tst_cmptest.cpp" line="122"> + <DataTag><![CDATA[null hash, invalid]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (actual): QVariant(QVariantHash) Expected (expected): QVariant()]]></Description> +</Incident> +<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/cmptest/tst_cmptest.cpp" line="122"> + <DataTag><![CDATA[string, null user type]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (actual): QVariant(QString,A simple string) Expected (expected): QVariant(PhonyClass)]]></Description> +</Incident> +<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/cmptest/tst_cmptest.cpp" line="122"> + <DataTag><![CDATA[both non-null user type]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (actual): QVariant(PhonyClass,<value not representable as string>) Expected (expected): QVariant(PhonyClass,<value not representable as string>)]]></Description> 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 @@ <Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="fiveTablePasses"> -<Incident type="pass" file="" line="0"> <Message type="info" file="/local/user_builds/qt/4.6/tests/auto/selftests/commandlinedata/tst_commandlinedata.cpp" line="65"> + <DataTag><![CDATA[fiveTablePasses_data1]]></DataTag> <Description><![CDATA[QVERIFY(test)]]></Description> </Message> <Message type="info" file="/local/user_builds/qt/4.6/tests/auto/selftests/commandlinedata/tst_commandlinedata.cpp" line="65"> + <DataTag><![CDATA[fiveTablePasses_data2]]></DataTag> <Description><![CDATA[QVERIFY(test)]]></Description> </Message> <Message type="info" file="/local/user_builds/qt/4.6/tests/auto/selftests/commandlinedata/tst_commandlinedata.cpp" line="65"> + <DataTag><![CDATA[fiveTablePasses_data3]]></DataTag> <Description><![CDATA[QVERIFY(test)]]></Description> </Message> <Message type="info" file="/local/user_builds/qt/4.6/tests/auto/selftests/commandlinedata/tst_commandlinedata.cpp" line="65"> + <DataTag><![CDATA[fiveTablePasses_data4]]></DataTag> <Description><![CDATA[QVERIFY(test)]]></Description> </Message> <Message type="info" file="/local/user_builds/qt/4.6/tests/auto/selftests/commandlinedata/tst_commandlinedata.cpp" line="65"> + <DataTag><![CDATA[fiveTablePasses_data5]]></DataTag> <Description><![CDATA[QVERIFY(test)]]></Description> </Message> -</Incident> +<Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="fiveTablePasses"> -<Incident type="pass" file="" line="0"> <Message type="info" file="/local/user_builds/qt/4.6/tests/auto/selftests/commandlinedata/tst_commandlinedata.cpp" line="65"> + <DataTag><![CDATA[fiveTablePasses_data1]]></DataTag> <Description><![CDATA[QVERIFY(test)]]></Description> </Message> -</Incident> +<Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> 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 @@ </TestFunction> <TestFunction name="fiveTableFailures"> <Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/datatable/tst_datatable.cpp" line="91"> + <DataTag><![CDATA[fiveTableFailures_data 1]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> +</Incident> +<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/datatable/tst_datatable.cpp" line="91"> + <DataTag><![CDATA[fiveTableFailures_data 2]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> +</Incident> +<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/datatable/tst_datatable.cpp" line="91"> + <DataTag><![CDATA[fiveTableFailures_data 3]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> +</Incident> +<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/datatable/tst_datatable.cpp" line="91"> + <DataTag><![CDATA[fiveTableFailures_data 4]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> +</Incident> +<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/datatable/tst_datatable.cpp" line="91"> + <DataTag><![CDATA[fiveTableFailures_data 5]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> </TestFunction> <TestFunction name="startsWithFailure"> <Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/datatable/tst_datatable.cpp" line="91"> + <DataTag><![CDATA[startsWithFailure_data 1]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> </TestFunction> <TestFunction name="endsWithFailure"> <Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/datatable/tst_datatable.cpp" line="91"> + <DataTag><![CDATA[endsWithFailure 5]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> </TestFunction> <TestFunction name="failureInMiddle"> <Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/datatable/tst_datatable.cpp" line="91"> + <DataTag><![CDATA[failureInMiddle_data 3]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> </TestFunction> <TestFunction name="fiveIsolatedFailures"> <Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/datatable/tst_datatable.cpp" line="173"> + <DataTag><![CDATA[fiveIsolatedFailures_data 1]]></DataTag> <Description><![CDATA['!test' returned FALSE. ()]]></Description> +</Incident> +<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/datatable/tst_datatable.cpp" line="173"> + <DataTag><![CDATA[fiveIsolatedFailures_data 2]]></DataTag> <Description><![CDATA['!test' returned FALSE. ()]]></Description> +</Incident> +<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/datatable/tst_datatable.cpp" line="173"> + <DataTag><![CDATA[fiveIsolatedFailures_data 3]]></DataTag> <Description><![CDATA['!test' returned FALSE. ()]]></Description> +</Incident> +<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/datatable/tst_datatable.cpp" line="173"> + <DataTag><![CDATA[fiveIsolatedFailures_data 4]]></DataTag> <Description><![CDATA['!test' returned FALSE. ()]]></Description> +</Incident> +<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/datatable/tst_datatable.cpp" line="173"> + <DataTag><![CDATA[fiveIsolatedFailures_data 5]]></DataTag> <Description><![CDATA['!test' returned FALSE. ()]]></Description> </Incident> </TestFunction> 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 @@ <Description><![CDATA[Compared values are not the same Actual (operandA): http://example.com Expected (operandB): ]]></Description> +</Incident> +<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/datetime/tst_datetime.cpp" line="74"> <Description><![CDATA[Compared values are not the same Actual (operandA): Expected (operandB): http://example.com]]></Description> 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 @@ <Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="expectAndContinue"> -<Incident type="xfail" file="/local/user_builds/qt/4.6/tests/auto/selftests/expectfail/tst_expectfail.cpp" line="60"> <Message type="qdebug" file="" line="0"> <Description><![CDATA[begin]]></Description> </Message> +<Incident type="xfail" file="/local/user_builds/qt/4.6/tests/auto/selftests/expectfail/tst_expectfail.cpp" line="60"> <Description><![CDATA[This should xfail]]></Description> +</Incident> <Message type="qdebug" file="" line="0"> <Description><![CDATA[after]]></Description> </Message> -</Incident> +<Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="expectAndAbort"> -<Incident type="xfail" file="/local/user_builds/qt/4.6/tests/auto/selftests/expectfail/tst_expectfail.cpp" line="68"> <Message type="qdebug" file="" line="0"> <Description><![CDATA[begin]]></Description> </Message> +<Incident type="xfail" file="/local/user_builds/qt/4.6/tests/auto/selftests/expectfail/tst_expectfail.cpp" line="68"> <Description><![CDATA[This should xfail]]></Description> </Incident> +<Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="xfailWithQString"> <Incident type="xfail" file="/local/user_builds/qt/4.6/tests/auto/selftests/expectfail/tst_expectfail.cpp" line="75"> <Description><![CDATA[A string]]></Description> +</Incident> +<Incident type="xfail" file="/local/user_builds/qt/4.6/tests/auto/selftests/expectfail/tst_expectfail.cpp" line="80"> <Description><![CDATA[Bug 5 (The message)]]></Description> </Incident> +<Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> 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 @@ <Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="fetchBogus"> -<Incident type="fail" file="Unknown file" line="0"> <Message type="qfatal" file="" line="0"> + <DataTag><![CDATA[foo]]></DataTag> <Description><![CDATA[QFETCH: Requested testdata 'bubu' not available, check your _data function.]]></Description> </Message> +<Incident type="fail" file="Unknown file" line="0"> + <DataTag><![CDATA[foo]]></DataTag> <Description><![CDATA[Received a fatal error.]]></Description> </Incident> </TestFunction> 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 @@ </TestFunction> <TestFunction name="skip"> <Message type="skip" file="/local/user_builds/qt/4.6/tests/auto/selftests/globaldata/tst_globaldata.cpp" line="128"> + <DataTag><![CDATA[1]]></DataTag> <Description><![CDATA[skipping]]></Description> </Message> </TestFunction> <TestFunction name="skipLocal"> <Message type="skip" file="/local/user_builds/qt/4.6/tests/auto/selftests/globaldata/tst_globaldata.cpp" line="148"> + <DataTag><![CDATA[1:local 1]]></DataTag> <Description><![CDATA[skipping]]></Description> </Message> </TestFunction> <TestFunction name="skipSingle"> -<Incident type="pass" file="" line="0"> <Message type="skip" file="/local/user_builds/qt/4.6/tests/auto/selftests/globaldata/tst_globaldata.cpp" line="142"> + <DataTag><![CDATA[2:local 1]]></DataTag> <Description><![CDATA[skipping]]></Description> </Message> -</Incident> +<Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> 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" /> 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 @@ </Message> </TestFunction> <TestFunction name="singleSkip"> -<Incident type="pass" file="" line="0"> <Message type="skip" file="/local/user_builds/qt/4.6/tests/auto/selftests/skip/tst_skip.cpp" line="97"> + <DataTag><![CDATA[local 1]]></DataTag> <Description><![CDATA[skipping one]]></Description> </Message> <Message type="qdebug" file="" line="0"> + <DataTag><![CDATA[local 2]]></DataTag> <Description><![CDATA[this line should only be reached once (true)]]></Description> </Message> -</Incident> +<Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> 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 @@ <Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="compareByteArray"> -<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/strcmp/tst_strcmp.cpp" line="88"> +<Incident type="xfail" file="/local/user_builds/qt/4.6/tests/auto/selftests/strcmp/tst_strcmp.cpp" line="88"> <Description><![CDATA[Next test should fail]]></Description> +</Incident> +<Incident type="xfail" file="/local/user_builds/qt/4.6/tests/auto/selftests/strcmp/tst_strcmp.cpp" line="95"> <Description><![CDATA[Next test should fail]]></Description> +</Incident> +<Incident type="xfail" file="/local/user_builds/qt/4.6/tests/auto/selftests/strcmp/tst_strcmp.cpp" line="102"> <Description><![CDATA[Next test should fail]]></Description> +</Incident> +<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/strcmp/tst_strcmp.cpp" line="109"> <Description><![CDATA[Compared values are not the same Actual (a): 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 42 ... Expected (b): 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 41 ...]]></Description> 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 @@ <Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="testWarnings"> -<Incident type="pass" file="" line="0"> <Message type="qwarn" file="" line="0"> <Description><![CDATA[Warning]]></Description> </Message> @@ -25,16 +24,16 @@ <Message type="qdebug" file="" line="0"> <Description><![CDATA[Baba]]></Description> </Message> -</Incident> +<Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="testMissingWarnings"> -<Incident type="fail" file="" line="0"> <Message type="info" file="" line="0"> <Description><![CDATA[Did not receive message: "Warning0"]]></Description> </Message> <Message type="info" file="" line="0"> <Description><![CDATA[Did not receive message: "Warning1"]]></Description> </Message> +<Incident type="fail" file="" line="0"> <Description><![CDATA[Not all expected messages were received]]></Description> </Incident> </TestFunction> 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 @@ <Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="testFunc1"> -<Incident type="pass" file="" line="0"> <Message type="warn" file="" line="0"> <Description><![CDATA[just a QWARN() !]]></Description> </Message> -</Incident> +<Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="testFunc2"> -<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/xunit/tst_xunit.cpp" line="74"> <Message type="qdebug" file="" line="0"> <Description><![CDATA[a qDebug() call with comment-ending stuff -->]]></Description> </Message> +<Incident type="fail" file="/local/user_builds/qt/4.6/tests/auto/selftests/xunit/tst_xunit.cpp" line="74"> <Description><![CDATA[Compared values are not the same Actual (2): 2 Expected (3): 3]]></Description> @@ -36,11 +35,13 @@ <Incident type="xfail" file="/local/user_builds/qt/4.6/tests/auto/selftests/xunit/tst_xunit.cpp" line="98"> <Description><![CDATA[this failure is expected]]></Description> </Incident> +<Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="testFunc6"> <Incident type="xfail" file="/local/user_builds/qt/4.6/tests/auto/selftests/xunit/tst_xunit.cpp" line="104"> <Description><![CDATA[this failure is also expected]]></Description> </Incident> +<Incident type="pass" file="" line="0" /> </TestFunction> <TestFunction name="testFunc7"> <Incident type="xpass" file="/local/user_builds/qt/4.6/tests/auto/selftests/xunit/tst_xunit.cpp" line="110"> 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<Logger> allLoggers() { return QList<Logger>() - << 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. */ |