2011-04-27 10:05:43 +00:00
|
|
|
<?xml version="1.0" encoding="UTF-8" ?>
|
Fix the skip-check in TestMethods::invokeTest()
TestMethods::invokeTest() has an outer loop on global data (albeit
with a comment that said otherwise). On its first cycle, we run the
test function's *_data() method, if it has one; there is an inner loop
on the rows this created. If the *_data() QSKIP()s, we need to skip
the whole test; otherwise, a QSKIP() in one sub-test should not lead
to skipping the remaining sub-tests.
Moved the check for *_data() QSKIP()ping to right after *_data()
returns, inside the "first global cycle" block that runs it.
Previously, this check was done before entering the loop on local data
rows, but outside that "first global cycle" block: consequently, later
global cycles would fall foul of this check (even though the *_data()
hasn't been run in this cycle, much less QSKIP()ped in it) if the last
sub-test of the previous global cycle had QSKIP()ped.
When running a single test for one specific data row, if the test's
*_data() QSKIP()ped, this misplaced check would also have lead to a
misleading "Unknown testdata" warning.
Changed testlib/selftests' tst_globaldata::skipSingle() to trigger the
bug (by having its last local row of first global row skip, which
caused the second global row to be omitted) to verify this is also
fixed; and amended one of its comments to reflect what's now to be
expected. Updated the test's expected output files.
Task-number: QTBUG-61774
Change-Id: I99596b595c6d1184038f23383844c6ff51a0cd91
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-07-18 09:57:02 +00:00
|
|
|
<testsuite errors="43" failures="0" tests="6" name="tst_globaldata">
|
2011-04-27 10:05:43 +00:00
|
|
|
<properties>
|
|
|
|
<property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
|
|
|
|
<property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
|
Use new QLibraryInfo::build() in testlib to log build information.
This produces:
********* Start testing of tst_QtJson *********
Config: Using QtTest library 5.3.0, Qt 5.3.0 (Feb 13 2014, GCC 4.6.3, 64 bit, debug build)
PASS : tst_QtJson::initTestCase()
<?xml version="1.0" encoding="UTF-8"?>
<TestCase name="tst_QtJson">
<Environment>
<QtVersion>5.3.0</QtVersion>
<QtBuild>Qt 5.3.0 (Feb 13 2014, GCC 4.6.3, 64 bit, debug build)</QtBuild>
<QTestVersion>5.3.0</QTestVersion>
</Environment>
<?xml version="1.0" encoding="UTF-8" ?>
<testsuite errors="1" failures="1" tests="42" name="tst_QtJson">
<properties>
<property value="5.3.0" name="QTestVersion"/>
<property value="5.3.0" name="QtVersion"/>
<property value="Qt 5.3.0 (Feb 13 2014, GCC 4.6.3, 64 bit, debug build)" name="QtBuild"/>
</properties>
<Environment>
<QtVersion>5.3.0</QtVersion>
<QtBuild>Qt 5.3.0 (Feb 13 2014, GCC 4.6.3, 64 bit, debug build)</QtBuild>
<QTestVersion>5.3.0</QTestVersion>
</Environment>
[ChangeLog][QtTest] Tests now output build information.
Change-Id: I0ab473371575f2b807db725256805b8bffea3454
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
2014-02-26 16:12:45 +00:00
|
|
|
<property value="" name="QtBuild"/>
|
2011-04-27 10:05:43 +00:00
|
|
|
</properties>
|
2011-09-20 03:13:34 +00:00
|
|
|
<testcase result="pass" name="initTestCase">
|
2013-10-16 13:59:27 +00:00
|
|
|
<!-- message="initTestCase initTestCase (null)" type="qdebug" -->
|
2011-09-20 03:13:34 +00:00
|
|
|
</testcase>
|
|
|
|
<testcase result="pass" name="testGlobal">
|
2017-07-18 16:43:56 +00:00
|
|
|
<!-- tag="global=false:local=false" message="init testGlobal local=false" type="qdebug" -->
|
|
|
|
<!-- tag="global=false:local=false" message="global: false" type="qdebug" -->
|
|
|
|
<!-- tag="global=false:local=false" message="local: false" type="qdebug" -->
|
|
|
|
<!-- tag="global=false:local=false" message="cleanup testGlobal local=false" type="qdebug" -->
|
|
|
|
<!-- tag="global=false:local=true" message="init testGlobal local=true" type="qdebug" -->
|
|
|
|
<!-- tag="global=false:local=true" message="global: false" type="qdebug" -->
|
|
|
|
<!-- tag="global=false:local=true" message="local: true" type="qdebug" -->
|
|
|
|
<!-- tag="global=false:local=true" message="cleanup testGlobal local=true" type="qdebug" -->
|
|
|
|
<!-- tag="global=true:local=false" message="init testGlobal local=false" type="qdebug" -->
|
|
|
|
<!-- tag="global=true:local=false" message="global: true" type="qdebug" -->
|
|
|
|
<!-- tag="global=true:local=false" message="local: false" type="qdebug" -->
|
|
|
|
<!-- tag="global=true:local=false" message="cleanup testGlobal local=false" type="qdebug" -->
|
|
|
|
<!-- tag="global=true:local=true" message="init testGlobal local=true" type="qdebug" -->
|
|
|
|
<!-- tag="global=true:local=true" message="global: true" type="qdebug" -->
|
|
|
|
<!-- tag="global=true:local=true" message="local: true" type="qdebug" -->
|
|
|
|
<!-- tag="global=true:local=true" message="cleanup testGlobal local=true" type="qdebug" -->
|
2011-09-20 03:13:34 +00:00
|
|
|
</testcase>
|
2011-04-27 10:05:43 +00:00
|
|
|
<testcase name="skip">
|
2017-07-18 16:43:56 +00:00
|
|
|
<!-- tag="global=false" message="skipping" type="skip" -->
|
2011-04-27 10:05:43 +00:00
|
|
|
</testcase>
|
|
|
|
<testcase name="skipLocal">
|
2017-07-18 16:43:56 +00:00
|
|
|
<!-- tag="global=false:local=false" message="init skipLocal local=false" type="qdebug" -->
|
|
|
|
<!-- tag="global=false:local=false" message="skipping" type="skip" -->
|
|
|
|
<!-- tag="global=false:local=false" message="cleanup skipLocal local=false" type="qdebug" -->
|
|
|
|
<!-- tag="global=false:local=true" message="init skipLocal local=true" type="qdebug" -->
|
|
|
|
<!-- tag="global=false:local=true" message="skipping" type="skip" -->
|
|
|
|
<!-- tag="global=false:local=true" message="cleanup skipLocal local=true" type="qdebug" -->
|
Fix the skip-check in TestMethods::invokeTest()
TestMethods::invokeTest() has an outer loop on global data (albeit
with a comment that said otherwise). On its first cycle, we run the
test function's *_data() method, if it has one; there is an inner loop
on the rows this created. If the *_data() QSKIP()s, we need to skip
the whole test; otherwise, a QSKIP() in one sub-test should not lead
to skipping the remaining sub-tests.
Moved the check for *_data() QSKIP()ping to right after *_data()
returns, inside the "first global cycle" block that runs it.
Previously, this check was done before entering the loop on local data
rows, but outside that "first global cycle" block: consequently, later
global cycles would fall foul of this check (even though the *_data()
hasn't been run in this cycle, much less QSKIP()ped in it) if the last
sub-test of the previous global cycle had QSKIP()ped.
When running a single test for one specific data row, if the test's
*_data() QSKIP()ped, this misplaced check would also have lead to a
misleading "Unknown testdata" warning.
Changed testlib/selftests' tst_globaldata::skipSingle() to trigger the
bug (by having its last local row of first global row skip, which
caused the second global row to be omitted) to verify this is also
fixed; and amended one of its comments to reflect what's now to be
expected. Updated the test's expected output files.
Task-number: QTBUG-61774
Change-Id: I99596b595c6d1184038f23383844c6ff51a0cd91
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-07-18 09:57:02 +00:00
|
|
|
<!-- tag="global=true:local=false" message="init skipLocal local=false" type="qdebug" -->
|
|
|
|
<!-- tag="global=true:local=false" message="skipping" type="skip" -->
|
|
|
|
<!-- tag="global=true:local=false" message="cleanup skipLocal local=false" type="qdebug" -->
|
|
|
|
<!-- tag="global=true:local=true" message="init skipLocal local=true" type="qdebug" -->
|
|
|
|
<!-- tag="global=true:local=true" message="skipping" type="skip" -->
|
|
|
|
<!-- tag="global=true:local=true" message="cleanup skipLocal local=true" type="qdebug" -->
|
2011-04-27 10:05:43 +00:00
|
|
|
</testcase>
|
|
|
|
<testcase result="pass" name="skipSingle">
|
2017-07-18 16:43:56 +00:00
|
|
|
<!-- tag="global=false:local=false" message="init skipSingle local=false" type="qdebug" -->
|
|
|
|
<!-- tag="global=false:local=false" message="global: false local: false" type="qdebug" -->
|
|
|
|
<!-- tag="global=false:local=false" message="cleanup skipSingle local=false" type="qdebug" -->
|
|
|
|
<!-- tag="global=false:local=true" message="init skipSingle local=true" type="qdebug" -->
|
Fix the skip-check in TestMethods::invokeTest()
TestMethods::invokeTest() has an outer loop on global data (albeit
with a comment that said otherwise). On its first cycle, we run the
test function's *_data() method, if it has one; there is an inner loop
on the rows this created. If the *_data() QSKIP()s, we need to skip
the whole test; otherwise, a QSKIP() in one sub-test should not lead
to skipping the remaining sub-tests.
Moved the check for *_data() QSKIP()ping to right after *_data()
returns, inside the "first global cycle" block that runs it.
Previously, this check was done before entering the loop on local data
rows, but outside that "first global cycle" block: consequently, later
global cycles would fall foul of this check (even though the *_data()
hasn't been run in this cycle, much less QSKIP()ped in it) if the last
sub-test of the previous global cycle had QSKIP()ped.
When running a single test for one specific data row, if the test's
*_data() QSKIP()ped, this misplaced check would also have lead to a
misleading "Unknown testdata" warning.
Changed testlib/selftests' tst_globaldata::skipSingle() to trigger the
bug (by having its last local row of first global row skip, which
caused the second global row to be omitted) to verify this is also
fixed; and amended one of its comments to reflect what's now to be
expected. Updated the test's expected output files.
Task-number: QTBUG-61774
Change-Id: I99596b595c6d1184038f23383844c6ff51a0cd91
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-07-18 09:57:02 +00:00
|
|
|
<!-- tag="global=false:local=true" message="Skipping" type="skip" -->
|
2017-07-18 16:43:56 +00:00
|
|
|
<!-- tag="global=false:local=true" message="cleanup skipSingle local=true" type="qdebug" -->
|
|
|
|
<!-- tag="global=true:local=false" message="init skipSingle local=false" type="qdebug" -->
|
|
|
|
<!-- tag="global=true:local=false" message="Skipping" type="skip" -->
|
|
|
|
<!-- tag="global=true:local=false" message="cleanup skipSingle local=false" type="qdebug" -->
|
|
|
|
<!-- tag="global=true:local=true" message="init skipSingle local=true" type="qdebug" -->
|
|
|
|
<!-- tag="global=true:local=true" message="global: true local: true" type="qdebug" -->
|
|
|
|
<!-- tag="global=true:local=true" message="cleanup skipSingle local=true" type="qdebug" -->
|
2011-09-20 03:13:34 +00:00
|
|
|
</testcase>
|
|
|
|
<testcase result="pass" name="cleanupTestCase">
|
2013-10-16 13:59:27 +00:00
|
|
|
<!-- message="cleanupTestCase cleanupTestCase (null)" type="qdebug" -->
|
2011-04-27 10:05:43 +00:00
|
|
|
</testcase>
|
|
|
|
<system-err>
|
2013-10-16 13:59:27 +00:00
|
|
|
<![CDATA[initTestCase initTestCase (null)]]>
|
2017-07-18 16:43:56 +00:00
|
|
|
<![CDATA[init testGlobal local=false]]>
|
2013-10-16 13:59:27 +00:00
|
|
|
<![CDATA[global: false]]>
|
|
|
|
<![CDATA[local: false]]>
|
2017-07-18 16:43:56 +00:00
|
|
|
<![CDATA[cleanup testGlobal local=false]]>
|
|
|
|
<![CDATA[init testGlobal local=true]]>
|
2013-10-16 13:59:27 +00:00
|
|
|
<![CDATA[global: false]]>
|
|
|
|
<![CDATA[local: true]]>
|
2017-07-18 16:43:56 +00:00
|
|
|
<![CDATA[cleanup testGlobal local=true]]>
|
|
|
|
<![CDATA[init testGlobal local=false]]>
|
2013-10-16 13:59:27 +00:00
|
|
|
<![CDATA[global: true]]>
|
|
|
|
<![CDATA[local: false]]>
|
2017-07-18 16:43:56 +00:00
|
|
|
<![CDATA[cleanup testGlobal local=false]]>
|
|
|
|
<![CDATA[init testGlobal local=true]]>
|
2013-10-16 13:59:27 +00:00
|
|
|
<![CDATA[global: true]]>
|
|
|
|
<![CDATA[local: true]]>
|
2017-07-18 16:43:56 +00:00
|
|
|
<![CDATA[cleanup testGlobal local=true]]>
|
2011-04-27 10:05:43 +00:00
|
|
|
<![CDATA[skipping]]>
|
2017-07-18 16:43:56 +00:00
|
|
|
<![CDATA[init skipLocal local=false]]>
|
2011-04-27 10:05:43 +00:00
|
|
|
<![CDATA[skipping]]>
|
2017-07-18 16:43:56 +00:00
|
|
|
<![CDATA[cleanup skipLocal local=false]]>
|
|
|
|
<![CDATA[init skipLocal local=true]]>
|
2011-10-18 04:53:23 +00:00
|
|
|
<![CDATA[skipping]]>
|
2017-07-18 16:43:56 +00:00
|
|
|
<![CDATA[cleanup skipLocal local=true]]>
|
Fix the skip-check in TestMethods::invokeTest()
TestMethods::invokeTest() has an outer loop on global data (albeit
with a comment that said otherwise). On its first cycle, we run the
test function's *_data() method, if it has one; there is an inner loop
on the rows this created. If the *_data() QSKIP()s, we need to skip
the whole test; otherwise, a QSKIP() in one sub-test should not lead
to skipping the remaining sub-tests.
Moved the check for *_data() QSKIP()ping to right after *_data()
returns, inside the "first global cycle" block that runs it.
Previously, this check was done before entering the loop on local data
rows, but outside that "first global cycle" block: consequently, later
global cycles would fall foul of this check (even though the *_data()
hasn't been run in this cycle, much less QSKIP()ped in it) if the last
sub-test of the previous global cycle had QSKIP()ped.
When running a single test for one specific data row, if the test's
*_data() QSKIP()ped, this misplaced check would also have lead to a
misleading "Unknown testdata" warning.
Changed testlib/selftests' tst_globaldata::skipSingle() to trigger the
bug (by having its last local row of first global row skip, which
caused the second global row to be omitted) to verify this is also
fixed; and amended one of its comments to reflect what's now to be
expected. Updated the test's expected output files.
Task-number: QTBUG-61774
Change-Id: I99596b595c6d1184038f23383844c6ff51a0cd91
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-07-18 09:57:02 +00:00
|
|
|
<![CDATA[init skipLocal local=false]]>
|
|
|
|
<![CDATA[skipping]]>
|
|
|
|
<![CDATA[cleanup skipLocal local=false]]>
|
|
|
|
<![CDATA[init skipLocal local=true]]>
|
|
|
|
<![CDATA[skipping]]>
|
|
|
|
<![CDATA[cleanup skipLocal local=true]]>
|
2017-07-18 16:43:56 +00:00
|
|
|
<![CDATA[init skipSingle local=false]]>
|
2013-10-16 13:59:27 +00:00
|
|
|
<![CDATA[global: false local: false]]>
|
2017-07-18 16:43:56 +00:00
|
|
|
<![CDATA[cleanup skipSingle local=false]]>
|
|
|
|
<![CDATA[init skipSingle local=true]]>
|
Fix the skip-check in TestMethods::invokeTest()
TestMethods::invokeTest() has an outer loop on global data (albeit
with a comment that said otherwise). On its first cycle, we run the
test function's *_data() method, if it has one; there is an inner loop
on the rows this created. If the *_data() QSKIP()s, we need to skip
the whole test; otherwise, a QSKIP() in one sub-test should not lead
to skipping the remaining sub-tests.
Moved the check for *_data() QSKIP()ping to right after *_data()
returns, inside the "first global cycle" block that runs it.
Previously, this check was done before entering the loop on local data
rows, but outside that "first global cycle" block: consequently, later
global cycles would fall foul of this check (even though the *_data()
hasn't been run in this cycle, much less QSKIP()ped in it) if the last
sub-test of the previous global cycle had QSKIP()ped.
When running a single test for one specific data row, if the test's
*_data() QSKIP()ped, this misplaced check would also have lead to a
misleading "Unknown testdata" warning.
Changed testlib/selftests' tst_globaldata::skipSingle() to trigger the
bug (by having its last local row of first global row skip, which
caused the second global row to be omitted) to verify this is also
fixed; and amended one of its comments to reflect what's now to be
expected. Updated the test's expected output files.
Task-number: QTBUG-61774
Change-Id: I99596b595c6d1184038f23383844c6ff51a0cd91
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-07-18 09:57:02 +00:00
|
|
|
<![CDATA[Skipping]]>
|
2017-07-18 16:43:56 +00:00
|
|
|
<![CDATA[cleanup skipSingle local=true]]>
|
|
|
|
<![CDATA[init skipSingle local=false]]>
|
|
|
|
<![CDATA[Skipping]]>
|
|
|
|
<![CDATA[cleanup skipSingle local=false]]>
|
|
|
|
<![CDATA[init skipSingle local=true]]>
|
2013-10-16 13:59:27 +00:00
|
|
|
<![CDATA[global: true local: true]]>
|
2017-07-18 16:43:56 +00:00
|
|
|
<![CDATA[cleanup skipSingle local=true]]>
|
2013-10-16 13:59:27 +00:00
|
|
|
<![CDATA[cleanupTestCase cleanupTestCase (null)]]>
|
2011-04-27 10:05:43 +00:00
|
|
|
</system-err>
|
|
|
|
</testsuite>
|