diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:25:31 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:26:33 +0100 |
| commit | d065dfd454890c332482a6109ed34a989e50809b (patch) | |
| tree | 0d3e9c5367c1fad7d089d368182374e8d1d46ca1 /tests/auto/testlib/selftests/expected_expectfail.xunitxml | |
| parent | 632840cb0f5ad355d87fc040b015d04af86371ec (diff) | |
| parent | 9f54846d951838361f4188b423e7aa7c7b9a9540 (diff) | |
Merge remote-tracking branch 'gerrit/master' into containers
Conflicts:
src/corelib/tools/qstring.cpp
Change-Id: I23d214bf33c2badfae1876da3cc7d6d8f6e635fb
Diffstat (limited to 'tests/auto/testlib/selftests/expected_expectfail.xunitxml')
| -rw-r--r-- | tests/auto/testlib/selftests/expected_expectfail.xunitxml | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/tests/auto/testlib/selftests/expected_expectfail.xunitxml b/tests/auto/testlib/selftests/expected_expectfail.xunitxml index 328bb6433b..017e4501c1 100644 --- a/tests/auto/testlib/selftests/expected_expectfail.xunitxml +++ b/tests/auto/testlib/selftests/expected_expectfail.xunitxml @@ -1,38 +1,41 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite errors="11" failures="2" tests="10" name="tst_ExpectFail"> +<testsuite errors="11" failures="3" tests="11" name="tst_ExpectFail"> <properties> - <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/> - <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/> + <property value="5.0.0" name="QTestVersion"/> + <property value="5.0.0" name="QtVersion"/> </properties> <testcase result="pass" name="initTestCase"/> - <testcase result="xfail" name="expectAndContinue"> + <testcase result="xfail" name="xfailAndContinue"> <!-- message="begin" type="qdebug" --> <!-- message="This should xfail" type="info" --> <!-- message="after" type="qdebug" --> </testcase> - <testcase result="xfail" name="expectAndAbort"> + <testcase result="xfail" name="xfailAndAbort"> <!-- message="begin" type="qdebug" --> <!-- message="This should xfail" type="info" --> </testcase> - <testcase result="fail" name="expectTwice"> + <testcase result="fail" name="xfailTwice"> <failure message="Already expecting a fail" result="fail"/> </testcase> <testcase result="xfail" name="xfailWithQString"> <!-- message="A string" type="info" --> <!-- message="Bug 5 (The message)" type="info" --> </testcase> - <testcase result="xpass" name="xpass"> - <failure message="'true' returned FALSE. ()" result="xpass"/> - </testcase> - <testcase result="xfail" name="dataDrivenTest"> + <testcase result="xfail" name="xfailDataDriven"> <!-- tag="Abort" message="This test should xfail" type="info" --> <!-- tag="Continue" message="This test should xfail" type="info" --> </testcase> - <testcase result="pass" name="expectOnWrongRow"/> - <testcase result="xfail" name="expectOnAnyRow"> + <testcase result="pass" name="xfailOnWrongRow"/> + <testcase result="xfail" name="xfailOnAnyRow"> <!-- tag="first row" message="This test should xfail" type="info" --> <!-- tag="second row" message="This test should xfail" type="info" --> </testcase> + <testcase result="xpass" name="xpass"> + <failure message="'true' returned FALSE. ()" result="xpass"/> + </testcase> + <testcase result="xpass" name="xpassDataDriven"> + <failure tag="XPass" message="'true' returned FALSE. ()" result="xpass"/> + </testcase> <testcase result="pass" name="cleanupTestCase"/> <system-err> <![CDATA[begin]]> |