diff options
Diffstat (limited to 'tests/auto/testlib')
189 files changed, 3044 insertions, 1237 deletions
diff --git a/tests/auto/testlib/selftests/deleteLater/deleteLater.pro b/tests/auto/testlib/selftests/deleteLater/deleteLater.pro new file mode 100644 index 0000000000..6847238b1d --- /dev/null +++ b/tests/auto/testlib/selftests/deleteLater/deleteLater.pro @@ -0,0 +1,7 @@ +SOURCES += tst_deleteLater.cpp +QT = core testlib + +CONFIG -= app_bundle +CONFIG -= debug_and_release_target + +TARGET = tst_deleteLater diff --git a/tests/auto/testlib/selftests/deleteLater/tst_deleteLater.cpp b/tests/auto/testlib/selftests/deleteLater/tst_deleteLater.cpp new file mode 100644 index 0000000000..8789baa22a --- /dev/null +++ b/tests/auto/testlib/selftests/deleteLater/tst_deleteLater.cpp @@ -0,0 +1,87 @@ +/**************************************************************************** +** +** Copyright (C) 2017 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author David Faure <david.faure@kdab.com> +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +#include <QtCore/QCoreApplication> +#include <QtTest/QtTest> + +class tst_DeleteLater: public QObject +{ + Q_OBJECT + +private slots: + void qtestLibShouldFlushDeleteLaterBetweenTests_setup(); + void qtestLibShouldFlushDeleteLaterBetweenTests_check(); + void qtestLibShouldFlushDeleteLaterOnExit(); +}; + +class ToBeDeleted : public QObject +{ +public: + ToBeDeleted(bool *staticBool) : staticBool(staticBool) {} + ~ToBeDeleted() { *staticBool = true; } +private: + bool *staticBool; +}; + +static bool deletedBetweenTests = false; + +void tst_DeleteLater::qtestLibShouldFlushDeleteLaterBetweenTests_setup() +{ + ToBeDeleted *obj = new ToBeDeleted(&deletedBetweenTests); + obj->deleteLater(); +} + +void tst_DeleteLater::qtestLibShouldFlushDeleteLaterBetweenTests_check() +{ + QVERIFY(deletedBetweenTests); +} + +static bool deletedOnExit = false; + +void tst_DeleteLater::qtestLibShouldFlushDeleteLaterOnExit() +{ + ToBeDeleted *obj = new ToBeDeleted(&deletedOnExit); + obj->deleteLater(); +} + +// This global object will check whether the deleteLater was processed +class DeleteChecker +{ +public: + ~DeleteChecker() { + if (!deletedOnExit) { + qFatal("QTestLib failed to flush deleteLater on exit"); + } + } +}; +static DeleteChecker s_deleteChecker; + +QTEST_MAIN(tst_DeleteLater) + +#include "tst_deleteLater.moc" diff --git a/tests/auto/testlib/selftests/deleteLater_noApp/deleteLater_noApp.pro b/tests/auto/testlib/selftests/deleteLater_noApp/deleteLater_noApp.pro new file mode 100644 index 0000000000..f860a767cd --- /dev/null +++ b/tests/auto/testlib/selftests/deleteLater_noApp/deleteLater_noApp.pro @@ -0,0 +1,7 @@ +SOURCES += tst_deleteLater_noApp.cpp +QT = core testlib + +CONFIG -= app_bundle +CONFIG -= debug_and_release_target + +TARGET = tst_deleteLater_noApp diff --git a/tests/auto/testlib/selftests/deleteLater_noApp/tst_deleteLater_noApp.cpp b/tests/auto/testlib/selftests/deleteLater_noApp/tst_deleteLater_noApp.cpp new file mode 100644 index 0000000000..9069e5d07e --- /dev/null +++ b/tests/auto/testlib/selftests/deleteLater_noApp/tst_deleteLater_noApp.cpp @@ -0,0 +1,88 @@ +/**************************************************************************** +** +** Copyright (C) 2017 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author David Faure <david.faure@kdab.com> +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +#include <QtCore/QCoreApplication> +#include <QtTest/QtTest> + +class tst_DeleteLater_noApp: public QObject +{ + Q_OBJECT + +private slots: + void qtestLibShouldNotFlushDeleteLaterBetweenTests_setup(); + void qtestLibShouldNotFlushDeleteLaterBetweenTests_check(); + void qtestLibShouldNotFlushDeleteLaterOnExit(); +}; + +class ToBeDeleted : public QObject +{ +public: + ToBeDeleted(bool *staticBool) : staticBool(staticBool) {} + ~ToBeDeleted() { *staticBool = true; } +private: + bool *staticBool; +}; + +static bool deletedBetweenTests = false; + +void tst_DeleteLater_noApp::qtestLibShouldNotFlushDeleteLaterBetweenTests_setup() +{ + ToBeDeleted *obj = new ToBeDeleted(&deletedBetweenTests); + obj->deleteLater(); +} + +void tst_DeleteLater_noApp::qtestLibShouldNotFlushDeleteLaterBetweenTests_check() +{ + // There's no qApp, we can't flush the events + QVERIFY(!deletedBetweenTests); +} + +static bool deletedOnExit = false; + +void tst_DeleteLater_noApp::qtestLibShouldNotFlushDeleteLaterOnExit() +{ + ToBeDeleted *obj = new ToBeDeleted(&deletedOnExit); + obj->deleteLater(); +} + +// This global object will check whether the deleteLater was processed +class DeleteChecker +{ +public: + ~DeleteChecker() { + if (deletedOnExit) { + qFatal("QTestLib somehow flushed deleteLater on exit, without a qApp?"); + } + } +}; +static DeleteChecker s_deleteChecker; + +QTEST_APPLESS_MAIN(tst_DeleteLater_noApp) + +#include "tst_deleteLater_noApp.moc" diff --git a/tests/auto/testlib/selftests/expected_alive.txt b/tests/auto/testlib/selftests/expected_alive.txt deleted file mode 100644 index 4384a9fcea..0000000000 --- a/tests/auto/testlib/selftests/expected_alive.txt +++ /dev/null @@ -1,13 +0,0 @@ -********* Start testing of tst_Alive ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ -PASS : tst_Alive::initTestCase() -QWARN : tst_Alive::alive() TEST LAGS 3 PINGS behind! -QWARN : tst_Alive::alive() TEST LAGS 4 PINGS behind! -QDEBUG : tst_Alive::alive() CUT -QWARN : tst_Alive::alive() TEST LAGS 3 PINGS behind! -QWARN : tst_Alive::alive() TEST LAGS 4 PINGS behind! -PASS : tst_Alive::alive() -PASS : tst_Alive::addMouseDClick() -PASS : tst_Alive::cleanupTestCase() -Totals: 4 passed, 0 failed, 0 skipped, 0 blacklisted -********* Finished testing of tst_Alive ********* diff --git a/tests/auto/testlib/selftests/expected_assert.lightxml b/tests/auto/testlib/selftests/expected_assert.lightxml index b40ff41da3..1591f4cf41 100644 --- a/tests/auto/testlib/selftests/expected_assert.lightxml +++ b/tests/auto/testlib/selftests/expected_assert.lightxml @@ -5,19 +5,19 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testNumber1"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testNumber2"> <Message type="qfatal" file="" line="0"> - <Description><![CDATA[ASSERT: "false" in file tst_assert.cpp, line 66]]></Description> + <Description><![CDATA[ASSERT: "false" in file qtbase/tests/auto/testlib/selftests/assert/tst_assert.cpp, line 0]]></Description> </Message> <Incident type="fail" file="Unknown file" line="0"> <Description><![CDATA[Received a fatal error.]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_assert.teamcity b/tests/auto/testlib/selftests/expected_assert.teamcity index 2b6cf21863..3f68c5f21b 100644 --- a/tests/auto/testlib/selftests/expected_assert.teamcity +++ b/tests/auto/testlib/selftests/expected_assert.teamcity @@ -5,6 +5,6 @@ ##teamcity[testFinished name='testNumber1()' flowId='tst_Assert'] ##teamcity[testStarted name='testNumber2()' flowId='tst_Assert'] ##teamcity[testFailed name='testNumber2()' message='Failure! |[Loc: Unknown file(0)|]' details='Received a fatal error.' flowId='tst_Assert'] -##teamcity[testStdOut name='testNumber2()' out='QFATAL: ASSERT: "false" in file tst_assert.cpp, line 58' flowId='tst_Assert'] +##teamcity[testStdOut name='testNumber2()' out='QFATAL: ASSERT: "false" in file qtbase/tests/auto/testlib/selftests/assert/tst_assert.cpp, line 0' flowId='tst_Assert'] ##teamcity[testFinished name='testNumber2()' flowId='tst_Assert'] ##teamcity[testSuiteFinished name='tst_Assert' flowId='tst_Assert'] diff --git a/tests/auto/testlib/selftests/expected_assert.txt b/tests/auto/testlib/selftests/expected_assert.txt index c07c95d8ee..9380eeddc1 100644 --- a/tests/auto/testlib/selftests/expected_assert.txt +++ b/tests/auto/testlib/selftests/expected_assert.txt @@ -1,9 +1,9 @@ ********* Start testing of tst_Assert ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_Assert::initTestCase() PASS : tst_Assert::testNumber1() -QFATAL : tst_Assert::testNumber2() ASSERT: "false" in file tst_assert.cpp, line 66 +QFATAL : tst_Assert::testNumber2() ASSERT: "false" in file qtbase/tests/auto/testlib/selftests/assert/tst_assert.cpp, line 0 FAIL! : tst_Assert::testNumber2() Received a fatal error. Loc: [Unknown file(0)] -Totals: 2 passed, 1 failed, 0 skipped, 0 blacklisted +Totals: 2 passed, 1 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_Assert ********* diff --git a/tests/auto/testlib/selftests/expected_assert.xml b/tests/auto/testlib/selftests/expected_assert.xml index 9770b3cd57..cdb7f4d8d1 100644 --- a/tests/auto/testlib/selftests/expected_assert.xml +++ b/tests/auto/testlib/selftests/expected_assert.xml @@ -7,20 +7,20 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testNumber1"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testNumber2"> <Message type="qfatal" file="" line="0"> - <Description><![CDATA[ASSERT: "false" in file tst_assert.cpp, line 66]]></Description> + <Description><![CDATA[ASSERT: "false" in file qtbase/tests/auto/testlib/selftests/assert/tst_assert.cpp, line 0]]></Description> </Message> <Incident type="fail" file="Unknown file" line="0"> <Description><![CDATA[Received a fatal error.]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_assert.xunitxml b/tests/auto/testlib/selftests/expected_assert.xunitxml index 96daa33dcf..ca12a45e20 100644 --- a/tests/auto/testlib/selftests/expected_assert.xunitxml +++ b/tests/auto/testlib/selftests/expected_assert.xunitxml @@ -8,10 +8,10 @@ <testcase result="pass" name="initTestCase"/> <testcase result="pass" name="testNumber1"/> <testcase result="fail" name="testNumber2"> - <!-- message="ASSERT: "false" in file tst_assert.cpp, line 66" type="qfatal" --> + <!-- message="ASSERT: "false" in file qtbase/tests/auto/testlib/selftests/assert/tst_assert.cpp, line 53" type="qfatal" --> <failure message="Received a fatal error." result="fail"/> </testcase> <system-err> -<![CDATA[ASSERT: "false" in file tst_assert.cpp, line 66]]> +<![CDATA[ASSERT: "false" in file qtbase/tests/auto/testlib/selftests/assert/tst_assert.cpp, line 0]]> </system-err> </testsuite> diff --git a/tests/auto/testlib/selftests/expected_badxml.lightxml b/tests/auto/testlib/selftests/expected_badxml.lightxml index 94f479a79a..1ab76274d3 100644 --- a/tests/auto/testlib/selftests/expected_badxml.lightxml +++ b/tests/auto/testlib/selftests/expected_badxml.lightxml @@ -12,7 +12,7 @@ <DataTag><![CDATA[fail end cdata ]]]><![CDATA[]> text ]]]><![CDATA[]> more text]]></DataTag> <Description><![CDATA[a message]]></Description> </Message> -<Incident type="fail" file="tst_badxml.cpp" line="114"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="0"> <DataTag><![CDATA[fail end cdata ]]]><![CDATA[]> text ]]]><![CDATA[]> more text]]></DataTag> <Description><![CDATA[a failure]]></Description> </Incident> @@ -28,7 +28,7 @@ <DataTag><![CDATA[fail quotes " text" more text]]></DataTag> <Description><![CDATA[a message]]></Description> </Message> -<Incident type="fail" file="tst_badxml.cpp" line="114"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="0"> <DataTag><![CDATA[fail quotes " text" more text]]></DataTag> <Description><![CDATA[a failure]]></Description> </Incident> @@ -44,7 +44,7 @@ <DataTag><![CDATA[fail xml close > open < tags < text]]></DataTag> <Description><![CDATA[a message]]></Description> </Message> -<Incident type="fail" file="tst_badxml.cpp" line="114"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="0"> <DataTag><![CDATA[fail xml close > open < tags < text]]></DataTag> <Description><![CDATA[a failure]]></Description> </Incident> @@ -60,7 +60,7 @@ <DataTag><![CDATA[fail all > " mixed ]]]><![CDATA[]> up > " in < the ]]]><![CDATA[]> hopes < of triggering "< ]]]><![CDATA[]> bugs]]></DataTag> <Description><![CDATA[a message]]></Description> </Message> -<Incident type="fail" file="tst_badxml.cpp" line="114"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="0"> <DataTag><![CDATA[fail all > " mixed ]]]><![CDATA[]> up > " in < the ]]]><![CDATA[]> hopes < of triggering "< ]]]><![CDATA[]> bugs]]></DataTag> <Description><![CDATA[a failure]]></Description> </Incident> diff --git a/tests/auto/testlib/selftests/expected_badxml.teamcity b/tests/auto/testlib/selftests/expected_badxml.teamcity index 04d38f81ab..e765393375 100644 --- a/tests/auto/testlib/selftests/expected_badxml.teamcity +++ b/tests/auto/testlib/selftests/expected_badxml.teamcity @@ -2,28 +2,28 @@ ##teamcity[testStarted name='initTestCase()' flowId='tst_BadXml'] ##teamcity[testFinished name='initTestCase()' flowId='tst_BadXml'] ##teamcity[testStarted name='badDataTag(fail end cdata |]|]> text |]|]> more text)' flowId='tst_BadXml'] -##teamcity[testFailed name='badDataTag(fail end cdata |]|]> text |]|]> more text)' message='Failure! |[Loc: tst_badxml.cpp(106)|]' details='a failure' flowId='tst_BadXml'] +##teamcity[testFailed name='badDataTag(fail end cdata |]|]> text |]|]> more text)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(0)|]' details='a failure' flowId='tst_BadXml'] ##teamcity[testStdOut name='badDataTag(fail end cdata |]|]> text |]|]> more text)' out='QDEBUG: a message' flowId='tst_BadXml'] ##teamcity[testFinished name='badDataTag(fail end cdata |]|]> text |]|]> more text)' flowId='tst_BadXml'] ##teamcity[testStarted name='badDataTag(pass end cdata |]|]> text |]|]> more text)' flowId='tst_BadXml'] ##teamcity[testStdOut name='badDataTag(pass end cdata |]|]> text |]|]> more text)' out='QDEBUG: a message' flowId='tst_BadXml'] ##teamcity[testFinished name='badDataTag(pass end cdata |]|]> text |]|]> more text)' flowId='tst_BadXml'] ##teamcity[testStarted name='badDataTag(fail quotes " text" more text)' flowId='tst_BadXml'] -##teamcity[testFailed name='badDataTag(fail quotes " text" more text)' message='Failure! |[Loc: tst_badxml.cpp(106)|]' details='a failure' flowId='tst_BadXml'] +##teamcity[testFailed name='badDataTag(fail quotes " text" more text)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(0)|]' details='a failure' flowId='tst_BadXml'] ##teamcity[testStdOut name='badDataTag(fail quotes " text" more text)' out='QDEBUG: a message' flowId='tst_BadXml'] ##teamcity[testFinished name='badDataTag(fail quotes " text" more text)' flowId='tst_BadXml'] ##teamcity[testStarted name='badDataTag(pass quotes " text" more text)' flowId='tst_BadXml'] ##teamcity[testStdOut name='badDataTag(pass quotes " text" more text)' out='QDEBUG: a message' flowId='tst_BadXml'] ##teamcity[testFinished name='badDataTag(pass quotes " text" more text)' flowId='tst_BadXml'] ##teamcity[testStarted name='badDataTag(fail xml close > open < tags < text)' flowId='tst_BadXml'] -##teamcity[testFailed name='badDataTag(fail xml close > open < tags < text)' message='Failure! |[Loc: tst_badxml.cpp(106)|]' details='a failure' flowId='tst_BadXml'] +##teamcity[testFailed name='badDataTag(fail xml close > open < tags < text)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(0)|]' details='a failure' flowId='tst_BadXml'] ##teamcity[testStdOut name='badDataTag(fail xml close > open < tags < text)' out='QDEBUG: a message' flowId='tst_BadXml'] ##teamcity[testFinished name='badDataTag(fail xml close > open < tags < text)' flowId='tst_BadXml'] ##teamcity[testStarted name='badDataTag(pass xml close > open < tags < text)' flowId='tst_BadXml'] ##teamcity[testStdOut name='badDataTag(pass xml close > open < tags < text)' out='QDEBUG: a message' flowId='tst_BadXml'] ##teamcity[testFinished name='badDataTag(pass xml close > open < tags < text)' flowId='tst_BadXml'] ##teamcity[testStarted name='badDataTag(fail all > " mixed |]|]> up > " in < the |]|]> hopes < of triggering "< |]|]> bugs)' flowId='tst_BadXml'] -##teamcity[testFailed name='badDataTag(fail all > " mixed |]|]> up > " in < the |]|]> hopes < of triggering "< |]|]> bugs)' message='Failure! |[Loc: tst_badxml.cpp(106)|]' details='a failure' flowId='tst_BadXml'] +##teamcity[testFailed name='badDataTag(fail all > " mixed |]|]> up > " in < the |]|]> hopes < of triggering "< |]|]> bugs)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(0)|]' details='a failure' flowId='tst_BadXml'] ##teamcity[testStdOut name='badDataTag(fail all > " mixed |]|]> up > " in < the |]|]> hopes < of triggering "< |]|]> bugs)' out='QDEBUG: a message' flowId='tst_BadXml'] ##teamcity[testFinished name='badDataTag(fail all > " mixed |]|]> up > " in < the |]|]> hopes < of triggering "< |]|]> bugs)' flowId='tst_BadXml'] ##teamcity[testStarted name='badDataTag(pass all > " mixed |]|]> up > " in < the |]|]> hopes < of triggering "< |]|]> bugs)' flowId='tst_BadXml'] @@ -44,7 +44,7 @@ ##teamcity[testStarted name='failWithNoFile()' flowId='tst_BadXml'] ##teamcity[testFailed name='failWithNoFile()' message='Failure!' details='failure message' flowId='tst_BadXml'] ##teamcity[testFinished name='failWithNoFile()' flowId='tst_BadXml'] -##teamcity[testIgnored name='encoding()' message='Skipped for text due to unpredictable console encoding. |[Loc: tst_badxml.cpp(131)|]' flowId='tst_BadXml'] +##teamcity[testIgnored name='encoding()' message='Skipped for text due to unpredictable console encoding. |[Loc: qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(0)|]' flowId='tst_BadXml'] ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_BadXml'] ##teamcity[testFinished name='cleanupTestCase()' flowId='tst_BadXml'] ##teamcity[testSuiteFinished name='tst_BadXml' flowId='tst_BadXml'] diff --git a/tests/auto/testlib/selftests/expected_badxml.txt b/tests/auto/testlib/selftests/expected_badxml.txt index e4fa78494e..e9d8695130 100644 --- a/tests/auto/testlib/selftests/expected_badxml.txt +++ b/tests/auto/testlib/selftests/expected_badxml.txt @@ -1,30 +1,30 @@ ********* Start testing of tst_BadXml ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_BadXml::initTestCase() QDEBUG : tst_BadXml::badDataTag(fail end cdata ]]> text ]]> more text) a message FAIL! : tst_BadXml::badDataTag(fail end cdata ]]> text ]]> more text) a failure - Loc: [tst_badxml.cpp(114)] + Loc: [qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(0)] QDEBUG : tst_BadXml::badDataTag(pass end cdata ]]> text ]]> more text) a message PASS : tst_BadXml::badDataTag(pass end cdata ]]> text ]]> more text) RESULT : tst_BadXml::badDataTag():"pass end cdata ]]> text ]]> more text": 0 events per iteration (total: 0, iterations: 1) QDEBUG : tst_BadXml::badDataTag(fail quotes " text" more text) a message FAIL! : tst_BadXml::badDataTag(fail quotes " text" more text) a failure - Loc: [tst_badxml.cpp(114)] + Loc: [qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(0)] QDEBUG : tst_BadXml::badDataTag(pass quotes " text" more text) a message PASS : tst_BadXml::badDataTag(pass quotes " text" more text) RESULT : tst_BadXml::badDataTag():"pass quotes " text" more text": 0 events per iteration (total: 0, iterations: 1) QDEBUG : tst_BadXml::badDataTag(fail xml close > open < tags < text) a message FAIL! : tst_BadXml::badDataTag(fail xml close > open < tags < text) a failure - Loc: [tst_badxml.cpp(114)] + Loc: [qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(0)] QDEBUG : tst_BadXml::badDataTag(pass xml close > open < tags < text) a message PASS : tst_BadXml::badDataTag(pass xml close > open < tags < text) RESULT : tst_BadXml::badDataTag():"pass xml close > open < tags < text": 0 events per iteration (total: 0, iterations: 1) QDEBUG : tst_BadXml::badDataTag(fail all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs) a message FAIL! : tst_BadXml::badDataTag(fail all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs) a failure - Loc: [tst_badxml.cpp(114)] + Loc: [qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(0)] QDEBUG : tst_BadXml::badDataTag(pass all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs) a message PASS : tst_BadXml::badDataTag(pass all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs) RESULT : tst_BadXml::badDataTag():"pass all > " mixed ]]> up > " in < the ]]> hopes < of triggering "< ]]> bugs": @@ -39,7 +39,7 @@ QDEBUG : tst_BadXml::badMessage(string 3) all > " mixed ]]> up > " in < the ]]> PASS : tst_BadXml::badMessage(string 3) FAIL! : tst_BadXml::failWithNoFile() failure message SKIP : tst_BadXml::encoding() Skipped for text due to unpredictable console encoding. - Loc: [tst_badxml.cpp(139)] + Loc: [qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp(0)] PASS : tst_BadXml::cleanupTestCase() -Totals: 10 passed, 5 failed, 1 skipped, 0 blacklisted +Totals: 10 passed, 5 failed, 1 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_BadXml ********* diff --git a/tests/auto/testlib/selftests/expected_badxml.xml b/tests/auto/testlib/selftests/expected_badxml.xml index c1266bfeed..927f58f7f6 100644 --- a/tests/auto/testlib/selftests/expected_badxml.xml +++ b/tests/auto/testlib/selftests/expected_badxml.xml @@ -14,7 +14,7 @@ <DataTag><![CDATA[fail end cdata ]]]><![CDATA[]> text ]]]><![CDATA[]> more text]]></DataTag> <Description><![CDATA[a message]]></Description> </Message> -<Incident type="fail" file="tst_badxml.cpp" line="114"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="0"> <DataTag><![CDATA[fail end cdata ]]]><![CDATA[]> text ]]]><![CDATA[]> more text]]></DataTag> <Description><![CDATA[a failure]]></Description> </Incident> @@ -30,7 +30,7 @@ <DataTag><![CDATA[fail quotes " text" more text]]></DataTag> <Description><![CDATA[a message]]></Description> </Message> -<Incident type="fail" file="tst_badxml.cpp" line="114"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="0"> <DataTag><![CDATA[fail quotes " text" more text]]></DataTag> <Description><![CDATA[a failure]]></Description> </Incident> @@ -46,7 +46,7 @@ <DataTag><![CDATA[fail xml close > open < tags < text]]></DataTag> <Description><![CDATA[a message]]></Description> </Message> -<Incident type="fail" file="tst_badxml.cpp" line="114"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="0"> <DataTag><![CDATA[fail xml close > open < tags < text]]></DataTag> <Description><![CDATA[a failure]]></Description> </Incident> @@ -62,7 +62,7 @@ <DataTag><![CDATA[fail all > " mixed ]]]><![CDATA[]> up > " in < the ]]]><![CDATA[]> hopes < of triggering "< ]]]><![CDATA[]> bugs]]></DataTag> <Description><![CDATA[a message]]></Description> </Message> -<Incident type="fail" file="tst_badxml.cpp" line="114"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/badxml/tst_badxml.cpp" line="0"> <DataTag><![CDATA[fail all > " mixed ]]]><![CDATA[]> up > " in < the ]]]><![CDATA[]> hopes < of triggering "< ]]]><![CDATA[]> bugs]]></DataTag> <Description><![CDATA[a failure]]></Description> </Incident> diff --git a/tests/auto/testlib/selftests/expected_benchlibcallgrind.lightxml b/tests/auto/testlib/selftests/expected_benchlibcallgrind.lightxml new file mode 100644 index 0000000000..ea5374985d --- /dev/null +++ b/tests/auto/testlib/selftests/expected_benchlibcallgrind.lightxml @@ -0,0 +1,26 @@ +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="twoHundredMillionInstructions"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp" line="0"> + <Description><![CDATA[This test is only defined for gcc and x86.]]></Description> +</Message> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="cleanupTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_benchlibcallgrind.teamcity b/tests/auto/testlib/selftests/expected_benchlibcallgrind.teamcity new file mode 100644 index 0000000000..11de23ccc2 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_benchlibcallgrind.teamcity @@ -0,0 +1,9 @@ +##teamcity[testSuiteStarted name='tst_BenchlibCallgrind' flowId='tst_BenchlibCallgrind'] +##teamcity[testSuiteStarted name='tst_BenchlibCallgrind' flowId='tst_BenchlibCallgrind'] +##teamcity[testStarted name='initTestCase()' flowId='tst_BenchlibCallgrind'] +##teamcity[testFinished name='initTestCase()' flowId='tst_BenchlibCallgrind'] +##teamcity[testIgnored name='twoHundredMillionInstructions()' message='This test is only defined for gcc and x86. |[Loc: qtbase/tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp(0)|]' flowId='tst_BenchlibCallgrind'] +##teamcity[testStarted name='cleanupTestCase()' flowId='tst_BenchlibCallgrind'] +##teamcity[testFinished name='cleanupTestCase()' flowId='tst_BenchlibCallgrind'] +##teamcity[testSuiteFinished name='tst_BenchlibCallgrind' flowId='tst_BenchlibCallgrind'] +##teamcity[testSuiteFinished name='tst_BenchlibCallgrind' flowId='tst_BenchlibCallgrind'] diff --git a/tests/auto/testlib/selftests/expected_benchlibcallgrind.xml b/tests/auto/testlib/selftests/expected_benchlibcallgrind.xml new file mode 100644 index 0000000000..14433e719d --- /dev/null +++ b/tests/auto/testlib/selftests/expected_benchlibcallgrind.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<TestCase name="tst_BenchlibCallgrind"> +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<?xml version="1.0" encoding="UTF-8"?> +<TestCase name="tst_BenchlibCallgrind"> +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="twoHundredMillionInstructions"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp" line="0"> + <Description><![CDATA[This test is only defined for gcc and x86.]]></Description> +</Message> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="cleanupTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> +</TestCase> +<Duration msecs="0"/> +</TestCase> diff --git a/tests/auto/testlib/selftests/expected_benchlibcallgrind.xunitxml b/tests/auto/testlib/selftests/expected_benchlibcallgrind.xunitxml new file mode 100644 index 0000000000..95d90e6ee7 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_benchlibcallgrind.xunitxml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<testsuite errors="1" failures="0" tests="3" name="tst_BenchlibCallgrind"> + <properties> + <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/> + <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/> + <property value="" name="QtBuild"/> + </properties> + <testcase result="pass" name="initTestCase"/> + <testcase name="twoHundredMillionInstructions"> + <!-- message="This test is only defined for gcc and x86." type="skip" --> + </testcase> + <testcase result="pass" name="cleanupTestCase"/> + <system-err> +<![CDATA[This test is only defined for gcc and x86.]]> + </system-err> +</testsuite> +<?xml version="1.0" encoding="UTF-8" ?> +<testsuite errors="0" failures="0" tests="0" name="tst_BenchlibCallgrind"> + <properties> + <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/> + <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/> + <property value="" name="QtBuild"/> + </properties> + <system-err/> +</testsuite> diff --git a/tests/auto/testlib/selftests/expected_benchlibcallgrind_0.txt b/tests/auto/testlib/selftests/expected_benchlibcallgrind_0.txt new file mode 100644 index 0000000000..750dcf4736 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_benchlibcallgrind_0.txt @@ -0,0 +1,8 @@ +********* Start testing of tst_BenchlibCallgrind ********* +Config: Using QtTest library +PASS : tst_BenchlibCallgrind::initTestCase() +SKIP : tst_BenchlibCallgrind::twoHundredMillionInstructions() This test is only defined for gcc and x86. + Loc: [qtbase/tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp(0)] +PASS : tst_BenchlibCallgrind::cleanupTestCase() +Totals: 2 passed, 0 failed, 1 skipped, 0 blacklisted +********* Finished testing of tst_BenchlibCallgrind ********* diff --git a/tests/auto/testlib/selftests/expected_benchlibcallgrind.txt b/tests/auto/testlib/selftests/expected_benchlibcallgrind_1.txt index 07365bb9e8..07365bb9e8 100644 --- a/tests/auto/testlib/selftests/expected_benchlibcallgrind.txt +++ b/tests/auto/testlib/selftests/expected_benchlibcallgrind_1.txt diff --git a/tests/auto/testlib/selftests/expected_benchlibcounting.lightxml b/tests/auto/testlib/selftests/expected_benchlibcounting.lightxml index 6fe511462c..cc83020650 100644 --- a/tests/auto/testlib/selftests/expected_benchlibcounting.lightxml +++ b/tests/auto/testlib/selftests/expected_benchlibcounting.lightxml @@ -5,27 +5,27 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="passingBenchmark"> <Incident type="pass" file="" line="0" /> <BenchmarkResult metric="Events" tag="" value="0" iterations="1" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="skippingBenchmark"> -<Message type="skip" file="tst_benchlibcounting.cpp" line="64"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp" line="0"> <Description><![CDATA[This is a skipping benchmark]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="failingBenchmark"> -<Incident type="fail" file="tst_benchlibcounting.cpp" line="71"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp" line="0"> <Description><![CDATA[This is a failing benchmark]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_benchlibcounting.teamcity b/tests/auto/testlib/selftests/expected_benchlibcounting.teamcity new file mode 100644 index 0000000000..f693db31d8 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_benchlibcounting.teamcity @@ -0,0 +1,12 @@ +##teamcity[testSuiteStarted name='tst_BenchlibCounting' flowId='tst_BenchlibCounting'] +##teamcity[testStarted name='initTestCase()' flowId='tst_BenchlibCounting'] +##teamcity[testFinished name='initTestCase()' flowId='tst_BenchlibCounting'] +##teamcity[testStarted name='passingBenchmark()' flowId='tst_BenchlibCounting'] +##teamcity[testFinished name='passingBenchmark()' flowId='tst_BenchlibCounting'] +##teamcity[testIgnored name='skippingBenchmark()' message='This is a skipping benchmark |[Loc: qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp(0)|]' flowId='tst_BenchlibCounting'] +##teamcity[testStarted name='failingBenchmark()' flowId='tst_BenchlibCounting'] +##teamcity[testFailed name='failingBenchmark()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp(0)|]' details='This is a failing benchmark' flowId='tst_BenchlibCounting'] +##teamcity[testFinished name='failingBenchmark()' flowId='tst_BenchlibCounting'] +##teamcity[testStarted name='cleanupTestCase()' flowId='tst_BenchlibCounting'] +##teamcity[testFinished name='cleanupTestCase()' flowId='tst_BenchlibCounting'] +##teamcity[testSuiteFinished name='tst_BenchlibCounting' flowId='tst_BenchlibCounting'] diff --git a/tests/auto/testlib/selftests/expected_benchlibcounting.txt b/tests/auto/testlib/selftests/expected_benchlibcounting.txt index 62e316dc3c..d47309d11c 100644 --- a/tests/auto/testlib/selftests/expected_benchlibcounting.txt +++ b/tests/auto/testlib/selftests/expected_benchlibcounting.txt @@ -1,13 +1,13 @@ ********* Start testing of tst_BenchlibCounting ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_BenchlibCounting::initTestCase() PASS : tst_BenchlibCounting::passingBenchmark() RESULT : tst_BenchlibCounting::passingBenchmark(): 0 events per iteration (total: 0, iterations: 1) SKIP : tst_BenchlibCounting::skippingBenchmark() This is a skipping benchmark - Loc: [tst_benchlibcounting.cpp(64)] + Loc: [qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp(0)] FAIL! : tst_BenchlibCounting::failingBenchmark() This is a failing benchmark - Loc: [tst_benchlibcounting.cpp(71)] + Loc: [qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp(0)] PASS : tst_BenchlibCounting::cleanupTestCase() -Totals: 3 passed, 1 failed, 1 skipped, 0 blacklisted +Totals: 3 passed, 1 failed, 1 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_BenchlibCounting ********* diff --git a/tests/auto/testlib/selftests/expected_benchlibcounting.xml b/tests/auto/testlib/selftests/expected_benchlibcounting.xml index d945511eec..7c8366ed8c 100644 --- a/tests/auto/testlib/selftests/expected_benchlibcounting.xml +++ b/tests/auto/testlib/selftests/expected_benchlibcounting.xml @@ -7,28 +7,28 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="passingBenchmark"> <Incident type="pass" file="" line="0" /> <BenchmarkResult metric="Events" tag="" value="0" iterations="1" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="skippingBenchmark"> -<Message type="skip" file="tst_benchlibcounting.cpp" line="64"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp" line="0"> <Description><![CDATA[This is a skipping benchmark]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="failingBenchmark"> -<Incident type="fail" file="tst_benchlibcounting.cpp" line="71"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/benchlibcounting/tst_benchlibcounting.cpp" line="0"> <Description><![CDATA[This is a failing benchmark]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_benchlibeventcounter.lightxml b/tests/auto/testlib/selftests/expected_benchlibeventcounter.lightxml index 0bc00569e9..867210ecb3 100644 --- a/tests/auto/testlib/selftests/expected_benchlibeventcounter.lightxml +++ b/tests/auto/testlib/selftests/expected_benchlibeventcounter.lightxml @@ -5,7 +5,7 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="events"> <Incident type="pass" file="" line="0"> @@ -36,10 +36,10 @@ <DataTag><![CDATA[100000]]></DataTag> </Incident> <BenchmarkResult metric="Events" tag="100000" value="100000" iterations="1" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_benchlibeventcounter.teamcity b/tests/auto/testlib/selftests/expected_benchlibeventcounter.teamcity new file mode 100644 index 0000000000..6cb4c7214c --- /dev/null +++ b/tests/auto/testlib/selftests/expected_benchlibeventcounter.teamcity @@ -0,0 +1,20 @@ +##teamcity[testSuiteStarted name='tst_BenchlibEventCounter' flowId='tst_BenchlibEventCounter'] +##teamcity[testStarted name='initTestCase()' flowId='tst_BenchlibEventCounter'] +##teamcity[testFinished name='initTestCase()' flowId='tst_BenchlibEventCounter'] +##teamcity[testStarted name='events(0)' flowId='tst_BenchlibEventCounter'] +##teamcity[testFinished name='events(0)' flowId='tst_BenchlibEventCounter'] +##teamcity[testStarted name='events(1)' flowId='tst_BenchlibEventCounter'] +##teamcity[testFinished name='events(1)' flowId='tst_BenchlibEventCounter'] +##teamcity[testStarted name='events(10)' flowId='tst_BenchlibEventCounter'] +##teamcity[testFinished name='events(10)' flowId='tst_BenchlibEventCounter'] +##teamcity[testStarted name='events(100)' flowId='tst_BenchlibEventCounter'] +##teamcity[testFinished name='events(100)' flowId='tst_BenchlibEventCounter'] +##teamcity[testStarted name='events(500)' flowId='tst_BenchlibEventCounter'] +##teamcity[testFinished name='events(500)' flowId='tst_BenchlibEventCounter'] +##teamcity[testStarted name='events(5000)' flowId='tst_BenchlibEventCounter'] +##teamcity[testFinished name='events(5000)' flowId='tst_BenchlibEventCounter'] +##teamcity[testStarted name='events(100000)' flowId='tst_BenchlibEventCounter'] +##teamcity[testFinished name='events(100000)' flowId='tst_BenchlibEventCounter'] +##teamcity[testStarted name='cleanupTestCase()' flowId='tst_BenchlibEventCounter'] +##teamcity[testFinished name='cleanupTestCase()' flowId='tst_BenchlibEventCounter'] +##teamcity[testSuiteFinished name='tst_BenchlibEventCounter' flowId='tst_BenchlibEventCounter'] diff --git a/tests/auto/testlib/selftests/expected_benchlibeventcounter.txt b/tests/auto/testlib/selftests/expected_benchlibeventcounter.txt index 773bc4cc14..67c5ab495f 100644 --- a/tests/auto/testlib/selftests/expected_benchlibeventcounter.txt +++ b/tests/auto/testlib/selftests/expected_benchlibeventcounter.txt @@ -1,5 +1,5 @@ ********* Start testing of tst_BenchlibEventCounter ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_BenchlibEventCounter::initTestCase() PASS : tst_BenchlibEventCounter::events(0) RESULT : tst_BenchlibEventCounter::events():"0": @@ -23,5 +23,5 @@ PASS : tst_BenchlibEventCounter::events(100000) RESULT : tst_BenchlibEventCounter::events():"100000": 100,000 events per iteration (total: 100,000, iterations: 1) PASS : tst_BenchlibEventCounter::cleanupTestCase() -Totals: 9 passed, 0 failed, 0 skipped, 0 blacklisted +Totals: 9 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_BenchlibEventCounter ********* diff --git a/tests/auto/testlib/selftests/expected_benchlibeventcounter.xml b/tests/auto/testlib/selftests/expected_benchlibeventcounter.xml index f543e2775c..8a03b84461 100644 --- a/tests/auto/testlib/selftests/expected_benchlibeventcounter.xml +++ b/tests/auto/testlib/selftests/expected_benchlibeventcounter.xml @@ -7,7 +7,7 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="events"> <Incident type="pass" file="" line="0"> @@ -38,11 +38,11 @@ <DataTag><![CDATA[100000]]></DataTag> </Incident> <BenchmarkResult metric="Events" tag="100000" value="100000" iterations="1" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_benchliboptions.lightxml b/tests/auto/testlib/selftests/expected_benchliboptions.lightxml new file mode 100644 index 0000000000..ed7c206a61 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_benchliboptions.lightxml @@ -0,0 +1,57 @@ +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="threeEvents"> +<Incident type="pass" file="" line="0" /> +<BenchmarkResult metric="Events" tag="" value="3" iterations="1" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="cleanupTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="threeEvents"> +<Incident type="pass" file="" line="0" /> +<BenchmarkResult metric="Events" tag="" value="3" iterations="15" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="cleanupTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="threeEvents"> +<Incident type="pass" file="" line="0" /> +<BenchmarkResult metric="Events" tag="" value="3" iterations="64" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="cleanupTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_benchliboptions.teamcity b/tests/auto/testlib/selftests/expected_benchliboptions.teamcity new file mode 100644 index 0000000000..6dbaa64af7 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_benchliboptions.teamcity @@ -0,0 +1,24 @@ +##teamcity[testSuiteStarted name='tst_BenchlibOptions' flowId='tst_BenchlibOptions'] +##teamcity[testStarted name='initTestCase()' flowId='tst_BenchlibOptions'] +##teamcity[testFinished name='initTestCase()' flowId='tst_BenchlibOptions'] +##teamcity[testStarted name='threeEvents()' flowId='tst_BenchlibOptions'] +##teamcity[testFinished name='threeEvents()' flowId='tst_BenchlibOptions'] +##teamcity[testStarted name='cleanupTestCase()' flowId='tst_BenchlibOptions'] +##teamcity[testFinished name='cleanupTestCase()' flowId='tst_BenchlibOptions'] +##teamcity[testSuiteFinished name='tst_BenchlibOptions' flowId='tst_BenchlibOptions'] +##teamcity[testSuiteStarted name='tst_BenchlibFifteenIterations' flowId='tst_BenchlibFifteenIterations'] +##teamcity[testStarted name='initTestCase()' flowId='tst_BenchlibFifteenIterations'] +##teamcity[testFinished name='initTestCase()' flowId='tst_BenchlibFifteenIterations'] +##teamcity[testStarted name='threeEvents()' flowId='tst_BenchlibFifteenIterations'] +##teamcity[testFinished name='threeEvents()' flowId='tst_BenchlibFifteenIterations'] +##teamcity[testStarted name='cleanupTestCase()' flowId='tst_BenchlibFifteenIterations'] +##teamcity[testFinished name='cleanupTestCase()' flowId='tst_BenchlibFifteenIterations'] +##teamcity[testSuiteFinished name='tst_BenchlibFifteenIterations' flowId='tst_BenchlibFifteenIterations'] +##teamcity[testSuiteStarted name='tst_BenchlibOneHundredMinimum' flowId='tst_BenchlibOneHundredMinimum'] +##teamcity[testStarted name='initTestCase()' flowId='tst_BenchlibOneHundredMinimum'] +##teamcity[testFinished name='initTestCase()' flowId='tst_BenchlibOneHundredMinimum'] +##teamcity[testStarted name='threeEvents()' flowId='tst_BenchlibOneHundredMinimum'] +##teamcity[testFinished name='threeEvents()' flowId='tst_BenchlibOneHundredMinimum'] +##teamcity[testStarted name='cleanupTestCase()' flowId='tst_BenchlibOneHundredMinimum'] +##teamcity[testFinished name='cleanupTestCase()' flowId='tst_BenchlibOneHundredMinimum'] +##teamcity[testSuiteFinished name='tst_BenchlibOneHundredMinimum' flowId='tst_BenchlibOneHundredMinimum'] diff --git a/tests/auto/testlib/selftests/expected_benchliboptions.txt b/tests/auto/testlib/selftests/expected_benchliboptions.txt index 0b8ec87724..462b517933 100644 --- a/tests/auto/testlib/selftests/expected_benchliboptions.txt +++ b/tests/auto/testlib/selftests/expected_benchliboptions.txt @@ -1,27 +1,27 @@ ********* Start testing of tst_BenchlibOptions ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_BenchlibOptions::initTestCase() PASS : tst_BenchlibOptions::threeEvents() RESULT : tst_BenchlibOptions::threeEvents(): 3 events per iteration (total: 3, iterations: 1) PASS : tst_BenchlibOptions::cleanupTestCase() -Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_BenchlibOptions ********* ********* Start testing of tst_BenchlibFifteenIterations ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_BenchlibFifteenIterations::initTestCase() PASS : tst_BenchlibFifteenIterations::threeEvents() RESULT : tst_BenchlibFifteenIterations::threeEvents(): 3.0 events per iteration (total: 45, iterations: 15) PASS : tst_BenchlibFifteenIterations::cleanupTestCase() -Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_BenchlibFifteenIterations ********* ********* Start testing of tst_BenchlibOneHundredMinimum ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_BenchlibOneHundredMinimum::initTestCase() PASS : tst_BenchlibOneHundredMinimum::threeEvents() RESULT : tst_BenchlibOneHundredMinimum::threeEvents(): 3.00 events per iteration (total: 192, iterations: 64) PASS : tst_BenchlibOneHundredMinimum::cleanupTestCase() -Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_BenchlibOneHundredMinimum ********* diff --git a/tests/auto/testlib/selftests/expected_benchliboptions.xml b/tests/auto/testlib/selftests/expected_benchliboptions.xml new file mode 100644 index 0000000000..45ae180889 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_benchliboptions.xml @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<TestCase name="tst_BenchlibOptions"> +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="threeEvents"> +<Incident type="pass" file="" line="0" /> +<BenchmarkResult metric="Events" tag="" value="3" iterations="1" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="cleanupTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> +</TestCase> +<?xml version="1.0" encoding="UTF-8"?> +<TestCase name="tst_BenchlibFifteenIterations"> +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="threeEvents"> +<Incident type="pass" file="" line="0" /> +<BenchmarkResult metric="Events" tag="" value="3" iterations="15" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="cleanupTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> +</TestCase> +<?xml version="1.0" encoding="UTF-8"?> +<TestCase name="tst_BenchlibOneHundredMinimum"> +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="threeEvents"> +<Incident type="pass" file="" line="0" /> +<BenchmarkResult metric="Events" tag="" value="3" iterations="64" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="cleanupTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> +</TestCase> diff --git a/tests/auto/testlib/selftests/expected_benchliboptions.xunitxml b/tests/auto/testlib/selftests/expected_benchliboptions.xunitxml new file mode 100644 index 0000000000..370d1c7c5c --- /dev/null +++ b/tests/auto/testlib/selftests/expected_benchliboptions.xunitxml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<testsuite errors="0" failures="0" tests="3" name="tst_BenchlibOptions"> + <properties> + <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/> + <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/> + <property value="" name="QtBuild"/> + </properties> + <testcase result="pass" name="initTestCase"/> + <testcase result="pass" name="threeEvents"> + </testcase> + <testcase result="pass" name="cleanupTestCase"/> + <system-err/> +</testsuite> +<?xml version="1.0" encoding="UTF-8" ?> +<testsuite errors="0" failures="0" tests="3" name="tst_BenchlibFifteenIterations"> + <properties> + <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/> + <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/> + <property value="" name="QtBuild"/> + </properties> + <testcase result="pass" name="initTestCase"/> + <testcase result="pass" name="threeEvents"> + </testcase> + <testcase result="pass" name="cleanupTestCase"/> + <system-err/> +</testsuite> +<?xml version="1.0" encoding="UTF-8" ?> +<testsuite errors="0" failures="0" tests="3" name="tst_BenchlibOneHundredMinimum"> + <properties> + <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/> + <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/> + <property value="" name="QtBuild"/> + </properties> + <testcase result="pass" name="initTestCase"/> + <testcase result="pass" name="threeEvents"> + </testcase> + <testcase result="pass" name="cleanupTestCase"/> + <system-err/> +</testsuite> diff --git a/tests/auto/testlib/selftests/expected_benchlibtickcounter.lightxml b/tests/auto/testlib/selftests/expected_benchlibtickcounter.lightxml index 11296ad9c2..57076755df 100644 --- a/tests/auto/testlib/selftests/expected_benchlibtickcounter.lightxml +++ b/tests/auto/testlib/selftests/expected_benchlibtickcounter.lightxml @@ -5,15 +5,15 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="threeBillionTicks"> <Incident type="pass" file="" line="0" /> -<BenchmarkResult metric="CPUTicks" tag="" value="3.00001e+09" iterations="1" /> -<Duration msecs="0"/> +<BenchmarkResult metric="CPUTicks" tag="" value="0" iterations="1" /> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_benchlibtickcounter.teamcity b/tests/auto/testlib/selftests/expected_benchlibtickcounter.teamcity new file mode 100644 index 0000000000..842d36b79c --- /dev/null +++ b/tests/auto/testlib/selftests/expected_benchlibtickcounter.teamcity @@ -0,0 +1,8 @@ +##teamcity[testSuiteStarted name='tst_BenchlibTickCounter' flowId='tst_BenchlibTickCounter'] +##teamcity[testStarted name='initTestCase()' flowId='tst_BenchlibTickCounter'] +##teamcity[testFinished name='initTestCase()' flowId='tst_BenchlibTickCounter'] +##teamcity[testStarted name='threeBillionTicks()' flowId='tst_BenchlibTickCounter'] +##teamcity[testFinished name='threeBillionTicks()' flowId='tst_BenchlibTickCounter'] +##teamcity[testStarted name='cleanupTestCase()' flowId='tst_BenchlibTickCounter'] +##teamcity[testFinished name='cleanupTestCase()' flowId='tst_BenchlibTickCounter'] +##teamcity[testSuiteFinished name='tst_BenchlibTickCounter' flowId='tst_BenchlibTickCounter'] diff --git a/tests/auto/testlib/selftests/expected_benchlibtickcounter.txt b/tests/auto/testlib/selftests/expected_benchlibtickcounter.txt index 5fd6bfb4fd..5a292bad18 100644 --- a/tests/auto/testlib/selftests/expected_benchlibtickcounter.txt +++ b/tests/auto/testlib/selftests/expected_benchlibtickcounter.txt @@ -1,9 +1,9 @@ ********* Start testing of tst_BenchlibTickCounter ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_BenchlibTickCounter::initTestCase() PASS : tst_BenchlibTickCounter::threeBillionTicks() RESULT : tst_BenchlibTickCounter::threeBillionTicks(): - 3,000,005,772 CPU ticks per iteration (total: 3,000,005,772, iterations: 1) + 0 CPU ticks per iteration (total: 0, iterations: 1) PASS : tst_BenchlibTickCounter::cleanupTestCase() -Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_BenchlibTickCounter ********* diff --git a/tests/auto/testlib/selftests/expected_benchlibtickcounter.xml b/tests/auto/testlib/selftests/expected_benchlibtickcounter.xml index 3dd56b4af7..224d287e92 100644 --- a/tests/auto/testlib/selftests/expected_benchlibtickcounter.xml +++ b/tests/auto/testlib/selftests/expected_benchlibtickcounter.xml @@ -7,16 +7,16 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="threeBillionTicks"> <Incident type="pass" file="" line="0" /> -<BenchmarkResult metric="CPUTicks" tag="" value="3.00002e+09" iterations="1" /> -<Duration msecs="0"/> +<BenchmarkResult metric="CPUTicks" tag="" value="0" iterations="1" /> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_benchlibwalltime.lightxml b/tests/auto/testlib/selftests/expected_benchlibwalltime.lightxml index c75a6c944d..f0db92ebe0 100644 --- a/tests/auto/testlib/selftests/expected_benchlibwalltime.lightxml +++ b/tests/auto/testlib/selftests/expected_benchlibwalltime.lightxml @@ -5,25 +5,25 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="waitForOneThousand"> <Incident type="pass" file="" line="0" /> -<BenchmarkResult metric="WalltimeMilliseconds" tag="" value="1004" iterations="1" /> -<Duration msecs="0"/> +<BenchmarkResult metric="WalltimeMilliseconds" tag="" value="0" iterations="1" /> + <Duration msecs="0"/> </TestFunction> <TestFunction name="waitForFourThousand"> <Incident type="pass" file="" line="0" /> -<BenchmarkResult metric="WalltimeMilliseconds" tag="" value="4004" iterations="1" /> -<Duration msecs="0"/> +<BenchmarkResult metric="WalltimeMilliseconds" tag="" value="0" iterations="1" /> + <Duration msecs="0"/> </TestFunction> <TestFunction name="qbenchmark_once"> <Incident type="pass" file="" line="0" /> <BenchmarkResult metric="WalltimeMilliseconds" tag="" value="0" iterations="1" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_benchlibwalltime.teamcity b/tests/auto/testlib/selftests/expected_benchlibwalltime.teamcity new file mode 100644 index 0000000000..4c5d9667e7 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_benchlibwalltime.teamcity @@ -0,0 +1,12 @@ +##teamcity[testSuiteStarted name='tst_BenchlibWalltime' flowId='tst_BenchlibWalltime'] +##teamcity[testStarted name='initTestCase()' flowId='tst_BenchlibWalltime'] +##teamcity[testFinished name='initTestCase()' flowId='tst_BenchlibWalltime'] +##teamcity[testStarted name='waitForOneThousand()' flowId='tst_BenchlibWalltime'] +##teamcity[testFinished name='waitForOneThousand()' flowId='tst_BenchlibWalltime'] +##teamcity[testStarted name='waitForFourThousand()' flowId='tst_BenchlibWalltime'] +##teamcity[testFinished name='waitForFourThousand()' flowId='tst_BenchlibWalltime'] +##teamcity[testStarted name='qbenchmark_once()' flowId='tst_BenchlibWalltime'] +##teamcity[testFinished name='qbenchmark_once()' flowId='tst_BenchlibWalltime'] +##teamcity[testStarted name='cleanupTestCase()' flowId='tst_BenchlibWalltime'] +##teamcity[testFinished name='cleanupTestCase()' flowId='tst_BenchlibWalltime'] +##teamcity[testSuiteFinished name='tst_BenchlibWalltime' flowId='tst_BenchlibWalltime'] diff --git a/tests/auto/testlib/selftests/expected_benchlibwalltime.txt b/tests/auto/testlib/selftests/expected_benchlibwalltime.txt index fd53b0a40e..ad86a994db 100644 --- a/tests/auto/testlib/selftests/expected_benchlibwalltime.txt +++ b/tests/auto/testlib/selftests/expected_benchlibwalltime.txt @@ -1,15 +1,15 @@ ********* Start testing of tst_BenchlibWalltime ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_BenchlibWalltime::initTestCase() PASS : tst_BenchlibWalltime::waitForOneThousand() RESULT : tst_BenchlibWalltime::waitForOneThousand(): - 1,006 msecs per iteration (total: 1,006, iterations: 1) + 0 msecs per iteration (total: 0, iterations: 1) PASS : tst_BenchlibWalltime::waitForFourThousand() RESULT : tst_BenchlibWalltime::waitForFourThousand(): - 4,008 msecs per iteration (total: 4,008, iterations: 1) + 0 msecs per iteration (total: 0, iterations: 1) PASS : tst_BenchlibWalltime::qbenchmark_once() RESULT : tst_BenchlibWalltime::qbenchmark_once(): 0 msecs per iteration (total: 0, iterations: 1) PASS : tst_BenchlibWalltime::cleanupTestCase() -Totals: 5 passed, 0 failed, 0 skipped, 0 blacklisted +Totals: 5 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_BenchlibWalltime ********* diff --git a/tests/auto/testlib/selftests/expected_benchlibwalltime.xml b/tests/auto/testlib/selftests/expected_benchlibwalltime.xml index a2f0edecc6..bb71d00218 100644 --- a/tests/auto/testlib/selftests/expected_benchlibwalltime.xml +++ b/tests/auto/testlib/selftests/expected_benchlibwalltime.xml @@ -7,26 +7,26 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="waitForOneThousand"> <Incident type="pass" file="" line="0" /> -<BenchmarkResult metric="WalltimeMilliseconds" tag="" value="1008" iterations="1" /> -<Duration msecs="0"/> +<BenchmarkResult metric="WalltimeMilliseconds" tag="" value="0" iterations="1" /> + <Duration msecs="0"/> </TestFunction> <TestFunction name="waitForFourThousand"> <Incident type="pass" file="" line="0" /> -<BenchmarkResult metric="WalltimeMilliseconds" tag="" value="4002" iterations="1" /> -<Duration msecs="0"/> +<BenchmarkResult metric="WalltimeMilliseconds" tag="" value="0" iterations="1" /> + <Duration msecs="0"/> </TestFunction> <TestFunction name="qbenchmark_once"> <Incident type="pass" file="" line="0" /> <BenchmarkResult metric="WalltimeMilliseconds" tag="" value="0" iterations="1" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_blacklisted.lightxml b/tests/auto/testlib/selftests/expected_blacklisted.lightxml new file mode 100644 index 0000000000..4193628e7c --- /dev/null +++ b/tests/auto/testlib/selftests/expected_blacklisted.lightxml @@ -0,0 +1,66 @@ +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="pass"> +<Incident type="bpass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="skip"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> + <Description><![CDATA[This test should SKIP]]></Description> +</Message> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="fail"> +<Incident type="bfail" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> + <Description><![CDATA['false' returned FALSE. (This test should BFAIL)]]></Description> +</Incident> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="xfail"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> + <Description><![CDATA[This test should XFAIL then BFAIL]]></Description> +</Incident> +<Incident type="bpass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="xpass"> +<Incident type="xpass" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> + <Description><![CDATA['true' returned TRUE unexpectedly. (This test should XPASS, blacklist ignored for XPASS)]]></Description> +</Incident> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="messages"> +<Message type="qwarn" file="" line="0"> + <Description><![CDATA[This is a warning that should not appear in silent test output]]></Description> +</Message> +<Message type="warn" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> + <Description><![CDATA[This is an internal testlib warning that should not appear in silent test output]]></Description> +</Message> +<Message type="qdebug" file="" line="0"> + <Description><![CDATA[This is a debug message that should not appear in silent test output]]></Description> +</Message> +<Message type="system" file="" line="0"> + <Description><![CDATA[This is a critical message that should not appear in silent test output]]></Description> +</Message> +<Message type="qinfo" file="" line="0"> + <Description><![CDATA[This is an info message that should not appear in silent test output]]></Description> +</Message> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> + <Description><![CDATA[This is an internal testlib info message that should not appear in silent test output]]></Description> +</Message> +<Message type="qfatal" file="" line="0"> + <Description><![CDATA[This is a fatal error message that should still appear in silent test output]]></Description> +</Message> +<Incident type="bfail" file="Unknown file" line="0"> + <Description><![CDATA[Received a fatal error.]]></Description> +</Incident> + <Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_blacklisted.teamcity b/tests/auto/testlib/selftests/expected_blacklisted.teamcity new file mode 100644 index 0000000000..8180a7ce76 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_blacklisted.teamcity @@ -0,0 +1,18 @@ +##teamcity[testSuiteStarted name='tst_Blacklisted' flowId='tst_Blacklisted'] +##teamcity[testStarted name='initTestCase()' flowId='tst_Blacklisted'] +##teamcity[testFinished name='initTestCase()' flowId='tst_Blacklisted'] +##teamcity[testStarted name='pass()' flowId='tst_Blacklisted'] +##teamcity[testFinished name='pass()' flowId='tst_Blacklisted'] +##teamcity[testIgnored name='skip()' message='This test should SKIP |[Loc: qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)|]' flowId='tst_Blacklisted'] +##teamcity[testStarted name='fail()' flowId='tst_Blacklisted'] +##teamcity[testFinished name='fail()' flowId='tst_Blacklisted'] +##teamcity[testStarted name='xfail()' flowId='tst_Blacklisted'] +##teamcity[testStdOut name='xfail()' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)|]: This test should XFAIL then BFAIL' flowId='tst_Blacklisted'] +##teamcity[testFinished name='xfail()' flowId='tst_Blacklisted'] +##teamcity[testStarted name='xpass()' flowId='tst_Blacklisted'] +##teamcity[testFailed name='xpass()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)|]' details='|'true|' returned TRUE unexpectedly. (This test should XPASS, blacklist ignored for XPASS)' flowId='tst_Blacklisted'] +##teamcity[testFinished name='xpass()' flowId='tst_Blacklisted'] +##teamcity[testStarted name='messages()' flowId='tst_Blacklisted'] +##teamcity[testStdOut name='messages()' out='QWARN: This is a warning that should not appear in silent test output|nWARNING |[Loc: qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)|]: This is an internal testlib warning that should not appear in silent test output|nQDEBUG: This is a debug message that should not appear in silent test output|nQSYSTEM: This is a critical message that should not appear in silent test output|nQINFO: This is an info message that should not appear in silent test output|nINFO |[Loc: qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)|]: This is an internal testlib info message that should not appear in silent test output|nQFATAL: This is a fatal error message that should still appear in silent test output' flowId='tst_Blacklisted'] +##teamcity[testFinished name='messages()' flowId='tst_Blacklisted'] +##teamcity[testSuiteFinished name='tst_Blacklisted' flowId='tst_Blacklisted'] diff --git a/tests/auto/testlib/selftests/expected_blacklisted.txt b/tests/auto/testlib/selftests/expected_blacklisted.txt index 3afd93b0cc..6fa2403b59 100644 --- a/tests/auto/testlib/selftests/expected_blacklisted.txt +++ b/tests/auto/testlib/selftests/expected_blacklisted.txt @@ -1,26 +1,26 @@ ********* Start testing of tst_Blacklisted ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_Blacklisted::initTestCase() BPASS : tst_Blacklisted::pass() SKIP : tst_Blacklisted::skip() This test should SKIP - Loc: [tst_blacklisted.cpp(62)] + Loc: [qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)] BFAIL : tst_Blacklisted::fail() 'false' returned FALSE. (This test should BFAIL) - Loc: [tst_blacklisted.cpp(67)] + Loc: [qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)] XFAIL : tst_Blacklisted::xfail() This test should XFAIL then BFAIL - Loc: [tst_blacklisted.cpp(73)] + Loc: [qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)] BPASS : tst_Blacklisted::xfail() XPASS : tst_Blacklisted::xpass() 'true' returned TRUE unexpectedly. (This test should XPASS, blacklist ignored for XPASS) - Loc: [tst_blacklisted.cpp(79)] + Loc: [qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)] QWARN : tst_Blacklisted::messages() This is a warning that should not appear in silent test output WARNING: tst_Blacklisted::messages() This is an internal testlib warning that should not appear in silent test output - Loc: [tst_blacklisted.cpp(85)] + Loc: [qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)] QDEBUG : tst_Blacklisted::messages() This is a debug message that should not appear in silent test output QSYSTEM: tst_Blacklisted::messages() This is a critical message that should not appear in silent test output QINFO : tst_Blacklisted::messages() This is an info message that should not appear in silent test output INFO : tst_Blacklisted::messages() This is an internal testlib info message that should not appear in silent test output - Loc: [tst_blacklisted.cpp(89)] + Loc: [qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)] QFATAL : tst_Blacklisted::messages() This is a fatal error message that should still appear in silent test output BFAIL : tst_Blacklisted::messages() Received a fatal error. Loc: [Unknown file(0)] -Totals: 1 passed, 1 failed, 1 skipped, 4 blacklisted +Totals: 1 passed, 1 failed, 1 skipped, 4 blacklisted, 0ms ********* Finished testing of tst_Blacklisted ********* diff --git a/tests/auto/testlib/selftests/expected_blacklisted.xml b/tests/auto/testlib/selftests/expected_blacklisted.xml new file mode 100644 index 0000000000..443bc6b199 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_blacklisted.xml @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="UTF-8"?> +<TestCase name="tst_Blacklisted"> +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="pass"> +<Incident type="bpass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="skip"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> + <Description><![CDATA[This test should SKIP]]></Description> +</Message> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="fail"> +<Incident type="bfail" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> + <Description><![CDATA['false' returned FALSE. (This test should BFAIL)]]></Description> +</Incident> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="xfail"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> + <Description><![CDATA[This test should XFAIL then BFAIL]]></Description> +</Incident> +<Incident type="bpass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="xpass"> +<Incident type="xpass" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> + <Description><![CDATA['true' returned TRUE unexpectedly. (This test should XPASS, blacklist ignored for XPASS)]]></Description> +</Incident> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="messages"> +<Message type="qwarn" file="" line="0"> + <Description><![CDATA[This is a warning that should not appear in silent test output]]></Description> +</Message> +<Message type="warn" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> + <Description><![CDATA[This is an internal testlib warning that should not appear in silent test output]]></Description> +</Message> +<Message type="qdebug" file="" line="0"> + <Description><![CDATA[This is a debug message that should not appear in silent test output]]></Description> +</Message> +<Message type="system" file="" line="0"> + <Description><![CDATA[This is a critical message that should not appear in silent test output]]></Description> +</Message> +<Message type="qinfo" file="" line="0"> + <Description><![CDATA[This is an info message that should not appear in silent test output]]></Description> +</Message> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0"> + <Description><![CDATA[This is an internal testlib info message that should not appear in silent test output]]></Description> +</Message> +<Message type="qfatal" file="" line="0"> + <Description><![CDATA[This is a fatal error message that should still appear in silent test output]]></Description> +</Message> +<Incident type="bfail" file="Unknown file" line="0"> + <Description><![CDATA[Received a fatal error.]]></Description> +</Incident> + <Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> +</TestCase> diff --git a/tests/auto/testlib/selftests/expected_blacklisted.xunitxml b/tests/auto/testlib/selftests/expected_blacklisted.xunitxml new file mode 100644 index 0000000000..2752bc18b4 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_blacklisted.xunitxml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<testsuite errors="9" failures="3" tests="7" name="tst_Blacklisted"> + <properties> + <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/> + <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/> + <property value="" name="QtBuild"/> + </properties> + <testcase result="pass" name="initTestCase"/> + <testcase result="bpass" name="pass"/> + <testcase name="skip"> + <!-- message="This test should SKIP" type="skip" --> + </testcase> + <testcase result="bfail" name="fail"/> + <testcase result="xfail" name="xfail"> + <!-- message="This test should XFAIL then BFAIL" type="info" --> + </testcase> + <testcase result="xpass" name="xpass"> + <failure message="'true' returned TRUE unexpectedly. (This test should XPASS, blacklist ignored for XPASS)" result="xpass"/> + </testcase> + <testcase result="bfail" name="messages"> + <!-- message="This is a warning that should not appear in silent test output" type="qwarn" --> + <!-- message="This is an internal testlib warning that should not appear in silent test output" type="warn" --> + <!-- message="This is a debug message that should not appear in silent test output" type="qdebug" --> + <!-- message="This is a critical message that should not appear in silent test output" type="system" --> + <!-- message="This is an info message that should not appear in silent test output" type="qinfo" --> + <!-- message="This is an internal testlib info message that should not appear in silent test output" type="info" --> + <!-- message="This is a fatal error message that should still appear in silent test output" type="qfatal" --> + </testcase> + <system-err> +<![CDATA[This test should SKIP]]> +<![CDATA[This test should XFAIL then BFAIL]]> +<![CDATA[This is a warning that should not appear in silent test output]]> +<![CDATA[This is an internal testlib warning that should not appear in silent test output]]> +<![CDATA[This is a debug message that should not appear in silent test output]]> +<![CDATA[This is a critical message that should not appear in silent test output]]> +<![CDATA[This is an info message that should not appear in silent test output]]> +<![CDATA[This is an internal testlib info message that should not appear in silent test output]]> +<![CDATA[This is a fatal error message that should still appear in silent test output]]> + </system-err> +</testsuite> diff --git a/tests/auto/testlib/selftests/expected_cmptest.lightxml b/tests/auto/testlib/selftests/expected_cmptest.lightxml index eb11d236d4..41cfb03f18 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.lightxml +++ b/tests/auto/testlib/selftests/expected_cmptest.lightxml @@ -8,13 +8,13 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="compare_unregistered_enums"> -<Incident type="fail" file="tst_cmptest.cpp" line="160"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <Description><![CDATA[Compared values are not the same]]></Description> </Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="compare_registered_enums"> -<Incident type="fail" file="tst_cmptest.cpp" line="167"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <Description><![CDATA[Compared values are not the same Actual (Qt::Monday): Monday Expected (Qt::Sunday): Sunday]]></Description> @@ -22,7 +22,7 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="compare_class_enums"> -<Incident type="fail" file="tst_cmptest.cpp" line="173"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <Description><![CDATA[Compared values are not the same Actual (MyClassEnum::MyClassEnumValue1): MyClassEnumValue1 Expected (MyClassEnum::MyClassEnumValue2): MyClassEnumValue2]]></Description> @@ -42,7 +42,7 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="compare_tostring"> -<Incident type="fail" file="tst_cmptest.cpp" line="262"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[int, string]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (actual) : QVariant(int,123) @@ -51,19 +51,19 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[both invalid]]></DataTag> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="262"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <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="tst_cmptest.cpp" line="262"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <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="tst_cmptest.cpp" line="262"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <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>) @@ -78,31 +78,31 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[equal lists]]></DataTag> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="356"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[last item different]]></DataTag> <Description><![CDATA[Compared lists differ at index 2. Actual (opA): "string3" Expected (opB): "DIFFERS"]]></Description> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="356"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[second-last item different]]></DataTag> <Description><![CDATA[Compared lists differ at index 2. Actual (opA): "string3" Expected (opB): "DIFFERS"]]></Description> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="356"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[prefix]]></DataTag> <Description><![CDATA[Compared lists have different sizes. Actual (opA) size: 2 Expected (opB) size: 1]]></Description> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="356"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[short list second]]></DataTag> <Description><![CDATA[Compared lists have different sizes. Actual (opA) size: 12 Expected (opB) size: 1]]></Description> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="356"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[short list first]]></DataTag> <Description><![CDATA[Compared lists have different sizes. Actual (opA) size: 1 @@ -111,7 +111,7 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="compareQListInt"> -<Incident type="fail" file="tst_cmptest.cpp" line="363"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <Description><![CDATA[Compared lists differ at index 2. Actual (int1): 3 Expected (int2): 4]]></Description> @@ -119,7 +119,7 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="compareQListDouble"> -<Incident type="fail" file="tst_cmptest.cpp" line="370"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <Description><![CDATA[Compared lists differ at index 0. Actual (double1): 1.5 Expected (double2): 1]]></Description> @@ -127,7 +127,7 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="compareQColor"> -<Incident type="fail" file="tst_cmptest.cpp" line="380"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <Description><![CDATA[Compared values are not the same Actual (yellow): #ffff00 Expected (green) : #00ff00]]></Description> @@ -138,13 +138,13 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[both null]]></DataTag> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="405"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[one null]]></DataTag> <Description><![CDATA[Compared QPixmaps differ. Actual (opA).isNull(): 1 Expected (opB).isNull(): 0]]></Description> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="405"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[other null]]></DataTag> <Description><![CDATA[Compared QPixmaps differ. Actual (opA).isNull(): 0 @@ -153,13 +153,13 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[equal]]></DataTag> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="405"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[different size]]></DataTag> <Description><![CDATA[Compared QPixmaps differ in size. Actual (opA): 11x20 Expected (opB): 20x20]]></Description> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="405"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[different pixels]]></DataTag> <Description><![CDATA[Compared values are not the same]]></Description> </Incident> @@ -169,13 +169,13 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[both null]]></DataTag> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="432"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[one null]]></DataTag> <Description><![CDATA[Compared QImages differ. Actual (opA).isNull(): 1 Expected (opB).isNull(): 0]]></Description> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="432"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[other null]]></DataTag> <Description><![CDATA[Compared QImages differ. Actual (opA).isNull(): 0 @@ -184,19 +184,19 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[equal]]></DataTag> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="432"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[different size]]></DataTag> <Description><![CDATA[Compared QImages differ in size. Actual (opA): 11x20 Expected (opB): 20x20]]></Description> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="432"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[different format]]></DataTag> <Description><![CDATA[Compared QImages differ in format. Actual (opA): 6 Expected (opB): 3]]></Description> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="432"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[different pixels]]></DataTag> <Description><![CDATA[Compared values are not the same]]></Description> </Incident> @@ -206,7 +206,7 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[equal-empty]]></DataTag> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="455"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[1-empty]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (rA): QRegion(200x50+10+10) @@ -215,7 +215,7 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[equal]]></DataTag> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="455"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[different lists]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (rA): QRegion(200x50+10+10) @@ -224,7 +224,7 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="compareQVector2D"> -<Incident type="fail" file="tst_cmptest.cpp" line="0"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <Description><![CDATA[Compared values are not the same Actual (v2a): QVector2D(1, 2) Expected (v2b): QVector2D(1, 3)]]></Description> @@ -232,7 +232,7 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="compareQVector3D"> -<Incident type="fail" file="tst_cmptest.cpp" line="0"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <Description><![CDATA[Compared values are not the same Actual (v3a): QVector3D(1, 2, 3) Expected (v3b): QVector3D(1, 3, 3)]]></Description> @@ -240,7 +240,7 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="compareQVector4D"> -<Incident type="fail" file="tst_cmptest.cpp" line="0"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <Description><![CDATA[Compared values are not the same Actual (v4a): QVector4D(1, 2, 3, 4) Expected (v4b): QVector4D(1, 3, 3, 4)]]></Description> @@ -248,25 +248,25 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="verify"> -<Incident type="fail" file="tst_cmptest.cpp" line="467"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <Description><![CDATA['opaqueFunc() < 2' returned FALSE. ()]]></Description> </Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="verify2"> -<Incident type="fail" file="tst_cmptest.cpp" line="473"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <Description><![CDATA['opaqueFunc() < 2' returned FALSE. (42)]]></Description> </Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="tryVerify"> -<Incident type="fail" file="tst_cmptest.cpp" line="479"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <Description><![CDATA['opaqueFunc() < 2' returned FALSE. ()]]></Description> </Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="tryVerify2"> -<Incident type="fail" file="tst_cmptest.cpp" line="485"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <Description><![CDATA['opaqueFunc() < 2' returned FALSE. (42)]]></Description> </Incident> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_cmptest.teamcity b/tests/auto/testlib/selftests/expected_cmptest.teamcity index c49f5d6b79..bb94fe3f50 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.teamcity +++ b/tests/auto/testlib/selftests/expected_cmptest.teamcity @@ -2,13 +2,13 @@ ##teamcity[testStarted name='initTestCase()' flowId='tst_Cmptest'] ##teamcity[testFinished name='initTestCase()' flowId='tst_Cmptest'] ##teamcity[testStarted name='compare_unregistered_enums()' flowId='tst_Cmptest'] -##teamcity[testFailed name='compare_unregistered_enums()' message='Failure! |[Loc: tst_cmptest.cpp(160)|]' details='Compared values are not the same' flowId='tst_Cmptest'] +##teamcity[testFailed name='compare_unregistered_enums()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared values are not the same' flowId='tst_Cmptest'] ##teamcity[testFinished name='compare_unregistered_enums()' flowId='tst_Cmptest'] ##teamcity[testStarted name='compare_registered_enums()' flowId='tst_Cmptest'] -##teamcity[testFailed name='compare_registered_enums()' message='Failure! |[Loc: tst_cmptest.cpp(167)|]' details='Compared values are not the same|n Actual (Qt::Monday): Monday|n Expected (Qt::Sunday): Sunday' flowId='tst_Cmptest'] +##teamcity[testFailed name='compare_registered_enums()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared values are not the same|n Actual (Qt::Monday): Monday|n Expected (Qt::Sunday): Sunday' flowId='tst_Cmptest'] ##teamcity[testFinished name='compare_registered_enums()' flowId='tst_Cmptest'] ##teamcity[testStarted name='compare_class_enums()' flowId='tst_Cmptest'] -##teamcity[testFailed name='compare_class_enums()' message='Failure! |[Loc: tst_cmptest.cpp(173)|]' details='Compared values are not the same|n Actual (MyClassEnum::MyClassEnumValue1): MyClassEnumValue1|n Expected (MyClassEnum::MyClassEnumValue2): MyClassEnumValue2' flowId='tst_Cmptest'] +##teamcity[testFailed name='compare_class_enums()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared values are not the same|n Actual (MyClassEnum::MyClassEnumValue1): MyClassEnumValue1|n Expected (MyClassEnum::MyClassEnumValue2): MyClassEnumValue2' flowId='tst_Cmptest'] ##teamcity[testFinished name='compare_class_enums()' flowId='tst_Cmptest'] ##teamcity[testStarted name='compare_boolfuncs()' flowId='tst_Cmptest'] ##teamcity[testFinished name='compare_boolfuncs()' flowId='tst_Cmptest'] @@ -17,112 +17,112 @@ ##teamcity[testStarted name='compare_pointerfuncs()' flowId='tst_Cmptest'] ##teamcity[testFinished name='compare_pointerfuncs()' flowId='tst_Cmptest'] ##teamcity[testStarted name='compare_tostring(int, string)' flowId='tst_Cmptest'] -##teamcity[testFailed name='compare_tostring(int, string)' message='Failure! |[Loc: tst_cmptest.cpp(262)|]' details='Compared values are not the same|n Actual (actual) : QVariant(int,123)|n Expected (expected): QVariant(QString,hi)' flowId='tst_Cmptest'] +##teamcity[testFailed name='compare_tostring(int, string)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared values are not the same|n Actual (actual) : QVariant(int,123)|n Expected (expected): QVariant(QString,hi)' flowId='tst_Cmptest'] ##teamcity[testFinished name='compare_tostring(int, string)' flowId='tst_Cmptest'] ##teamcity[testStarted name='compare_tostring(both invalid)' flowId='tst_Cmptest'] ##teamcity[testFinished name='compare_tostring(both invalid)' flowId='tst_Cmptest'] ##teamcity[testStarted name='compare_tostring(null hash, invalid)' flowId='tst_Cmptest'] -##teamcity[testFailed name='compare_tostring(null hash, invalid)' message='Failure! |[Loc: tst_cmptest.cpp(262)|]' details='Compared values are not the same|n Actual (actual) : QVariant(QVariantHash)|n Expected (expected): QVariant()' flowId='tst_Cmptest'] +##teamcity[testFailed name='compare_tostring(null hash, invalid)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared values are not the same|n Actual (actual) : QVariant(QVariantHash)|n Expected (expected): QVariant()' flowId='tst_Cmptest'] ##teamcity[testFinished name='compare_tostring(null hash, invalid)' flowId='tst_Cmptest'] ##teamcity[testStarted name='compare_tostring(string, null user type)' flowId='tst_Cmptest'] -##teamcity[testFailed name='compare_tostring(string, null user type)' message='Failure! |[Loc: tst_cmptest.cpp(262)|]' details='Compared values are not the same|n Actual (actual) : QVariant(QString,A simple string)|n Expected (expected): QVariant(PhonyClass)' flowId='tst_Cmptest'] +##teamcity[testFailed name='compare_tostring(string, null user type)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared values are not the same|n Actual (actual) : QVariant(QString,A simple string)|n Expected (expected): QVariant(PhonyClass)' flowId='tst_Cmptest'] ##teamcity[testFinished name='compare_tostring(string, null user type)' flowId='tst_Cmptest'] ##teamcity[testStarted name='compare_tostring(both non-null user type)' flowId='tst_Cmptest'] -##teamcity[testFailed name='compare_tostring(both non-null user type)' message='Failure! |[Loc: tst_cmptest.cpp(262)|]' details='Compared values are not the same|n Actual (actual) : QVariant(PhonyClass,<value not representable as string>)|n Expected (expected): QVariant(PhonyClass,<value not representable as string>)' flowId='tst_Cmptest'] +##teamcity[testFailed name='compare_tostring(both non-null user type)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared values are not the same|n Actual (actual) : QVariant(PhonyClass,<value not representable as string>)|n Expected (expected): QVariant(PhonyClass,<value not representable as string>)' flowId='tst_Cmptest'] ##teamcity[testFinished name='compare_tostring(both non-null user type)' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQStringLists(empty lists)' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQStringLists(empty lists)' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQStringLists(equal lists)' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQStringLists(equal lists)' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQStringLists(last item different)' flowId='tst_Cmptest'] -##teamcity[testFailed name='compareQStringLists(last item different)' message='Failure! |[Loc: tst_cmptest.cpp(356)|]' details='Compared lists differ at index 2.|n Actual (opA): "string3"|n Expected (opB): "DIFFERS"' flowId='tst_Cmptest'] +##teamcity[testFailed name='compareQStringLists(last item different)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared lists differ at index 2.|n Actual (opA): "string3"|n Expected (opB): "DIFFERS"' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQStringLists(last item different)' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQStringLists(second-last item different)' flowId='tst_Cmptest'] -##teamcity[testFailed name='compareQStringLists(second-last item different)' message='Failure! |[Loc: tst_cmptest.cpp(356)|]' details='Compared lists differ at index 2.|n Actual (opA): "string3"|n Expected (opB): "DIFFERS"' flowId='tst_Cmptest'] +##teamcity[testFailed name='compareQStringLists(second-last item different)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared lists differ at index 2.|n Actual (opA): "string3"|n Expected (opB): "DIFFERS"' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQStringLists(second-last item different)' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQStringLists(prefix)' flowId='tst_Cmptest'] -##teamcity[testFailed name='compareQStringLists(prefix)' message='Failure! |[Loc: tst_cmptest.cpp(356)|]' details='Compared lists have different sizes.|n Actual (opA) size: 2|n Expected (opB) size: 1' flowId='tst_Cmptest'] +##teamcity[testFailed name='compareQStringLists(prefix)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared lists have different sizes.|n Actual (opA) size: 2|n Expected (opB) size: 1' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQStringLists(prefix)' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQStringLists(short list second)' flowId='tst_Cmptest'] -##teamcity[testFailed name='compareQStringLists(short list second)' message='Failure! |[Loc: tst_cmptest.cpp(356)|]' details='Compared lists have different sizes.|n Actual (opA) size: 12|n Expected (opB) size: 1' flowId='tst_Cmptest'] +##teamcity[testFailed name='compareQStringLists(short list second)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared lists have different sizes.|n Actual (opA) size: 12|n Expected (opB) size: 1' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQStringLists(short list second)' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQStringLists(short list first)' flowId='tst_Cmptest'] -##teamcity[testFailed name='compareQStringLists(short list first)' message='Failure! |[Loc: tst_cmptest.cpp(356)|]' details='Compared lists have different sizes.|n Actual (opA) size: 1|n Expected (opB) size: 12' flowId='tst_Cmptest'] +##teamcity[testFailed name='compareQStringLists(short list first)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared lists have different sizes.|n Actual (opA) size: 1|n Expected (opB) size: 12' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQStringLists(short list first)' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQListInt()' flowId='tst_Cmptest'] -##teamcity[testFailed name='compareQListInt()' message='Failure! |[Loc: tst_cmptest.cpp(363)|]' details='Compared lists differ at index 2.|n Actual (int1): 3|n Expected (int2): 4' flowId='tst_Cmptest'] +##teamcity[testFailed name='compareQListInt()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared lists differ at index 2.|n Actual (int1): 3|n Expected (int2): 4' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQListInt()' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQListDouble()' flowId='tst_Cmptest'] -##teamcity[testFailed name='compareQListDouble()' message='Failure! |[Loc: tst_cmptest.cpp(370)|]' details='Compared lists differ at index 0.|n Actual (double1): 1.5|n Expected (double2): 1' flowId='tst_Cmptest'] +##teamcity[testFailed name='compareQListDouble()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared lists differ at index 0.|n Actual (double1): 1.5|n Expected (double2): 1' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQListDouble()' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQColor()' flowId='tst_Cmptest'] -##teamcity[testFailed name='compareQColor()' message='Failure! |[Loc: tst_cmptest.cpp(380)|]' details='Compared values are not the same|n Actual (yellow): #ffff00|n Expected (green) : #00ff00' flowId='tst_Cmptest'] +##teamcity[testFailed name='compareQColor()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared values are not the same|n Actual (yellow): #ffff00|n Expected (green) : #00ff00' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQColor()' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQPixmaps(both null)' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQPixmaps(both null)' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQPixmaps(one null)' flowId='tst_Cmptest'] -##teamcity[testFailed name='compareQPixmaps(one null)' message='Failure! |[Loc: tst_cmptest.cpp(405)|]' details='Compared QPixmaps differ.|n Actual (opA).isNull(): 1|n Expected (opB).isNull(): 0' flowId='tst_Cmptest'] +##teamcity[testFailed name='compareQPixmaps(one null)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared QPixmaps differ.|n Actual (opA).isNull(): 1|n Expected (opB).isNull(): 0' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQPixmaps(one null)' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQPixmaps(other null)' flowId='tst_Cmptest'] -##teamcity[testFailed name='compareQPixmaps(other null)' message='Failure! |[Loc: tst_cmptest.cpp(405)|]' details='Compared QPixmaps differ.|n Actual (opA).isNull(): 0|n Expected (opB).isNull(): 1' flowId='tst_Cmptest'] +##teamcity[testFailed name='compareQPixmaps(other null)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared QPixmaps differ.|n Actual (opA).isNull(): 0|n Expected (opB).isNull(): 1' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQPixmaps(other null)' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQPixmaps(equal)' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQPixmaps(equal)' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQPixmaps(different size)' flowId='tst_Cmptest'] -##teamcity[testFailed name='compareQPixmaps(different size)' message='Failure! |[Loc: tst_cmptest.cpp(405)|]' details='Compared QPixmaps differ in size.|n Actual (opA): 11x20|n Expected (opB): 20x20' flowId='tst_Cmptest'] +##teamcity[testFailed name='compareQPixmaps(different size)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared QPixmaps differ in size.|n Actual (opA): 11x20|n Expected (opB): 20x20' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQPixmaps(different size)' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQPixmaps(different pixels)' flowId='tst_Cmptest'] -##teamcity[testFailed name='compareQPixmaps(different pixels)' message='Failure! |[Loc: tst_cmptest.cpp(405)|]' details='Compared values are not the same' flowId='tst_Cmptest'] +##teamcity[testFailed name='compareQPixmaps(different pixels)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared values are not the same' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQPixmaps(different pixels)' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQImages(both null)' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQImages(both null)' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQImages(one null)' flowId='tst_Cmptest'] -##teamcity[testFailed name='compareQImages(one null)' message='Failure! |[Loc: tst_cmptest.cpp(432)|]' details='Compared QImages differ.|n Actual (opA).isNull(): 1|n Expected (opB).isNull(): 0' flowId='tst_Cmptest'] +##teamcity[testFailed name='compareQImages(one null)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared QImages differ.|n Actual (opA).isNull(): 1|n Expected (opB).isNull(): 0' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQImages(one null)' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQImages(other null)' flowId='tst_Cmptest'] -##teamcity[testFailed name='compareQImages(other null)' message='Failure! |[Loc: tst_cmptest.cpp(432)|]' details='Compared QImages differ.|n Actual (opA).isNull(): 0|n Expected (opB).isNull(): 1' flowId='tst_Cmptest'] +##teamcity[testFailed name='compareQImages(other null)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared QImages differ.|n Actual (opA).isNull(): 0|n Expected (opB).isNull(): 1' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQImages(other null)' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQImages(equal)' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQImages(equal)' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQImages(different size)' flowId='tst_Cmptest'] -##teamcity[testFailed name='compareQImages(different size)' message='Failure! |[Loc: tst_cmptest.cpp(432)|]' details='Compared QImages differ in size.|n Actual (opA): 11x20|n Expected (opB): 20x20' flowId='tst_Cmptest'] +##teamcity[testFailed name='compareQImages(different size)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared QImages differ in size.|n Actual (opA): 11x20|n Expected (opB): 20x20' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQImages(different size)' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQImages(different format)' flowId='tst_Cmptest'] -##teamcity[testFailed name='compareQImages(different format)' message='Failure! |[Loc: tst_cmptest.cpp(432)|]' details='Compared QImages differ in format.|n Actual (opA): 6|n Expected (opB): 3' flowId='tst_Cmptest'] +##teamcity[testFailed name='compareQImages(different format)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared QImages differ in format.|n Actual (opA): 6|n Expected (opB): 3' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQImages(different format)' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQImages(different pixels)' flowId='tst_Cmptest'] -##teamcity[testFailed name='compareQImages(different pixels)' message='Failure! |[Loc: tst_cmptest.cpp(432)|]' details='Compared values are not the same' flowId='tst_Cmptest'] +##teamcity[testFailed name='compareQImages(different pixels)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared values are not the same' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQImages(different pixels)' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQRegion(equal-empty)' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQRegion(equal-empty)' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQRegion(1-empty)' flowId='tst_Cmptest'] -##teamcity[testFailed name='compareQRegion(1-empty)' message='Failure! |[Loc: tst_cmptest.cpp(455)|]' details='Compared values are not the same|n Actual (rA): QRegion(200x50+10+10)|n Expected (rB): QRegion(null)' flowId='tst_Cmptest'] +##teamcity[testFailed name='compareQRegion(1-empty)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared values are not the same|n Actual (rA): QRegion(200x50+10+10)|n Expected (rB): QRegion(null)' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQRegion(1-empty)' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQRegion(equal)' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQRegion(equal)' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQRegion(different lists)' flowId='tst_Cmptest'] -##teamcity[testFailed name='compareQRegion(different lists)' message='Failure! |[Loc: tst_cmptest.cpp(455)|]' details='Compared values are not the same|n Actual (rA): QRegion(200x50+10+10)|n Expected (rB): QRegion(2 rectangles, 50x200+100+200, 200x50+10+10)' flowId='tst_Cmptest'] +##teamcity[testFailed name='compareQRegion(different lists)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared values are not the same|n Actual (rA): QRegion(200x50+10+10)|n Expected (rB): QRegion(2 rectangles, 50x200+100+200, 200x50+10+10)' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQRegion(different lists)' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQVector2D()' flowId='tst_Cmptest'] -##teamcity[testFailed name='compareQVector2D()' message='Failure! |[Loc: tst_cmptest.cpp(0)|]' details='Compared values are not the same|n Actual (v2a): QVector2D(1, 2)|n Expected (v2b): QVector2D(1, 3)' flowId='tst_Cmptest'] +##teamcity[testFailed name='compareQVector2D()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared values are not the same|n Actual (v2a): QVector2D(1, 2)|n Expected (v2b): QVector2D(1, 3)' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQVector2D()' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQVector3D()' flowId='tst_Cmptest'] -##teamcity[testFailed name='compareQVector3D()' message='Failure! |[Loc: tst_cmptest.cpp(0)|]' details='Compared values are not the same|n Actual (v3a): QVector3D(1, 2, 3)|n Expected (v3b): QVector3D(1, 3, 3)' flowId='tst_Cmptest'] +##teamcity[testFailed name='compareQVector3D()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared values are not the same|n Actual (v3a): QVector3D(1, 2, 3)|n Expected (v3b): QVector3D(1, 3, 3)' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQVector3D()' flowId='tst_Cmptest'] ##teamcity[testStarted name='compareQVector4D()' flowId='tst_Cmptest'] -##teamcity[testFailed name='compareQVector4D()' message='Failure! |[Loc: tst_cmptest.cpp(0)|]' details='Compared values are not the same|n Actual (v4a): QVector4D(1, 2, 3, 4)|n Expected (v4b): QVector4D(1, 3, 3, 4)' flowId='tst_Cmptest'] +##teamcity[testFailed name='compareQVector4D()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='Compared values are not the same|n Actual (v4a): QVector4D(1, 2, 3, 4)|n Expected (v4b): QVector4D(1, 3, 3, 4)' flowId='tst_Cmptest'] ##teamcity[testFinished name='compareQVector4D()' flowId='tst_Cmptest'] ##teamcity[testStarted name='verify()' flowId='tst_Cmptest'] -##teamcity[testFailed name='verify()' message='Failure! |[Loc: tst_cmptest.cpp(467)|]' details='|'opaqueFunc() < 2|' returned FALSE. ()' flowId='tst_Cmptest'] +##teamcity[testFailed name='verify()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='|'opaqueFunc() < 2|' returned FALSE. ()' flowId='tst_Cmptest'] ##teamcity[testFinished name='verify()' flowId='tst_Cmptest'] ##teamcity[testStarted name='verify2()' flowId='tst_Cmptest'] -##teamcity[testFailed name='verify2()' message='Failure! |[Loc: tst_cmptest.cpp(473)|]' details='|'opaqueFunc() < 2|' returned FALSE. (42)' flowId='tst_Cmptest'] +##teamcity[testFailed name='verify2()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='|'opaqueFunc() < 2|' returned FALSE. (42)' flowId='tst_Cmptest'] ##teamcity[testFinished name='verify2()' flowId='tst_Cmptest'] ##teamcity[testStarted name='tryVerify()' flowId='tst_Cmptest'] -##teamcity[testFailed name='tryVerify()' message='Failure! |[Loc: tst_cmptest.cpp(479)|]' details='|'opaqueFunc() < 2|' returned FALSE. ()' flowId='tst_Cmptest'] +##teamcity[testFailed name='tryVerify()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='|'opaqueFunc() < 2|' returned FALSE. ()' flowId='tst_Cmptest'] ##teamcity[testFinished name='tryVerify()' flowId='tst_Cmptest'] ##teamcity[testStarted name='tryVerify2()' flowId='tst_Cmptest'] -##teamcity[testFailed name='tryVerify2()' message='Failure! |[Loc: tst_cmptest.cpp(485)|]' details='|'opaqueFunc() < 2|' returned FALSE. (42)' flowId='tst_Cmptest'] +##teamcity[testFailed name='tryVerify2()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)|]' details='|'opaqueFunc() < 2|' returned FALSE. (42)' flowId='tst_Cmptest'] ##teamcity[testFinished name='tryVerify2()' flowId='tst_Cmptest'] ##teamcity[testStarted name='verifyExplicitOperatorBool()' flowId='tst_Cmptest'] ##teamcity[testFinished name='verifyExplicitOperatorBool()' flowId='tst_Cmptest'] diff --git a/tests/auto/testlib/selftests/expected_cmptest.txt b/tests/auto/testlib/selftests/expected_cmptest.txt index 179136a2c7..c833bf6d81 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.txt +++ b/tests/auto/testlib/selftests/expected_cmptest.txt @@ -2,135 +2,135 @@ Config: Using QtTest library PASS : tst_Cmptest::initTestCase() FAIL! : tst_Cmptest::compare_unregistered_enums() Compared values are not the same - Loc: [tst_cmptest.cpp(160)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] FAIL! : tst_Cmptest::compare_registered_enums() Compared values are not the same Actual (Qt::Monday): Monday Expected (Qt::Sunday): Sunday - Loc: [tst_cmptest.cpp(167)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] FAIL! : tst_Cmptest::compare_class_enums() Compared values are not the same Actual (MyClassEnum::MyClassEnumValue1): MyClassEnumValue1 Expected (MyClassEnum::MyClassEnumValue2): MyClassEnumValue2 - Loc: [tst_cmptest.cpp(173)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] PASS : tst_Cmptest::compare_boolfuncs() PASS : tst_Cmptest::compare_to_nullptr() PASS : tst_Cmptest::compare_pointerfuncs() FAIL! : tst_Cmptest::compare_tostring(int, string) Compared values are not the same Actual (actual) : QVariant(int,123) Expected (expected): QVariant(QString,hi) - Loc: [tst_cmptest.cpp(262)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] PASS : tst_Cmptest::compare_tostring(both invalid) FAIL! : tst_Cmptest::compare_tostring(null hash, invalid) Compared values are not the same Actual (actual) : QVariant(QVariantHash) Expected (expected): QVariant() - Loc: [tst_cmptest.cpp(262)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] FAIL! : tst_Cmptest::compare_tostring(string, null user type) Compared values are not the same Actual (actual) : QVariant(QString,A simple string) Expected (expected): QVariant(PhonyClass) - Loc: [tst_cmptest.cpp(262)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] FAIL! : tst_Cmptest::compare_tostring(both non-null user type) Compared values are not the same Actual (actual) : QVariant(PhonyClass,<value not representable as string>) Expected (expected): QVariant(PhonyClass,<value not representable as string>) - Loc: [tst_cmptest.cpp(262)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] PASS : tst_Cmptest::compareQStringLists(empty lists) PASS : tst_Cmptest::compareQStringLists(equal lists) FAIL! : tst_Cmptest::compareQStringLists(last item different) Compared lists differ at index 2. Actual (opA): "string3" Expected (opB): "DIFFERS" - Loc: [tst_cmptest.cpp(356)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] FAIL! : tst_Cmptest::compareQStringLists(second-last item different) Compared lists differ at index 2. Actual (opA): "string3" Expected (opB): "DIFFERS" - Loc: [tst_cmptest.cpp(356)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] FAIL! : tst_Cmptest::compareQStringLists(prefix) Compared lists have different sizes. Actual (opA) size: 2 Expected (opB) size: 1 - Loc: [tst_cmptest.cpp(356)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] FAIL! : tst_Cmptest::compareQStringLists(short list second) Compared lists have different sizes. Actual (opA) size: 12 Expected (opB) size: 1 - Loc: [tst_cmptest.cpp(356)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] FAIL! : tst_Cmptest::compareQStringLists(short list first) Compared lists have different sizes. Actual (opA) size: 1 Expected (opB) size: 12 - Loc: [tst_cmptest.cpp(356)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] FAIL! : tst_Cmptest::compareQListInt() Compared lists differ at index 2. Actual (int1): 3 Expected (int2): 4 - Loc: [tst_cmptest.cpp(363)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] FAIL! : tst_Cmptest::compareQListDouble() Compared lists differ at index 0. Actual (double1): 1.5 Expected (double2): 1 - Loc: [tst_cmptest.cpp(370)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] FAIL! : tst_Cmptest::compareQColor() Compared values are not the same Actual (yellow): #ffff00 Expected (green) : #00ff00 - Loc: [tst_cmptest.cpp(380)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] PASS : tst_Cmptest::compareQPixmaps(both null) FAIL! : tst_Cmptest::compareQPixmaps(one null) Compared QPixmaps differ. Actual (opA).isNull(): 1 Expected (opB).isNull(): 0 - Loc: [tst_cmptest.cpp(405)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] FAIL! : tst_Cmptest::compareQPixmaps(other null) Compared QPixmaps differ. Actual (opA).isNull(): 0 Expected (opB).isNull(): 1 - Loc: [tst_cmptest.cpp(405)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] PASS : tst_Cmptest::compareQPixmaps(equal) FAIL! : tst_Cmptest::compareQPixmaps(different size) Compared QPixmaps differ in size. Actual (opA): 11x20 Expected (opB): 20x20 - Loc: [tst_cmptest.cpp(405)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] FAIL! : tst_Cmptest::compareQPixmaps(different pixels) Compared values are not the same - Loc: [tst_cmptest.cpp(405)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] PASS : tst_Cmptest::compareQImages(both null) FAIL! : tst_Cmptest::compareQImages(one null) Compared QImages differ. Actual (opA).isNull(): 1 Expected (opB).isNull(): 0 - Loc: [tst_cmptest.cpp(432)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] FAIL! : tst_Cmptest::compareQImages(other null) Compared QImages differ. Actual (opA).isNull(): 0 Expected (opB).isNull(): 1 - Loc: [tst_cmptest.cpp(432)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] PASS : tst_Cmptest::compareQImages(equal) FAIL! : tst_Cmptest::compareQImages(different size) Compared QImages differ in size. Actual (opA): 11x20 Expected (opB): 20x20 - Loc: [tst_cmptest.cpp(432)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] FAIL! : tst_Cmptest::compareQImages(different format) Compared QImages differ in format. Actual (opA): 6 Expected (opB): 3 - Loc: [tst_cmptest.cpp(432)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] FAIL! : tst_Cmptest::compareQImages(different pixels) Compared values are not the same - Loc: [tst_cmptest.cpp(432)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] PASS : tst_Cmptest::compareQRegion(equal-empty) FAIL! : tst_Cmptest::compareQRegion(1-empty) Compared values are not the same Actual (rA): QRegion(200x50+10+10) Expected (rB): QRegion(null) - Loc: [tst_cmptest.cpp(455)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] PASS : tst_Cmptest::compareQRegion(equal) FAIL! : tst_Cmptest::compareQRegion(different lists) Compared values are not the same Actual (rA): QRegion(200x50+10+10) Expected (rB): QRegion(2 rectangles, 50x200+100+200, 200x50+10+10) - Loc: [tst_cmptest.cpp(455)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] FAIL! : tst_Cmptest::compareQVector2D() Compared values are not the same Actual (v2a): QVector2D(1, 2) Expected (v2b): QVector2D(1, 3) - Loc: [tst_cmptest.cpp(0)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] FAIL! : tst_Cmptest::compareQVector3D() Compared values are not the same Actual (v3a): QVector3D(1, 2, 3) Expected (v3b): QVector3D(1, 3, 3) - Loc: [tst_cmptest.cpp(0)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] FAIL! : tst_Cmptest::compareQVector4D() Compared values are not the same Actual (v4a): QVector4D(1, 2, 3, 4) Expected (v4b): QVector4D(1, 3, 3, 4) - Loc: [tst_cmptest.cpp(0)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] FAIL! : tst_Cmptest::verify() 'opaqueFunc() < 2' returned FALSE. () - Loc: [tst_cmptest.cpp(467)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] FAIL! : tst_Cmptest::verify2() 'opaqueFunc() < 2' returned FALSE. (42) - Loc: [tst_cmptest.cpp(473)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] FAIL! : tst_Cmptest::tryVerify() 'opaqueFunc() < 2' returned FALSE. () - Loc: [tst_cmptest.cpp(479)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] FAIL! : tst_Cmptest::tryVerify2() 'opaqueFunc() < 2' returned FALSE. (42) - Loc: [tst_cmptest.cpp(485)] + Loc: [qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp(0)] PASS : tst_Cmptest::verifyExplicitOperatorBool() PASS : tst_Cmptest::cleanupTestCase() Totals: 15 passed, 33 failed, 0 skipped, 0 blacklisted, 0ms diff --git a/tests/auto/testlib/selftests/expected_cmptest.xml b/tests/auto/testlib/selftests/expected_cmptest.xml index b281b04677..12d8263e55 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.xml +++ b/tests/auto/testlib/selftests/expected_cmptest.xml @@ -10,13 +10,13 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="compare_unregistered_enums"> -<Incident type="fail" file="tst_cmptest.cpp" line="160"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <Description><![CDATA[Compared values are not the same]]></Description> </Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="compare_registered_enums"> -<Incident type="fail" file="tst_cmptest.cpp" line="167"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <Description><![CDATA[Compared values are not the same Actual (Qt::Monday): Monday Expected (Qt::Sunday): Sunday]]></Description> @@ -24,7 +24,7 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="compare_class_enums"> -<Incident type="fail" file="tst_cmptest.cpp" line="173"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <Description><![CDATA[Compared values are not the same Actual (MyClassEnum::MyClassEnumValue1): MyClassEnumValue1 Expected (MyClassEnum::MyClassEnumValue2): MyClassEnumValue2]]></Description> @@ -44,7 +44,7 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="compare_tostring"> -<Incident type="fail" file="tst_cmptest.cpp" line="262"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[int, string]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (actual) : QVariant(int,123) @@ -53,19 +53,19 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[both invalid]]></DataTag> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="262"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <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="tst_cmptest.cpp" line="262"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <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="tst_cmptest.cpp" line="262"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <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>) @@ -80,31 +80,31 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[equal lists]]></DataTag> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="356"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[last item different]]></DataTag> <Description><![CDATA[Compared lists differ at index 2. Actual (opA): "string3" Expected (opB): "DIFFERS"]]></Description> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="356"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[second-last item different]]></DataTag> <Description><![CDATA[Compared lists differ at index 2. Actual (opA): "string3" Expected (opB): "DIFFERS"]]></Description> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="356"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[prefix]]></DataTag> <Description><![CDATA[Compared lists have different sizes. Actual (opA) size: 2 Expected (opB) size: 1]]></Description> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="356"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[short list second]]></DataTag> <Description><![CDATA[Compared lists have different sizes. Actual (opA) size: 12 Expected (opB) size: 1]]></Description> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="356"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[short list first]]></DataTag> <Description><![CDATA[Compared lists have different sizes. Actual (opA) size: 1 @@ -113,7 +113,7 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="compareQListInt"> -<Incident type="fail" file="tst_cmptest.cpp" line="363"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <Description><![CDATA[Compared lists differ at index 2. Actual (int1): 3 Expected (int2): 4]]></Description> @@ -121,7 +121,7 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="compareQListDouble"> -<Incident type="fail" file="tst_cmptest.cpp" line="370"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <Description><![CDATA[Compared lists differ at index 0. Actual (double1): 1.5 Expected (double2): 1]]></Description> @@ -129,7 +129,7 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="compareQColor"> -<Incident type="fail" file="tst_cmptest.cpp" line="380"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <Description><![CDATA[Compared values are not the same Actual (yellow): #ffff00 Expected (green) : #00ff00]]></Description> @@ -140,13 +140,13 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[both null]]></DataTag> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="405"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[one null]]></DataTag> <Description><![CDATA[Compared QPixmaps differ. Actual (opA).isNull(): 1 Expected (opB).isNull(): 0]]></Description> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="405"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[other null]]></DataTag> <Description><![CDATA[Compared QPixmaps differ. Actual (opA).isNull(): 0 @@ -155,13 +155,13 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[equal]]></DataTag> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="405"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[different size]]></DataTag> <Description><![CDATA[Compared QPixmaps differ in size. Actual (opA): 11x20 Expected (opB): 20x20]]></Description> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="405"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[different pixels]]></DataTag> <Description><![CDATA[Compared values are not the same]]></Description> </Incident> @@ -171,13 +171,13 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[both null]]></DataTag> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="432"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[one null]]></DataTag> <Description><![CDATA[Compared QImages differ. Actual (opA).isNull(): 1 Expected (opB).isNull(): 0]]></Description> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="432"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[other null]]></DataTag> <Description><![CDATA[Compared QImages differ. Actual (opA).isNull(): 0 @@ -186,19 +186,19 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[equal]]></DataTag> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="432"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[different size]]></DataTag> <Description><![CDATA[Compared QImages differ in size. Actual (opA): 11x20 Expected (opB): 20x20]]></Description> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="432"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[different format]]></DataTag> <Description><![CDATA[Compared QImages differ in format. Actual (opA): 6 Expected (opB): 3]]></Description> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="432"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[different pixels]]></DataTag> <Description><![CDATA[Compared values are not the same]]></Description> </Incident> @@ -208,7 +208,7 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[equal-empty]]></DataTag> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="455"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[1-empty]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (rA): QRegion(200x50+10+10) @@ -217,7 +217,7 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[equal]]></DataTag> </Incident> -<Incident type="fail" file="tst_cmptest.cpp" line="455"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <DataTag><![CDATA[different lists]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (rA): QRegion(200x50+10+10) @@ -226,7 +226,7 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="compareQVector2D"> -<Incident type="fail" file="tst_cmptest.cpp" line="0"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <Description><![CDATA[Compared values are not the same Actual (v2a): QVector2D(1, 2) Expected (v2b): QVector2D(1, 3)]]></Description> @@ -234,7 +234,7 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="compareQVector3D"> -<Incident type="fail" file="tst_cmptest.cpp" line="0"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <Description><![CDATA[Compared values are not the same Actual (v3a): QVector3D(1, 2, 3) Expected (v3b): QVector3D(1, 3, 3)]]></Description> @@ -242,7 +242,7 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="compareQVector4D"> -<Incident type="fail" file="tst_cmptest.cpp" line="0"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <Description><![CDATA[Compared values are not the same Actual (v4a): QVector4D(1, 2, 3, 4) Expected (v4b): QVector4D(1, 3, 3, 4)]]></Description> @@ -250,25 +250,25 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="verify"> -<Incident type="fail" file="tst_cmptest.cpp" line="467"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <Description><![CDATA['opaqueFunc() < 2' returned FALSE. ()]]></Description> </Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="verify2"> -<Incident type="fail" file="tst_cmptest.cpp" line="473"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <Description><![CDATA['opaqueFunc() < 2' returned FALSE. (42)]]></Description> </Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="tryVerify"> -<Incident type="fail" file="tst_cmptest.cpp" line="479"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <Description><![CDATA['opaqueFunc() < 2' returned FALSE. ()]]></Description> </Incident> <Duration msecs="0"/> </TestFunction> <TestFunction name="tryVerify2"> -<Incident type="fail" file="tst_cmptest.cpp" line="485"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp" line="0"> <Description><![CDATA['opaqueFunc() < 2' returned FALSE. (42)]]></Description> </Incident> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_commandlinedata.lightxml b/tests/auto/testlib/selftests/expected_commandlinedata.lightxml index 894ae7ae23..89016c21aa 100644 --- a/tests/auto/testlib/selftests/expected_commandlinedata.lightxml +++ b/tests/auto/testlib/selftests/expected_commandlinedata.lightxml @@ -5,58 +5,58 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="fiveTablePasses"> -<Message type="info" file="tst_commandlinedata.cpp" line="65"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp" line="0"> <DataTag><![CDATA[fiveTablePasses_data1]]></DataTag> <Description><![CDATA[QVERIFY(test)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[fiveTablePasses_data1]]></DataTag> </Incident> -<Message type="info" file="tst_commandlinedata.cpp" line="65"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp" line="0"> <DataTag><![CDATA[fiveTablePasses_data2]]></DataTag> <Description><![CDATA[QVERIFY(test)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[fiveTablePasses_data2]]></DataTag> </Incident> -<Message type="info" file="tst_commandlinedata.cpp" line="65"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp" line="0"> <DataTag><![CDATA[fiveTablePasses_data3]]></DataTag> <Description><![CDATA[QVERIFY(test)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[fiveTablePasses_data3]]></DataTag> </Incident> -<Message type="info" file="tst_commandlinedata.cpp" line="65"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp" line="0"> <DataTag><![CDATA[fiveTablePasses_data4]]></DataTag> <Description><![CDATA[QVERIFY(test)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[fiveTablePasses_data4]]></DataTag> </Incident> -<Message type="info" file="tst_commandlinedata.cpp" line="65"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp" line="0"> <DataTag><![CDATA[fiveTablePasses_data5]]></DataTag> <Description><![CDATA[QVERIFY(test)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[fiveTablePasses_data5]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="fiveTablePasses"> -<Message type="info" file="tst_commandlinedata.cpp" line="65"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp" line="0"> <DataTag><![CDATA[fiveTablePasses_data1]]></DataTag> <Description><![CDATA[QVERIFY(test)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[fiveTablePasses_data1]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_commandlinedata.teamcity b/tests/auto/testlib/selftests/expected_commandlinedata.teamcity index 13c0b44320..a8ec263c18 100644 --- a/tests/auto/testlib/selftests/expected_commandlinedata.teamcity +++ b/tests/auto/testlib/selftests/expected_commandlinedata.teamcity @@ -2,22 +2,22 @@ ##teamcity[testStarted name='initTestCase()' flowId='tst_DataTable'] ##teamcity[testFinished name='initTestCase()' flowId='tst_DataTable'] ##teamcity[testStarted name='fiveTablePasses(fiveTablePasses_data1)' flowId='tst_DataTable'] -##teamcity[testStdOut name='fiveTablePasses(fiveTablePasses_data1)' out='INFO |[Loc: tst_commandlinedata.cpp(57)|]: QVERIFY(test)' flowId='tst_DataTable'] +##teamcity[testStdOut name='fiveTablePasses(fiveTablePasses_data1)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp(0)|]: QVERIFY(test)' flowId='tst_DataTable'] ##teamcity[testFinished name='fiveTablePasses(fiveTablePasses_data1)' flowId='tst_DataTable'] ##teamcity[testStarted name='fiveTablePasses(fiveTablePasses_data2)' flowId='tst_DataTable'] -##teamcity[testStdOut name='fiveTablePasses(fiveTablePasses_data2)' out='INFO |[Loc: tst_commandlinedata.cpp(57)|]: QVERIFY(test)' flowId='tst_DataTable'] +##teamcity[testStdOut name='fiveTablePasses(fiveTablePasses_data2)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp(0)|]: QVERIFY(test)' flowId='tst_DataTable'] ##teamcity[testFinished name='fiveTablePasses(fiveTablePasses_data2)' flowId='tst_DataTable'] ##teamcity[testStarted name='fiveTablePasses(fiveTablePasses_data3)' flowId='tst_DataTable'] -##teamcity[testStdOut name='fiveTablePasses(fiveTablePasses_data3)' out='INFO |[Loc: tst_commandlinedata.cpp(57)|]: QVERIFY(test)' flowId='tst_DataTable'] +##teamcity[testStdOut name='fiveTablePasses(fiveTablePasses_data3)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp(0)|]: QVERIFY(test)' flowId='tst_DataTable'] ##teamcity[testFinished name='fiveTablePasses(fiveTablePasses_data3)' flowId='tst_DataTable'] ##teamcity[testStarted name='fiveTablePasses(fiveTablePasses_data4)' flowId='tst_DataTable'] -##teamcity[testStdOut name='fiveTablePasses(fiveTablePasses_data4)' out='INFO |[Loc: tst_commandlinedata.cpp(57)|]: QVERIFY(test)' flowId='tst_DataTable'] +##teamcity[testStdOut name='fiveTablePasses(fiveTablePasses_data4)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp(0)|]: QVERIFY(test)' flowId='tst_DataTable'] ##teamcity[testFinished name='fiveTablePasses(fiveTablePasses_data4)' flowId='tst_DataTable'] ##teamcity[testStarted name='fiveTablePasses(fiveTablePasses_data5)' flowId='tst_DataTable'] -##teamcity[testStdOut name='fiveTablePasses(fiveTablePasses_data5)' out='INFO |[Loc: tst_commandlinedata.cpp(57)|]: QVERIFY(test)' flowId='tst_DataTable'] +##teamcity[testStdOut name='fiveTablePasses(fiveTablePasses_data5)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp(0)|]: QVERIFY(test)' flowId='tst_DataTable'] ##teamcity[testFinished name='fiveTablePasses(fiveTablePasses_data5)' flowId='tst_DataTable'] ##teamcity[testStarted name='fiveTablePasses(fiveTablePasses_data1)' flowId='tst_DataTable'] -##teamcity[testStdOut name='fiveTablePasses(fiveTablePasses_data1)' out='INFO |[Loc: tst_commandlinedata.cpp(57)|]: QVERIFY(test)' flowId='tst_DataTable'] +##teamcity[testStdOut name='fiveTablePasses(fiveTablePasses_data1)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp(0)|]: QVERIFY(test)' flowId='tst_DataTable'] ##teamcity[testFinished name='fiveTablePasses(fiveTablePasses_data1)' flowId='tst_DataTable'] ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_DataTable'] ##teamcity[testFinished name='cleanupTestCase()' flowId='tst_DataTable'] diff --git a/tests/auto/testlib/selftests/expected_commandlinedata.txt b/tests/auto/testlib/selftests/expected_commandlinedata.txt index 94861416d7..bc86235918 100644 --- a/tests/auto/testlib/selftests/expected_commandlinedata.txt +++ b/tests/auto/testlib/selftests/expected_commandlinedata.txt @@ -1,28 +1,28 @@ ********* Start testing of tst_DataTable ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library INFO : tst_DataTable::initTestCase() entering PASS : tst_DataTable::initTestCase() INFO : tst_DataTable::fiveTablePasses() entering INFO : tst_DataTable::fiveTablePasses(fiveTablePasses_data1) QVERIFY(test) - Loc: [tst_commandlinedata.cpp(65)] + Loc: [qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp(0)] PASS : tst_DataTable::fiveTablePasses(fiveTablePasses_data1) INFO : tst_DataTable::fiveTablePasses(fiveTablePasses_data2) QVERIFY(test) - Loc: [tst_commandlinedata.cpp(65)] + Loc: [qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp(0)] PASS : tst_DataTable::fiveTablePasses(fiveTablePasses_data2) INFO : tst_DataTable::fiveTablePasses(fiveTablePasses_data3) QVERIFY(test) - Loc: [tst_commandlinedata.cpp(65)] + Loc: [qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp(0)] PASS : tst_DataTable::fiveTablePasses(fiveTablePasses_data3) INFO : tst_DataTable::fiveTablePasses(fiveTablePasses_data4) QVERIFY(test) - Loc: [tst_commandlinedata.cpp(65)] + Loc: [qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp(0)] PASS : tst_DataTable::fiveTablePasses(fiveTablePasses_data4) INFO : tst_DataTable::fiveTablePasses(fiveTablePasses_data5) QVERIFY(test) - Loc: [tst_commandlinedata.cpp(65)] + Loc: [qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp(0)] PASS : tst_DataTable::fiveTablePasses(fiveTablePasses_data5) INFO : tst_DataTable::fiveTablePasses() entering INFO : tst_DataTable::fiveTablePasses(fiveTablePasses_data1) QVERIFY(test) - Loc: [tst_commandlinedata.cpp(65)] + Loc: [qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp(0)] PASS : tst_DataTable::fiveTablePasses(fiveTablePasses_data1) INFO : tst_DataTable::cleanupTestCase() entering PASS : tst_DataTable::cleanupTestCase() -Totals: 8 passed, 0 failed, 0 skipped, 0 blacklisted +Totals: 8 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_DataTable ********* diff --git a/tests/auto/testlib/selftests/expected_commandlinedata.xml b/tests/auto/testlib/selftests/expected_commandlinedata.xml index b2aa98f6a7..9597a3e8a0 100644 --- a/tests/auto/testlib/selftests/expected_commandlinedata.xml +++ b/tests/auto/testlib/selftests/expected_commandlinedata.xml @@ -7,59 +7,59 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="fiveTablePasses"> -<Message type="info" file="tst_commandlinedata.cpp" line="65"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp" line="0"> <DataTag><![CDATA[fiveTablePasses_data1]]></DataTag> <Description><![CDATA[QVERIFY(test)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[fiveTablePasses_data1]]></DataTag> </Incident> -<Message type="info" file="tst_commandlinedata.cpp" line="65"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp" line="0"> <DataTag><![CDATA[fiveTablePasses_data2]]></DataTag> <Description><![CDATA[QVERIFY(test)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[fiveTablePasses_data2]]></DataTag> </Incident> -<Message type="info" file="tst_commandlinedata.cpp" line="65"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp" line="0"> <DataTag><![CDATA[fiveTablePasses_data3]]></DataTag> <Description><![CDATA[QVERIFY(test)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[fiveTablePasses_data3]]></DataTag> </Incident> -<Message type="info" file="tst_commandlinedata.cpp" line="65"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp" line="0"> <DataTag><![CDATA[fiveTablePasses_data4]]></DataTag> <Description><![CDATA[QVERIFY(test)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[fiveTablePasses_data4]]></DataTag> </Incident> -<Message type="info" file="tst_commandlinedata.cpp" line="65"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp" line="0"> <DataTag><![CDATA[fiveTablePasses_data5]]></DataTag> <Description><![CDATA[QVERIFY(test)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[fiveTablePasses_data5]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="fiveTablePasses"> -<Message type="info" file="tst_commandlinedata.cpp" line="65"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp" line="0"> <DataTag><![CDATA[fiveTablePasses_data1]]></DataTag> <Description><![CDATA[QVERIFY(test)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[fiveTablePasses_data1]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_counting.lightxml b/tests/auto/testlib/selftests/expected_counting.lightxml index 836c35fb85..68730a3293 100644 --- a/tests/auto/testlib/selftests/expected_counting.lightxml +++ b/tests/auto/testlib/selftests/expected_counting.lightxml @@ -5,7 +5,7 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testPassPass"> <Incident type="pass" file="" line="0"> @@ -14,104 +14,104 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testPassSkip"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Message type="skip" file="tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testPassFail"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Incident type="fail" file="tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipPass"> -<Message type="skip" file="tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipSkip"> -<Message type="skip" file="tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Message type="skip" file="tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipFail"> -<Message type="skip" file="tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Incident type="fail" file="tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailPass"> -<Incident type="fail" file="tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailSkip"> -<Incident type="fail" file="tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Message type="skip" file="tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailFail"> -<Incident type="fail" file="tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailInInit"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Incident type="fail" file="tst_counting.cpp" line="234"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[fail]]></DataTag> <Description><![CDATA[Fail in init()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailInCleanup"> <Incident type="pass" file="" line="0"> @@ -121,27 +121,27 @@ <DataTag><![CDATA[fail]]></DataTag> <Description><![CDATA[This test function should execute and then QFAIL in cleanup()]]></Description> </Message> -<Incident type="fail" file="tst_counting.cpp" line="242"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[fail]]></DataTag> <Description><![CDATA[Fail in cleanup()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipInInit"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Message type="skip" file="tst_counting.cpp" line="236"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in init()]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipInCleanup"> <Incident type="pass" file="" line="0"> @@ -151,17 +151,17 @@ <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description> </Message> -<Message type="skip" file="tst_counting.cpp" line="244"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in cleanup()]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_counting.teamcity b/tests/auto/testlib/selftests/expected_counting.teamcity index 705d42a90f..5ceaf155d8 100644 --- a/tests/auto/testlib/selftests/expected_counting.teamcity +++ b/tests/auto/testlib/selftests/expected_counting.teamcity @@ -7,59 +7,59 @@ ##teamcity[testFinished name='testPassPass(row 2)' flowId='tst_Counting'] ##teamcity[testStarted name='testPassSkip(row 1)' flowId='tst_Counting'] ##teamcity[testFinished name='testPassSkip(row 1)' flowId='tst_Counting'] -##teamcity[testIgnored name='testPassSkip(row 2)' message='Skipping |[Loc: tst_counting.cpp(110)|]' flowId='tst_Counting'] +##teamcity[testIgnored name='testPassSkip(row 2)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] ##teamcity[testStarted name='testPassFail(row 1)' flowId='tst_Counting'] ##teamcity[testFinished name='testPassFail(row 1)' flowId='tst_Counting'] ##teamcity[testStarted name='testPassFail(row 2)' flowId='tst_Counting'] -##teamcity[testFailed name='testPassFail(row 2)' message='Failure! |[Loc: tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] +##teamcity[testFailed name='testPassFail(row 2)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] ##teamcity[testFinished name='testPassFail(row 2)' flowId='tst_Counting'] -##teamcity[testIgnored name='testSkipPass(row 1)' message='Skipping |[Loc: tst_counting.cpp(110)|]' flowId='tst_Counting'] +##teamcity[testIgnored name='testSkipPass(row 1)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] ##teamcity[testStarted name='testSkipPass(row 2)' flowId='tst_Counting'] ##teamcity[testFinished name='testSkipPass(row 2)' flowId='tst_Counting'] -##teamcity[testIgnored name='testSkipSkip(row 1)' message='Skipping |[Loc: tst_counting.cpp(110)|]' flowId='tst_Counting'] -##teamcity[testIgnored name='testSkipSkip(row 2)' message='Skipping |[Loc: tst_counting.cpp(110)|]' flowId='tst_Counting'] -##teamcity[testIgnored name='testSkipFail(row 1)' message='Skipping |[Loc: tst_counting.cpp(110)|]' flowId='tst_Counting'] +##teamcity[testIgnored name='testSkipSkip(row 1)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testIgnored name='testSkipSkip(row 2)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testIgnored name='testSkipFail(row 1)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] ##teamcity[testStarted name='testSkipFail(row 2)' flowId='tst_Counting'] -##teamcity[testFailed name='testSkipFail(row 2)' message='Failure! |[Loc: tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] +##teamcity[testFailed name='testSkipFail(row 2)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] ##teamcity[testFinished name='testSkipFail(row 2)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailPass(row 1)' flowId='tst_Counting'] -##teamcity[testFailed name='testFailPass(row 1)' message='Failure! |[Loc: tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] +##teamcity[testFailed name='testFailPass(row 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] ##teamcity[testFinished name='testFailPass(row 1)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailPass(row 2)' flowId='tst_Counting'] ##teamcity[testFinished name='testFailPass(row 2)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailSkip(row 1)' flowId='tst_Counting'] -##teamcity[testFailed name='testFailSkip(row 1)' message='Failure! |[Loc: tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] +##teamcity[testFailed name='testFailSkip(row 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] ##teamcity[testFinished name='testFailSkip(row 1)' flowId='tst_Counting'] -##teamcity[testIgnored name='testFailSkip(row 2)' message='Skipping |[Loc: tst_counting.cpp(110)|]' flowId='tst_Counting'] +##teamcity[testIgnored name='testFailSkip(row 2)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] ##teamcity[testStarted name='testFailFail(row 1)' flowId='tst_Counting'] -##teamcity[testFailed name='testFailFail(row 1)' message='Failure! |[Loc: tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] +##teamcity[testFailed name='testFailFail(row 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] ##teamcity[testFinished name='testFailFail(row 1)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailFail(row 2)' flowId='tst_Counting'] -##teamcity[testFailed name='testFailFail(row 2)' message='Failure! |[Loc: tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] +##teamcity[testFailed name='testFailFail(row 2)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] ##teamcity[testFinished name='testFailFail(row 2)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailInInit(before)' flowId='tst_Counting'] ##teamcity[testFinished name='testFailInInit(before)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailInInit(fail)' flowId='tst_Counting'] -##teamcity[testFailed name='testFailInInit(fail)' message='Failure! |[Loc: tst_counting.cpp(226)|]' details='Fail in init()' flowId='tst_Counting'] +##teamcity[testFailed name='testFailInInit(fail)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='Fail in init()' flowId='tst_Counting'] ##teamcity[testFinished name='testFailInInit(fail)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailInInit(after)' flowId='tst_Counting'] ##teamcity[testFinished name='testFailInInit(after)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailInCleanup(before)' flowId='tst_Counting'] ##teamcity[testFinished name='testFailInCleanup(before)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailInCleanup(fail)' flowId='tst_Counting'] -##teamcity[testFailed name='testFailInCleanup(fail)' message='Failure! |[Loc: tst_counting.cpp(234)|]' details='Fail in cleanup()' flowId='tst_Counting'] +##teamcity[testFailed name='testFailInCleanup(fail)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='Fail in cleanup()' flowId='tst_Counting'] ##teamcity[testStdOut name='testFailInCleanup(fail)' out='QDEBUG: This test function should execute and then QFAIL in cleanup()' flowId='tst_Counting'] ##teamcity[testFinished name='testFailInCleanup(fail)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailInCleanup(after)' flowId='tst_Counting'] ##teamcity[testFinished name='testFailInCleanup(after)' flowId='tst_Counting'] ##teamcity[testStarted name='testSkipInInit(before)' flowId='tst_Counting'] ##teamcity[testFinished name='testSkipInInit(before)' flowId='tst_Counting'] -##teamcity[testIgnored name='testSkipInInit(skip)' message='Skip in init() |[Loc: tst_counting.cpp(228)|]' flowId='tst_Counting'] +##teamcity[testIgnored name='testSkipInInit(skip)' message='Skip in init() |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] ##teamcity[testStarted name='testSkipInInit(after)' flowId='tst_Counting'] ##teamcity[testFinished name='testSkipInInit(after)' flowId='tst_Counting'] ##teamcity[testStarted name='testSkipInCleanup(before)' flowId='tst_Counting'] ##teamcity[testFinished name='testSkipInCleanup(before)' flowId='tst_Counting'] -##teamcity[testIgnored name='testSkipInCleanup(skip)' message='Skip in cleanup() |[Loc: tst_counting.cpp(236)|]' flowId='tst_Counting'] +##teamcity[testIgnored name='testSkipInCleanup(skip)' message='Skip in cleanup() |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] ##teamcity[testStarted name='testSkipInCleanup(after)' flowId='tst_Counting'] ##teamcity[testStdOut name='testSkipInCleanup(after)' out='QDEBUG: This test function should execute and then QSKIP in cleanup()' flowId='tst_Counting'] ##teamcity[testFinished name='testSkipInCleanup(after)' flowId='tst_Counting'] diff --git a/tests/auto/testlib/selftests/expected_counting.txt b/tests/auto/testlib/selftests/expected_counting.txt index 32368760d6..027e5b2c6e 100644 --- a/tests/auto/testlib/selftests/expected_counting.txt +++ b/tests/auto/testlib/selftests/expected_counting.txt @@ -1,54 +1,54 @@ ********* Start testing of tst_Counting ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_Counting::initTestCase() PASS : tst_Counting::testPassPass(row 1) PASS : tst_Counting::testPassPass(row 2) PASS : tst_Counting::testPassSkip(row 1) SKIP : tst_Counting::testPassSkip(row 2) Skipping - Loc: [tst_counting.cpp(118)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] PASS : tst_Counting::testPassFail(row 1) FAIL! : tst_Counting::testPassFail(row 2) 'false' returned FALSE. () - Loc: [tst_counting.cpp(115)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] SKIP : tst_Counting::testSkipPass(row 1) Skipping - Loc: [tst_counting.cpp(118)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] PASS : tst_Counting::testSkipPass(row 2) SKIP : tst_Counting::testSkipSkip(row 1) Skipping - Loc: [tst_counting.cpp(118)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] SKIP : tst_Counting::testSkipSkip(row 2) Skipping - Loc: [tst_counting.cpp(118)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] SKIP : tst_Counting::testSkipFail(row 1) Skipping - Loc: [tst_counting.cpp(118)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] FAIL! : tst_Counting::testSkipFail(row 2) 'false' returned FALSE. () - Loc: [tst_counting.cpp(115)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] FAIL! : tst_Counting::testFailPass(row 1) 'false' returned FALSE. () - Loc: [tst_counting.cpp(115)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] PASS : tst_Counting::testFailPass(row 2) FAIL! : tst_Counting::testFailSkip(row 1) 'false' returned FALSE. () - Loc: [tst_counting.cpp(115)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] SKIP : tst_Counting::testFailSkip(row 2) Skipping - Loc: [tst_counting.cpp(118)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] FAIL! : tst_Counting::testFailFail(row 1) 'false' returned FALSE. () - Loc: [tst_counting.cpp(115)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] FAIL! : tst_Counting::testFailFail(row 2) 'false' returned FALSE. () - Loc: [tst_counting.cpp(115)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] PASS : tst_Counting::testFailInInit(before) FAIL! : tst_Counting::testFailInInit(fail) Fail in init() - Loc: [tst_counting.cpp(234)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] PASS : tst_Counting::testFailInInit(after) PASS : tst_Counting::testFailInCleanup(before) QDEBUG : tst_Counting::testFailInCleanup(fail) This test function should execute and then QFAIL in cleanup() FAIL! : tst_Counting::testFailInCleanup(fail) Fail in cleanup() - Loc: [tst_counting.cpp(242)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] PASS : tst_Counting::testFailInCleanup(after) PASS : tst_Counting::testSkipInInit(before) SKIP : tst_Counting::testSkipInInit(skip) Skip in init() - Loc: [tst_counting.cpp(236)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] PASS : tst_Counting::testSkipInInit(after) PASS : tst_Counting::testSkipInCleanup(before) QDEBUG : tst_Counting::testSkipInCleanup(skip) This test function should execute and then QSKIP in cleanup() SKIP : tst_Counting::testSkipInCleanup(skip) Skip in cleanup() - Loc: [tst_counting.cpp(244)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] PASS : tst_Counting::testSkipInCleanup(after) PASS : tst_Counting::cleanupTestCase() -Totals: 16 passed, 8 failed, 8 skipped, 0 blacklisted +Totals: 16 passed, 8 failed, 8 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_Counting ********* diff --git a/tests/auto/testlib/selftests/expected_counting.xml b/tests/auto/testlib/selftests/expected_counting.xml index 892fd762c6..841a49c30d 100644 --- a/tests/auto/testlib/selftests/expected_counting.xml +++ b/tests/auto/testlib/selftests/expected_counting.xml @@ -7,7 +7,7 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testPassPass"> <Incident type="pass" file="" line="0"> @@ -16,104 +16,104 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testPassSkip"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Message type="skip" file="tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testPassFail"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Incident type="fail" file="tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipPass"> -<Message type="skip" file="tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipSkip"> -<Message type="skip" file="tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Message type="skip" file="tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipFail"> -<Message type="skip" file="tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Incident type="fail" file="tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailPass"> -<Incident type="fail" file="tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailSkip"> -<Incident type="fail" file="tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Message type="skip" file="tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailFail"> -<Incident type="fail" file="tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailInInit"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Incident type="fail" file="tst_counting.cpp" line="234"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[fail]]></DataTag> <Description><![CDATA[Fail in init()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailInCleanup"> <Incident type="pass" file="" line="0"> @@ -123,27 +123,27 @@ <DataTag><![CDATA[fail]]></DataTag> <Description><![CDATA[This test function should execute and then QFAIL in cleanup()]]></Description> </Message> -<Incident type="fail" file="tst_counting.cpp" line="242"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[fail]]></DataTag> <Description><![CDATA[Fail in cleanup()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipInInit"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Message type="skip" file="tst_counting.cpp" line="236"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in init()]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipInCleanup"> <Incident type="pass" file="" line="0"> @@ -153,18 +153,18 @@ <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description> </Message> -<Message type="skip" file="tst_counting.cpp" line="244"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in cleanup()]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_datatable.lightxml b/tests/auto/testlib/selftests/expected_datatable.lightxml index c14a6a1940..b4378ea887 100644 --- a/tests/auto/testlib/selftests/expected_datatable.lightxml +++ b/tests/auto/testlib/selftests/expected_datatable.lightxml @@ -5,15 +5,15 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="singleTestFunction1"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="singleTestFunction2"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="fiveTablePasses"> <Incident type="pass" file="" line="0"> @@ -31,33 +31,33 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[fiveTablePasses_data 5]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="fiveTableFailures"> -<Incident type="fail" file="tst_datatable.cpp" line="91"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="0"> <DataTag><![CDATA[fiveTableFailures_data 1]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="tst_datatable.cpp" line="91"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="0"> <DataTag><![CDATA[fiveTableFailures_data 2]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="tst_datatable.cpp" line="91"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="0"> <DataTag><![CDATA[fiveTableFailures_data 3]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="tst_datatable.cpp" line="91"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="0"> <DataTag><![CDATA[fiveTableFailures_data 4]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="tst_datatable.cpp" line="91"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="0"> <DataTag><![CDATA[fiveTableFailures_data 5]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="startsWithFailure"> -<Incident type="fail" file="tst_datatable.cpp" line="91"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="0"> <DataTag><![CDATA[startsWithFailure_data 1]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> @@ -73,7 +73,7 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[startsWithFailure_data 5]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="endsWithFailure"> <Incident type="pass" file="" line="0"> @@ -88,11 +88,11 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[endsWithFailure 4]]></DataTag> </Incident> -<Incident type="fail" file="tst_datatable.cpp" line="91"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="0"> <DataTag><![CDATA[endsWithFailure 5]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="failureInMiddle"> <Incident type="pass" file="" line="0"> @@ -101,7 +101,7 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[failureInMiddle_data 2]]></DataTag> </Incident> -<Incident type="fail" file="tst_datatable.cpp" line="91"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="0"> <DataTag><![CDATA[failureInMiddle_data 3]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> @@ -111,33 +111,33 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[failureInMiddle_data 5]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="fiveIsolatedFailures"> -<Incident type="fail" file="tst_datatable.cpp" line="173"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="0"> <DataTag><![CDATA[fiveIsolatedFailures_data 1]]></DataTag> <Description><![CDATA['!test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="tst_datatable.cpp" line="173"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="0"> <DataTag><![CDATA[fiveIsolatedFailures_data 2]]></DataTag> <Description><![CDATA['!test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="tst_datatable.cpp" line="173"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="0"> <DataTag><![CDATA[fiveIsolatedFailures_data 3]]></DataTag> <Description><![CDATA['!test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="tst_datatable.cpp" line="173"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="0"> <DataTag><![CDATA[fiveIsolatedFailures_data 4]]></DataTag> <Description><![CDATA['!test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="tst_datatable.cpp" line="173"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="0"> <DataTag><![CDATA[fiveIsolatedFailures_data 5]]></DataTag> <Description><![CDATA['!test' returned FALSE. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_datatable.teamcity b/tests/auto/testlib/selftests/expected_datatable.teamcity index 9df9dd2a36..0b52e153e2 100644 --- a/tests/auto/testlib/selftests/expected_datatable.teamcity +++ b/tests/auto/testlib/selftests/expected_datatable.teamcity @@ -16,22 +16,22 @@ ##teamcity[testStarted name='fiveTablePasses(fiveTablePasses_data 5)' flowId='tst_DataTable'] ##teamcity[testFinished name='fiveTablePasses(fiveTablePasses_data 5)' flowId='tst_DataTable'] ##teamcity[testStarted name='fiveTableFailures(fiveTableFailures_data 1)' flowId='tst_DataTable'] -##teamcity[testFailed name='fiveTableFailures(fiveTableFailures_data 1)' message='Failure! |[Loc: tst_datatable.cpp(83)|]' details='|'test|' returned FALSE. ()' flowId='tst_DataTable'] +##teamcity[testFailed name='fiveTableFailures(fiveTableFailures_data 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(0)|]' details='|'test|' returned FALSE. ()' flowId='tst_DataTable'] ##teamcity[testFinished name='fiveTableFailures(fiveTableFailures_data 1)' flowId='tst_DataTable'] ##teamcity[testStarted name='fiveTableFailures(fiveTableFailures_data 2)' flowId='tst_DataTable'] -##teamcity[testFailed name='fiveTableFailures(fiveTableFailures_data 2)' message='Failure! |[Loc: tst_datatable.cpp(83)|]' details='|'test|' returned FALSE. ()' flowId='tst_DataTable'] +##teamcity[testFailed name='fiveTableFailures(fiveTableFailures_data 2)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(0)|]' details='|'test|' returned FALSE. ()' flowId='tst_DataTable'] ##teamcity[testFinished name='fiveTableFailures(fiveTableFailures_data 2)' flowId='tst_DataTable'] ##teamcity[testStarted name='fiveTableFailures(fiveTableFailures_data 3)' flowId='tst_DataTable'] -##teamcity[testFailed name='fiveTableFailures(fiveTableFailures_data 3)' message='Failure! |[Loc: tst_datatable.cpp(83)|]' details='|'test|' returned FALSE. ()' flowId='tst_DataTable'] +##teamcity[testFailed name='fiveTableFailures(fiveTableFailures_data 3)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(0)|]' details='|'test|' returned FALSE. ()' flowId='tst_DataTable'] ##teamcity[testFinished name='fiveTableFailures(fiveTableFailures_data 3)' flowId='tst_DataTable'] ##teamcity[testStarted name='fiveTableFailures(fiveTableFailures_data 4)' flowId='tst_DataTable'] -##teamcity[testFailed name='fiveTableFailures(fiveTableFailures_data 4)' message='Failure! |[Loc: tst_datatable.cpp(83)|]' details='|'test|' returned FALSE. ()' flowId='tst_DataTable'] +##teamcity[testFailed name='fiveTableFailures(fiveTableFailures_data 4)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(0)|]' details='|'test|' returned FALSE. ()' flowId='tst_DataTable'] ##teamcity[testFinished name='fiveTableFailures(fiveTableFailures_data 4)' flowId='tst_DataTable'] ##teamcity[testStarted name='fiveTableFailures(fiveTableFailures_data 5)' flowId='tst_DataTable'] -##teamcity[testFailed name='fiveTableFailures(fiveTableFailures_data 5)' message='Failure! |[Loc: tst_datatable.cpp(83)|]' details='|'test|' returned FALSE. ()' flowId='tst_DataTable'] +##teamcity[testFailed name='fiveTableFailures(fiveTableFailures_data 5)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(0)|]' details='|'test|' returned FALSE. ()' flowId='tst_DataTable'] ##teamcity[testFinished name='fiveTableFailures(fiveTableFailures_data 5)' flowId='tst_DataTable'] ##teamcity[testStarted name='startsWithFailure(startsWithFailure_data 1)' flowId='tst_DataTable'] -##teamcity[testFailed name='startsWithFailure(startsWithFailure_data 1)' message='Failure! |[Loc: tst_datatable.cpp(83)|]' details='|'test|' returned FALSE. ()' flowId='tst_DataTable'] +##teamcity[testFailed name='startsWithFailure(startsWithFailure_data 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(0)|]' details='|'test|' returned FALSE. ()' flowId='tst_DataTable'] ##teamcity[testFinished name='startsWithFailure(startsWithFailure_data 1)' flowId='tst_DataTable'] ##teamcity[testStarted name='startsWithFailure(startsWithFailure_data 2)' flowId='tst_DataTable'] ##teamcity[testFinished name='startsWithFailure(startsWithFailure_data 2)' flowId='tst_DataTable'] @@ -50,33 +50,33 @@ ##teamcity[testStarted name='endsWithFailure(endsWithFailure 4)' flowId='tst_DataTable'] ##teamcity[testFinished name='endsWithFailure(endsWithFailure 4)' flowId='tst_DataTable'] ##teamcity[testStarted name='endsWithFailure(endsWithFailure 5)' flowId='tst_DataTable'] -##teamcity[testFailed name='endsWithFailure(endsWithFailure 5)' message='Failure! |[Loc: tst_datatable.cpp(83)|]' details='|'test|' returned FALSE. ()' flowId='tst_DataTable'] +##teamcity[testFailed name='endsWithFailure(endsWithFailure 5)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(0)|]' details='|'test|' returned FALSE. ()' flowId='tst_DataTable'] ##teamcity[testFinished name='endsWithFailure(endsWithFailure 5)' flowId='tst_DataTable'] ##teamcity[testStarted name='failureInMiddle(failureInMiddle_data 1)' flowId='tst_DataTable'] ##teamcity[testFinished name='failureInMiddle(failureInMiddle_data 1)' flowId='tst_DataTable'] ##teamcity[testStarted name='failureInMiddle(failureInMiddle_data 2)' flowId='tst_DataTable'] ##teamcity[testFinished name='failureInMiddle(failureInMiddle_data 2)' flowId='tst_DataTable'] ##teamcity[testStarted name='failureInMiddle(failureInMiddle_data 3)' flowId='tst_DataTable'] -##teamcity[testFailed name='failureInMiddle(failureInMiddle_data 3)' message='Failure! |[Loc: tst_datatable.cpp(83)|]' details='|'test|' returned FALSE. ()' flowId='tst_DataTable'] +##teamcity[testFailed name='failureInMiddle(failureInMiddle_data 3)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(0)|]' details='|'test|' returned FALSE. ()' flowId='tst_DataTable'] ##teamcity[testFinished name='failureInMiddle(failureInMiddle_data 3)' flowId='tst_DataTable'] ##teamcity[testStarted name='failureInMiddle(failureInMiddle_data 4)' flowId='tst_DataTable'] ##teamcity[testFinished name='failureInMiddle(failureInMiddle_data 4)' flowId='tst_DataTable'] ##teamcity[testStarted name='failureInMiddle(failureInMiddle_data 5)' flowId='tst_DataTable'] ##teamcity[testFinished name='failureInMiddle(failureInMiddle_data 5)' flowId='tst_DataTable'] ##teamcity[testStarted name='fiveIsolatedFailures(fiveIsolatedFailures_data 1)' flowId='tst_DataTable'] -##teamcity[testFailed name='fiveIsolatedFailures(fiveIsolatedFailures_data 1)' message='Failure! |[Loc: tst_datatable.cpp(165)|]' details='|'!test|' returned FALSE. ()' flowId='tst_DataTable'] +##teamcity[testFailed name='fiveIsolatedFailures(fiveIsolatedFailures_data 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(0)|]' details='|'!test|' returned FALSE. ()' flowId='tst_DataTable'] ##teamcity[testFinished name='fiveIsolatedFailures(fiveIsolatedFailures_data 1)' flowId='tst_DataTable'] ##teamcity[testStarted name='fiveIsolatedFailures(fiveIsolatedFailures_data 2)' flowId='tst_DataTable'] -##teamcity[testFailed name='fiveIsolatedFailures(fiveIsolatedFailures_data 2)' message='Failure! |[Loc: tst_datatable.cpp(165)|]' details='|'!test|' returned FALSE. ()' flowId='tst_DataTable'] +##teamcity[testFailed name='fiveIsolatedFailures(fiveIsolatedFailures_data 2)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(0)|]' details='|'!test|' returned FALSE. ()' flowId='tst_DataTable'] ##teamcity[testFinished name='fiveIsolatedFailures(fiveIsolatedFailures_data 2)' flowId='tst_DataTable'] ##teamcity[testStarted name='fiveIsolatedFailures(fiveIsolatedFailures_data 3)' flowId='tst_DataTable'] -##teamcity[testFailed name='fiveIsolatedFailures(fiveIsolatedFailures_data 3)' message='Failure! |[Loc: tst_datatable.cpp(165)|]' details='|'!test|' returned FALSE. ()' flowId='tst_DataTable'] +##teamcity[testFailed name='fiveIsolatedFailures(fiveIsolatedFailures_data 3)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(0)|]' details='|'!test|' returned FALSE. ()' flowId='tst_DataTable'] ##teamcity[testFinished name='fiveIsolatedFailures(fiveIsolatedFailures_data 3)' flowId='tst_DataTable'] ##teamcity[testStarted name='fiveIsolatedFailures(fiveIsolatedFailures_data 4)' flowId='tst_DataTable'] -##teamcity[testFailed name='fiveIsolatedFailures(fiveIsolatedFailures_data 4)' message='Failure! |[Loc: tst_datatable.cpp(165)|]' details='|'!test|' returned FALSE. ()' flowId='tst_DataTable'] +##teamcity[testFailed name='fiveIsolatedFailures(fiveIsolatedFailures_data 4)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(0)|]' details='|'!test|' returned FALSE. ()' flowId='tst_DataTable'] ##teamcity[testFinished name='fiveIsolatedFailures(fiveIsolatedFailures_data 4)' flowId='tst_DataTable'] ##teamcity[testStarted name='fiveIsolatedFailures(fiveIsolatedFailures_data 5)' flowId='tst_DataTable'] -##teamcity[testFailed name='fiveIsolatedFailures(fiveIsolatedFailures_data 5)' message='Failure! |[Loc: tst_datatable.cpp(165)|]' details='|'!test|' returned FALSE. ()' flowId='tst_DataTable'] +##teamcity[testFailed name='fiveIsolatedFailures(fiveIsolatedFailures_data 5)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(0)|]' details='|'!test|' returned FALSE. ()' flowId='tst_DataTable'] ##teamcity[testFinished name='fiveIsolatedFailures(fiveIsolatedFailures_data 5)' flowId='tst_DataTable'] ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_DataTable'] ##teamcity[testFinished name='cleanupTestCase()' flowId='tst_DataTable'] diff --git a/tests/auto/testlib/selftests/expected_datatable.txt b/tests/auto/testlib/selftests/expected_datatable.txt index b1ace3be01..8d24a55a55 100644 --- a/tests/auto/testlib/selftests/expected_datatable.txt +++ b/tests/auto/testlib/selftests/expected_datatable.txt @@ -1,5 +1,5 @@ ********* Start testing of tst_DataTable ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_DataTable::initTestCase() PASS : tst_DataTable::singleTestFunction1() PASS : tst_DataTable::singleTestFunction2() @@ -9,17 +9,17 @@ PASS : tst_DataTable::fiveTablePasses(fiveTablePasses_data 3) PASS : tst_DataTable::fiveTablePasses(fiveTablePasses_data 4) PASS : tst_DataTable::fiveTablePasses(fiveTablePasses_data 5) FAIL! : tst_DataTable::fiveTableFailures(fiveTableFailures_data 1) 'test' returned FALSE. () - Loc: [tst_datatable.cpp(91)] + Loc: [qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(0)] FAIL! : tst_DataTable::fiveTableFailures(fiveTableFailures_data 2) 'test' returned FALSE. () - Loc: [tst_datatable.cpp(91)] + Loc: [qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(0)] FAIL! : tst_DataTable::fiveTableFailures(fiveTableFailures_data 3) 'test' returned FALSE. () - Loc: [tst_datatable.cpp(91)] + Loc: [qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(0)] FAIL! : tst_DataTable::fiveTableFailures(fiveTableFailures_data 4) 'test' returned FALSE. () - Loc: [tst_datatable.cpp(91)] + Loc: [qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(0)] FAIL! : tst_DataTable::fiveTableFailures(fiveTableFailures_data 5) 'test' returned FALSE. () - Loc: [tst_datatable.cpp(91)] + Loc: [qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(0)] FAIL! : tst_DataTable::startsWithFailure(startsWithFailure_data 1) 'test' returned FALSE. () - Loc: [tst_datatable.cpp(91)] + Loc: [qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(0)] PASS : tst_DataTable::startsWithFailure(startsWithFailure_data 2) PASS : tst_DataTable::startsWithFailure(startsWithFailure_data 3) PASS : tst_DataTable::startsWithFailure(startsWithFailure_data 4) @@ -29,23 +29,23 @@ PASS : tst_DataTable::endsWithFailure(endsWithFailure 2) PASS : tst_DataTable::endsWithFailure(endsWithFailure 3) PASS : tst_DataTable::endsWithFailure(endsWithFailure 4) FAIL! : tst_DataTable::endsWithFailure(endsWithFailure 5) 'test' returned FALSE. () - Loc: [tst_datatable.cpp(91)] + Loc: [qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(0)] PASS : tst_DataTable::failureInMiddle(failureInMiddle_data 1) PASS : tst_DataTable::failureInMiddle(failureInMiddle_data 2) FAIL! : tst_DataTable::failureInMiddle(failureInMiddle_data 3) 'test' returned FALSE. () - Loc: [tst_datatable.cpp(91)] + Loc: [qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(0)] PASS : tst_DataTable::failureInMiddle(failureInMiddle_data 4) PASS : tst_DataTable::failureInMiddle(failureInMiddle_data 5) FAIL! : tst_DataTable::fiveIsolatedFailures(fiveIsolatedFailures_data 1) '!test' returned FALSE. () - Loc: [tst_datatable.cpp(173)] + Loc: [qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(0)] FAIL! : tst_DataTable::fiveIsolatedFailures(fiveIsolatedFailures_data 2) '!test' returned FALSE. () - Loc: [tst_datatable.cpp(173)] + Loc: [qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(0)] FAIL! : tst_DataTable::fiveIsolatedFailures(fiveIsolatedFailures_data 3) '!test' returned FALSE. () - Loc: [tst_datatable.cpp(173)] + Loc: [qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(0)] FAIL! : tst_DataTable::fiveIsolatedFailures(fiveIsolatedFailures_data 4) '!test' returned FALSE. () - Loc: [tst_datatable.cpp(173)] + Loc: [qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(0)] FAIL! : tst_DataTable::fiveIsolatedFailures(fiveIsolatedFailures_data 5) '!test' returned FALSE. () - Loc: [tst_datatable.cpp(173)] + Loc: [qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp(0)] PASS : tst_DataTable::cleanupTestCase() -Totals: 21 passed, 13 failed, 0 skipped, 0 blacklisted +Totals: 21 passed, 13 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_DataTable ********* diff --git a/tests/auto/testlib/selftests/expected_datatable.xml b/tests/auto/testlib/selftests/expected_datatable.xml index 297cb0d5de..6fefe4eed1 100644 --- a/tests/auto/testlib/selftests/expected_datatable.xml +++ b/tests/auto/testlib/selftests/expected_datatable.xml @@ -7,15 +7,15 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="singleTestFunction1"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="singleTestFunction2"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="fiveTablePasses"> <Incident type="pass" file="" line="0"> @@ -33,33 +33,33 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[fiveTablePasses_data 5]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="fiveTableFailures"> -<Incident type="fail" file="tst_datatable.cpp" line="91"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="0"> <DataTag><![CDATA[fiveTableFailures_data 1]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="tst_datatable.cpp" line="91"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="0"> <DataTag><![CDATA[fiveTableFailures_data 2]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="tst_datatable.cpp" line="91"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="0"> <DataTag><![CDATA[fiveTableFailures_data 3]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="tst_datatable.cpp" line="91"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="0"> <DataTag><![CDATA[fiveTableFailures_data 4]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="tst_datatable.cpp" line="91"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="0"> <DataTag><![CDATA[fiveTableFailures_data 5]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="startsWithFailure"> -<Incident type="fail" file="tst_datatable.cpp" line="91"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="0"> <DataTag><![CDATA[startsWithFailure_data 1]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> @@ -75,7 +75,7 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[startsWithFailure_data 5]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="endsWithFailure"> <Incident type="pass" file="" line="0"> @@ -90,11 +90,11 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[endsWithFailure 4]]></DataTag> </Incident> -<Incident type="fail" file="tst_datatable.cpp" line="91"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="0"> <DataTag><![CDATA[endsWithFailure 5]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="failureInMiddle"> <Incident type="pass" file="" line="0"> @@ -103,7 +103,7 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[failureInMiddle_data 2]]></DataTag> </Incident> -<Incident type="fail" file="tst_datatable.cpp" line="91"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="0"> <DataTag><![CDATA[failureInMiddle_data 3]]></DataTag> <Description><![CDATA['test' returned FALSE. ()]]></Description> </Incident> @@ -113,34 +113,34 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[failureInMiddle_data 5]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="fiveIsolatedFailures"> -<Incident type="fail" file="tst_datatable.cpp" line="173"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="0"> <DataTag><![CDATA[fiveIsolatedFailures_data 1]]></DataTag> <Description><![CDATA['!test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="tst_datatable.cpp" line="173"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="0"> <DataTag><![CDATA[fiveIsolatedFailures_data 2]]></DataTag> <Description><![CDATA['!test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="tst_datatable.cpp" line="173"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="0"> <DataTag><![CDATA[fiveIsolatedFailures_data 3]]></DataTag> <Description><![CDATA['!test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="tst_datatable.cpp" line="173"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="0"> <DataTag><![CDATA[fiveIsolatedFailures_data 4]]></DataTag> <Description><![CDATA['!test' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="tst_datatable.cpp" line="173"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datatable/tst_datatable.cpp" line="0"> <DataTag><![CDATA[fiveIsolatedFailures_data 5]]></DataTag> <Description><![CDATA['!test' returned FALSE. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_datetime.lightxml b/tests/auto/testlib/selftests/expected_datetime.lightxml index 1aeac37e42..c7c7758b8b 100644 --- a/tests/auto/testlib/selftests/expected_datetime.lightxml +++ b/tests/auto/testlib/selftests/expected_datetime.lightxml @@ -5,27 +5,27 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="dateTime"> -<Incident type="fail" file="tst_datetime.cpp" line="65"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp" line="0"> <Description><![CDATA[Compared values are not the same Actual (local): 2000/05/03 04:03:04.000[UTC+00:02] Expected (utc) : 2000/05/03 04:03:04.000[UTC]]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="qurl"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[empty urls]]></DataTag> </Incident> -<Incident type="fail" file="tst_datetime.cpp" line="73"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp" line="0"> <DataTag><![CDATA[empty rhs]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (operandA): http://example.com Expected (operandB): Invalid URL: ]]></Description> </Incident> -<Incident type="fail" file="tst_datetime.cpp" line="73"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp" line="0"> <DataTag><![CDATA[empty lhs]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (operandA): Invalid URL: @@ -34,10 +34,10 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[same urls]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_datetime.teamcity b/tests/auto/testlib/selftests/expected_datetime.teamcity index a2bc95cd2f..be5612eb0d 100644 --- a/tests/auto/testlib/selftests/expected_datetime.teamcity +++ b/tests/auto/testlib/selftests/expected_datetime.teamcity @@ -2,15 +2,15 @@ ##teamcity[testStarted name='initTestCase()' flowId='tst_DateTime'] ##teamcity[testFinished name='initTestCase()' flowId='tst_DateTime'] ##teamcity[testStarted name='dateTime()' flowId='tst_DateTime'] -##teamcity[testFailed name='dateTime()' message='Failure! |[Loc: tst_datetime.cpp(57)|]' details='Compared values are not the same|n Actual (local): 2000/05/03 04:03:04.000|[UTC+00:02|]|n Expected (utc) : 2000/05/03 04:03:04.000|[UTC|]' flowId='tst_DateTime'] +##teamcity[testFailed name='dateTime()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp(0)|]' details='Compared values are not the same|n Actual (local): 2000/05/03 04:03:04.000|[UTC+00:02|]|n Expected (utc) : 2000/05/03 04:03:04.000|[UTC|]' flowId='tst_DateTime'] ##teamcity[testFinished name='dateTime()' flowId='tst_DateTime'] ##teamcity[testStarted name='qurl(empty urls)' flowId='tst_DateTime'] ##teamcity[testFinished name='qurl(empty urls)' flowId='tst_DateTime'] ##teamcity[testStarted name='qurl(empty rhs)' flowId='tst_DateTime'] -##teamcity[testFailed name='qurl(empty rhs)' message='Failure! |[Loc: tst_datetime.cpp(65)|]' details='Compared values are not the same|n Actual (operandA): http://example.com|n Expected (operandB): Invalid URL:' flowId='tst_DateTime'] +##teamcity[testFailed name='qurl(empty rhs)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp(0)|]' details='Compared values are not the same|n Actual (operandA): http://example.com|n Expected (operandB): Invalid URL:' flowId='tst_DateTime'] ##teamcity[testFinished name='qurl(empty rhs)' flowId='tst_DateTime'] ##teamcity[testStarted name='qurl(empty lhs)' flowId='tst_DateTime'] -##teamcity[testFailed name='qurl(empty lhs)' message='Failure! |[Loc: tst_datetime.cpp(65)|]' details='Compared values are not the same|n Actual (operandA): Invalid URL: |n Expected (operandB): http://example.com' flowId='tst_DateTime'] +##teamcity[testFailed name='qurl(empty lhs)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp(0)|]' details='Compared values are not the same|n Actual (operandA): Invalid URL: |n Expected (operandB): http://example.com' flowId='tst_DateTime'] ##teamcity[testFinished name='qurl(empty lhs)' flowId='tst_DateTime'] ##teamcity[testStarted name='qurl(same urls)' flowId='tst_DateTime'] ##teamcity[testFinished name='qurl(same urls)' flowId='tst_DateTime'] diff --git a/tests/auto/testlib/selftests/expected_datetime.txt b/tests/auto/testlib/selftests/expected_datetime.txt index c29fa050a1..387e8e93a5 100644 --- a/tests/auto/testlib/selftests/expected_datetime.txt +++ b/tests/auto/testlib/selftests/expected_datetime.txt @@ -1,20 +1,20 @@ ********* Start testing of tst_DateTime ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_DateTime::initTestCase() FAIL! : tst_DateTime::dateTime() Compared values are not the same Actual (local): 2000/05/03 04:03:04.000[UTC+00:02] Expected (utc) : 2000/05/03 04:03:04.000[UTC] - Loc: [tst_datetime.cpp(65)] + Loc: [qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp(0)] PASS : tst_DateTime::qurl(empty urls) FAIL! : tst_DateTime::qurl(empty rhs) Compared values are not the same Actual (operandA): http://example.com Expected (operandB): Invalid URL: - Loc: [tst_datetime.cpp(73)] + Loc: [qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp(0)] FAIL! : tst_DateTime::qurl(empty lhs) Compared values are not the same Actual (operandA): Invalid URL: Expected (operandB): http://example.com - Loc: [tst_datetime.cpp(73)] + Loc: [qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp(0)] PASS : tst_DateTime::qurl(same urls) PASS : tst_DateTime::cleanupTestCase() -Totals: 4 passed, 3 failed, 0 skipped, 0 blacklisted +Totals: 4 passed, 3 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_DateTime ********* diff --git a/tests/auto/testlib/selftests/expected_datetime.xml b/tests/auto/testlib/selftests/expected_datetime.xml index 4c5bb0525b..910388502a 100644 --- a/tests/auto/testlib/selftests/expected_datetime.xml +++ b/tests/auto/testlib/selftests/expected_datetime.xml @@ -7,27 +7,27 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="dateTime"> -<Incident type="fail" file="tst_datetime.cpp" line="65"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp" line="0"> <Description><![CDATA[Compared values are not the same Actual (local): 2000/05/03 04:03:04.000[UTC+00:02] Expected (utc) : 2000/05/03 04:03:04.000[UTC]]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="qurl"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[empty urls]]></DataTag> </Incident> -<Incident type="fail" file="tst_datetime.cpp" line="73"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp" line="0"> <DataTag><![CDATA[empty rhs]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (operandA): http://example.com Expected (operandB): Invalid URL: ]]></Description> </Incident> -<Incident type="fail" file="tst_datetime.cpp" line="73"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/datetime/tst_datetime.cpp" line="0"> <DataTag><![CDATA[empty lhs]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (operandA): Invalid URL: @@ -36,11 +36,11 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[same urls]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_differentexec.lightxml b/tests/auto/testlib/selftests/expected_differentexec.lightxml new file mode 100644 index 0000000000..30ee50bc08 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_differentexec.lightxml @@ -0,0 +1,21 @@ +********* Start testing of tst_TestA ********* +Config: Using QtTest library +PASS : tst_TestA::initTestCase() +PASS : tst_TestA::slotName() +PASS : tst_TestA::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_TestA ********* +********* Start testing of tst_TestA ********* +Config: Using QtTest library +PASS : tst_TestA::initTestCase() +PASS : tst_TestA::slotName() +PASS : tst_TestA::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_TestA ********* +********* Start testing of tst_TestB ********* +Config: Using QtTest library +PASS : tst_TestB::initTestCase() +PASS : tst_TestB::slotName() +PASS : tst_TestB::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_TestB ********* diff --git a/tests/auto/testlib/selftests/expected_differentexec.teamcity b/tests/auto/testlib/selftests/expected_differentexec.teamcity new file mode 100644 index 0000000000..30ee50bc08 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_differentexec.teamcity @@ -0,0 +1,21 @@ +********* Start testing of tst_TestA ********* +Config: Using QtTest library +PASS : tst_TestA::initTestCase() +PASS : tst_TestA::slotName() +PASS : tst_TestA::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_TestA ********* +********* Start testing of tst_TestA ********* +Config: Using QtTest library +PASS : tst_TestA::initTestCase() +PASS : tst_TestA::slotName() +PASS : tst_TestA::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_TestA ********* +********* Start testing of tst_TestB ********* +Config: Using QtTest library +PASS : tst_TestB::initTestCase() +PASS : tst_TestB::slotName() +PASS : tst_TestB::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_TestB ********* diff --git a/tests/auto/testlib/selftests/expected_differentexec.txt b/tests/auto/testlib/selftests/expected_differentexec.txt index acaf556c9b..30ee50bc08 100644 --- a/tests/auto/testlib/selftests/expected_differentexec.txt +++ b/tests/auto/testlib/selftests/expected_differentexec.txt @@ -1,21 +1,21 @@ ********* Start testing of tst_TestA ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_TestA::initTestCase() PASS : tst_TestA::slotName() PASS : tst_TestA::cleanupTestCase() -Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_TestA ********* ********* Start testing of tst_TestA ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_TestA::initTestCase() PASS : tst_TestA::slotName() PASS : tst_TestA::cleanupTestCase() -Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_TestA ********* ********* Start testing of tst_TestB ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_TestB::initTestCase() PASS : tst_TestB::slotName() PASS : tst_TestB::cleanupTestCase() -Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_TestB ********* diff --git a/tests/auto/testlib/selftests/expected_differentexec.xml b/tests/auto/testlib/selftests/expected_differentexec.xml new file mode 100644 index 0000000000..30ee50bc08 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_differentexec.xml @@ -0,0 +1,21 @@ +********* Start testing of tst_TestA ********* +Config: Using QtTest library +PASS : tst_TestA::initTestCase() +PASS : tst_TestA::slotName() +PASS : tst_TestA::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_TestA ********* +********* Start testing of tst_TestA ********* +Config: Using QtTest library +PASS : tst_TestA::initTestCase() +PASS : tst_TestA::slotName() +PASS : tst_TestA::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_TestA ********* +********* Start testing of tst_TestB ********* +Config: Using QtTest library +PASS : tst_TestB::initTestCase() +PASS : tst_TestB::slotName() +PASS : tst_TestB::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_TestB ********* diff --git a/tests/auto/testlib/selftests/expected_differentexec.xunitxml b/tests/auto/testlib/selftests/expected_differentexec.xunitxml new file mode 100644 index 0000000000..30ee50bc08 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_differentexec.xunitxml @@ -0,0 +1,21 @@ +********* Start testing of tst_TestA ********* +Config: Using QtTest library +PASS : tst_TestA::initTestCase() +PASS : tst_TestA::slotName() +PASS : tst_TestA::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_TestA ********* +********* Start testing of tst_TestA ********* +Config: Using QtTest library +PASS : tst_TestA::initTestCase() +PASS : tst_TestA::slotName() +PASS : tst_TestA::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_TestA ********* +********* Start testing of tst_TestB ********* +Config: Using QtTest library +PASS : tst_TestB::initTestCase() +PASS : tst_TestB::slotName() +PASS : tst_TestB::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_TestB ********* diff --git a/tests/auto/testlib/selftests/expected_exceptionthrow.lightxml b/tests/auto/testlib/selftests/expected_exceptionthrow.lightxml index 2b802aabaf..aadc1a3cb8 100644 --- a/tests/auto/testlib/selftests/expected_exceptionthrow.lightxml +++ b/tests/auto/testlib/selftests/expected_exceptionthrow.lightxml @@ -5,12 +5,12 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="throwException"> -<Incident type="fail" file="qtestcase.cpp" line="2235"> +<Incident type="fail" file="qtbase/src/testlib/qtestcase.cpp" line="0"> <Description><![CDATA[Caught unhandled exception]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_exceptionthrow.teamcity b/tests/auto/testlib/selftests/expected_exceptionthrow.teamcity index 3bc7271b65..120dc006b9 100644 --- a/tests/auto/testlib/selftests/expected_exceptionthrow.teamcity +++ b/tests/auto/testlib/selftests/expected_exceptionthrow.teamcity @@ -2,6 +2,6 @@ ##teamcity[testStarted name='initTestCase()' flowId='tst_Exception'] ##teamcity[testFinished name='initTestCase()' flowId='tst_Exception'] ##teamcity[testStarted name='throwException()' flowId='tst_Exception'] -##teamcity[testFailed name='throwException()' message='Failure! |[Loc: qtestcase.cpp(1707)|]' details='Caught unhandled exception' flowId='tst_Exception'] +##teamcity[testFailed name='throwException()' message='Failure! |[Loc: qtbase/src/testlib/qtestcase.cpp(0)|]' details='Caught unhandled exception' flowId='tst_Exception'] ##teamcity[testFinished name='throwException()' flowId='tst_Exception'] ##teamcity[testSuiteFinished name='tst_Exception' flowId='tst_Exception'] diff --git a/tests/auto/testlib/selftests/expected_exceptionthrow.txt b/tests/auto/testlib/selftests/expected_exceptionthrow.txt index bb9c101709..8911a60fc2 100644 --- a/tests/auto/testlib/selftests/expected_exceptionthrow.txt +++ b/tests/auto/testlib/selftests/expected_exceptionthrow.txt @@ -1,7 +1,7 @@ ********* Start testing of tst_Exception ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_Exception::initTestCase() FAIL! : tst_Exception::throwException() Caught unhandled exception - Loc: [/home/frederik/dev/qt/qt-src-dev/qtbase/src/testlib/qtestcase.cpp(2229)] -Totals: 1 passed, 1 failed, 0 skipped, 0 blacklisted + Loc: [qtbase/src/testlib/qtestcase.cpp(0)] +Totals: 1 passed, 1 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_Exception ********* diff --git a/tests/auto/testlib/selftests/expected_exceptionthrow.xml b/tests/auto/testlib/selftests/expected_exceptionthrow.xml index a265d5ba5f..8adc1bf87d 100644 --- a/tests/auto/testlib/selftests/expected_exceptionthrow.xml +++ b/tests/auto/testlib/selftests/expected_exceptionthrow.xml @@ -7,13 +7,13 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="throwException"> -<Incident type="fail" file="qtestcase.cpp" line="2235"> +<Incident type="fail" file="qtbase/src/testlib/qtestcase.cpp" line="0"> <Description><![CDATA[Caught unhandled exception]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_expectfail.lightxml b/tests/auto/testlib/selftests/expected_expectfail.lightxml index cd5ab78fbe..7c91656b89 100644 --- a/tests/auto/testlib/selftests/expected_expectfail.lightxml +++ b/tests/auto/testlib/selftests/expected_expectfail.lightxml @@ -5,46 +5,46 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailAndContinue"> <Message type="qdebug" file="" line="0"> <Description><![CDATA[begin]]></Description> </Message> -<Incident type="xfail" file="tst_expectfail.cpp" line="78"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <Description><![CDATA[This should xfail]]></Description> </Incident> <Message type="qdebug" file="" line="0"> <Description><![CDATA[after]]></Description> </Message> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailAndAbort"> <Message type="qdebug" file="" line="0"> <Description><![CDATA[begin]]></Description> </Message> -<Incident type="xfail" file="tst_expectfail.cpp" line="86"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <Description><![CDATA[This should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailTwice"> -<Incident type="fail" file="tst_expectfail.cpp" line="96"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <Description><![CDATA[Already expecting a fail]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailWithQString"> -<Incident type="xfail" file="tst_expectfail.cpp" line="105"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <Description><![CDATA[A string]]></Description> </Incident> -<Incident type="xfail" file="tst_expectfail.cpp" line="110"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <Description><![CDATA[Bug 5 (The message)]]></Description> </Incident> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailDataDrivenWithQVerify"> <Incident type="pass" file="" line="0"> @@ -53,21 +53,21 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Pass 2]]></DataTag> </Incident> -<Incident type="xfail" file="tst_expectfail.cpp" line="139"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[Abort]]></DataTag> <Description><![CDATA[This test should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Abort]]></DataTag> </Incident> -<Incident type="xfail" file="tst_expectfail.cpp" line="139"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[Continue]]></DataTag> <Description><![CDATA[This test should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Continue]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailDataDrivenWithQCompare"> <Incident type="pass" file="" line="0"> @@ -76,44 +76,44 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Pass 2]]></DataTag> </Incident> -<Incident type="xfail" file="tst_expectfail.cpp" line="173"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[Abort]]></DataTag> <Description><![CDATA[This test should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Abort]]></DataTag> </Incident> -<Incident type="xfail" file="tst_expectfail.cpp" line="173"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[Continue]]></DataTag> <Description><![CDATA[This test should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Continue]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailOnWrongRow"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[right row]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailOnAnyRow"> -<Incident type="xfail" file="tst_expectfail.cpp" line="208"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[first row]]></DataTag> <Description><![CDATA[This test should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[first row]]></DataTag> </Incident> -<Incident type="xfail" file="tst_expectfail.cpp" line="208"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[second row]]></DataTag> <Description><![CDATA[This test should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[second row]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailWithoutVerify"> <Incident type="fail" file="" line="0"> @@ -124,36 +124,36 @@ <DataTag><![CDATA[second row]]></DataTag> <Description><![CDATA[QEXPECT_FAIL was called without any subsequent verification statements]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xpass"> -<Incident type="xpass" file="tst_expectfail.cpp" line="228"> +<Incident type="xpass" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <Description><![CDATA['true' returned TRUE unexpectedly. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xpassDataDrivenWithQVerify"> -<Incident type="xpass" file="tst_expectfail.cpp" line="250"> +<Incident type="xpass" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[XPass]]></DataTag> <Description><![CDATA['true' returned TRUE unexpectedly. ()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Pass]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xpassDataDrivenWithQCompare"> -<Incident type="xpass" file="tst_expectfail.cpp" line="271"> +<Incident type="xpass" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[XPass]]></DataTag> <Description><![CDATA[QCOMPARE(1, 1) returned TRUE unexpectedly.]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Pass]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_expectfail.teamcity b/tests/auto/testlib/selftests/expected_expectfail.teamcity index 29546c1cee..cac2c34491 100644 --- a/tests/auto/testlib/selftests/expected_expectfail.teamcity +++ b/tests/auto/testlib/selftests/expected_expectfail.teamcity @@ -2,44 +2,44 @@ ##teamcity[testStarted name='initTestCase()' flowId='tst_ExpectFail'] ##teamcity[testFinished name='initTestCase()' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailAndContinue()' flowId='tst_ExpectFail'] -##teamcity[testStdOut name='xfailAndContinue()' out='QDEBUG: begin|nXFAIL |[Loc: tst_expectfail.cpp(70)|]: This should xfail|nQDEBUG: after' flowId='tst_ExpectFail'] +##teamcity[testStdOut name='xfailAndContinue()' out='QDEBUG: begin|nXFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: This should xfail|nQDEBUG: after' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailAndContinue()' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailAndAbort()' flowId='tst_ExpectFail'] -##teamcity[testStdOut name='xfailAndAbort()' out='QDEBUG: begin|nXFAIL |[Loc: tst_expectfail.cpp(78)|]: This should xfail' flowId='tst_ExpectFail'] +##teamcity[testStdOut name='xfailAndAbort()' out='QDEBUG: begin|nXFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: This should xfail' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailAndAbort()' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailTwice()' flowId='tst_ExpectFail'] -##teamcity[testFailed name='xfailTwice()' message='Failure! |[Loc: tst_expectfail.cpp(88)|]' details='Already expecting a fail' flowId='tst_ExpectFail'] +##teamcity[testFailed name='xfailTwice()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]' details='Already expecting a fail' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailTwice()' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailWithQString()' flowId='tst_ExpectFail'] -##teamcity[testStdOut name='xfailWithQString()' out='XFAIL |[Loc: tst_expectfail.cpp(97)|]: A string|nXFAIL |[Loc: tst_expectfail.cpp(102)|]: Bug 5 (The message)' flowId='tst_ExpectFail'] +##teamcity[testStdOut name='xfailWithQString()' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: A string|nXFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: Bug 5 (The message)' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailWithQString()' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailDataDrivenWithQVerify(Pass 1)' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailDataDrivenWithQVerify(Pass 1)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailDataDrivenWithQVerify(Pass 2)' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailDataDrivenWithQVerify(Pass 2)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailDataDrivenWithQVerify(Abort)' flowId='tst_ExpectFail'] -##teamcity[testStdOut name='xfailDataDrivenWithQVerify(Abort)' out='XFAIL |[Loc: tst_expectfail.cpp(131)|]: This test should xfail' flowId='tst_ExpectFail'] +##teamcity[testStdOut name='xfailDataDrivenWithQVerify(Abort)' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: This test should xfail' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailDataDrivenWithQVerify(Abort)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailDataDrivenWithQVerify(Continue)' flowId='tst_ExpectFail'] -##teamcity[testStdOut name='xfailDataDrivenWithQVerify(Continue)' out='XFAIL |[Loc: tst_expectfail.cpp(131)|]: This test should xfail' flowId='tst_ExpectFail'] +##teamcity[testStdOut name='xfailDataDrivenWithQVerify(Continue)' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: This test should xfail' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailDataDrivenWithQVerify(Continue)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailDataDrivenWithQCompare(Pass 1)' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailDataDrivenWithQCompare(Pass 1)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailDataDrivenWithQCompare(Pass 2)' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailDataDrivenWithQCompare(Pass 2)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailDataDrivenWithQCompare(Abort)' flowId='tst_ExpectFail'] -##teamcity[testStdOut name='xfailDataDrivenWithQCompare(Abort)' out='XFAIL |[Loc: tst_expectfail.cpp(165)|]: This test should xfail' flowId='tst_ExpectFail'] +##teamcity[testStdOut name='xfailDataDrivenWithQCompare(Abort)' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: This test should xfail' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailDataDrivenWithQCompare(Abort)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailDataDrivenWithQCompare(Continue)' flowId='tst_ExpectFail'] -##teamcity[testStdOut name='xfailDataDrivenWithQCompare(Continue)' out='XFAIL |[Loc: tst_expectfail.cpp(165)|]: This test should xfail' flowId='tst_ExpectFail'] +##teamcity[testStdOut name='xfailDataDrivenWithQCompare(Continue)' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: This test should xfail' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailDataDrivenWithQCompare(Continue)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailOnWrongRow(right row)' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailOnWrongRow(right row)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailOnAnyRow(first row)' flowId='tst_ExpectFail'] -##teamcity[testStdOut name='xfailOnAnyRow(first row)' out='XFAIL |[Loc: tst_expectfail.cpp(200)|]: This test should xfail' flowId='tst_ExpectFail'] +##teamcity[testStdOut name='xfailOnAnyRow(first row)' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: This test should xfail' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailOnAnyRow(first row)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailOnAnyRow(second row)' flowId='tst_ExpectFail'] -##teamcity[testStdOut name='xfailOnAnyRow(second row)' out='XFAIL |[Loc: tst_expectfail.cpp(200)|]: This test should xfail' flowId='tst_ExpectFail'] +##teamcity[testStdOut name='xfailOnAnyRow(second row)' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]: This test should xfail' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailOnAnyRow(second row)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xfailWithoutVerify(first row)' flowId='tst_ExpectFail'] ##teamcity[testFailed name='xfailWithoutVerify(first row)' message='Failure!' details='QEXPECT_FAIL was called without any subsequent verification statements' flowId='tst_ExpectFail'] @@ -48,15 +48,15 @@ ##teamcity[testFailed name='xfailWithoutVerify(second row)' message='Failure!' details='QEXPECT_FAIL was called without any subsequent verification statements' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xfailWithoutVerify(second row)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xpass()' flowId='tst_ExpectFail'] -##teamcity[testFailed name='xpass()' message='Failure! |[Loc: tst_expectfail.cpp(220)|]' details='|'true|' returned TRUE unexpectedly. ()' flowId='tst_ExpectFail'] +##teamcity[testFailed name='xpass()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]' details='|'true|' returned TRUE unexpectedly. ()' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xpass()' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xpassDataDrivenWithQVerify(XPass)' flowId='tst_ExpectFail'] -##teamcity[testFailed name='xpassDataDrivenWithQVerify(XPass)' message='Failure! |[Loc: tst_expectfail.cpp(242)|]' details='|'true|' returned TRUE unexpectedly. ()' flowId='tst_ExpectFail'] +##teamcity[testFailed name='xpassDataDrivenWithQVerify(XPass)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]' details='|'true|' returned TRUE unexpectedly. ()' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xpassDataDrivenWithQVerify(XPass)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xpassDataDrivenWithQVerify(Pass)' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xpassDataDrivenWithQVerify(Pass)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xpassDataDrivenWithQCompare(XPass)' flowId='tst_ExpectFail'] -##teamcity[testFailed name='xpassDataDrivenWithQCompare(XPass)' message='Failure! |[Loc: tst_expectfail.cpp(263)|]' details='QCOMPARE(1, 1) returned TRUE unexpectedly.' flowId='tst_ExpectFail'] +##teamcity[testFailed name='xpassDataDrivenWithQCompare(XPass)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)|]' details='QCOMPARE(1, 1) returned TRUE unexpectedly.' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xpassDataDrivenWithQCompare(XPass)' flowId='tst_ExpectFail'] ##teamcity[testStarted name='xpassDataDrivenWithQCompare(Pass)' flowId='tst_ExpectFail'] ##teamcity[testFinished name='xpassDataDrivenWithQCompare(Pass)' flowId='tst_ExpectFail'] diff --git a/tests/auto/testlib/selftests/expected_expectfail.txt b/tests/auto/testlib/selftests/expected_expectfail.txt index a23b845f23..75d41e5733 100644 --- a/tests/auto/testlib/selftests/expected_expectfail.txt +++ b/tests/auto/testlib/selftests/expected_expectfail.txt @@ -1,55 +1,55 @@ ********* Start testing of tst_ExpectFail ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_ExpectFail::initTestCase() QDEBUG : tst_ExpectFail::xfailAndContinue() begin XFAIL : tst_ExpectFail::xfailAndContinue() This should xfail - Loc: [tst_expectfail.cpp(78)] + Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)] QDEBUG : tst_ExpectFail::xfailAndContinue() after PASS : tst_ExpectFail::xfailAndContinue() QDEBUG : tst_ExpectFail::xfailAndAbort() begin XFAIL : tst_ExpectFail::xfailAndAbort() This should xfail - Loc: [tst_expectfail.cpp(86)] + Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)] PASS : tst_ExpectFail::xfailAndAbort() FAIL! : tst_ExpectFail::xfailTwice() Already expecting a fail - Loc: [tst_expectfail.cpp(96)] + Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)] XFAIL : tst_ExpectFail::xfailWithQString() A string - Loc: [tst_expectfail.cpp(105)] + Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)] XFAIL : tst_ExpectFail::xfailWithQString() Bug 5 (The message) - Loc: [tst_expectfail.cpp(110)] + Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)] PASS : tst_ExpectFail::xfailWithQString() PASS : tst_ExpectFail::xfailDataDrivenWithQVerify(Pass 1) PASS : tst_ExpectFail::xfailDataDrivenWithQVerify(Pass 2) XFAIL : tst_ExpectFail::xfailDataDrivenWithQVerify(Abort) This test should xfail - Loc: [tst_expectfail.cpp(139)] + Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)] PASS : tst_ExpectFail::xfailDataDrivenWithQVerify(Abort) XFAIL : tst_ExpectFail::xfailDataDrivenWithQVerify(Continue) This test should xfail - Loc: [tst_expectfail.cpp(139)] + Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)] PASS : tst_ExpectFail::xfailDataDrivenWithQVerify(Continue) PASS : tst_ExpectFail::xfailDataDrivenWithQCompare(Pass 1) PASS : tst_ExpectFail::xfailDataDrivenWithQCompare(Pass 2) XFAIL : tst_ExpectFail::xfailDataDrivenWithQCompare(Abort) This test should xfail - Loc: [tst_expectfail.cpp(173)] + Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)] PASS : tst_ExpectFail::xfailDataDrivenWithQCompare(Abort) XFAIL : tst_ExpectFail::xfailDataDrivenWithQCompare(Continue) This test should xfail - Loc: [tst_expectfail.cpp(173)] + Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)] PASS : tst_ExpectFail::xfailDataDrivenWithQCompare(Continue) PASS : tst_ExpectFail::xfailOnWrongRow(right row) XFAIL : tst_ExpectFail::xfailOnAnyRow(first row) This test should xfail - Loc: [tst_expectfail.cpp(208)] + Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)] PASS : tst_ExpectFail::xfailOnAnyRow(first row) XFAIL : tst_ExpectFail::xfailOnAnyRow(second row) This test should xfail - Loc: [tst_expectfail.cpp(208)] + Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)] PASS : tst_ExpectFail::xfailOnAnyRow(second row) FAIL! : tst_ExpectFail::xfailWithoutVerify(first row) QEXPECT_FAIL was called without any subsequent verification statements FAIL! : tst_ExpectFail::xfailWithoutVerify(second row) QEXPECT_FAIL was called without any subsequent verification statements XPASS : tst_ExpectFail::xpass() 'true' returned TRUE unexpectedly. () - Loc: [tst_expectfail.cpp(228)] + Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)] XPASS : tst_ExpectFail::xpassDataDrivenWithQVerify(XPass) 'true' returned TRUE unexpectedly. () - Loc: [tst_expectfail.cpp(250)] + Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)] PASS : tst_ExpectFail::xpassDataDrivenWithQVerify(Pass) XPASS : tst_ExpectFail::xpassDataDrivenWithQCompare(XPass) QCOMPARE(1, 1) returned TRUE unexpectedly. - Loc: [tst_expectfail.cpp(271)] + Loc: [qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp(0)] PASS : tst_ExpectFail::xpassDataDrivenWithQCompare(Pass) PASS : tst_ExpectFail::cleanupTestCase() -Totals: 18 passed, 6 failed, 0 skipped, 0 blacklisted +Totals: 18 passed, 6 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_ExpectFail ********* diff --git a/tests/auto/testlib/selftests/expected_expectfail.xml b/tests/auto/testlib/selftests/expected_expectfail.xml index a98b97810c..ccfd942c92 100644 --- a/tests/auto/testlib/selftests/expected_expectfail.xml +++ b/tests/auto/testlib/selftests/expected_expectfail.xml @@ -7,46 +7,46 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailAndContinue"> <Message type="qdebug" file="" line="0"> <Description><![CDATA[begin]]></Description> </Message> -<Incident type="xfail" file="tst_expectfail.cpp" line="78"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <Description><![CDATA[This should xfail]]></Description> </Incident> <Message type="qdebug" file="" line="0"> <Description><![CDATA[after]]></Description> </Message> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailAndAbort"> <Message type="qdebug" file="" line="0"> <Description><![CDATA[begin]]></Description> </Message> -<Incident type="xfail" file="tst_expectfail.cpp" line="86"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <Description><![CDATA[This should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailTwice"> -<Incident type="fail" file="tst_expectfail.cpp" line="96"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <Description><![CDATA[Already expecting a fail]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailWithQString"> -<Incident type="xfail" file="tst_expectfail.cpp" line="105"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <Description><![CDATA[A string]]></Description> </Incident> -<Incident type="xfail" file="tst_expectfail.cpp" line="110"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <Description><![CDATA[Bug 5 (The message)]]></Description> </Incident> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailDataDrivenWithQVerify"> <Incident type="pass" file="" line="0"> @@ -55,21 +55,21 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Pass 2]]></DataTag> </Incident> -<Incident type="xfail" file="tst_expectfail.cpp" line="139"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[Abort]]></DataTag> <Description><![CDATA[This test should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Abort]]></DataTag> </Incident> -<Incident type="xfail" file="tst_expectfail.cpp" line="139"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[Continue]]></DataTag> <Description><![CDATA[This test should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Continue]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailDataDrivenWithQCompare"> <Incident type="pass" file="" line="0"> @@ -78,44 +78,44 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Pass 2]]></DataTag> </Incident> -<Incident type="xfail" file="tst_expectfail.cpp" line="173"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[Abort]]></DataTag> <Description><![CDATA[This test should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Abort]]></DataTag> </Incident> -<Incident type="xfail" file="tst_expectfail.cpp" line="173"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[Continue]]></DataTag> <Description><![CDATA[This test should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Continue]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailOnWrongRow"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[right row]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailOnAnyRow"> -<Incident type="xfail" file="tst_expectfail.cpp" line="208"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[first row]]></DataTag> <Description><![CDATA[This test should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[first row]]></DataTag> </Incident> -<Incident type="xfail" file="tst_expectfail.cpp" line="208"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[second row]]></DataTag> <Description><![CDATA[This test should xfail]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[second row]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xfailWithoutVerify"> <Incident type="fail" file="" line="0"> @@ -126,37 +126,37 @@ <DataTag><![CDATA[second row]]></DataTag> <Description><![CDATA[QEXPECT_FAIL was called without any subsequent verification statements]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xpass"> -<Incident type="xpass" file="tst_expectfail.cpp" line="228"> +<Incident type="xpass" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <Description><![CDATA['true' returned TRUE unexpectedly. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xpassDataDrivenWithQVerify"> -<Incident type="xpass" file="tst_expectfail.cpp" line="250"> +<Incident type="xpass" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[XPass]]></DataTag> <Description><![CDATA['true' returned TRUE unexpectedly. ()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Pass]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="xpassDataDrivenWithQCompare"> -<Incident type="xpass" file="tst_expectfail.cpp" line="271"> +<Incident type="xpass" file="qtbase/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp" line="0"> <DataTag><![CDATA[XPass]]></DataTag> <Description><![CDATA[QCOMPARE(1, 1) returned TRUE unexpectedly.]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[Pass]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_failcleanup.lightxml b/tests/auto/testlib/selftests/expected_failcleanup.lightxml index b2db64c4e2..c6484111d3 100644 --- a/tests/auto/testlib/selftests/expected_failcleanup.lightxml +++ b/tests/auto/testlib/selftests/expected_failcleanup.lightxml @@ -5,16 +5,16 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="aTestFunction"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> -<Incident type="fail" file="tst_failcleanup.cpp" line="59"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/failcleanup/tst_failcleanup.cpp" line="0"> <Description><![CDATA['false' returned FALSE. (Fail inside cleanupTestCase)]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_failcleanup.teamcity b/tests/auto/testlib/selftests/expected_failcleanup.teamcity index ecd15b7483..1f8d353581 100644 --- a/tests/auto/testlib/selftests/expected_failcleanup.teamcity +++ b/tests/auto/testlib/selftests/expected_failcleanup.teamcity @@ -4,6 +4,6 @@ ##teamcity[testStarted name='aTestFunction()' flowId='tst_FailCleanup'] ##teamcity[testFinished name='aTestFunction()' flowId='tst_FailCleanup'] ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_FailCleanup'] -##teamcity[testFailed name='cleanupTestCase()' message='Failure! |[Loc: tst_failcleanup.cpp(51)|]' details='|'false|' returned FALSE. (Fail inside cleanupTestCase)' flowId='tst_FailCleanup'] +##teamcity[testFailed name='cleanupTestCase()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/failcleanup/tst_failcleanup.cpp(0)|]' details='|'false|' returned FALSE. (Fail inside cleanupTestCase)' flowId='tst_FailCleanup'] ##teamcity[testFinished name='cleanupTestCase()' flowId='tst_FailCleanup'] ##teamcity[testSuiteFinished name='tst_FailCleanup' flowId='tst_FailCleanup'] diff --git a/tests/auto/testlib/selftests/expected_failcleanup.txt b/tests/auto/testlib/selftests/expected_failcleanup.txt index 4fb877429e..a5776e59bf 100644 --- a/tests/auto/testlib/selftests/expected_failcleanup.txt +++ b/tests/auto/testlib/selftests/expected_failcleanup.txt @@ -1,8 +1,8 @@ ********* Start testing of tst_FailCleanup ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_FailCleanup::initTestCase() PASS : tst_FailCleanup::aTestFunction() FAIL! : tst_FailCleanup::cleanupTestCase() 'false' returned FALSE. (Fail inside cleanupTestCase) - Loc: [tst_failcleanup.cpp(59)] -Totals: 2 passed, 1 failed, 0 skipped, 0 blacklisted + Loc: [qtbase/tests/auto/testlib/selftests/failcleanup/tst_failcleanup.cpp(0)] +Totals: 2 passed, 1 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_FailCleanup ********* diff --git a/tests/auto/testlib/selftests/expected_failcleanup.xml b/tests/auto/testlib/selftests/expected_failcleanup.xml index 476e56c4f4..bb0502983c 100644 --- a/tests/auto/testlib/selftests/expected_failcleanup.xml +++ b/tests/auto/testlib/selftests/expected_failcleanup.xml @@ -7,17 +7,17 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="aTestFunction"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> -<Incident type="fail" file="tst_failcleanup.cpp" line="59"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/failcleanup/tst_failcleanup.cpp" line="0"> <Description><![CDATA['false' returned FALSE. (Fail inside cleanupTestCase)]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_failinit.lightxml b/tests/auto/testlib/selftests/expected_failinit.lightxml index 5a940fc36b..663aa5c3dd 100644 --- a/tests/auto/testlib/selftests/expected_failinit.lightxml +++ b/tests/auto/testlib/selftests/expected_failinit.lightxml @@ -4,13 +4,13 @@ <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> </Environment> <TestFunction name="initTestCase"> -<Incident type="fail" file="tst_failinit.cpp" line="55"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/failinit/tst_failinit.cpp" line="0"> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_failinit.teamcity b/tests/auto/testlib/selftests/expected_failinit.teamcity index 49972c7aa2..78a4c8bc9f 100644 --- a/tests/auto/testlib/selftests/expected_failinit.teamcity +++ b/tests/auto/testlib/selftests/expected_failinit.teamcity @@ -1,6 +1,6 @@ ##teamcity[testSuiteStarted name='tst_FailInit' flowId='tst_FailInit'] ##teamcity[testStarted name='initTestCase()' flowId='tst_FailInit'] -##teamcity[testFailed name='initTestCase()' message='Failure! |[Loc: tst_failinit.cpp(47)|]' details='|'false|' returned FALSE. ()' flowId='tst_FailInit'] +##teamcity[testFailed name='initTestCase()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/failinit/tst_failinit.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_FailInit'] ##teamcity[testFinished name='initTestCase()' flowId='tst_FailInit'] ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_FailInit'] ##teamcity[testFinished name='cleanupTestCase()' flowId='tst_FailInit'] diff --git a/tests/auto/testlib/selftests/expected_failinit.txt b/tests/auto/testlib/selftests/expected_failinit.txt index 62d6ec1dd6..7608367d78 100644 --- a/tests/auto/testlib/selftests/expected_failinit.txt +++ b/tests/auto/testlib/selftests/expected_failinit.txt @@ -1,7 +1,7 @@ ********* Start testing of tst_FailInit ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library FAIL! : tst_FailInit::initTestCase() 'false' returned FALSE. () - Loc: [tst_failinit.cpp(55)] + Loc: [qtbase/tests/auto/testlib/selftests/failinit/tst_failinit.cpp(0)] PASS : tst_FailInit::cleanupTestCase() -Totals: 1 passed, 1 failed, 0 skipped, 0 blacklisted +Totals: 1 passed, 1 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_FailInit ********* diff --git a/tests/auto/testlib/selftests/expected_failinit.xml b/tests/auto/testlib/selftests/expected_failinit.xml index 51e1a7fce4..46c925091c 100644 --- a/tests/auto/testlib/selftests/expected_failinit.xml +++ b/tests/auto/testlib/selftests/expected_failinit.xml @@ -6,14 +6,14 @@ <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> </Environment> <TestFunction name="initTestCase"> -<Incident type="fail" file="tst_failinit.cpp" line="55"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/failinit/tst_failinit.cpp" line="0"> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_failinitdata.lightxml b/tests/auto/testlib/selftests/expected_failinitdata.lightxml index f9da42c060..60bf7b60bf 100644 --- a/tests/auto/testlib/selftests/expected_failinitdata.lightxml +++ b/tests/auto/testlib/selftests/expected_failinitdata.lightxml @@ -4,9 +4,9 @@ <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> </Environment> <TestFunction name="initTestCase"> -<Incident type="fail" file="tst_failinitdata.cpp" line="56"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/failinitdata/tst_failinitdata.cpp" line="0"> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_failinitdata.teamcity b/tests/auto/testlib/selftests/expected_failinitdata.teamcity index 7766d9dca2..5823b55dd1 100644 --- a/tests/auto/testlib/selftests/expected_failinitdata.teamcity +++ b/tests/auto/testlib/selftests/expected_failinitdata.teamcity @@ -1,5 +1,5 @@ ##teamcity[testSuiteStarted name='tst_FailInitData' flowId='tst_FailInitData'] ##teamcity[testStarted name='initTestCase()' flowId='tst_FailInitData'] -##teamcity[testFailed name='initTestCase()' message='Failure! |[Loc: tst_failinitdata.cpp(48)|]' details='|'false|' returned FALSE. ()' flowId='tst_FailInitData'] +##teamcity[testFailed name='initTestCase()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/failinitdata/tst_failinitdata.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_FailInitData'] ##teamcity[testFinished name='initTestCase()' flowId='tst_FailInitData'] ##teamcity[testSuiteFinished name='tst_FailInitData' flowId='tst_FailInitData'] diff --git a/tests/auto/testlib/selftests/expected_failinitdata.txt b/tests/auto/testlib/selftests/expected_failinitdata.txt index 431c70269e..3f985516da 100644 --- a/tests/auto/testlib/selftests/expected_failinitdata.txt +++ b/tests/auto/testlib/selftests/expected_failinitdata.txt @@ -1,6 +1,6 @@ ********* Start testing of tst_FailInitData ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library FAIL! : tst_FailInitData::initTestCase() 'false' returned FALSE. () - Loc: [tst_failinitdata.cpp(56)] -Totals: 0 passed, 1 failed, 0 skipped, 0 blacklisted + Loc: [qtbase/tests/auto/testlib/selftests/failinitdata/tst_failinitdata.cpp(0)] +Totals: 0 passed, 1 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_FailInitData ********* diff --git a/tests/auto/testlib/selftests/expected_failinitdata.xml b/tests/auto/testlib/selftests/expected_failinitdata.xml index e843863bfc..e135c59c8c 100644 --- a/tests/auto/testlib/selftests/expected_failinitdata.xml +++ b/tests/auto/testlib/selftests/expected_failinitdata.xml @@ -6,10 +6,10 @@ <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> </Environment> <TestFunction name="initTestCase"> -<Incident type="fail" file="tst_failinitdata.cpp" line="56"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/failinitdata/tst_failinitdata.cpp" line="0"> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_fetchbogus.lightxml b/tests/auto/testlib/selftests/expected_fetchbogus.lightxml index c62a93eb49..b586fa9c29 100644 --- a/tests/auto/testlib/selftests/expected_fetchbogus.lightxml +++ b/tests/auto/testlib/selftests/expected_fetchbogus.lightxml @@ -5,7 +5,7 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="fetchBogus"> <Message type="qfatal" file="" line="0"> @@ -16,6 +16,6 @@ <DataTag><![CDATA[foo]]></DataTag> <Description><![CDATA[Received a fatal error.]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_fetchbogus.teamcity b/tests/auto/testlib/selftests/expected_fetchbogus.teamcity index c2da66c2ee..6fa9c833fb 100644 --- a/tests/auto/testlib/selftests/expected_fetchbogus.teamcity +++ b/tests/auto/testlib/selftests/expected_fetchbogus.teamcity @@ -2,7 +2,7 @@ ##teamcity[testStarted name='initTestCase()' flowId='tst_FetchBogus'] ##teamcity[testFinished name='initTestCase()' flowId='tst_FetchBogus'] ##teamcity[testStarted name='fetchBogus(foo)' flowId='tst_FetchBogus'] -##teamcity[testFailed name='fetchBogus(foo)' message='Failure! |[Loc: Unknown file(57)|]' details='Received a fatal error.' flowId='tst_FetchBogus'] +##teamcity[testFailed name='fetchBogus(foo)' message='Failure! |[Loc: Unknown file(0)|]' details='Received a fatal error.' flowId='tst_FetchBogus'] ##teamcity[testStdOut name='fetchBogus(foo)' out='QFATAL: QFETCH: Requested testdata |'bubu|' not available, check your _data function.' flowId='tst_FetchBogus'] ##teamcity[testFinished name='fetchBogus(foo)' flowId='tst_FetchBogus'] ##teamcity[testSuiteFinished name='tst_FetchBogus' flowId='tst_FetchBogus'] diff --git a/tests/auto/testlib/selftests/expected_fetchbogus.txt b/tests/auto/testlib/selftests/expected_fetchbogus.txt index 598e281215..94c7cca223 100644 --- a/tests/auto/testlib/selftests/expected_fetchbogus.txt +++ b/tests/auto/testlib/selftests/expected_fetchbogus.txt @@ -1,8 +1,8 @@ ********* Start testing of tst_FetchBogus ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_FetchBogus::initTestCase() QFATAL : tst_FetchBogus::fetchBogus(foo) QFETCH: Requested testdata 'bubu' not available, check your _data function. FAIL! : tst_FetchBogus::fetchBogus(foo) Received a fatal error. Loc: [Unknown file(0)] -Totals: 1 passed, 1 failed, 0 skipped, 0 blacklisted +Totals: 1 passed, 1 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_FetchBogus ********* diff --git a/tests/auto/testlib/selftests/expected_fetchbogus.xml b/tests/auto/testlib/selftests/expected_fetchbogus.xml index c20de137a2..38ffa2fa7a 100644 --- a/tests/auto/testlib/selftests/expected_fetchbogus.xml +++ b/tests/auto/testlib/selftests/expected_fetchbogus.xml @@ -7,7 +7,7 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="fetchBogus"> <Message type="qfatal" file="" line="0"> @@ -18,7 +18,7 @@ <DataTag><![CDATA[foo]]></DataTag> <Description><![CDATA[Received a fatal error.]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_findtestdata.lightxml b/tests/auto/testlib/selftests/expected_findtestdata.lightxml index e3c3cea7bc..90acd946a5 100644 --- a/tests/auto/testlib/selftests/expected_findtestdata.lightxml +++ b/tests/auto/testlib/selftests/expected_findtestdata.lightxml @@ -5,17 +5,17 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="paths"> -<Message type="warn" file="findtestdata.cpp" line="154"> +<Message type="warn" file="qtbase/tests/auto/testlib/selftests/findtestdata/findtestdata.cpp" line="0"> <Description><![CDATA[testdata testfile could not be located!]]></Description> </Message> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_findtestdata.teamcity b/tests/auto/testlib/selftests/expected_findtestdata.teamcity index 8a8fa2e885..c653400c42 100644 --- a/tests/auto/testlib/selftests/expected_findtestdata.teamcity +++ b/tests/auto/testlib/selftests/expected_findtestdata.teamcity @@ -2,7 +2,7 @@ ##teamcity[testStarted name='initTestCase()' flowId='FindTestData'] ##teamcity[testFinished name='initTestCase()' flowId='FindTestData'] ##teamcity[testStarted name='paths()' flowId='FindTestData'] -##teamcity[testStdOut name='paths()' out='WARNING |[Loc: findtestdata.cpp(146)|]: testdata testfile could not be located!' flowId='FindTestData'] +##teamcity[testStdOut name='paths()' out='WARNING |[Loc: qtbase/tests/auto/testlib/selftests/findtestdata/findtestdata.cpp(0)|]: testdata testfile could not be located!' flowId='FindTestData'] ##teamcity[testFinished name='paths()' flowId='FindTestData'] ##teamcity[testStarted name='cleanupTestCase()' flowId='FindTestData'] ##teamcity[testFinished name='cleanupTestCase()' flowId='FindTestData'] diff --git a/tests/auto/testlib/selftests/expected_findtestdata.txt b/tests/auto/testlib/selftests/expected_findtestdata.txt index 6a900e73d6..81ebefb423 100644 --- a/tests/auto/testlib/selftests/expected_findtestdata.txt +++ b/tests/auto/testlib/selftests/expected_findtestdata.txt @@ -1,9 +1,9 @@ ********* Start testing of FindTestData ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : FindTestData::initTestCase() WARNING: FindTestData::paths() testdata testfile could not be located! - Loc: [findtestdata.cpp(154)] + Loc: [qtbase/tests/auto/testlib/selftests/findtestdata/findtestdata.cpp(0)] PASS : FindTestData::paths() PASS : FindTestData::cleanupTestCase() -Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of FindTestData ********* diff --git a/tests/auto/testlib/selftests/expected_findtestdata.xml b/tests/auto/testlib/selftests/expected_findtestdata.xml index 6abaa15103..152700acee 100644 --- a/tests/auto/testlib/selftests/expected_findtestdata.xml +++ b/tests/auto/testlib/selftests/expected_findtestdata.xml @@ -7,18 +7,18 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="paths"> -<Message type="warn" file="findtestdata.cpp" line="154"> +<Message type="warn" file="qtbase/tests/auto/testlib/selftests/findtestdata/findtestdata.cpp" line="0"> <Description><![CDATA[testdata testfile could not be located!]]></Description> </Message> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_float.lightxml b/tests/auto/testlib/selftests/expected_float.lightxml new file mode 100644 index 0000000000..0dbc5dd8c8 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_float.lightxml @@ -0,0 +1,62 @@ +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="floatComparisons"> +<Incident type="pass" file="" line="0"> + <DataTag><![CDATA[should SUCCEED 1]]></DataTag> +</Incident> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0"> + <DataTag><![CDATA[should FAIL 1]]></DataTag> + <Description><![CDATA[Compared floats are not the same (fuzzy compare) + Actual (operandLeft) : 1 + Expected (operandRight): 3]]></Description> +</Incident> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0"> + <DataTag><![CDATA[should FAIL 2]]></DataTag> + <Description><![CDATA[Compared floats are not the same (fuzzy compare) + Actual (operandLeft) : 1e-07 + Expected (operandRight): 3e-07]]></Description> +</Incident> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0"> + <DataTag><![CDATA[should FAIL 3]]></DataTag> + <Description><![CDATA[Compared floats are not the same (fuzzy compare) + Actual (operandLeft) : 99998 + Expected (operandRight): 99999]]></Description> +</Incident> +<Incident type="pass" file="" line="0"> + <DataTag><![CDATA[should SUCCEED 2]]></DataTag> +</Incident> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="compareFloatTests"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0"> + <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="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0"> + <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="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0"> + <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> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="cleanupTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_float.teamcity b/tests/auto/testlib/selftests/expected_float.teamcity new file mode 100644 index 0000000000..d5b81593d8 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_float.teamcity @@ -0,0 +1,28 @@ +##teamcity[testSuiteStarted name='tst_float' flowId='tst_float'] +##teamcity[testStarted name='initTestCase()' flowId='tst_float'] +##teamcity[testFinished name='initTestCase()' flowId='tst_float'] +##teamcity[testStarted name='floatComparisons(should SUCCEED 1)' flowId='tst_float'] +##teamcity[testFinished name='floatComparisons(should SUCCEED 1)' flowId='tst_float'] +##teamcity[testStarted name='floatComparisons(should FAIL 1)' flowId='tst_float'] +##teamcity[testFailed name='floatComparisons(should FAIL 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared floats are not the same (fuzzy compare)|n Actual (operandLeft) : 1|n Expected (operandRight): 3' flowId='tst_float'] +##teamcity[testFinished name='floatComparisons(should FAIL 1)' flowId='tst_float'] +##teamcity[testStarted name='floatComparisons(should FAIL 2)' flowId='tst_float'] +##teamcity[testFailed name='floatComparisons(should FAIL 2)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared floats are not the same (fuzzy compare)|n Actual (operandLeft) : 1e-07|n Expected (operandRight): 3e-07' flowId='tst_float'] +##teamcity[testFinished name='floatComparisons(should FAIL 2)' flowId='tst_float'] +##teamcity[testStarted name='floatComparisons(should FAIL 3)' flowId='tst_float'] +##teamcity[testFailed name='floatComparisons(should FAIL 3)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared floats are not the same (fuzzy compare)|n Actual (operandLeft) : 99998|n Expected (operandRight): 99999' flowId='tst_float'] +##teamcity[testFinished name='floatComparisons(should FAIL 3)' flowId='tst_float'] +##teamcity[testStarted name='floatComparisons(should SUCCEED 2)' flowId='tst_float'] +##teamcity[testFinished name='floatComparisons(should SUCCEED 2)' flowId='tst_float'] +##teamcity[testStarted name='compareFloatTests(1e0)' flowId='tst_float'] +##teamcity[testFailed name='compareFloatTests(1e0)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared floats are not the same (fuzzy compare)|n Actual (t1): 1|n Expected (t3): 3' flowId='tst_float'] +##teamcity[testFinished name='compareFloatTests(1e0)' flowId='tst_float'] +##teamcity[testStarted name='compareFloatTests(1e-7)' flowId='tst_float'] +##teamcity[testFailed name='compareFloatTests(1e-7)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared floats are not the same (fuzzy compare)|n Actual (t1): 1e-07|n Expected (t3): 3e-07' flowId='tst_float'] +##teamcity[testFinished name='compareFloatTests(1e-7)' flowId='tst_float'] +##teamcity[testStarted name='compareFloatTests(1e+7)' flowId='tst_float'] +##teamcity[testFailed name='compareFloatTests(1e+7)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)|]' details='Compared floats are not the same (fuzzy compare)|n Actual (t1): 1e+07|n Expected (t3): 3e+07' flowId='tst_float'] +##teamcity[testFinished name='compareFloatTests(1e+7)' flowId='tst_float'] +##teamcity[testStarted name='cleanupTestCase()' flowId='tst_float'] +##teamcity[testFinished name='cleanupTestCase()' flowId='tst_float'] +##teamcity[testSuiteFinished name='tst_float' flowId='tst_float'] diff --git a/tests/auto/testlib/selftests/expected_float.txt b/tests/auto/testlib/selftests/expected_float.txt index e9cfae04b4..8abea6a67e 100644 --- a/tests/auto/testlib/selftests/expected_float.txt +++ b/tests/auto/testlib/selftests/expected_float.txt @@ -1,32 +1,32 @@ ********* Start testing of tst_float ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_float::initTestCase() PASS : tst_float::floatComparisons(should SUCCEED 1) FAIL! : tst_float::floatComparisons(should FAIL 1) Compared floats are not the same (fuzzy compare) Actual (operandLeft) : 1 Expected (operandRight): 3 - Loc: [tst_float.cpp(61)] + Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::floatComparisons(should FAIL 2) Compared floats are not the same (fuzzy compare) Actual (operandLeft) : 1e-07 Expected (operandRight): 3e-07 - Loc: [tst_float.cpp(61)] + Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::floatComparisons(should FAIL 3) Compared floats are not the same (fuzzy compare) Actual (operandLeft) : 99998 Expected (operandRight): 99999 - Loc: [tst_float.cpp(61)] + Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] PASS : tst_float::floatComparisons(should SUCCEED 2) FAIL! : tst_float::compareFloatTests(1e0) Compared floats are not the same (fuzzy compare) Actual (t1): 1 Expected (t3): 3 - Loc: [tst_float.cpp(109)] + Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::compareFloatTests(1e-7) Compared floats are not the same (fuzzy compare) Actual (t1): 1e-07 Expected (t3): 3e-07 - Loc: [tst_float.cpp(109)] + Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] FAIL! : tst_float::compareFloatTests(1e+7) Compared floats are not the same (fuzzy compare) Actual (t1): 1e+07 Expected (t3): 3e+07 - Loc: [tst_float.cpp(109)] + Loc: [qtbase/tests/auto/testlib/selftests/float/tst_float.cpp(0)] PASS : tst_float::cleanupTestCase() -Totals: 4 passed, 6 failed, 0 skipped, 0 blacklisted +Totals: 4 passed, 6 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_float ********* diff --git a/tests/auto/testlib/selftests/expected_float.xml b/tests/auto/testlib/selftests/expected_float.xml new file mode 100644 index 0000000000..096e1a5b54 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_float.xml @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="UTF-8"?> +<TestCase name="tst_float"> +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="floatComparisons"> +<Incident type="pass" file="" line="0"> + <DataTag><![CDATA[should SUCCEED 1]]></DataTag> +</Incident> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0"> + <DataTag><![CDATA[should FAIL 1]]></DataTag> + <Description><![CDATA[Compared floats are not the same (fuzzy compare) + Actual (operandLeft) : 1 + Expected (operandRight): 3]]></Description> +</Incident> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0"> + <DataTag><![CDATA[should FAIL 2]]></DataTag> + <Description><![CDATA[Compared floats are not the same (fuzzy compare) + Actual (operandLeft) : 1e-07 + Expected (operandRight): 3e-07]]></Description> +</Incident> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0"> + <DataTag><![CDATA[should FAIL 3]]></DataTag> + <Description><![CDATA[Compared floats are not the same (fuzzy compare) + Actual (operandLeft) : 99998 + Expected (operandRight): 99999]]></Description> +</Incident> +<Incident type="pass" file="" line="0"> + <DataTag><![CDATA[should SUCCEED 2]]></DataTag> +</Incident> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="compareFloatTests"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0"> + <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="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0"> + <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="qtbase/tests/auto/testlib/selftests/float/tst_float.cpp" line="0"> + <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> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="cleanupTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> +</TestCase> diff --git a/tests/auto/testlib/selftests/expected_float.xunitxml b/tests/auto/testlib/selftests/expected_float.xunitxml new file mode 100644 index 0000000000..5de14e8d9b --- /dev/null +++ b/tests/auto/testlib/selftests/expected_float.xunitxml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<testsuite errors="0" failures="6" tests="4" name="tst_float"> + <properties> + <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/> + <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/> + <property value="" name="QtBuild"/> + </properties> + <testcase result="pass" name="initTestCase"/> + <testcase result="fail" name="floatComparisons"> + <failure tag="should FAIL 1" message="Compared floats are not the same (fuzzy compare) + Actual (operandLeft) : 1 + Expected (operandRight): 3" result="fail"/> + <failure tag="should FAIL 2" message="Compared floats are not the same (fuzzy compare) + Actual (operandLeft) : 1e-07 + Expected (operandRight): 3e-07" result="fail"/> + <failure tag="should FAIL 3" message="Compared floats are not the same (fuzzy compare) + Actual (operandLeft) : 99998 + Expected (operandRight): 99999" result="fail"/> + </testcase> + <testcase result="fail" name="compareFloatTests"> + <failure tag="1e0" message="Compared floats are not the same (fuzzy compare) + Actual (t1): 1 + Expected (t3): 3" result="fail"/> + <failure tag="1e-7" message="Compared floats are not the same (fuzzy compare) + Actual (t1): 1e-07 + Expected (t3): 3e-07" result="fail"/> + <failure tag="1e+7" message="Compared floats are not the same (fuzzy compare) + Actual (t1): 1e+07 + Expected (t3): 3e+07" result="fail"/> + </testcase> + <testcase result="pass" name="cleanupTestCase"/> + <system-err/> +</testsuite> diff --git a/tests/auto/testlib/selftests/expected_globaldata.lightxml b/tests/auto/testlib/selftests/expected_globaldata.lightxml index 7d4c43905c..f66c4c552d 100644 --- a/tests/auto/testlib/selftests/expected_globaldata.lightxml +++ b/tests/auto/testlib/selftests/expected_globaldata.lightxml @@ -8,7 +8,7 @@ <Description><![CDATA[initTestCase initTestCase (null)]]></Description> </Message> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testGlobal"> <Message type="qdebug" file="" line="0"> @@ -87,21 +87,21 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[2:local 2]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="skip"> -<Message type="skip" file="tst_globaldata.cpp" line="129"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> <DataTag><![CDATA[1]]></DataTag> <Description><![CDATA[skipping]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="skipLocal"> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 1]]></DataTag> <Description><![CDATA[init skipLocal local 1]]></Description> </Message> -<Message type="skip" file="tst_globaldata.cpp" line="149"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> <DataTag><![CDATA[1:local 1]]></DataTag> <Description><![CDATA[skipping]]></Description> </Message> @@ -113,7 +113,7 @@ <DataTag><![CDATA[1:local 2]]></DataTag> <Description><![CDATA[init skipLocal local 2]]></Description> </Message> -<Message type="skip" file="tst_globaldata.cpp" line="149"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> <DataTag><![CDATA[1:local 2]]></DataTag> <Description><![CDATA[skipping]]></Description> </Message> @@ -121,7 +121,7 @@ <DataTag><![CDATA[1:local 2]]></DataTag> <Description><![CDATA[cleanup skipLocal local 2]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="skipSingle"> <Message type="qdebug" file="" line="0"> @@ -158,7 +158,7 @@ <DataTag><![CDATA[2:local 1]]></DataTag> <Description><![CDATA[init skipSingle local 1]]></Description> </Message> -<Message type="skip" file="tst_globaldata.cpp" line="143"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> <DataTag><![CDATA[2:local 1]]></DataTag> <Description><![CDATA[skipping]]></Description> </Message> @@ -181,13 +181,13 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[2:local 2]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Message type="qdebug" file="" line="0"> <Description><![CDATA[cleanupTestCase cleanupTestCase (null)]]></Description> </Message> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_globaldata.teamcity b/tests/auto/testlib/selftests/expected_globaldata.teamcity index 5c6cc4b88d..5d623a3285 100644 --- a/tests/auto/testlib/selftests/expected_globaldata.teamcity +++ b/tests/auto/testlib/selftests/expected_globaldata.teamcity @@ -14,16 +14,16 @@ ##teamcity[testStarted name='testGlobal(local 2)' flowId='tst_globaldata'] ##teamcity[testStdOut name='testGlobal(local 2)' out='QDEBUG: init testGlobal local 2|nQDEBUG: global: true|nQDEBUG: local: true|nQDEBUG: cleanup testGlobal local 2' flowId='tst_globaldata'] ##teamcity[testFinished name='testGlobal(local 2)' flowId='tst_globaldata'] -##teamcity[testIgnored name='skip()' message='skipping |[Loc: tst_globaldata.cpp(121)|]' flowId='tst_globaldata'] -##teamcity[testIgnored name='skipLocal(local 1)' message='skipping |[Loc: tst_globaldata.cpp(141)|]' flowId='tst_globaldata'] -##teamcity[testIgnored name='skipLocal(local 2)' message='skipping |[Loc: tst_globaldata.cpp(141)|]' flowId='tst_globaldata'] +##teamcity[testIgnored name='skip()' message='skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata'] +##teamcity[testIgnored name='skipLocal(local 1)' message='skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata'] +##teamcity[testIgnored name='skipLocal(local 2)' message='skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata'] ##teamcity[testStarted name='skipSingle(local 1)' flowId='tst_globaldata'] ##teamcity[testStdOut name='skipSingle(local 1)' out='QDEBUG: init skipLocal local 1|nQDEBUG: cleanup skipLocal local 1|nQDEBUG: init skipLocal local 2|nQDEBUG: cleanup skipLocal local 2|nQDEBUG: init skipSingle local 1|nQDEBUG: global: false local: false|nQDEBUG: cleanup skipSingle local 1' flowId='tst_globaldata'] ##teamcity[testFinished name='skipSingle(local 1)' flowId='tst_globaldata'] ##teamcity[testStarted name='skipSingle(local 2)' flowId='tst_globaldata'] ##teamcity[testStdOut name='skipSingle(local 2)' out='QDEBUG: init skipSingle local 2|nQDEBUG: global: false local: true|nQDEBUG: cleanup skipSingle local 2' flowId='tst_globaldata'] ##teamcity[testFinished name='skipSingle(local 2)' flowId='tst_globaldata'] -##teamcity[testIgnored name='skipSingle(local 1)' message='skipping |[Loc: tst_globaldata.cpp(135)|]' flowId='tst_globaldata'] +##teamcity[testIgnored name='skipSingle(local 1)' message='skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata'] ##teamcity[testStdOut name='skipSingle(local 2)' out='QDEBUG: init skipSingle local 1|nQDEBUG: cleanup skipSingle local 1|nQDEBUG: init skipSingle local 2|nQDEBUG: global: true local: true|nQDEBUG: cleanup skipSingle local 2' flowId='tst_globaldata'] ##teamcity[testFinished name='skipSingle(local 2)' flowId='tst_globaldata'] ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_globaldata'] diff --git a/tests/auto/testlib/selftests/expected_globaldata.txt b/tests/auto/testlib/selftests/expected_globaldata.txt index efd461d7d2..b12f4a2a69 100644 --- a/tests/auto/testlib/selftests/expected_globaldata.txt +++ b/tests/auto/testlib/selftests/expected_globaldata.txt @@ -1,5 +1,5 @@ ********* Start testing of tst_globaldata ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library QDEBUG : tst_globaldata::initTestCase() initTestCase initTestCase (null) PASS : tst_globaldata::initTestCase() QDEBUG : tst_globaldata::testGlobal(1:local 1) init testGlobal local 1 @@ -23,14 +23,14 @@ QDEBUG : tst_globaldata::testGlobal(2:local 2) local: true QDEBUG : tst_globaldata::testGlobal(2:local 2) cleanup testGlobal local 2 PASS : tst_globaldata::testGlobal(2:local 2) SKIP : tst_globaldata::skip(1) skipping - Loc: [tst_globaldata.cpp(129)] + Loc: [qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)] QDEBUG : tst_globaldata::skipLocal(1:local 1) init skipLocal local 1 SKIP : tst_globaldata::skipLocal(1:local 1) skipping - Loc: [tst_globaldata.cpp(149)] + Loc: [qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)] QDEBUG : tst_globaldata::skipLocal(1:local 1) cleanup skipLocal local 1 QDEBUG : tst_globaldata::skipLocal(1:local 2) init skipLocal local 2 SKIP : tst_globaldata::skipLocal(1:local 2) skipping - Loc: [tst_globaldata.cpp(149)] + Loc: [qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)] QDEBUG : tst_globaldata::skipLocal(1:local 2) cleanup skipLocal local 2 QDEBUG : tst_globaldata::skipSingle(1:local 1) init skipSingle local 1 QDEBUG : tst_globaldata::skipSingle(1:local 1) global: false local: false @@ -42,7 +42,7 @@ QDEBUG : tst_globaldata::skipSingle(1:local 2) cleanup skipSingle local 2 PASS : tst_globaldata::skipSingle(1:local 2) QDEBUG : tst_globaldata::skipSingle(2:local 1) init skipSingle local 1 SKIP : tst_globaldata::skipSingle(2:local 1) skipping - Loc: [tst_globaldata.cpp(143)] + Loc: [qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)] QDEBUG : tst_globaldata::skipSingle(2:local 1) cleanup skipSingle local 1 QDEBUG : tst_globaldata::skipSingle(2:local 2) init skipSingle local 2 QDEBUG : tst_globaldata::skipSingle(2:local 2) global: true local: true @@ -50,5 +50,5 @@ QDEBUG : tst_globaldata::skipSingle(2:local 2) cleanup skipSingle local 2 PASS : tst_globaldata::skipSingle(2:local 2) QDEBUG : tst_globaldata::cleanupTestCase() cleanupTestCase cleanupTestCase (null) PASS : tst_globaldata::cleanupTestCase() -Totals: 9 passed, 0 failed, 4 skipped, 0 blacklisted +Totals: 9 passed, 0 failed, 4 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_globaldata ********* diff --git a/tests/auto/testlib/selftests/expected_globaldata.xml b/tests/auto/testlib/selftests/expected_globaldata.xml index 5e5d4d8922..0f705ef352 100644 --- a/tests/auto/testlib/selftests/expected_globaldata.xml +++ b/tests/auto/testlib/selftests/expected_globaldata.xml @@ -10,7 +10,7 @@ <Description><![CDATA[initTestCase initTestCase (null)]]></Description> </Message> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testGlobal"> <Message type="qdebug" file="" line="0"> @@ -89,21 +89,21 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[2:local 2]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="skip"> -<Message type="skip" file="tst_globaldata.cpp" line="129"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> <DataTag><![CDATA[1]]></DataTag> <Description><![CDATA[skipping]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="skipLocal"> <Message type="qdebug" file="" line="0"> <DataTag><![CDATA[1:local 1]]></DataTag> <Description><![CDATA[init skipLocal local 1]]></Description> </Message> -<Message type="skip" file="tst_globaldata.cpp" line="149"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> <DataTag><![CDATA[1:local 1]]></DataTag> <Description><![CDATA[skipping]]></Description> </Message> @@ -115,7 +115,7 @@ <DataTag><![CDATA[1:local 2]]></DataTag> <Description><![CDATA[init skipLocal local 2]]></Description> </Message> -<Message type="skip" file="tst_globaldata.cpp" line="149"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> <DataTag><![CDATA[1:local 2]]></DataTag> <Description><![CDATA[skipping]]></Description> </Message> @@ -123,7 +123,7 @@ <DataTag><![CDATA[1:local 2]]></DataTag> <Description><![CDATA[cleanup skipLocal local 2]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="skipSingle"> <Message type="qdebug" file="" line="0"> @@ -160,7 +160,7 @@ <DataTag><![CDATA[2:local 1]]></DataTag> <Description><![CDATA[init skipSingle local 1]]></Description> </Message> -<Message type="skip" file="tst_globaldata.cpp" line="143"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0"> <DataTag><![CDATA[2:local 1]]></DataTag> <Description><![CDATA[skipping]]></Description> </Message> @@ -183,14 +183,14 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[2:local 2]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Message type="qdebug" file="" line="0"> <Description><![CDATA[cleanupTestCase cleanupTestCase (null)]]></Description> </Message> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_longstring.lightxml b/tests/auto/testlib/selftests/expected_longstring.lightxml index f8796bed4a..12e4fabd8d 100644 --- a/tests/auto/testlib/selftests/expected_longstring.lightxml +++ b/tests/auto/testlib/selftests/expected_longstring.lightxml @@ -5,10 +5,10 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="failWithLongString"> -<Incident type="fail" file="tst_longstring.cpp" line="67"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/longstring/tst_longstring.cpp" line="0"> <Description><![CDATA[Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem. Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt. Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna. Sed consequat, leo eget bibendum sodales, augue velit cursus nunc, quis gravida magna mi a libero. Fusce vulputate eleifend sapien. Vestibulum purus quam, scelerisque ut, mollis sed, nonummy id, metus. Nullam accumsan lorem in dui. Cras ultricies mi eu turpis hendrerit fringilla. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In ac dui quis mi consectetuer lacinia. @@ -19,10 +19,10 @@ Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo. M Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitudin urna dolor sagittis lacus. Donec elit libero, sodales nec, volutpat a, suscipit non, turpis. Nullam sagittis. Suspendisse pulvinar, augue ac venenatis condimentum, sem libero volutpat nibh, nec pellentesque velit pede quis nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus. Ut varius tincidunt libero. Phasellus dolor. Maecenas vestibulum mollis diam. Pellentesque ut neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_longstring.teamcity b/tests/auto/testlib/selftests/expected_longstring.teamcity index 0e7fa82b9b..0ea45871d1 100644 --- a/tests/auto/testlib/selftests/expected_longstring.teamcity +++ b/tests/auto/testlib/selftests/expected_longstring.teamcity @@ -2,7 +2,7 @@ ##teamcity[testStarted name='initTestCase()' flowId='tst_LongString'] ##teamcity[testFinished name='initTestCase()' flowId='tst_LongString'] ##teamcity[testStarted name='failWithLongString()' flowId='tst_LongString'] -##teamcity[testFailed name='failWithLongString()' message='Failure! |[Loc: tst_longstring.cpp(59)|]' details='Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui.|n|nEtiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem. Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt. Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna. Sed consequat, leo eget bibendum sodales, augue velit cursus nunc, quis gravida magna mi a libero. Fusce vulputate eleifend sapien. Vestibulum purus quam, scelerisque ut, mollis sed, nonummy id, metus. Nullam accumsan lorem in dui. Cras ultricies mi eu turpis hendrerit fringilla. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In ac dui quis mi consectetuer lacinia.|n|nNam pretium turpis et arcu. Duis arcu tortor, suscipit eget, imperdiet nec, imperdiet iaculis, ipsum. Sed aliquam ultrices mauris. Integer ante arcu, accumsan a, consectetuer eget, posuere ut, mauris. Praesent adipiscing. Phasellus ullamcorper ipsum rutrum nunc. Nunc nonummy metus. Vestibulum volutpat pretium libero. Cras id dui. Aenean ut eros et nisl sagittis vestibulum. Nullam nulla eros, ultricies sit amet, nonummy id, imperdiet feugiat, pede. Sed lectus. Donec mollis hendrerit risus. Phasellus nec sem in justo pellentesque facilisis. Etiam imperdiet imperdiet orci. Nunc nec neque. Phasellus leo dolor, tempus non, auctor et, hendrerit quis, nisi.|n|nCurabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo. Maecenas malesuada. Praesent congue erat at massa. Sed cursus turpis vitae tortor. Donec posuere vulputate arcu. Phasellus accumsan cursus velit. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed aliquam, nisi quis porttitor congue, elit erat euismod orci, ac placerat dolor lectus quis orci. Phasellus consectetuer vestibulum elit. Aenean tellus metus, bibendum sed, posuere ac, mattis non, nunc. Vestibulum fringilla pede sit amet augue. In turpis. Pellentesque posuere. Praesent turpis.|n|nAenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitudin urna dolor sagittis lacus. Donec elit libero, sodales nec, volutpat a, suscipit non, turpis. Nullam sagittis. Suspendisse pulvinar, augue ac venenatis condimentum, sem libero volutpat nibh, nec pellentesque velit pede quis nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus. Ut varius tincidunt libero. Phasellus dolor. Maecenas vestibulum mollis diam. Pellentesque ut neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.' flowId='tst_LongString'] +##teamcity[testFailed name='failWithLongString()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/longstring/tst_longstring.cpp(0)|]' details='Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui.|n|nEtiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem. Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt. Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna. Sed consequat, leo eget bibendum sodales, augue velit cursus nunc, quis gravida magna mi a libero. Fusce vulputate eleifend sapien. Vestibulum purus quam, scelerisque ut, mollis sed, nonummy id, metus. Nullam accumsan lorem in dui. Cras ultricies mi eu turpis hendrerit fringilla. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In ac dui quis mi consectetuer lacinia.|n|nNam pretium turpis et arcu. Duis arcu tortor, suscipit eget, imperdiet nec, imperdiet iaculis, ipsum. Sed aliquam ultrices mauris. Integer ante arcu, accumsan a, consectetuer eget, posuere ut, mauris. Praesent adipiscing. Phasellus ullamcorper ipsum rutrum nunc. Nunc nonummy metus. Vestibulum volutpat pretium libero. Cras id dui. Aenean ut eros et nisl sagittis vestibulum. Nullam nulla eros, ultricies sit amet, nonummy id, imperdiet feugiat, pede. Sed lectus. Donec mollis hendrerit risus. Phasellus nec sem in justo pellentesque facilisis. Etiam imperdiet imperdiet orci. Nunc nec neque. Phasellus leo dolor, tempus non, auctor et, hendrerit quis, nisi.|n|nCurabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo. Maecenas malesuada. Praesent congue erat at massa. Sed cursus turpis vitae tortor. Donec posuere vulputate arcu. Phasellus accumsan cursus velit. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed aliquam, nisi quis porttitor congue, elit erat euismod orci, ac placerat dolor lectus quis orci. Phasellus consectetuer vestibulum elit. Aenean tellus metus, bibendum sed, posuere ac, mattis non, nunc. Vestibulum fringilla pede sit amet augue. In turpis. Pellentesque posuere. Praesent turpis.|n|nAenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitudin urna dolor sagittis lacus. Donec elit libero, sodales nec, volutpat a, suscipit non, turpis. Nullam sagittis. Suspendisse pulvinar, augue ac venenatis condimentum, sem libero volutpat nibh, nec pellentesque velit pede quis nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus. Ut varius tincidunt libero. Phasellus dolor. Maecenas vestibulum mollis diam. Pellentesque ut neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.' flowId='tst_LongString'] ##teamcity[testFinished name='failWithLongString()' flowId='tst_LongString'] ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_LongString'] ##teamcity[testFinished name='cleanupTestCase()' flowId='tst_LongString'] diff --git a/tests/auto/testlib/selftests/expected_longstring.txt b/tests/auto/testlib/selftests/expected_longstring.txt index 7ffa77cc1c..3c403c9d92 100644 --- a/tests/auto/testlib/selftests/expected_longstring.txt +++ b/tests/auto/testlib/selftests/expected_longstring.txt @@ -1,5 +1,5 @@ ********* Start testing of tst_LongString ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_LongString::initTestCase() FAIL! : tst_LongString::failWithLongString() Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. @@ -10,7 +10,7 @@ Nam pretium turpis et arcu. Duis arcu tortor, suscipit eget, imperdiet nec, impe Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo. Maecenas malesuada. Praesent congue erat at massa. Sed cursus turpis vitae tortor. Donec posuere vulputate arcu. Phasellus accumsan cursus velit. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed aliquam, nisi quis porttitor congue, elit erat euismod orci, ac placerat dolor lectus quis orci. Phasellus consectetuer vestibulum elit. Aenean tellus metus, bibendum sed, posuere ac, mattis non, nunc. Vestibulum fringilla pede sit amet augue. In turpis. Pellentesque posuere. Praesent turpis. Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitudin urna dolor sagittis lacus. Donec elit libero, sodales nec, volutpat a, suscipit non, turpis. Nullam sagittis. Suspendisse pulvinar, augue ac venenatis condimentum, sem libero volutpat nibh, nec pellentesque velit pede quis nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus. Ut varius tincidunt libero. Phasellus dolor. Maecenas vestibulum mollis diam. Pellentesque ut neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. - Loc: [tst_longstring.cpp(67)] + Loc: [qtbase/tests/auto/testlib/selftests/longstring/tst_longstring.cpp(0)] PASS : tst_LongString::cleanupTestCase() -Totals: 2 passed, 1 failed, 0 skipped, 0 blacklisted +Totals: 2 passed, 1 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_LongString ********* diff --git a/tests/auto/testlib/selftests/expected_longstring.xml b/tests/auto/testlib/selftests/expected_longstring.xml index 6623b7cd88..9db4da0e92 100644 --- a/tests/auto/testlib/selftests/expected_longstring.xml +++ b/tests/auto/testlib/selftests/expected_longstring.xml @@ -7,10 +7,10 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="failWithLongString"> -<Incident type="fail" file="tst_longstring.cpp" line="67"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/longstring/tst_longstring.cpp" line="0"> <Description><![CDATA[Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem. Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt. Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna. Sed consequat, leo eget bibendum sodales, augue velit cursus nunc, quis gravida magna mi a libero. Fusce vulputate eleifend sapien. Vestibulum purus quam, scelerisque ut, mollis sed, nonummy id, metus. Nullam accumsan lorem in dui. Cras ultricies mi eu turpis hendrerit fringilla. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In ac dui quis mi consectetuer lacinia. @@ -21,11 +21,11 @@ Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo. M Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitudin urna dolor sagittis lacus. Donec elit libero, sodales nec, volutpat a, suscipit non, turpis. Nullam sagittis. Suspendisse pulvinar, augue ac venenatis condimentum, sem libero volutpat nibh, nec pellentesque velit pede quis nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus. Ut varius tincidunt libero. Phasellus dolor. Maecenas vestibulum mollis diam. Pellentesque ut neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_maxwarnings.lightxml b/tests/auto/testlib/selftests/expected_maxwarnings.lightxml index 49db189352..86967ce1dc 100644 --- a/tests/auto/testlib/selftests/expected_maxwarnings.lightxml +++ b/tests/auto/testlib/selftests/expected_maxwarnings.lightxml @@ -5,7 +5,7 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="warn"> <Message type="qwarn" file="" line="0"> @@ -6015,10 +6015,10 @@ <Description><![CDATA[Maximum amount of warnings exceeded. Use -maxwarnings to override.]]></Description> </Message> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_maxwarnings.txt b/tests/auto/testlib/selftests/expected_maxwarnings.txt index 30f8d6f5d3..437ec851dd 100644 --- a/tests/auto/testlib/selftests/expected_maxwarnings.txt +++ b/tests/auto/testlib/selftests/expected_maxwarnings.txt @@ -1,5 +1,5 @@ ********* Start testing of MaxWarnings ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : MaxWarnings::initTestCase() QWARN : MaxWarnings::warn() 0 QWARN : MaxWarnings::warn() 1 @@ -2005,5 +2005,5 @@ QWARN : MaxWarnings::warn() 2000 QSYSTEM: MaxWarnings::warn() Maximum amount of warnings exceeded. Use -maxwarnings to override. PASS : MaxWarnings::warn() PASS : MaxWarnings::cleanupTestCase() -Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of MaxWarnings ********* diff --git a/tests/auto/testlib/selftests/expected_maxwarnings.xml b/tests/auto/testlib/selftests/expected_maxwarnings.xml index 614b054fad..5134d60519 100644 --- a/tests/auto/testlib/selftests/expected_maxwarnings.xml +++ b/tests/auto/testlib/selftests/expected_maxwarnings.xml @@ -7,7 +7,7 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="warn"> <Message type="qwarn" file="" line="0"> @@ -6017,11 +6017,11 @@ <Description><![CDATA[Maximum amount of warnings exceeded. Use -maxwarnings to override.]]></Description> </Message> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_multiexec.lightxml b/tests/auto/testlib/selftests/expected_multiexec.lightxml new file mode 100644 index 0000000000..344955f049 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_multiexec.lightxml @@ -0,0 +1,90 @@ +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="nothing"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="cleanupTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="nothing"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="cleanupTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="nothing"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="cleanupTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="nothing"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="cleanupTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="nothing"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="cleanupTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_multiexec.teamcity b/tests/auto/testlib/selftests/expected_multiexec.teamcity new file mode 100644 index 0000000000..db2aa90272 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_multiexec.teamcity @@ -0,0 +1,40 @@ +##teamcity[testSuiteStarted name='tst_Nothing' flowId='tst_Nothing'] +##teamcity[testStarted name='initTestCase()' flowId='tst_Nothing'] +##teamcity[testFinished name='initTestCase()' flowId='tst_Nothing'] +##teamcity[testStarted name='nothing()' flowId='tst_Nothing'] +##teamcity[testFinished name='nothing()' flowId='tst_Nothing'] +##teamcity[testStarted name='cleanupTestCase()' flowId='tst_Nothing'] +##teamcity[testFinished name='cleanupTestCase()' flowId='tst_Nothing'] +##teamcity[testSuiteFinished name='tst_Nothing' flowId='tst_Nothing'] +##teamcity[testSuiteStarted name='tst_Nothing' flowId='tst_Nothing'] +##teamcity[testStarted name='initTestCase()' flowId='tst_Nothing'] +##teamcity[testFinished name='initTestCase()' flowId='tst_Nothing'] +##teamcity[testStarted name='nothing()' flowId='tst_Nothing'] +##teamcity[testFinished name='nothing()' flowId='tst_Nothing'] +##teamcity[testStarted name='cleanupTestCase()' flowId='tst_Nothing'] +##teamcity[testFinished name='cleanupTestCase()' flowId='tst_Nothing'] +##teamcity[testSuiteFinished name='tst_Nothing' flowId='tst_Nothing'] +##teamcity[testSuiteStarted name='tst_Nothing' flowId='tst_Nothing'] +##teamcity[testStarted name='initTestCase()' flowId='tst_Nothing'] +##teamcity[testFinished name='initTestCase()' flowId='tst_Nothing'] +##teamcity[testStarted name='nothing()' flowId='tst_Nothing'] +##teamcity[testFinished name='nothing()' flowId='tst_Nothing'] +##teamcity[testStarted name='cleanupTestCase()' flowId='tst_Nothing'] +##teamcity[testFinished name='cleanupTestCase()' flowId='tst_Nothing'] +##teamcity[testSuiteFinished name='tst_Nothing' flowId='tst_Nothing'] +##teamcity[testSuiteStarted name='tst_Nothing' flowId='tst_Nothing'] +##teamcity[testStarted name='initTestCase()' flowId='tst_Nothing'] +##teamcity[testFinished name='initTestCase()' flowId='tst_Nothing'] +##teamcity[testStarted name='nothing()' flowId='tst_Nothing'] +##teamcity[testFinished name='nothing()' flowId='tst_Nothing'] +##teamcity[testStarted name='cleanupTestCase()' flowId='tst_Nothing'] +##teamcity[testFinished name='cleanupTestCase()' flowId='tst_Nothing'] +##teamcity[testSuiteFinished name='tst_Nothing' flowId='tst_Nothing'] +##teamcity[testSuiteStarted name='tst_Nothing' flowId='tst_Nothing'] +##teamcity[testStarted name='initTestCase()' flowId='tst_Nothing'] +##teamcity[testFinished name='initTestCase()' flowId='tst_Nothing'] +##teamcity[testStarted name='nothing()' flowId='tst_Nothing'] +##teamcity[testFinished name='nothing()' flowId='tst_Nothing'] +##teamcity[testStarted name='cleanupTestCase()' flowId='tst_Nothing'] +##teamcity[testFinished name='cleanupTestCase()' flowId='tst_Nothing'] +##teamcity[testSuiteFinished name='tst_Nothing' flowId='tst_Nothing'] diff --git a/tests/auto/testlib/selftests/expected_multiexec.txt b/tests/auto/testlib/selftests/expected_multiexec.txt index f3cd942e38..28a5e5679e 100644 --- a/tests/auto/testlib/selftests/expected_multiexec.txt +++ b/tests/auto/testlib/selftests/expected_multiexec.txt @@ -1,35 +1,35 @@ ********* Start testing of tst_Nothing ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_Nothing::initTestCase() PASS : tst_Nothing::nothing() PASS : tst_Nothing::cleanupTestCase() -Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_Nothing ********* ********* Start testing of tst_Nothing ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_Nothing::initTestCase() PASS : tst_Nothing::nothing() PASS : tst_Nothing::cleanupTestCase() -Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_Nothing ********* ********* Start testing of tst_Nothing ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_Nothing::initTestCase() PASS : tst_Nothing::nothing() PASS : tst_Nothing::cleanupTestCase() -Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_Nothing ********* ********* Start testing of tst_Nothing ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_Nothing::initTestCase() PASS : tst_Nothing::nothing() PASS : tst_Nothing::cleanupTestCase() -Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_Nothing ********* ********* Start testing of tst_Nothing ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_Nothing::initTestCase() PASS : tst_Nothing::nothing() PASS : tst_Nothing::cleanupTestCase() -Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_Nothing ********* diff --git a/tests/auto/testlib/selftests/expected_multiexec.xml b/tests/auto/testlib/selftests/expected_multiexec.xml new file mode 100644 index 0000000000..e160b4f3e6 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_multiexec.xml @@ -0,0 +1,105 @@ +<?xml version="1.0" encoding="UTF-8"?> +<TestCase name="tst_Nothing"> +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="nothing"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="cleanupTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> +</TestCase> +<?xml version="1.0" encoding="UTF-8"?> +<TestCase name="tst_Nothing"> +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="nothing"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="cleanupTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> +</TestCase> +<?xml version="1.0" encoding="UTF-8"?> +<TestCase name="tst_Nothing"> +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="nothing"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="cleanupTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> +</TestCase> +<?xml version="1.0" encoding="UTF-8"?> +<TestCase name="tst_Nothing"> +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="nothing"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="cleanupTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> +</TestCase> +<?xml version="1.0" encoding="UTF-8"?> +<TestCase name="tst_Nothing"> +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="nothing"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="cleanupTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> +</TestCase> diff --git a/tests/auto/testlib/selftests/expected_multiexec.xunitxml b/tests/auto/testlib/selftests/expected_multiexec.xunitxml new file mode 100644 index 0000000000..8ab914842b --- /dev/null +++ b/tests/auto/testlib/selftests/expected_multiexec.xunitxml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<testsuite errors="0" failures="0" tests="3" name="tst_Nothing"> + <properties> + <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/> + <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/> + <property value="" name="QtBuild"/> + </properties> + <testcase result="pass" name="initTestCase"/> + <testcase result="pass" name="nothing"/> + <testcase result="pass" name="cleanupTestCase"/> + <system-err/> +</testsuite> +<?xml version="1.0" encoding="UTF-8" ?> +<testsuite errors="0" failures="0" tests="3" name="tst_Nothing"> + <properties> + <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/> + <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/> + <property value="" name="QtBuild"/> + </properties> + <testcase result="pass" name="initTestCase"/> + <testcase result="pass" name="nothing"/> + <testcase result="pass" name="cleanupTestCase"/> + <system-err/> +</testsuite> +<?xml version="1.0" encoding="UTF-8" ?> +<testsuite errors="0" failures="0" tests="3" name="tst_Nothing"> + <properties> + <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/> + <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/> + <property value="" name="QtBuild"/> + </properties> + <testcase result="pass" name="initTestCase"/> + <testcase result="pass" name="nothing"/> + <testcase result="pass" name="cleanupTestCase"/> + <system-err/> +</testsuite> +<?xml version="1.0" encoding="UTF-8" ?> +<testsuite errors="0" failures="0" tests="3" name="tst_Nothing"> + <properties> + <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/> + <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/> + <property value="" name="QtBuild"/> + </properties> + <testcase result="pass" name="initTestCase"/> + <testcase result="pass" name="nothing"/> + <testcase result="pass" name="cleanupTestCase"/> + <system-err/> +</testsuite> +<?xml version="1.0" encoding="UTF-8" ?> +<testsuite errors="0" failures="0" tests="3" name="tst_Nothing"> + <properties> + <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/> + <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/> + <property value="" name="QtBuild"/> + </properties> + <testcase result="pass" name="initTestCase"/> + <testcase result="pass" name="nothing"/> + <testcase result="pass" name="cleanupTestCase"/> + <system-err/> +</testsuite> diff --git a/tests/auto/testlib/selftests/expected_pairdiagnostics.lightxml b/tests/auto/testlib/selftests/expected_pairdiagnostics.lightxml index 95b932e3c4..7a842e9d36 100644 --- a/tests/auto/testlib/selftests/expected_pairdiagnostics.lightxml +++ b/tests/auto/testlib/selftests/expected_pairdiagnostics.lightxml @@ -8,7 +8,7 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="testQPair"> -<Incident type="fail" file="../../../qt5/qtbase_fixItemData/tests/auto/testlib/selftests/pairdiagnostics/tst_pairdiagnostics.cpp" line="51"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/pairdiagnostics/tst_pairdiagnostics.cpp" line="0"> <Description><![CDATA[Compared values are not the same Actual (pair1): "QPair(1,1)" Expected (pair2): "QPair(1,2)"]]></Description> @@ -16,7 +16,7 @@ <Duration msecs="0"/> </TestFunction> <TestFunction name="testStdPair"> -<Incident type="fail" file="../../../qt5/qtbase_fixItemData/tests/auto/testlib/selftests/pairdiagnostics/tst_pairdiagnostics.cpp" line="58"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/pairdiagnostics/tst_pairdiagnostics.cpp" line="0"> <Description><![CDATA[Compared values are not the same Actual (pair1): "std::pair(1,1)" Expected (pair2): "std::pair(1,2)"]]></Description> diff --git a/tests/auto/testlib/selftests/expected_pairdiagnostics.teamcity b/tests/auto/testlib/selftests/expected_pairdiagnostics.teamcity index 06883570ac..9068e2c45b 100644 --- a/tests/auto/testlib/selftests/expected_pairdiagnostics.teamcity +++ b/tests/auto/testlib/selftests/expected_pairdiagnostics.teamcity @@ -2,10 +2,10 @@ ##teamcity[testStarted name='initTestCase()' flowId='tst_PairDiagnostics'] ##teamcity[testFinished name='initTestCase()' flowId='tst_PairDiagnostics'] ##teamcity[testStarted name='testQPair()' flowId='tst_PairDiagnostics'] -##teamcity[testFailed name='testQPair()' message='Failure! |[Loc: ../../../qt5/qtbase_fixItemData/tests/auto/testlib/selftests/pairdiagnostics/tst_pairdiagnostics.cpp(51)|]' details='Compared values are not the same|n Actual (pair1): "QPair(1,1)"|n Expected (pair2): "QPair(1,2)"' flowId='tst_PairDiagnostics'] +##teamcity[testFailed name='testQPair()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/pairdiagnostics/tst_pairdiagnostics.cpp(0)|]' details='Compared values are not the same|n Actual (pair1): "QPair(1,1)"|n Expected (pair2): "QPair(1,2)"' flowId='tst_PairDiagnostics'] ##teamcity[testFinished name='testQPair()' flowId='tst_PairDiagnostics'] ##teamcity[testStarted name='testStdPair()' flowId='tst_PairDiagnostics'] -##teamcity[testFailed name='testStdPair()' message='Failure! |[Loc: ../../../qt5/qtbase_fixItemData/tests/auto/testlib/selftests/pairdiagnostics/tst_pairdiagnostics.cpp(58)|]' details='Compared values are not the same|n Actual (pair1): "std::pair(1,1)"|n Expected (pair2): "std::pair(1,2)"' flowId='tst_PairDiagnostics'] +##teamcity[testFailed name='testStdPair()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/pairdiagnostics/tst_pairdiagnostics.cpp(0)|]' details='Compared values are not the same|n Actual (pair1): "std::pair(1,1)"|n Expected (pair2): "std::pair(1,2)"' flowId='tst_PairDiagnostics'] ##teamcity[testFinished name='testStdPair()' flowId='tst_PairDiagnostics'] ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_PairDiagnostics'] ##teamcity[testFinished name='cleanupTestCase()' flowId='tst_PairDiagnostics'] diff --git a/tests/auto/testlib/selftests/expected_pairdiagnostics.txt b/tests/auto/testlib/selftests/expected_pairdiagnostics.txt index e09b9a560f..5e29888ba6 100644 --- a/tests/auto/testlib/selftests/expected_pairdiagnostics.txt +++ b/tests/auto/testlib/selftests/expected_pairdiagnostics.txt @@ -1,14 +1,14 @@ ********* Start testing of tst_PairDiagnostics ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_PairDiagnostics::initTestCase() FAIL! : tst_PairDiagnostics::testQPair() Compared values are not the same Actual (pair1): "QPair(1,1)" Expected (pair2): "QPair(1,2)" - Loc: [../../../qt5/qtbase_fixItemData/tests/auto/testlib/selftests/pairdiagnostics/tst_pairdiagnostics.cpp(51)] + Loc: [qtbase/tests/auto/testlib/selftests/pairdiagnostics/tst_pairdiagnostics.cpp(0)] FAIL! : tst_PairDiagnostics::testStdPair() Compared values are not the same Actual (pair1): "std::pair(1,1)" Expected (pair2): "std::pair(1,2)" - Loc: [../../../qt5/qtbase_fixItemData/tests/auto/testlib/selftests/pairdiagnostics/tst_pairdiagnostics.cpp(58)] + Loc: [qtbase/tests/auto/testlib/selftests/pairdiagnostics/tst_pairdiagnostics.cpp(0)] PASS : tst_PairDiagnostics::cleanupTestCase() -Totals: 2 passed, 2 failed, 0 skipped, 0 blacklisted, 1ms +Totals: 2 passed, 2 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_PairDiagnostics ********* diff --git a/tests/auto/testlib/selftests/expected_pairdiagnostics.xml b/tests/auto/testlib/selftests/expected_pairdiagnostics.xml index 47921e0b8a..cd98e4d36e 100644 --- a/tests/auto/testlib/selftests/expected_pairdiagnostics.xml +++ b/tests/auto/testlib/selftests/expected_pairdiagnostics.xml @@ -7,27 +7,27 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> - <Duration msecs="0.680795"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testQPair"> -<Incident type="fail" file="../../../qt5/qtbase_fixItemData/tests/auto/testlib/selftests/pairdiagnostics/tst_pairdiagnostics.cpp" line="51"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/pairdiagnostics/tst_pairdiagnostics.cpp" line="0"> <Description><![CDATA[Compared values are not the same Actual (pair1): "QPair(1,1)" Expected (pair2): "QPair(1,2)"]]></Description> </Incident> - <Duration msecs="0.085705"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testStdPair"> -<Incident type="fail" file="../../../qt5/qtbase_fixItemData/tests/auto/testlib/selftests/pairdiagnostics/tst_pairdiagnostics.cpp" line="58"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/pairdiagnostics/tst_pairdiagnostics.cpp" line="0"> <Description><![CDATA[Compared values are not the same Actual (pair1): "std::pair(1,1)" Expected (pair2): "std::pair(1,2)"]]></Description> </Incident> - <Duration msecs="0.030780"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> - <Duration msecs="0.039052"/> + <Duration msecs="0"/> </TestFunction> -<Duration msecs="0.995227"/> +<Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_qexecstringlist.lightxml b/tests/auto/testlib/selftests/expected_qexecstringlist.lightxml new file mode 100644 index 0000000000..c6db60bb1f --- /dev/null +++ b/tests/auto/testlib/selftests/expected_qexecstringlist.lightxml @@ -0,0 +1,75 @@ +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="testA"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="testB"> +<Incident type="pass" file="" line="0"> + <DataTag><![CDATA[Data1]]></DataTag> +</Incident> +<Incident type="pass" file="" line="0"> + <DataTag><![CDATA[Data2]]></DataTag> +</Incident> +<Incident type="pass" file="" line="0"> + <DataTag><![CDATA[Data3]]></DataTag> +</Incident> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="testC"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="cleanupTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> +********* Start testing of tst_QExecStringList ********* +Config: Using QtTest library +PASS : tst_QExecStringList::initTestCase() +PASS : tst_QExecStringList::testA() +PASS : tst_QExecStringList::testB(Data1) +PASS : tst_QExecStringList::testB(Data2) +PASS : tst_QExecStringList::testB(Data3) +PASS : tst_QExecStringList::testC() +PASS : tst_QExecStringList::cleanupTestCase() +Totals: 7 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_QExecStringList ********* +********* Start testing of tst_QExecStringList ********* +Config: Using QtTest library +PASS : tst_QExecStringList::initTestCase() +PASS : tst_QExecStringList::testA() +PASS : tst_QExecStringList::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_QExecStringList ********* +********* Start testing of tst_QExecStringList ********* +Config: Using QtTest library +PASS : tst_QExecStringList::initTestCase() +PASS : tst_QExecStringList::testB(Data1) +PASS : tst_QExecStringList::testB(Data2) +PASS : tst_QExecStringList::testB(Data3) +PASS : tst_QExecStringList::cleanupTestCase() +Totals: 5 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_QExecStringList ********* +********* Start testing of tst_QExecStringList ********* +Config: Using QtTest library +PASS : tst_QExecStringList::initTestCase() +PASS : tst_QExecStringList::testB(Data2) +PASS : tst_QExecStringList::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_QExecStringList ********* +********* Start testing of tst_QExecStringList ********* +Config: Using QtTest library +PASS : tst_QExecStringList::initTestCase() +PASS : tst_QExecStringList::testC() +PASS : tst_QExecStringList::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_QExecStringList ********* diff --git a/tests/auto/testlib/selftests/expected_qexecstringlist.teamcity b/tests/auto/testlib/selftests/expected_qexecstringlist.teamcity new file mode 100644 index 0000000000..bb7ae829dd --- /dev/null +++ b/tests/auto/testlib/selftests/expected_qexecstringlist.teamcity @@ -0,0 +1,57 @@ +##teamcity[testSuiteStarted name='tst_QExecStringList' flowId='tst_QExecStringList'] +##teamcity[testStarted name='initTestCase()' flowId='tst_QExecStringList'] +##teamcity[testFinished name='initTestCase()' flowId='tst_QExecStringList'] +##teamcity[testStarted name='testA()' flowId='tst_QExecStringList'] +##teamcity[testFinished name='testA()' flowId='tst_QExecStringList'] +##teamcity[testStarted name='testB(Data1)' flowId='tst_QExecStringList'] +##teamcity[testFinished name='testB(Data1)' flowId='tst_QExecStringList'] +##teamcity[testStarted name='testB(Data2)' flowId='tst_QExecStringList'] +##teamcity[testFinished name='testB(Data2)' flowId='tst_QExecStringList'] +##teamcity[testStarted name='testB(Data3)' flowId='tst_QExecStringList'] +##teamcity[testFinished name='testB(Data3)' flowId='tst_QExecStringList'] +##teamcity[testStarted name='testC()' flowId='tst_QExecStringList'] +##teamcity[testFinished name='testC()' flowId='tst_QExecStringList'] +##teamcity[testStarted name='cleanupTestCase()' flowId='tst_QExecStringList'] +##teamcity[testFinished name='cleanupTestCase()' flowId='tst_QExecStringList'] +##teamcity[testSuiteFinished name='tst_QExecStringList' flowId='tst_QExecStringList'] +********* Start testing of tst_QExecStringList ********* +Config: Using QtTest library +PASS : tst_QExecStringList::initTestCase() +PASS : tst_QExecStringList::testA() +PASS : tst_QExecStringList::testB(Data1) +PASS : tst_QExecStringList::testB(Data2) +PASS : tst_QExecStringList::testB(Data3) +PASS : tst_QExecStringList::testC() +PASS : tst_QExecStringList::cleanupTestCase() +Totals: 7 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_QExecStringList ********* +********* Start testing of tst_QExecStringList ********* +Config: Using QtTest library +PASS : tst_QExecStringList::initTestCase() +PASS : tst_QExecStringList::testA() +PASS : tst_QExecStringList::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_QExecStringList ********* +********* Start testing of tst_QExecStringList ********* +Config: Using QtTest library +PASS : tst_QExecStringList::initTestCase() +PASS : tst_QExecStringList::testB(Data1) +PASS : tst_QExecStringList::testB(Data2) +PASS : tst_QExecStringList::testB(Data3) +PASS : tst_QExecStringList::cleanupTestCase() +Totals: 5 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_QExecStringList ********* +********* Start testing of tst_QExecStringList ********* +Config: Using QtTest library +PASS : tst_QExecStringList::initTestCase() +PASS : tst_QExecStringList::testB(Data2) +PASS : tst_QExecStringList::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_QExecStringList ********* +********* Start testing of tst_QExecStringList ********* +Config: Using QtTest library +PASS : tst_QExecStringList::initTestCase() +PASS : tst_QExecStringList::testC() +PASS : tst_QExecStringList::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_QExecStringList ********* diff --git a/tests/auto/testlib/selftests/expected_qexecstringlist.txt b/tests/auto/testlib/selftests/expected_qexecstringlist.txt index 830e7e8b36..480baedd0a 100644 --- a/tests/auto/testlib/selftests/expected_qexecstringlist.txt +++ b/tests/auto/testlib/selftests/expected_qexecstringlist.txt @@ -1,5 +1,5 @@ ********* Start testing of tst_QExecStringList ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_QExecStringList::initTestCase() PASS : tst_QExecStringList::testA() PASS : tst_QExecStringList::testB(Data1) @@ -7,10 +7,10 @@ PASS : tst_QExecStringList::testB(Data2) PASS : tst_QExecStringList::testB(Data3) PASS : tst_QExecStringList::testC() PASS : tst_QExecStringList::cleanupTestCase() -Totals: 7 passed, 0 failed, 0 skipped, 0 blacklisted +Totals: 7 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_QExecStringList ********* ********* Start testing of tst_QExecStringList ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_QExecStringList::initTestCase() PASS : tst_QExecStringList::testA() PASS : tst_QExecStringList::testB(Data1) @@ -18,35 +18,35 @@ PASS : tst_QExecStringList::testB(Data2) PASS : tst_QExecStringList::testB(Data3) PASS : tst_QExecStringList::testC() PASS : tst_QExecStringList::cleanupTestCase() -Totals: 7 passed, 0 failed, 0 skipped, 0 blacklisted +Totals: 7 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_QExecStringList ********* ********* Start testing of tst_QExecStringList ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_QExecStringList::initTestCase() PASS : tst_QExecStringList::testA() PASS : tst_QExecStringList::cleanupTestCase() -Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_QExecStringList ********* ********* Start testing of tst_QExecStringList ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_QExecStringList::initTestCase() PASS : tst_QExecStringList::testB(Data1) PASS : tst_QExecStringList::testB(Data2) PASS : tst_QExecStringList::testB(Data3) PASS : tst_QExecStringList::cleanupTestCase() -Totals: 5 passed, 0 failed, 0 skipped, 0 blacklisted +Totals: 5 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_QExecStringList ********* ********* Start testing of tst_QExecStringList ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_QExecStringList::initTestCase() PASS : tst_QExecStringList::testB(Data2) PASS : tst_QExecStringList::cleanupTestCase() -Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_QExecStringList ********* ********* Start testing of tst_QExecStringList ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_QExecStringList::initTestCase() PASS : tst_QExecStringList::testC() PASS : tst_QExecStringList::cleanupTestCase() -Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_QExecStringList ********* diff --git a/tests/auto/testlib/selftests/expected_qexecstringlist.xml b/tests/auto/testlib/selftests/expected_qexecstringlist.xml new file mode 100644 index 0000000000..403d2725b0 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_qexecstringlist.xml @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="UTF-8"?> +<TestCase name="tst_QExecStringList"> +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="testA"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="testB"> +<Incident type="pass" file="" line="0"> + <DataTag><![CDATA[Data1]]></DataTag> +</Incident> +<Incident type="pass" file="" line="0"> + <DataTag><![CDATA[Data2]]></DataTag> +</Incident> +<Incident type="pass" file="" line="0"> + <DataTag><![CDATA[Data3]]></DataTag> +</Incident> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="testC"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="cleanupTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> +</TestCase> +********* Start testing of tst_QExecStringList ********* +Config: Using QtTest library +PASS : tst_QExecStringList::initTestCase() +PASS : tst_QExecStringList::testA() +PASS : tst_QExecStringList::testB(Data1) +PASS : tst_QExecStringList::testB(Data2) +PASS : tst_QExecStringList::testB(Data3) +PASS : tst_QExecStringList::testC() +PASS : tst_QExecStringList::cleanupTestCase() +Totals: 7 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_QExecStringList ********* +********* Start testing of tst_QExecStringList ********* +Config: Using QtTest library +PASS : tst_QExecStringList::initTestCase() +PASS : tst_QExecStringList::testA() +PASS : tst_QExecStringList::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_QExecStringList ********* +********* Start testing of tst_QExecStringList ********* +Config: Using QtTest library +PASS : tst_QExecStringList::initTestCase() +PASS : tst_QExecStringList::testB(Data1) +PASS : tst_QExecStringList::testB(Data2) +PASS : tst_QExecStringList::testB(Data3) +PASS : tst_QExecStringList::cleanupTestCase() +Totals: 5 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_QExecStringList ********* +********* Start testing of tst_QExecStringList ********* +Config: Using QtTest library +PASS : tst_QExecStringList::initTestCase() +PASS : tst_QExecStringList::testB(Data2) +PASS : tst_QExecStringList::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_QExecStringList ********* +********* Start testing of tst_QExecStringList ********* +Config: Using QtTest library +PASS : tst_QExecStringList::initTestCase() +PASS : tst_QExecStringList::testC() +PASS : tst_QExecStringList::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_QExecStringList ********* diff --git a/tests/auto/testlib/selftests/expected_qexecstringlist.xunitxml b/tests/auto/testlib/selftests/expected_qexecstringlist.xunitxml new file mode 100644 index 0000000000..b352b8e6b9 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_qexecstringlist.xunitxml @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<testsuite errors="0" failures="0" tests="5" name="tst_QExecStringList"> + <properties> + <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/> + <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/> + <property value="" name="QtBuild"/> + </properties> + <testcase result="pass" name="initTestCase"/> + <testcase result="pass" name="testA"/> + <testcase result="pass" name="testB"/> + <testcase result="pass" name="testC"/> + <testcase result="pass" name="cleanupTestCase"/> + <system-err/> +</testsuite> +********* Start testing of tst_QExecStringList ********* +Config: Using QtTest library +PASS : tst_QExecStringList::initTestCase() +PASS : tst_QExecStringList::testA() +PASS : tst_QExecStringList::testB(Data1) +PASS : tst_QExecStringList::testB(Data2) +PASS : tst_QExecStringList::testB(Data3) +PASS : tst_QExecStringList::testC() +PASS : tst_QExecStringList::cleanupTestCase() +Totals: 7 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_QExecStringList ********* +********* Start testing of tst_QExecStringList ********* +Config: Using QtTest library +PASS : tst_QExecStringList::initTestCase() +PASS : tst_QExecStringList::testA() +PASS : tst_QExecStringList::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_QExecStringList ********* +********* Start testing of tst_QExecStringList ********* +Config: Using QtTest library +PASS : tst_QExecStringList::initTestCase() +PASS : tst_QExecStringList::testB(Data1) +PASS : tst_QExecStringList::testB(Data2) +PASS : tst_QExecStringList::testB(Data3) +PASS : tst_QExecStringList::cleanupTestCase() +Totals: 5 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_QExecStringList ********* +********* Start testing of tst_QExecStringList ********* +Config: Using QtTest library +PASS : tst_QExecStringList::initTestCase() +PASS : tst_QExecStringList::testB(Data2) +PASS : tst_QExecStringList::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_QExecStringList ********* +********* Start testing of tst_QExecStringList ********* +Config: Using QtTest library +PASS : tst_QExecStringList::initTestCase() +PASS : tst_QExecStringList::testC() +PASS : tst_QExecStringList::cleanupTestCase() +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms +********* Finished testing of tst_QExecStringList ********* diff --git a/tests/auto/testlib/selftests/expected_silent.lightxml b/tests/auto/testlib/selftests/expected_silent.lightxml new file mode 100644 index 0000000000..29b582cb4b --- /dev/null +++ b/tests/auto/testlib/selftests/expected_silent.lightxml @@ -0,0 +1,66 @@ +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="pass"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="skip"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/silent/tst_silent.cpp" line="0"> + <Description><![CDATA[This test should skip]]></Description> +</Message> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="fail"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/silent/tst_silent.cpp" line="0"> + <Description><![CDATA['false' returned FALSE. (This test should fail)]]></Description> +</Incident> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="xfail"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/silent/tst_silent.cpp" line="0"> + <Description><![CDATA[This test should XFAIL]]></Description> +</Incident> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="xpass"> +<Incident type="xpass" file="qtbase/tests/auto/testlib/selftests/silent/tst_silent.cpp" line="0"> + <Description><![CDATA['true' returned TRUE unexpectedly. (This test should XPASS)]]></Description> +</Incident> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="messages"> +<Message type="qwarn" file="" line="0"> + <Description><![CDATA[This is a warning that should not appear in silent test output]]></Description> +</Message> +<Message type="warn" file="qtbase/tests/auto/testlib/selftests/silent/tst_silent.cpp" line="0"> + <Description><![CDATA[This is an internal testlib warning that should not appear in silent test output]]></Description> +</Message> +<Message type="qdebug" file="" line="0"> + <Description><![CDATA[This is a debug message that should not appear in silent test output]]></Description> +</Message> +<Message type="system" file="" line="0"> + <Description><![CDATA[This is a critical message that should not appear in silent test output]]></Description> +</Message> +<Message type="qinfo" file="" line="0"> + <Description><![CDATA[This is an info message that should not appear in silent test output]]></Description> +</Message> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/silent/tst_silent.cpp" line="0"> + <Description><![CDATA[This is an internal testlib info message that should not appear in silent test output]]></Description> +</Message> +<Message type="qfatal" file="" line="0"> + <Description><![CDATA[This is a fatal error message that should still appear in silent test output]]></Description> +</Message> +<Incident type="fail" file="Unknown file" line="0"> + <Description><![CDATA[Received a fatal error.]]></Description> +</Incident> + <Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_silent.teamcity b/tests/auto/testlib/selftests/expected_silent.teamcity index 0f68bcb437..327d667fee 100644 --- a/tests/auto/testlib/selftests/expected_silent.teamcity +++ b/tests/auto/testlib/selftests/expected_silent.teamcity @@ -1,12 +1,12 @@ ##teamcity[testSuiteStarted name='tst_Silent' flowId='tst_Silent'] ##teamcity[testStarted name='fail()' flowId='tst_Silent'] -##teamcity[testFailed name='fail()' message='Failure! |[Loc: tst_silent.cpp(65)|]' details='|'false|' returned FALSE. (This test should fail)' flowId='tst_Silent'] +##teamcity[testFailed name='fail()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/silent/tst_silent.cpp(0)|]' details='|'false|' returned FALSE. (This test should fail)' flowId='tst_Silent'] ##teamcity[testFinished name='fail()' flowId='tst_Silent'] ##teamcity[testStarted name='xpass()' flowId='tst_Silent'] -##teamcity[testFailed name='xpass()' message='Failure! |[Loc: tst_silent.cpp(77)|]' details='|'true|' returned TRUE unexpectedly. (This test should XPASS)' flowId='tst_Silent'] +##teamcity[testFailed name='xpass()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/silent/tst_silent.cpp(0)|]' details='|'true|' returned TRUE unexpectedly. (This test should XPASS)' flowId='tst_Silent'] ##teamcity[testFinished name='xpass()' flowId='tst_Silent'] ##teamcity[testStarted name='messages()' flowId='tst_Silent'] -##teamcity[testFailed name='messages()' message='Failure! |[Loc: unknown file(0)|]' details='Received a fatal error.' flowId='tst_Silent'] +##teamcity[testFailed name='messages()' message='Failure! |[Loc: Unknown file(0)|]' details='Received a fatal error.' flowId='tst_Silent'] ##teamcity[testStdOut name='messages()' out='QFATAL: This is a fatal error message that should still appear in silent test output' flowId='tst_Silent'] ##teamcity[testFinished name='messages()' flowId='tst_Silent'] ##teamcity[testSuiteFinished name='tst_Silent' flowId='tst_Silent'] diff --git a/tests/auto/testlib/selftests/expected_silent.txt b/tests/auto/testlib/selftests/expected_silent.txt index 34728f5829..b70a97dbac 100644 --- a/tests/auto/testlib/selftests/expected_silent.txt +++ b/tests/auto/testlib/selftests/expected_silent.txt @@ -1,9 +1,9 @@ Testing tst_Silent FAIL! : tst_Silent::fail() 'false' returned FALSE. (This test should fail) - Loc: [tst_silent.cpp(73)] + Loc: [qtbase/tests/auto/testlib/selftests/silent/tst_silent.cpp(0)] XPASS : tst_Silent::xpass() 'true' returned TRUE unexpectedly. (This test should XPASS) - Loc: [tst_silent.cpp(85)] + Loc: [qtbase/tests/auto/testlib/selftests/silent/tst_silent.cpp(0)] QFATAL : tst_Silent::messages() This is a fatal error message that should still appear in silent test output FAIL! : tst_Silent::messages() Received a fatal error. Loc: [Unknown file(0)] -Totals: 3 passed, 3 failed, 1 skipped, 0 blacklisted +Totals: 3 passed, 3 failed, 1 skipped, 0 blacklisted, 0ms diff --git a/tests/auto/testlib/selftests/expected_silent.xml b/tests/auto/testlib/selftests/expected_silent.xml new file mode 100644 index 0000000000..6d2fae9fab --- /dev/null +++ b/tests/auto/testlib/selftests/expected_silent.xml @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="UTF-8"?> +<TestCase name="tst_Silent"> +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="pass"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="skip"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/silent/tst_silent.cpp" line="0"> + <Description><![CDATA[This test should skip]]></Description> +</Message> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="fail"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/silent/tst_silent.cpp" line="0"> + <Description><![CDATA['false' returned FALSE. (This test should fail)]]></Description> +</Incident> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="xfail"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/silent/tst_silent.cpp" line="0"> + <Description><![CDATA[This test should XFAIL]]></Description> +</Incident> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="xpass"> +<Incident type="xpass" file="qtbase/tests/auto/testlib/selftests/silent/tst_silent.cpp" line="0"> + <Description><![CDATA['true' returned TRUE unexpectedly. (This test should XPASS)]]></Description> +</Incident> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="messages"> +<Message type="qwarn" file="" line="0"> + <Description><![CDATA[This is a warning that should not appear in silent test output]]></Description> +</Message> +<Message type="warn" file="qtbase/tests/auto/testlib/selftests/silent/tst_silent.cpp" line="0"> + <Description><![CDATA[This is an internal testlib warning that should not appear in silent test output]]></Description> +</Message> +<Message type="qdebug" file="" line="0"> + <Description><![CDATA[This is a debug message that should not appear in silent test output]]></Description> +</Message> +<Message type="system" file="" line="0"> + <Description><![CDATA[This is a critical message that should not appear in silent test output]]></Description> +</Message> +<Message type="qinfo" file="" line="0"> + <Description><![CDATA[This is an info message that should not appear in silent test output]]></Description> +</Message> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/silent/tst_silent.cpp" line="0"> + <Description><![CDATA[This is an internal testlib info message that should not appear in silent test output]]></Description> +</Message> +<Message type="qfatal" file="" line="0"> + <Description><![CDATA[This is a fatal error message that should still appear in silent test output]]></Description> +</Message> +<Incident type="fail" file="Unknown file" line="0"> + <Description><![CDATA[Received a fatal error.]]></Description> +</Incident> + <Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> +</TestCase> diff --git a/tests/auto/testlib/selftests/expected_silent.xunitxml b/tests/auto/testlib/selftests/expected_silent.xunitxml new file mode 100644 index 0000000000..ea229d1dc7 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_silent.xunitxml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<testsuite errors="9" failures="3" tests="7" name="tst_Silent"> + <properties> + <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/> + <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/> + <property value="" name="QtBuild"/> + </properties> + <testcase result="pass" name="initTestCase"/> + <testcase result="pass" name="pass"/> + <testcase name="skip"> + <!-- message="This test should skip" type="skip" --> + </testcase> + <testcase result="fail" name="fail"> + <failure message="'false' returned FALSE. (This test should fail)" result="fail"/> + </testcase> + <testcase result="xfail" name="xfail"> + <!-- message="This test should XFAIL" type="info" --> + </testcase> + <testcase result="xpass" name="xpass"> + <failure message="'true' returned TRUE unexpectedly. (This test should XPASS)" result="xpass"/> + </testcase> + <testcase result="fail" name="messages"> + <!-- message="This is a warning that should not appear in silent test output" type="qwarn" --> + <!-- message="This is an internal testlib warning that should not appear in silent test output" type="warn" --> + <!-- message="This is a debug message that should not appear in silent test output" type="qdebug" --> + <!-- message="This is a critical message that should not appear in silent test output" type="system" --> + <!-- message="This is an info message that should not appear in silent test output" type="qinfo" --> + <!-- message="This is an internal testlib info message that should not appear in silent test output" type="info" --> + <!-- message="This is a fatal error message that should still appear in silent test output" type="qfatal" --> + <failure message="Received a fatal error." result="fail"/> + </testcase> + <system-err> +<![CDATA[This test should skip]]> +<![CDATA[This test should XFAIL]]> +<![CDATA[This is a warning that should not appear in silent test output]]> +<![CDATA[This is an internal testlib warning that should not appear in silent test output]]> +<![CDATA[This is a debug message that should not appear in silent test output]]> +<![CDATA[This is a critical message that should not appear in silent test output]]> +<![CDATA[This is an info message that should not appear in silent test output]]> +<![CDATA[This is an internal testlib info message that should not appear in silent test output]]> +<![CDATA[This is a fatal error message that should still appear in silent test output]]> + </system-err> +</testsuite> diff --git a/tests/auto/testlib/selftests/expected_singleskip.lightxml b/tests/auto/testlib/selftests/expected_singleskip.lightxml index ce09c0a9ad..10e35ae27b 100644 --- a/tests/auto/testlib/selftests/expected_singleskip.lightxml +++ b/tests/auto/testlib/selftests/expected_singleskip.lightxml @@ -5,16 +5,16 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="myTest"> -<Message type="skip" file="tst_singleskip.cpp" line="56"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/singleskip/tst_singleskip.cpp" line="0"> <Description><![CDATA[skipping test]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_singleskip.teamcity b/tests/auto/testlib/selftests/expected_singleskip.teamcity index 6c3a04aeb8..461538cead 100644 --- a/tests/auto/testlib/selftests/expected_singleskip.teamcity +++ b/tests/auto/testlib/selftests/expected_singleskip.teamcity @@ -1,7 +1,7 @@ ##teamcity[testSuiteStarted name='tst_SingleSkip' flowId='tst_SingleSkip'] ##teamcity[testStarted name='initTestCase()' flowId='tst_SingleSkip'] ##teamcity[testFinished name='initTestCase()' flowId='tst_SingleSkip'] -##teamcity[testIgnored name='myTest()' message='skipping test |[Loc: tst_singleskip.cpp(48)|]' flowId='tst_SingleSkip'] +##teamcity[testIgnored name='myTest()' message='skipping test |[Loc: qtbase/tests/auto/testlib/selftests/singleskip/tst_singleskip.cpp(0)|]' flowId='tst_SingleSkip'] ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_SingleSkip'] ##teamcity[testFinished name='cleanupTestCase()' flowId='tst_SingleSkip'] ##teamcity[testSuiteFinished name='tst_SingleSkip' flowId='tst_SingleSkip'] diff --git a/tests/auto/testlib/selftests/expected_singleskip.txt b/tests/auto/testlib/selftests/expected_singleskip.txt index 34c877cfd4..f7484633bd 100644 --- a/tests/auto/testlib/selftests/expected_singleskip.txt +++ b/tests/auto/testlib/selftests/expected_singleskip.txt @@ -1,8 +1,8 @@ ********* Start testing of tst_SingleSkip ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_SingleSkip::initTestCase() SKIP : tst_SingleSkip::myTest() skipping test - Loc: [tst_singleskip.cpp(56)] + Loc: [qtbase/tests/auto/testlib/selftests/singleskip/tst_singleskip.cpp(0)] PASS : tst_SingleSkip::cleanupTestCase() -Totals: 2 passed, 0 failed, 1 skipped, 0 blacklisted +Totals: 2 passed, 0 failed, 1 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_SingleSkip ********* diff --git a/tests/auto/testlib/selftests/expected_singleskip.xml b/tests/auto/testlib/selftests/expected_singleskip.xml index 0c5cdade3d..a36e74a236 100644 --- a/tests/auto/testlib/selftests/expected_singleskip.xml +++ b/tests/auto/testlib/selftests/expected_singleskip.xml @@ -7,17 +7,17 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="myTest"> -<Message type="skip" file="tst_singleskip.cpp" line="56"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/singleskip/tst_singleskip.cpp" line="0"> <Description><![CDATA[skipping test]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_skip.lightxml b/tests/auto/testlib/selftests/expected_skip.lightxml index ee83d263b5..d44cfe317d 100644 --- a/tests/auto/testlib/selftests/expected_skip.lightxml +++ b/tests/auto/testlib/selftests/expected_skip.lightxml @@ -5,22 +5,22 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="test"> -<Message type="skip" file="tst_skip.cpp" line="68"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="0"> <Description><![CDATA[skipping all]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="emptytest"> -<Message type="skip" file="tst_skip.cpp" line="78"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="0"> <Description><![CDATA[skipping all]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="singleSkip"> -<Message type="skip" file="tst_skip.cpp" line="97"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="0"> <DataTag><![CDATA[local 1]]></DataTag> <Description><![CDATA[skipping one]]></Description> </Message> @@ -31,10 +31,10 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[local 2]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_skip.teamcity b/tests/auto/testlib/selftests/expected_skip.teamcity index 5c01cf1ff2..472690195f 100644 --- a/tests/auto/testlib/selftests/expected_skip.teamcity +++ b/tests/auto/testlib/selftests/expected_skip.teamcity @@ -1,9 +1,9 @@ ##teamcity[testSuiteStarted name='tst_Skip' flowId='tst_Skip'] ##teamcity[testStarted name='initTestCase()' flowId='tst_Skip'] ##teamcity[testFinished name='initTestCase()' flowId='tst_Skip'] -##teamcity[testIgnored name='test()' message='skipping all |[Loc: tst_skip.cpp(60)|]' flowId='tst_Skip'] -##teamcity[testIgnored name='emptytest()' message='skipping all |[Loc: tst_skip.cpp(70)|]' flowId='tst_Skip'] -##teamcity[testIgnored name='singleSkip(local 1)' message='skipping one |[Loc: tst_skip.cpp(89)|]' flowId='tst_Skip'] +##teamcity[testIgnored name='test()' message='skipping all |[Loc: qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp(0)|]' flowId='tst_Skip'] +##teamcity[testIgnored name='emptytest()' message='skipping all |[Loc: qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp(0)|]' flowId='tst_Skip'] +##teamcity[testIgnored name='singleSkip(local 1)' message='skipping one |[Loc: qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp(0)|]' flowId='tst_Skip'] ##teamcity[testStarted name='singleSkip(local 2)' flowId='tst_Skip'] ##teamcity[testStdOut name='singleSkip(local 2)' out='QDEBUG: this line should only be reached once (true)' flowId='tst_Skip'] ##teamcity[testFinished name='singleSkip(local 2)' flowId='tst_Skip'] diff --git a/tests/auto/testlib/selftests/expected_skip.txt b/tests/auto/testlib/selftests/expected_skip.txt index a48427d3b2..9499a54be3 100644 --- a/tests/auto/testlib/selftests/expected_skip.txt +++ b/tests/auto/testlib/selftests/expected_skip.txt @@ -1,14 +1,14 @@ ********* Start testing of tst_Skip ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_Skip::initTestCase() SKIP : tst_Skip::test() skipping all - Loc: [tst_skip.cpp(68)] + Loc: [qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp(0)] SKIP : tst_Skip::emptytest() skipping all - Loc: [tst_skip.cpp(78)] + Loc: [qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp(0)] SKIP : tst_Skip::singleSkip(local 1) skipping one - Loc: [tst_skip.cpp(97)] + Loc: [qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp(0)] QDEBUG : tst_Skip::singleSkip(local 2) this line should only be reached once (true) PASS : tst_Skip::singleSkip(local 2) PASS : tst_Skip::cleanupTestCase() -Totals: 3 passed, 0 failed, 3 skipped, 0 blacklisted +Totals: 3 passed, 0 failed, 3 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_Skip ********* diff --git a/tests/auto/testlib/selftests/expected_skip.xml b/tests/auto/testlib/selftests/expected_skip.xml index 2c830bc9fb..70d3d12cf5 100644 --- a/tests/auto/testlib/selftests/expected_skip.xml +++ b/tests/auto/testlib/selftests/expected_skip.xml @@ -7,22 +7,22 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="test"> -<Message type="skip" file="tst_skip.cpp" line="68"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="0"> <Description><![CDATA[skipping all]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="emptytest"> -<Message type="skip" file="tst_skip.cpp" line="78"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="0"> <Description><![CDATA[skipping all]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="singleSkip"> -<Message type="skip" file="tst_skip.cpp" line="97"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skip/tst_skip.cpp" line="0"> <DataTag><![CDATA[local 1]]></DataTag> <Description><![CDATA[skipping one]]></Description> </Message> @@ -33,11 +33,11 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[local 2]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_skipcleanup.lightxml b/tests/auto/testlib/selftests/expected_skipcleanup.lightxml index dbbc30c0db..ac310226e8 100644 --- a/tests/auto/testlib/selftests/expected_skipcleanup.lightxml +++ b/tests/auto/testlib/selftests/expected_skipcleanup.lightxml @@ -5,16 +5,16 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="aTestFunction"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> -<Message type="skip" file="tst_skipcleanup.cpp" line="59"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skipcleanup/tst_skipcleanup.cpp" line="0"> <Description><![CDATA[Skip inside cleanupTestCase.]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_skipcleanup.teamcity b/tests/auto/testlib/selftests/expected_skipcleanup.teamcity index 7f78f82004..12b0d0e0d2 100644 --- a/tests/auto/testlib/selftests/expected_skipcleanup.teamcity +++ b/tests/auto/testlib/selftests/expected_skipcleanup.teamcity @@ -3,5 +3,5 @@ ##teamcity[testFinished name='initTestCase()' flowId='tst_SkipCleanup'] ##teamcity[testStarted name='aTestFunction()' flowId='tst_SkipCleanup'] ##teamcity[testFinished name='aTestFunction()' flowId='tst_SkipCleanup'] -##teamcity[testIgnored name='cleanupTestCase()' message='Skip inside cleanupTestCase. |[Loc: tst_skipcleanup.cpp(51)|]' flowId='tst_SkipCleanup'] +##teamcity[testIgnored name='cleanupTestCase()' message='Skip inside cleanupTestCase. |[Loc: qtbase/tests/auto/testlib/selftests/skipcleanup/tst_skipcleanup.cpp(0)|]' flowId='tst_SkipCleanup'] ##teamcity[testSuiteFinished name='tst_SkipCleanup' flowId='tst_SkipCleanup'] diff --git a/tests/auto/testlib/selftests/expected_skipcleanup.txt b/tests/auto/testlib/selftests/expected_skipcleanup.txt index 3120cffcb6..987e2b9a14 100644 --- a/tests/auto/testlib/selftests/expected_skipcleanup.txt +++ b/tests/auto/testlib/selftests/expected_skipcleanup.txt @@ -1,8 +1,8 @@ ********* Start testing of tst_SkipCleanup ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_SkipCleanup::initTestCase() PASS : tst_SkipCleanup::aTestFunction() SKIP : tst_SkipCleanup::cleanupTestCase() Skip inside cleanupTestCase. - Loc: [tst_skipcleanup.cpp(59)] -Totals: 2 passed, 0 failed, 1 skipped, 0 blacklisted + Loc: [qtbase/tests/auto/testlib/selftests/skipcleanup/tst_skipcleanup.cpp(0)] +Totals: 2 passed, 0 failed, 1 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_SkipCleanup ********* diff --git a/tests/auto/testlib/selftests/expected_skipcleanup.xml b/tests/auto/testlib/selftests/expected_skipcleanup.xml index 7b787ebb3d..14207b2196 100644 --- a/tests/auto/testlib/selftests/expected_skipcleanup.xml +++ b/tests/auto/testlib/selftests/expected_skipcleanup.xml @@ -7,17 +7,17 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="aTestFunction"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> -<Message type="skip" file="tst_skipcleanup.cpp" line="59"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skipcleanup/tst_skipcleanup.cpp" line="0"> <Description><![CDATA[Skip inside cleanupTestCase.]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_skipinit.lightxml b/tests/auto/testlib/selftests/expected_skipinit.lightxml index 3682068825..76f4365cae 100644 --- a/tests/auto/testlib/selftests/expected_skipinit.lightxml +++ b/tests/auto/testlib/selftests/expected_skipinit.lightxml @@ -4,13 +4,13 @@ <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> </Environment> <TestFunction name="initTestCase"> -<Message type="skip" file="tst_skipinit.cpp" line="55"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skipinit/tst_skipinit.cpp" line="0"> <Description><![CDATA[Skip inside initTestCase. This should skip all tests in the class.]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_skipinit.teamcity b/tests/auto/testlib/selftests/expected_skipinit.teamcity index 7f36d6d3b9..07a30c743d 100644 --- a/tests/auto/testlib/selftests/expected_skipinit.teamcity +++ b/tests/auto/testlib/selftests/expected_skipinit.teamcity @@ -1,5 +1,5 @@ ##teamcity[testSuiteStarted name='tst_SkipInit' flowId='tst_SkipInit'] -##teamcity[testIgnored name='initTestCase()' message='Skip inside initTestCase. This should skip all tests in the class. |[Loc: tst_skipinit.cpp(47)|]' flowId='tst_SkipInit'] +##teamcity[testIgnored name='initTestCase()' message='Skip inside initTestCase. This should skip all tests in the class. |[Loc: qtbase/tests/auto/testlib/selftests/skipinit/tst_skipinit.cpp(0)|]' flowId='tst_SkipInit'] ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_SkipInit'] ##teamcity[testFinished name='cleanupTestCase()' flowId='tst_SkipInit'] ##teamcity[testSuiteFinished name='tst_SkipInit' flowId='tst_SkipInit'] diff --git a/tests/auto/testlib/selftests/expected_skipinit.txt b/tests/auto/testlib/selftests/expected_skipinit.txt index 8a2bbe01db..9fc2d98006 100644 --- a/tests/auto/testlib/selftests/expected_skipinit.txt +++ b/tests/auto/testlib/selftests/expected_skipinit.txt @@ -1,7 +1,7 @@ ********* Start testing of tst_SkipInit ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library SKIP : tst_SkipInit::initTestCase() Skip inside initTestCase. This should skip all tests in the class. - Loc: [tst_skipinit.cpp(55)] + Loc: [qtbase/tests/auto/testlib/selftests/skipinit/tst_skipinit.cpp(0)] PASS : tst_SkipInit::cleanupTestCase() -Totals: 1 passed, 0 failed, 1 skipped, 0 blacklisted +Totals: 1 passed, 0 failed, 1 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_SkipInit ********* diff --git a/tests/auto/testlib/selftests/expected_skipinit.xml b/tests/auto/testlib/selftests/expected_skipinit.xml index 9d6a38b82f..7e0c1564b6 100644 --- a/tests/auto/testlib/selftests/expected_skipinit.xml +++ b/tests/auto/testlib/selftests/expected_skipinit.xml @@ -6,14 +6,14 @@ <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> </Environment> <TestFunction name="initTestCase"> -<Message type="skip" file="tst_skipinit.cpp" line="55"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skipinit/tst_skipinit.cpp" line="0"> <Description><![CDATA[Skip inside initTestCase. This should skip all tests in the class.]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_skipinitdata.lightxml b/tests/auto/testlib/selftests/expected_skipinitdata.lightxml index 26afcb4ab1..27a207a4a2 100644 --- a/tests/auto/testlib/selftests/expected_skipinitdata.lightxml +++ b/tests/auto/testlib/selftests/expected_skipinitdata.lightxml @@ -4,9 +4,9 @@ <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> </Environment> <TestFunction name="initTestCase"> -<Message type="skip" file="tst_skipinitdata.cpp" line="56"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skipinitdata/tst_skipinitdata.cpp" line="0"> <Description><![CDATA[Skip inside initTestCase_data. This should skip all tests in the class.]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_skipinitdata.teamcity b/tests/auto/testlib/selftests/expected_skipinitdata.teamcity index 82b8be5370..8ae11fc7ff 100644 --- a/tests/auto/testlib/selftests/expected_skipinitdata.teamcity +++ b/tests/auto/testlib/selftests/expected_skipinitdata.teamcity @@ -1,3 +1,3 @@ ##teamcity[testSuiteStarted name='tst_SkipInitData' flowId='tst_SkipInitData'] -##teamcity[testIgnored name='initTestCase()' message='Skip inside initTestCase_data. This should skip all tests in the class. |[Loc: tst_skipinitdata.cpp(48)|]' flowId='tst_SkipInitData'] +##teamcity[testIgnored name='initTestCase()' message='Skip inside initTestCase_data. This should skip all tests in the class. |[Loc: qtbase/tests/auto/testlib/selftests/skipinitdata/tst_skipinitdata.cpp(0)|]' flowId='tst_SkipInitData'] ##teamcity[testSuiteFinished name='tst_SkipInitData' flowId='tst_SkipInitData'] diff --git a/tests/auto/testlib/selftests/expected_skipinitdata.txt b/tests/auto/testlib/selftests/expected_skipinitdata.txt index 654098630e..c245f52847 100644 --- a/tests/auto/testlib/selftests/expected_skipinitdata.txt +++ b/tests/auto/testlib/selftests/expected_skipinitdata.txt @@ -1,6 +1,6 @@ ********* Start testing of tst_SkipInitData ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library SKIP : tst_SkipInitData::initTestCase() Skip inside initTestCase_data. This should skip all tests in the class. - Loc: [tst_skipinitdata.cpp(56)] -Totals: 0 passed, 0 failed, 1 skipped, 0 blacklisted + Loc: [qtbase/tests/auto/testlib/selftests/skipinitdata/tst_skipinitdata.cpp(0)] +Totals: 0 passed, 0 failed, 1 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_SkipInitData ********* diff --git a/tests/auto/testlib/selftests/expected_skipinitdata.xml b/tests/auto/testlib/selftests/expected_skipinitdata.xml index 9ab84f21a1..cf0189e6be 100644 --- a/tests/auto/testlib/selftests/expected_skipinitdata.xml +++ b/tests/auto/testlib/selftests/expected_skipinitdata.xml @@ -6,10 +6,10 @@ <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> </Environment> <TestFunction name="initTestCase"> -<Message type="skip" file="tst_skipinitdata.cpp" line="56"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/skipinitdata/tst_skipinitdata.cpp" line="0"> <Description><![CDATA[Skip inside initTestCase_data. This should skip all tests in the class.]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_sleep.lightxml b/tests/auto/testlib/selftests/expected_sleep.lightxml new file mode 100644 index 0000000000..97b65d1259 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_sleep.lightxml @@ -0,0 +1,18 @@ +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="sleep"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="cleanupTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_sleep.txt b/tests/auto/testlib/selftests/expected_sleep.txt index 58c7b928c0..d18c3212bb 100644 --- a/tests/auto/testlib/selftests/expected_sleep.txt +++ b/tests/auto/testlib/selftests/expected_sleep.txt @@ -1,7 +1,7 @@ ********* Start testing of tst_Sleep ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_Sleep::initTestCase() PASS : tst_Sleep::sleep() PASS : tst_Sleep::cleanupTestCase() -Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted +Totals: 3 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_Sleep ********* diff --git a/tests/auto/testlib/selftests/expected_sleep.xml b/tests/auto/testlib/selftests/expected_sleep.xml new file mode 100644 index 0000000000..5729c0ac9d --- /dev/null +++ b/tests/auto/testlib/selftests/expected_sleep.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<TestCase name="tst_Sleep"> +<Environment> + <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion> + <QtBuild/> + <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion> +</Environment> +<TestFunction name="initTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="sleep"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<TestFunction name="cleanupTestCase"> +<Incident type="pass" file="" line="0" /> + <Duration msecs="0"/> +</TestFunction> +<Duration msecs="0"/> +</TestCase> diff --git a/tests/auto/testlib/selftests/expected_sleep.xunitxml b/tests/auto/testlib/selftests/expected_sleep.xunitxml new file mode 100644 index 0000000000..138486fc02 --- /dev/null +++ b/tests/auto/testlib/selftests/expected_sleep.xunitxml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<testsuite errors="0" failures="0" tests="3" name="tst_Sleep"> + <properties> + <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/> + <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/> + <property value="" name="QtBuild"/> + </properties> + <testcase result="pass" name="initTestCase"/> + <testcase result="pass" name="sleep"/> + <testcase result="pass" name="cleanupTestCase"/> + <system-err/> +</testsuite> diff --git a/tests/auto/testlib/selftests/expected_strcmp.lightxml b/tests/auto/testlib/selftests/expected_strcmp.lightxml index 93a860431e..e35ec497cc 100644 --- a/tests/auto/testlib/selftests/expected_strcmp.lightxml +++ b/tests/auto/testlib/selftests/expected_strcmp.lightxml @@ -5,63 +5,63 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="compareCharStars"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="compareByteArray"> -<Incident type="xfail" file="tst_strcmp.cpp" line="88"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="0"> <Description><![CDATA[Next test should fail]]></Description> </Incident> -<Incident type="xfail" file="tst_strcmp.cpp" line="95"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="0"> <Description><![CDATA[Next test should fail]]></Description> </Incident> -<Incident type="xfail" file="tst_strcmp.cpp" line="102"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="0"> <Description><![CDATA[Next test should fail]]></Description> </Incident> -<Incident type="fail" file="tst_strcmp.cpp" line="109"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="0"> <Description><![CDATA[Compared values are not the same Actual (a): "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"... Expected (b): "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"...]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="failByteArray"> -<Incident type="fail" file="tst_strcmp.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="0"> <Description><![CDATA[Compared values are not the same Actual (QByteArray("abc")): "abc" Expected (QByteArray("cba")): "cba"]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="failByteArrayNull"> -<Incident type="fail" file="tst_strcmp.cpp" line="121"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="0"> <Description><![CDATA[Compared values are not the same Actual (QByteArray("foo")): "foo" Expected (QByteArray()) : ""]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="failByteArrayEmpty"> -<Incident type="fail" file="tst_strcmp.cpp" line="126"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="0"> <Description><![CDATA[Compared values are not the same Actual (QByteArray("")) : "" Expected (QByteArray("foo")): "foo"]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="failByteArraySingleChars"> -<Incident type="fail" file="tst_strcmp.cpp" line="133"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="0"> <Description><![CDATA[Compared values are not the same Actual (QByteArray("6")): "6" Expected (QByteArray("7")): "7"]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_strcmp.teamcity b/tests/auto/testlib/selftests/expected_strcmp.teamcity index 1e56488067..b0a614e264 100644 --- a/tests/auto/testlib/selftests/expected_strcmp.teamcity +++ b/tests/auto/testlib/selftests/expected_strcmp.teamcity @@ -4,20 +4,20 @@ ##teamcity[testStarted name='compareCharStars()' flowId='tst_StrCmp'] ##teamcity[testFinished name='compareCharStars()' flowId='tst_StrCmp'] ##teamcity[testStarted name='compareByteArray()' flowId='tst_StrCmp'] -##teamcity[testFailed name='compareByteArray()' message='Failure! |[Loc: tst_strcmp.cpp(101)|]' details='Compared values are not the same|n Actual (a): "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"...|n Expected (b): "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"...' flowId='tst_StrCmp'] -##teamcity[testStdOut name='compareByteArray()' out='XFAIL |[Loc: tst_strcmp.cpp(80)|]: Next test should fail|nXFAIL |[Loc: tst_strcmp.cpp(87)|]: Next test should fail|nXFAIL |[Loc: tst_strcmp.cpp(94)|]: Next test should fail' flowId='tst_StrCmp'] +##teamcity[testFailed name='compareByteArray()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp(0)|]' details='Compared values are not the same|n Actual (a): "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"...|n Expected (b): "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"...' flowId='tst_StrCmp'] +##teamcity[testStdOut name='compareByteArray()' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp(0)|]: Next test should fail|nXFAIL |[Loc: qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp(0)|]: Next test should fail|nXFAIL |[Loc: qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp(0)|]: Next test should fail' flowId='tst_StrCmp'] ##teamcity[testFinished name='compareByteArray()' flowId='tst_StrCmp'] ##teamcity[testStarted name='failByteArray()' flowId='tst_StrCmp'] -##teamcity[testFailed name='failByteArray()' message='Failure! |[Loc: tst_strcmp.cpp(107)|]' details='Compared values are not the same|n Actual (QByteArray("abc")): "abc"|n Expected (QByteArray("cba")): "cba"' flowId='tst_StrCmp'] +##teamcity[testFailed name='failByteArray()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp(0)|]' details='Compared values are not the same|n Actual (QByteArray("abc")): "abc"|n Expected (QByteArray("cba")): "cba"' flowId='tst_StrCmp'] ##teamcity[testFinished name='failByteArray()' flowId='tst_StrCmp'] ##teamcity[testStarted name='failByteArrayNull()' flowId='tst_StrCmp'] -##teamcity[testFailed name='failByteArrayNull()' message='Failure! |[Loc: tst_strcmp.cpp(113)|]' details='Compared values are not the same|n Actual (QByteArray("foo")): "foo"|n Expected (QByteArray()) : ""' flowId='tst_StrCmp'] +##teamcity[testFailed name='failByteArrayNull()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp(0)|]' details='Compared values are not the same|n Actual (QByteArray("foo")): "foo"|n Expected (QByteArray()) : ""' flowId='tst_StrCmp'] ##teamcity[testFinished name='failByteArrayNull()' flowId='tst_StrCmp'] ##teamcity[testStarted name='failByteArrayEmpty()' flowId='tst_StrCmp'] -##teamcity[testFailed name='failByteArrayEmpty()' message='Failure! |[Loc: tst_strcmp.cpp(118)|]' details='Compared values are not the same|n Actual (QByteArray("")) : ""|n Expected (QByteArray("foo")): "foo"' flowId='tst_StrCmp'] +##teamcity[testFailed name='failByteArrayEmpty()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp(0)|]' details='Compared values are not the same|n Actual (QByteArray("")) : ""|n Expected (QByteArray("foo")): "foo"' flowId='tst_StrCmp'] ##teamcity[testFinished name='failByteArrayEmpty()' flowId='tst_StrCmp'] ##teamcity[testStarted name='failByteArraySingleChars()' flowId='tst_StrCmp'] -##teamcity[testFailed name='failByteArraySingleChars()' message='Failure! |[Loc: tst_strcmp.cpp(125)|]' details='Compared values are not the same|n Actual (QByteArray("6")): "6"|n Expected (QByteArray("7")): "7"' flowId='tst_StrCmp'] +##teamcity[testFailed name='failByteArraySingleChars()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp(0)|]' details='Compared values are not the same|n Actual (QByteArray("6")): "6"|n Expected (QByteArray("7")): "7"' flowId='tst_StrCmp'] ##teamcity[testFinished name='failByteArraySingleChars()' flowId='tst_StrCmp'] ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_StrCmp'] ##teamcity[testFinished name='cleanupTestCase()' flowId='tst_StrCmp'] diff --git a/tests/auto/testlib/selftests/expected_strcmp.txt b/tests/auto/testlib/selftests/expected_strcmp.txt index 270ce09892..ed8f9125f3 100644 --- a/tests/auto/testlib/selftests/expected_strcmp.txt +++ b/tests/auto/testlib/selftests/expected_strcmp.txt @@ -1,33 +1,33 @@ ********* Start testing of tst_StrCmp ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_StrCmp::initTestCase() PASS : tst_StrCmp::compareCharStars() XFAIL : tst_StrCmp::compareByteArray() Next test should fail - Loc: [tst_strcmp.cpp(88)] + Loc: [qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp(0)] XFAIL : tst_StrCmp::compareByteArray() Next test should fail - Loc: [tst_strcmp.cpp(95)] + Loc: [qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp(0)] XFAIL : tst_StrCmp::compareByteArray() Next test should fail - Loc: [tst_strcmp.cpp(102)] + Loc: [qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp(0)] FAIL! : tst_StrCmp::compareByteArray() Compared values are not the same Actual (a): "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"... Expected (b): "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"... - Loc: [/home/thiago/src/qt/qt5/qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp(109)] + Loc: [qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp(0)] FAIL! : tst_StrCmp::failByteArray() Compared values are not the same Actual (QByteArray("abc")): "abc" Expected (QByteArray("cba")): "cba" - Loc: [/home/thiago/src/qt/qt5/qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp(115)] + Loc: [qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp(0)] FAIL! : tst_StrCmp::failByteArrayNull() Compared values are not the same Actual (QByteArray("foo")): "foo" Expected (QByteArray()) : "" - Loc: [/home/thiago/src/qt/qt5/qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp(121)] + Loc: [qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp(0)] FAIL! : tst_StrCmp::failByteArrayEmpty() Compared values are not the same Actual (QByteArray("")) : "" Expected (QByteArray("foo")): "foo" - Loc: [/home/thiago/src/qt/qt5/qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp(126)] + Loc: [qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp(0)] FAIL! : tst_StrCmp::failByteArraySingleChars() Compared values are not the same Actual (QByteArray("6")): "6" Expected (QByteArray("7")): "7" - Loc: [/home/thiago/src/qt/qt5/qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp(133)] + Loc: [qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp(0)] PASS : tst_StrCmp::cleanupTestCase() -Totals: 3 passed, 5 failed, 0 skipped, 0 blacklisted +Totals: 3 passed, 5 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_StrCmp ********* diff --git a/tests/auto/testlib/selftests/expected_strcmp.xml b/tests/auto/testlib/selftests/expected_strcmp.xml index 9e14dddd7c..7848eea61f 100644 --- a/tests/auto/testlib/selftests/expected_strcmp.xml +++ b/tests/auto/testlib/selftests/expected_strcmp.xml @@ -7,64 +7,64 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="compareCharStars"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="compareByteArray"> -<Incident type="xfail" file="tst_strcmp.cpp" line="88"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="0"> <Description><![CDATA[Next test should fail]]></Description> </Incident> -<Incident type="xfail" file="tst_strcmp.cpp" line="95"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="0"> <Description><![CDATA[Next test should fail]]></Description> </Incident> -<Incident type="xfail" file="tst_strcmp.cpp" line="102"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="0"> <Description><![CDATA[Next test should fail]]></Description> </Incident> -<Incident type="fail" file="tst_strcmp.cpp" line="109"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="0"> <Description><![CDATA[Compared values are not the same Actual (a): "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"... Expected (b): "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"...]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="failByteArray"> -<Incident type="fail" file="tst_strcmp.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="0"> <Description><![CDATA[Compared values are not the same Actual (QByteArray("abc")): "abc" Expected (QByteArray("cba")): "cba"]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="failByteArrayNull"> -<Incident type="fail" file="tst_strcmp.cpp" line="121"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="0"> <Description><![CDATA[Compared values are not the same Actual (QByteArray("foo")): "foo" Expected (QByteArray()) : ""]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="failByteArrayEmpty"> -<Incident type="fail" file="tst_strcmp.cpp" line="126"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="0"> <Description><![CDATA[Compared values are not the same Actual (QByteArray("")) : "" Expected (QByteArray("foo")): "foo"]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="failByteArraySingleChars"> -<Incident type="fail" file="tst_strcmp.cpp" line="133"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp" line="0"> <Description><![CDATA[Compared values are not the same Actual (QByteArray("6")): "6" Expected (QByteArray("7")): "7"]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_subtest.lightxml b/tests/auto/testlib/selftests/expected_subtest.lightxml index 2e484aafef..f35f6a6dc4 100644 --- a/tests/auto/testlib/selftests/expected_subtest.lightxml +++ b/tests/auto/testlib/selftests/expected_subtest.lightxml @@ -8,7 +8,7 @@ <Description><![CDATA[initTestCase initTestCase (null)]]></Description> </Message> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="test1"> <Message type="qdebug" file="" line="0"> @@ -21,7 +21,7 @@ <Description><![CDATA[cleanup test1 (null)]]></Description> </Message> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="test2"> <Message type="qdebug" file="" line="0"> @@ -87,7 +87,7 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[data2]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="test3"> <Message type="qdebug" file="" line="0"> @@ -123,7 +123,7 @@ <DataTag><![CDATA[data1]]></DataTag> <Description><![CDATA[test2 test3 data1]]></Description> </Message> -<Incident type="fail" file="tst_subtest.cpp" line="154"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp" line="0"> <DataTag><![CDATA[data1]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (str) : "hello1" @@ -141,7 +141,7 @@ <DataTag><![CDATA[data2]]></DataTag> <Description><![CDATA[test2 test3 data2]]></Description> </Message> -<Incident type="fail" file="tst_subtest.cpp" line="154"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp" line="0"> <DataTag><![CDATA[data2]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (str) : "hello2" @@ -151,13 +151,13 @@ <DataTag><![CDATA[data2]]></DataTag> <Description><![CDATA[cleanup test3 data2]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Message type="qdebug" file="" line="0"> <Description><![CDATA[cleanupTestCase cleanupTestCase (null)]]></Description> </Message> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_subtest.teamcity b/tests/auto/testlib/selftests/expected_subtest.teamcity index b974e30d78..3fcbcb7ea4 100644 --- a/tests/auto/testlib/selftests/expected_subtest.teamcity +++ b/tests/auto/testlib/selftests/expected_subtest.teamcity @@ -18,11 +18,11 @@ ##teamcity[testStdOut name='test3(data0)' out='QDEBUG: test3_data test3 (null)|nQDEBUG: test3_data end|nQDEBUG: init test3 data0|nQDEBUG: test2 test3 data0|nQDEBUG: test2 end|nQDEBUG: cleanup test3 data0' flowId='tst_Subtest'] ##teamcity[testFinished name='test3(data0)' flowId='tst_Subtest'] ##teamcity[testStarted name='test3(data1)' flowId='tst_Subtest'] -##teamcity[testFailed name='test3(data1)' message='Failure! |[Loc: tst_subtest.cpp(146)|]' details='Compared values are not the same|n Actual (str) : "hello1"|n Expected (QString("hello0")): "hello0"' flowId='tst_Subtest'] +##teamcity[testFailed name='test3(data1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp(0)|]' details='Compared values are not the same|n Actual (str) : "hello1"|n Expected (QString("hello0")): "hello0"' flowId='tst_Subtest'] ##teamcity[testStdOut name='test3(data1)' out='QDEBUG: init test3 data1|nQDEBUG: test2 test3 data1' flowId='tst_Subtest'] ##teamcity[testFinished name='test3(data1)' flowId='tst_Subtest'] ##teamcity[testStarted name='test3(data2)' flowId='tst_Subtest'] -##teamcity[testFailed name='test3(data2)' message='Failure! |[Loc: tst_subtest.cpp(146)|]' details='Compared values are not the same|n Actual (str) : "hello2"|n Expected (QString("hello0")): "hello0"' flowId='tst_Subtest'] +##teamcity[testFailed name='test3(data2)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp(0)|]' details='Compared values are not the same|n Actual (str) : "hello2"|n Expected (QString("hello0")): "hello0"' flowId='tst_Subtest'] ##teamcity[testStdOut name='test3(data2)' out='QDEBUG: cleanup test3 data1|nQDEBUG: init test3 data2|nQDEBUG: test2 test3 data2' flowId='tst_Subtest'] ##teamcity[testFinished name='test3(data2)' flowId='tst_Subtest'] ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_Subtest'] diff --git a/tests/auto/testlib/selftests/expected_subtest.txt b/tests/auto/testlib/selftests/expected_subtest.txt index ba710e54a9..8b0dbf63ee 100644 --- a/tests/auto/testlib/selftests/expected_subtest.txt +++ b/tests/auto/testlib/selftests/expected_subtest.txt @@ -1,5 +1,5 @@ ********* Start testing of tst_Subtest ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library QDEBUG : tst_Subtest::initTestCase() initTestCase initTestCase (null) PASS : tst_Subtest::initTestCase() QDEBUG : tst_Subtest::test1() init test1 (null) @@ -35,16 +35,16 @@ QDEBUG : tst_Subtest::test3(data1) test2 test3 data1 FAIL! : tst_Subtest::test3(data1) Compared values are not the same Actual (str) : "hello1" Expected (QString("hello0")): "hello0" - Loc: [tst_subtest.cpp(154)] + Loc: [qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp(0)] QDEBUG : tst_Subtest::test3(data1) cleanup test3 data1 QDEBUG : tst_Subtest::test3(data2) init test3 data2 QDEBUG : tst_Subtest::test3(data2) test2 test3 data2 FAIL! : tst_Subtest::test3(data2) Compared values are not the same Actual (str) : "hello2" Expected (QString("hello0")): "hello0" - Loc: [tst_subtest.cpp(154)] + Loc: [qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp(0)] QDEBUG : tst_Subtest::test3(data2) cleanup test3 data2 QDEBUG : tst_Subtest::cleanupTestCase() cleanupTestCase cleanupTestCase (null) PASS : tst_Subtest::cleanupTestCase() -Totals: 7 passed, 2 failed, 0 skipped, 0 blacklisted +Totals: 7 passed, 2 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_Subtest ********* diff --git a/tests/auto/testlib/selftests/expected_subtest.xml b/tests/auto/testlib/selftests/expected_subtest.xml index f011489ec8..793f5d4d2d 100644 --- a/tests/auto/testlib/selftests/expected_subtest.xml +++ b/tests/auto/testlib/selftests/expected_subtest.xml @@ -10,7 +10,7 @@ <Description><![CDATA[initTestCase initTestCase (null)]]></Description> </Message> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="test1"> <Message type="qdebug" file="" line="0"> @@ -23,7 +23,7 @@ <Description><![CDATA[cleanup test1 (null)]]></Description> </Message> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="test2"> <Message type="qdebug" file="" line="0"> @@ -89,7 +89,7 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[data2]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="test3"> <Message type="qdebug" file="" line="0"> @@ -125,7 +125,7 @@ <DataTag><![CDATA[data1]]></DataTag> <Description><![CDATA[test2 test3 data1]]></Description> </Message> -<Incident type="fail" file="tst_subtest.cpp" line="154"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp" line="0"> <DataTag><![CDATA[data1]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (str) : "hello1" @@ -143,7 +143,7 @@ <DataTag><![CDATA[data2]]></DataTag> <Description><![CDATA[test2 test3 data2]]></Description> </Message> -<Incident type="fail" file="tst_subtest.cpp" line="154"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp" line="0"> <DataTag><![CDATA[data2]]></DataTag> <Description><![CDATA[Compared values are not the same Actual (str) : "hello2" @@ -153,14 +153,14 @@ <DataTag><![CDATA[data2]]></DataTag> <Description><![CDATA[cleanup test3 data2]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Message type="qdebug" file="" line="0"> <Description><![CDATA[cleanupTestCase cleanupTestCase (null)]]></Description> </Message> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_verbose1.lightxml b/tests/auto/testlib/selftests/expected_verbose1.lightxml index 6d7ce13ea0..68730a3293 100644 --- a/tests/auto/testlib/selftests/expected_verbose1.lightxml +++ b/tests/auto/testlib/selftests/expected_verbose1.lightxml @@ -5,7 +5,7 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testPassPass"> <Incident type="pass" file="" line="0"> @@ -14,104 +14,104 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testPassSkip"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Message type="skip" file="../counting/tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testPassFail"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipPass"> -<Message type="skip" file="../counting/tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipSkip"> -<Message type="skip" file="../counting/tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Message type="skip" file="../counting/tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipFail"> -<Message type="skip" file="../counting/tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailPass"> -<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailSkip"> -<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Message type="skip" file="../counting/tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailFail"> -<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailInInit"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Incident type="fail" file="../counting/tst_counting.cpp" line="234"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[fail]]></DataTag> <Description><![CDATA[Fail in init()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailInCleanup"> <Incident type="pass" file="" line="0"> @@ -121,27 +121,27 @@ <DataTag><![CDATA[fail]]></DataTag> <Description><![CDATA[This test function should execute and then QFAIL in cleanup()]]></Description> </Message> -<Incident type="fail" file="../counting/tst_counting.cpp" line="242"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[fail]]></DataTag> <Description><![CDATA[Fail in cleanup()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipInInit"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Message type="skip" file="../counting/tst_counting.cpp" line="236"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in init()]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipInCleanup"> <Incident type="pass" file="" line="0"> @@ -151,17 +151,17 @@ <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description> </Message> -<Message type="skip" file="../counting/tst_counting.cpp" line="244"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in cleanup()]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_verbose1.teamcity b/tests/auto/testlib/selftests/expected_verbose1.teamcity index e6d324a573..5ceaf155d8 100644 --- a/tests/auto/testlib/selftests/expected_verbose1.teamcity +++ b/tests/auto/testlib/selftests/expected_verbose1.teamcity @@ -7,59 +7,59 @@ ##teamcity[testFinished name='testPassPass(row 2)' flowId='tst_Counting'] ##teamcity[testStarted name='testPassSkip(row 1)' flowId='tst_Counting'] ##teamcity[testFinished name='testPassSkip(row 1)' flowId='tst_Counting'] -##teamcity[testIgnored name='testPassSkip(row 2)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]' flowId='tst_Counting'] +##teamcity[testIgnored name='testPassSkip(row 2)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] ##teamcity[testStarted name='testPassFail(row 1)' flowId='tst_Counting'] ##teamcity[testFinished name='testPassFail(row 1)' flowId='tst_Counting'] ##teamcity[testStarted name='testPassFail(row 2)' flowId='tst_Counting'] -##teamcity[testFailed name='testPassFail(row 2)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] +##teamcity[testFailed name='testPassFail(row 2)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] ##teamcity[testFinished name='testPassFail(row 2)' flowId='tst_Counting'] -##teamcity[testIgnored name='testSkipPass(row 1)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]' flowId='tst_Counting'] +##teamcity[testIgnored name='testSkipPass(row 1)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] ##teamcity[testStarted name='testSkipPass(row 2)' flowId='tst_Counting'] ##teamcity[testFinished name='testSkipPass(row 2)' flowId='tst_Counting'] -##teamcity[testIgnored name='testSkipSkip(row 1)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]' flowId='tst_Counting'] -##teamcity[testIgnored name='testSkipSkip(row 2)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]' flowId='tst_Counting'] -##teamcity[testIgnored name='testSkipFail(row 1)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]' flowId='tst_Counting'] +##teamcity[testIgnored name='testSkipSkip(row 1)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testIgnored name='testSkipSkip(row 2)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testIgnored name='testSkipFail(row 1)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] ##teamcity[testStarted name='testSkipFail(row 2)' flowId='tst_Counting'] -##teamcity[testFailed name='testSkipFail(row 2)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] +##teamcity[testFailed name='testSkipFail(row 2)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] ##teamcity[testFinished name='testSkipFail(row 2)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailPass(row 1)' flowId='tst_Counting'] -##teamcity[testFailed name='testFailPass(row 1)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] +##teamcity[testFailed name='testFailPass(row 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] ##teamcity[testFinished name='testFailPass(row 1)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailPass(row 2)' flowId='tst_Counting'] ##teamcity[testFinished name='testFailPass(row 2)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailSkip(row 1)' flowId='tst_Counting'] -##teamcity[testFailed name='testFailSkip(row 1)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] +##teamcity[testFailed name='testFailSkip(row 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] ##teamcity[testFinished name='testFailSkip(row 1)' flowId='tst_Counting'] -##teamcity[testIgnored name='testFailSkip(row 2)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]' flowId='tst_Counting'] +##teamcity[testIgnored name='testFailSkip(row 2)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] ##teamcity[testStarted name='testFailFail(row 1)' flowId='tst_Counting'] -##teamcity[testFailed name='testFailFail(row 1)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] +##teamcity[testFailed name='testFailFail(row 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] ##teamcity[testFinished name='testFailFail(row 1)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailFail(row 2)' flowId='tst_Counting'] -##teamcity[testFailed name='testFailFail(row 2)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] +##teamcity[testFailed name='testFailFail(row 2)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] ##teamcity[testFinished name='testFailFail(row 2)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailInInit(before)' flowId='tst_Counting'] ##teamcity[testFinished name='testFailInInit(before)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailInInit(fail)' flowId='tst_Counting'] -##teamcity[testFailed name='testFailInInit(fail)' message='Failure! |[Loc: ../counting/tst_counting.cpp(226)|]' details='Fail in init()' flowId='tst_Counting'] +##teamcity[testFailed name='testFailInInit(fail)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='Fail in init()' flowId='tst_Counting'] ##teamcity[testFinished name='testFailInInit(fail)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailInInit(after)' flowId='tst_Counting'] ##teamcity[testFinished name='testFailInInit(after)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailInCleanup(before)' flowId='tst_Counting'] ##teamcity[testFinished name='testFailInCleanup(before)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailInCleanup(fail)' flowId='tst_Counting'] -##teamcity[testFailed name='testFailInCleanup(fail)' message='Failure! |[Loc: ../counting/tst_counting.cpp(234)|]' details='Fail in cleanup()' flowId='tst_Counting'] +##teamcity[testFailed name='testFailInCleanup(fail)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='Fail in cleanup()' flowId='tst_Counting'] ##teamcity[testStdOut name='testFailInCleanup(fail)' out='QDEBUG: This test function should execute and then QFAIL in cleanup()' flowId='tst_Counting'] ##teamcity[testFinished name='testFailInCleanup(fail)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailInCleanup(after)' flowId='tst_Counting'] ##teamcity[testFinished name='testFailInCleanup(after)' flowId='tst_Counting'] ##teamcity[testStarted name='testSkipInInit(before)' flowId='tst_Counting'] ##teamcity[testFinished name='testSkipInInit(before)' flowId='tst_Counting'] -##teamcity[testIgnored name='testSkipInInit(skip)' message='Skip in init() |[Loc: ../counting/tst_counting.cpp(228)|]' flowId='tst_Counting'] +##teamcity[testIgnored name='testSkipInInit(skip)' message='Skip in init() |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] ##teamcity[testStarted name='testSkipInInit(after)' flowId='tst_Counting'] ##teamcity[testFinished name='testSkipInInit(after)' flowId='tst_Counting'] ##teamcity[testStarted name='testSkipInCleanup(before)' flowId='tst_Counting'] ##teamcity[testFinished name='testSkipInCleanup(before)' flowId='tst_Counting'] -##teamcity[testIgnored name='testSkipInCleanup(skip)' message='Skip in cleanup() |[Loc: ../counting/tst_counting.cpp(236)|]' flowId='tst_Counting'] +##teamcity[testIgnored name='testSkipInCleanup(skip)' message='Skip in cleanup() |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] ##teamcity[testStarted name='testSkipInCleanup(after)' flowId='tst_Counting'] ##teamcity[testStdOut name='testSkipInCleanup(after)' out='QDEBUG: This test function should execute and then QSKIP in cleanup()' flowId='tst_Counting'] ##teamcity[testFinished name='testSkipInCleanup(after)' flowId='tst_Counting'] diff --git a/tests/auto/testlib/selftests/expected_verbose1.txt b/tests/auto/testlib/selftests/expected_verbose1.txt index 1c83be75cc..da2e04674d 100644 --- a/tests/auto/testlib/selftests/expected_verbose1.txt +++ b/tests/auto/testlib/selftests/expected_verbose1.txt @@ -1,5 +1,5 @@ ********* Start testing of tst_Counting ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library INFO : tst_Counting::initTestCase() entering PASS : tst_Counting::initTestCase() INFO : tst_Counting::testPassPass() entering @@ -8,62 +8,62 @@ PASS : tst_Counting::testPassPass(row 2) INFO : tst_Counting::testPassSkip() entering PASS : tst_Counting::testPassSkip(row 1) SKIP : tst_Counting::testPassSkip(row 2) Skipping - Loc: [../counting/tst_counting.cpp(118)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] INFO : tst_Counting::testPassFail() entering PASS : tst_Counting::testPassFail(row 1) FAIL! : tst_Counting::testPassFail(row 2) 'false' returned FALSE. () - Loc: [../counting/tst_counting.cpp(115)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] INFO : tst_Counting::testSkipPass() entering SKIP : tst_Counting::testSkipPass(row 1) Skipping - Loc: [../counting/tst_counting.cpp(118)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] PASS : tst_Counting::testSkipPass(row 2) INFO : tst_Counting::testSkipSkip() entering SKIP : tst_Counting::testSkipSkip(row 1) Skipping - Loc: [../counting/tst_counting.cpp(118)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] SKIP : tst_Counting::testSkipSkip(row 2) Skipping - Loc: [../counting/tst_counting.cpp(118)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] INFO : tst_Counting::testSkipFail() entering SKIP : tst_Counting::testSkipFail(row 1) Skipping - Loc: [../counting/tst_counting.cpp(118)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] FAIL! : tst_Counting::testSkipFail(row 2) 'false' returned FALSE. () - Loc: [../counting/tst_counting.cpp(115)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] INFO : tst_Counting::testFailPass() entering FAIL! : tst_Counting::testFailPass(row 1) 'false' returned FALSE. () - Loc: [../counting/tst_counting.cpp(115)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] PASS : tst_Counting::testFailPass(row 2) INFO : tst_Counting::testFailSkip() entering FAIL! : tst_Counting::testFailSkip(row 1) 'false' returned FALSE. () - Loc: [../counting/tst_counting.cpp(115)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] SKIP : tst_Counting::testFailSkip(row 2) Skipping - Loc: [../counting/tst_counting.cpp(118)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] INFO : tst_Counting::testFailFail() entering FAIL! : tst_Counting::testFailFail(row 1) 'false' returned FALSE. () - Loc: [../counting/tst_counting.cpp(115)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] FAIL! : tst_Counting::testFailFail(row 2) 'false' returned FALSE. () - Loc: [../counting/tst_counting.cpp(115)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] INFO : tst_Counting::testFailInInit() entering PASS : tst_Counting::testFailInInit(before) FAIL! : tst_Counting::testFailInInit(fail) Fail in init() - Loc: [../counting/tst_counting.cpp(234)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] PASS : tst_Counting::testFailInInit(after) INFO : tst_Counting::testFailInCleanup() entering PASS : tst_Counting::testFailInCleanup(before) QDEBUG : tst_Counting::testFailInCleanup(fail) This test function should execute and then QFAIL in cleanup() FAIL! : tst_Counting::testFailInCleanup(fail) Fail in cleanup() - Loc: [../counting/tst_counting.cpp(242)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] PASS : tst_Counting::testFailInCleanup(after) INFO : tst_Counting::testSkipInInit() entering PASS : tst_Counting::testSkipInInit(before) SKIP : tst_Counting::testSkipInInit(skip) Skip in init() - Loc: [../counting/tst_counting.cpp(236)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] PASS : tst_Counting::testSkipInInit(after) INFO : tst_Counting::testSkipInCleanup() entering PASS : tst_Counting::testSkipInCleanup(before) QDEBUG : tst_Counting::testSkipInCleanup(skip) This test function should execute and then QSKIP in cleanup() SKIP : tst_Counting::testSkipInCleanup(skip) Skip in cleanup() - Loc: [../counting/tst_counting.cpp(244)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] PASS : tst_Counting::testSkipInCleanup(after) INFO : tst_Counting::cleanupTestCase() entering PASS : tst_Counting::cleanupTestCase() -Totals: 16 passed, 8 failed, 8 skipped, 0 blacklisted +Totals: 16 passed, 8 failed, 8 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_Counting ********* diff --git a/tests/auto/testlib/selftests/expected_verbose1.xml b/tests/auto/testlib/selftests/expected_verbose1.xml index b5ae1286cb..841a49c30d 100644 --- a/tests/auto/testlib/selftests/expected_verbose1.xml +++ b/tests/auto/testlib/selftests/expected_verbose1.xml @@ -7,7 +7,7 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testPassPass"> <Incident type="pass" file="" line="0"> @@ -16,104 +16,104 @@ <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testPassSkip"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Message type="skip" file="../counting/tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testPassFail"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipPass"> -<Message type="skip" file="../counting/tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipSkip"> -<Message type="skip" file="../counting/tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Message type="skip" file="../counting/tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipFail"> -<Message type="skip" file="../counting/tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailPass"> -<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailSkip"> -<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Message type="skip" file="../counting/tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailFail"> -<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailInInit"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Incident type="fail" file="../counting/tst_counting.cpp" line="234"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[fail]]></DataTag> <Description><![CDATA[Fail in init()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailInCleanup"> <Incident type="pass" file="" line="0"> @@ -123,27 +123,27 @@ <DataTag><![CDATA[fail]]></DataTag> <Description><![CDATA[This test function should execute and then QFAIL in cleanup()]]></Description> </Message> -<Incident type="fail" file="../counting/tst_counting.cpp" line="242"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[fail]]></DataTag> <Description><![CDATA[Fail in cleanup()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipInInit"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Message type="skip" file="../counting/tst_counting.cpp" line="236"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in init()]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipInCleanup"> <Incident type="pass" file="" line="0"> @@ -153,18 +153,18 @@ <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description> </Message> -<Message type="skip" file="../counting/tst_counting.cpp" line="244"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in cleanup()]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_verbose2.lightxml b/tests/auto/testlib/selftests/expected_verbose2.lightxml index 85f9ec45af..cad736a7e6 100644 --- a/tests/auto/testlib/selftests/expected_verbose2.lightxml +++ b/tests/auto/testlib/selftests/expected_verbose2.lightxml @@ -5,185 +5,185 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testPassPass"> -<Message type="info" file="../counting/tst_counting.cpp" line="111"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QVERIFY(true)]]></Description> </Message> -<Message type="info" file="../counting/tst_counting.cpp" line="112"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QCOMPARE(2 + 1, 3)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Message type="info" file="../counting/tst_counting.cpp" line="111"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QVERIFY(true)]]></Description> </Message> -<Message type="info" file="../counting/tst_counting.cpp" line="112"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QCOMPARE(2 + 1, 3)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testPassSkip"> -<Message type="info" file="../counting/tst_counting.cpp" line="111"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QVERIFY(true)]]></Description> </Message> -<Message type="info" file="../counting/tst_counting.cpp" line="112"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QCOMPARE(2 + 1, 3)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Message type="skip" file="../counting/tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testPassFail"> -<Message type="info" file="../counting/tst_counting.cpp" line="111"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QVERIFY(true)]]></Description> </Message> -<Message type="info" file="../counting/tst_counting.cpp" line="112"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QCOMPARE(2 + 1, 3)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Message type="info" file="../counting/tst_counting.cpp" line="115"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QVERIFY(false)]]></Description> </Message> -<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipPass"> -<Message type="skip" file="../counting/tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Message type="info" file="../counting/tst_counting.cpp" line="111"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QVERIFY(true)]]></Description> </Message> -<Message type="info" file="../counting/tst_counting.cpp" line="112"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QCOMPARE(2 + 1, 3)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipSkip"> -<Message type="skip" file="../counting/tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Message type="skip" file="../counting/tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipFail"> -<Message type="skip" file="../counting/tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Message type="info" file="../counting/tst_counting.cpp" line="115"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QVERIFY(false)]]></Description> </Message> -<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailPass"> -<Message type="info" file="../counting/tst_counting.cpp" line="115"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QVERIFY(false)]]></Description> </Message> -<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Message type="info" file="../counting/tst_counting.cpp" line="111"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QVERIFY(true)]]></Description> </Message> -<Message type="info" file="../counting/tst_counting.cpp" line="112"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QCOMPARE(2 + 1, 3)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailSkip"> -<Message type="info" file="../counting/tst_counting.cpp" line="115"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QVERIFY(false)]]></Description> </Message> -<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Message type="skip" file="../counting/tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailFail"> -<Message type="info" file="../counting/tst_counting.cpp" line="115"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QVERIFY(false)]]></Description> </Message> -<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Message type="info" file="../counting/tst_counting.cpp" line="115"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QVERIFY(false)]]></Description> </Message> -<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailInInit"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Incident type="fail" file="../counting/tst_counting.cpp" line="234"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[fail]]></DataTag> <Description><![CDATA[Fail in init()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailInCleanup"> <Incident type="pass" file="" line="0"> @@ -193,27 +193,27 @@ <DataTag><![CDATA[fail]]></DataTag> <Description><![CDATA[This test function should execute and then QFAIL in cleanup()]]></Description> </Message> -<Incident type="fail" file="../counting/tst_counting.cpp" line="242"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[fail]]></DataTag> <Description><![CDATA[Fail in cleanup()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipInInit"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Message type="skip" file="../counting/tst_counting.cpp" line="236"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in init()]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipInCleanup"> <Incident type="pass" file="" line="0"> @@ -223,17 +223,17 @@ <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description> </Message> -<Message type="skip" file="../counting/tst_counting.cpp" line="244"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in cleanup()]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_verbose2.teamcity b/tests/auto/testlib/selftests/expected_verbose2.teamcity index 138e223fa5..2aebb94938 100644 --- a/tests/auto/testlib/selftests/expected_verbose2.teamcity +++ b/tests/auto/testlib/selftests/expected_verbose2.teamcity @@ -2,76 +2,76 @@ ##teamcity[testStarted name='initTestCase()' flowId='tst_Counting'] ##teamcity[testFinished name='initTestCase()' flowId='tst_Counting'] ##teamcity[testStarted name='testPassPass(row 1)' flowId='tst_Counting'] -##teamcity[testStdOut name='testPassPass(row 1)' out='INFO |[Loc: ../counting/tst_counting.cpp(103)|]: QVERIFY(true)|nINFO |[Loc: ../counting/tst_counting.cpp(104)|]: QCOMPARE(2 + 1, 3)' flowId='tst_Counting'] +##teamcity[testStdOut name='testPassPass(row 1)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QVERIFY(true)|nINFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QCOMPARE(2 + 1, 3)' flowId='tst_Counting'] ##teamcity[testFinished name='testPassPass(row 1)' flowId='tst_Counting'] ##teamcity[testStarted name='testPassPass(row 2)' flowId='tst_Counting'] -##teamcity[testStdOut name='testPassPass(row 2)' out='INFO |[Loc: ../counting/tst_counting.cpp(103)|]: QVERIFY(true)|nINFO |[Loc: ../counting/tst_counting.cpp(104)|]: QCOMPARE(2 + 1, 3)' flowId='tst_Counting'] +##teamcity[testStdOut name='testPassPass(row 2)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QVERIFY(true)|nINFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QCOMPARE(2 + 1, 3)' flowId='tst_Counting'] ##teamcity[testFinished name='testPassPass(row 2)' flowId='tst_Counting'] ##teamcity[testStarted name='testPassSkip(row 1)' flowId='tst_Counting'] -##teamcity[testStdOut name='testPassSkip(row 1)' out='INFO |[Loc: ../counting/tst_counting.cpp(103)|]: QVERIFY(true)|nINFO |[Loc: ../counting/tst_counting.cpp(104)|]: QCOMPARE(2 + 1, 3)' flowId='tst_Counting'] +##teamcity[testStdOut name='testPassSkip(row 1)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QVERIFY(true)|nINFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QCOMPARE(2 + 1, 3)' flowId='tst_Counting'] ##teamcity[testFinished name='testPassSkip(row 1)' flowId='tst_Counting'] -##teamcity[testIgnored name='testPassSkip(row 2)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]' flowId='tst_Counting'] +##teamcity[testIgnored name='testPassSkip(row 2)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] ##teamcity[testStarted name='testPassFail(row 1)' flowId='tst_Counting'] -##teamcity[testStdOut name='testPassFail(row 1)' out='INFO |[Loc: ../counting/tst_counting.cpp(103)|]: QVERIFY(true)|nINFO |[Loc: ../counting/tst_counting.cpp(104)|]: QCOMPARE(2 + 1, 3)' flowId='tst_Counting'] +##teamcity[testStdOut name='testPassFail(row 1)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QVERIFY(true)|nINFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QCOMPARE(2 + 1, 3)' flowId='tst_Counting'] ##teamcity[testFinished name='testPassFail(row 1)' flowId='tst_Counting'] ##teamcity[testStarted name='testPassFail(row 2)' flowId='tst_Counting'] -##teamcity[testFailed name='testPassFail(row 2)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] -##teamcity[testStdOut name='testPassFail(row 2)' out='INFO |[Loc: ../counting/tst_counting.cpp(107)|]: QVERIFY(false)' flowId='tst_Counting'] +##teamcity[testFailed name='testPassFail(row 2)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] +##teamcity[testStdOut name='testPassFail(row 2)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QVERIFY(false)' flowId='tst_Counting'] ##teamcity[testFinished name='testPassFail(row 2)' flowId='tst_Counting'] -##teamcity[testIgnored name='testSkipPass(row 1)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]' flowId='tst_Counting'] +##teamcity[testIgnored name='testSkipPass(row 1)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] ##teamcity[testStarted name='testSkipPass(row 2)' flowId='tst_Counting'] -##teamcity[testStdOut name='testSkipPass(row 2)' out='INFO |[Loc: ../counting/tst_counting.cpp(103)|]: QVERIFY(true)|nINFO |[Loc: ../counting/tst_counting.cpp(104)|]: QCOMPARE(2 + 1, 3)' flowId='tst_Counting'] +##teamcity[testStdOut name='testSkipPass(row 2)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QVERIFY(true)|nINFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QCOMPARE(2 + 1, 3)' flowId='tst_Counting'] ##teamcity[testFinished name='testSkipPass(row 2)' flowId='tst_Counting'] -##teamcity[testIgnored name='testSkipSkip(row 1)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]' flowId='tst_Counting'] -##teamcity[testIgnored name='testSkipSkip(row 2)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]' flowId='tst_Counting'] -##teamcity[testIgnored name='testSkipFail(row 1)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]' flowId='tst_Counting'] +##teamcity[testIgnored name='testSkipSkip(row 1)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testIgnored name='testSkipSkip(row 2)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] +##teamcity[testIgnored name='testSkipFail(row 1)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] ##teamcity[testStarted name='testSkipFail(row 2)' flowId='tst_Counting'] -##teamcity[testFailed name='testSkipFail(row 2)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] -##teamcity[testStdOut name='testSkipFail(row 2)' out='INFO |[Loc: ../counting/tst_counting.cpp(107)|]: QVERIFY(false)' flowId='tst_Counting'] +##teamcity[testFailed name='testSkipFail(row 2)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] +##teamcity[testStdOut name='testSkipFail(row 2)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QVERIFY(false)' flowId='tst_Counting'] ##teamcity[testFinished name='testSkipFail(row 2)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailPass(row 1)' flowId='tst_Counting'] -##teamcity[testFailed name='testFailPass(row 1)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] -##teamcity[testStdOut name='testFailPass(row 1)' out='INFO |[Loc: ../counting/tst_counting.cpp(107)|]: QVERIFY(false)' flowId='tst_Counting'] +##teamcity[testFailed name='testFailPass(row 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] +##teamcity[testStdOut name='testFailPass(row 1)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QVERIFY(false)' flowId='tst_Counting'] ##teamcity[testFinished name='testFailPass(row 1)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailPass(row 2)' flowId='tst_Counting'] -##teamcity[testStdOut name='testFailPass(row 2)' out='INFO |[Loc: ../counting/tst_counting.cpp(103)|]: QVERIFY(true)|nINFO |[Loc: ../counting/tst_counting.cpp(104)|]: QCOMPARE(2 + 1, 3)' flowId='tst_Counting'] +##teamcity[testStdOut name='testFailPass(row 2)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QVERIFY(true)|nINFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QCOMPARE(2 + 1, 3)' flowId='tst_Counting'] ##teamcity[testFinished name='testFailPass(row 2)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailSkip(row 1)' flowId='tst_Counting'] -##teamcity[testFailed name='testFailSkip(row 1)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] -##teamcity[testStdOut name='testFailSkip(row 1)' out='INFO |[Loc: ../counting/tst_counting.cpp(107)|]: QVERIFY(false)' flowId='tst_Counting'] +##teamcity[testFailed name='testFailSkip(row 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] +##teamcity[testStdOut name='testFailSkip(row 1)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QVERIFY(false)' flowId='tst_Counting'] ##teamcity[testFinished name='testFailSkip(row 1)' flowId='tst_Counting'] -##teamcity[testIgnored name='testFailSkip(row 2)' message='Skipping |[Loc: ../counting/tst_counting.cpp(110)|]' flowId='tst_Counting'] +##teamcity[testIgnored name='testFailSkip(row 2)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] ##teamcity[testStarted name='testFailFail(row 1)' flowId='tst_Counting'] -##teamcity[testFailed name='testFailFail(row 1)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] -##teamcity[testStdOut name='testFailFail(row 1)' out='INFO |[Loc: ../counting/tst_counting.cpp(107)|]: QVERIFY(false)' flowId='tst_Counting'] +##teamcity[testFailed name='testFailFail(row 1)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] +##teamcity[testStdOut name='testFailFail(row 1)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QVERIFY(false)' flowId='tst_Counting'] ##teamcity[testFinished name='testFailFail(row 1)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailFail(row 2)' flowId='tst_Counting'] -##teamcity[testFailed name='testFailFail(row 2)' message='Failure! |[Loc: ../counting/tst_counting.cpp(107)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] -##teamcity[testStdOut name='testFailFail(row 2)' out='INFO |[Loc: ../counting/tst_counting.cpp(107)|]: QVERIFY(false)' flowId='tst_Counting'] +##teamcity[testFailed name='testFailFail(row 2)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='|'false|' returned FALSE. ()' flowId='tst_Counting'] +##teamcity[testStdOut name='testFailFail(row 2)' out='INFO |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]: QVERIFY(false)' flowId='tst_Counting'] ##teamcity[testFinished name='testFailFail(row 2)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailInInit(before)' flowId='tst_Counting'] ##teamcity[testFinished name='testFailInInit(before)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailInInit(fail)' flowId='tst_Counting'] -##teamcity[testFailed name='testFailInInit(fail)' message='Failure! |[Loc: ../counting/tst_counting.cpp(226)|]' details='Fail in init()' flowId='tst_Counting'] +##teamcity[testFailed name='testFailInInit(fail)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='Fail in init()' flowId='tst_Counting'] ##teamcity[testFinished name='testFailInInit(fail)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailInInit(after)' flowId='tst_Counting'] ##teamcity[testFinished name='testFailInInit(after)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailInCleanup(before)' flowId='tst_Counting'] ##teamcity[testFinished name='testFailInCleanup(before)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailInCleanup(fail)' flowId='tst_Counting'] -##teamcity[testFailed name='testFailInCleanup(fail)' message='Failure! |[Loc: ../counting/tst_counting.cpp(234)|]' details='Fail in cleanup()' flowId='tst_Counting'] +##teamcity[testFailed name='testFailInCleanup(fail)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' details='Fail in cleanup()' flowId='tst_Counting'] ##teamcity[testStdOut name='testFailInCleanup(fail)' out='QDEBUG: This test function should execute and then QFAIL in cleanup()' flowId='tst_Counting'] ##teamcity[testFinished name='testFailInCleanup(fail)' flowId='tst_Counting'] ##teamcity[testStarted name='testFailInCleanup(after)' flowId='tst_Counting'] ##teamcity[testFinished name='testFailInCleanup(after)' flowId='tst_Counting'] ##teamcity[testStarted name='testSkipInInit(before)' flowId='tst_Counting'] ##teamcity[testFinished name='testSkipInInit(before)' flowId='tst_Counting'] -##teamcity[testIgnored name='testSkipInInit(skip)' message='Skip in init() |[Loc: ../counting/tst_counting.cpp(228)|]' flowId='tst_Counting'] +##teamcity[testIgnored name='testSkipInInit(skip)' message='Skip in init() |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] ##teamcity[testStarted name='testSkipInInit(after)' flowId='tst_Counting'] ##teamcity[testFinished name='testSkipInInit(after)' flowId='tst_Counting'] ##teamcity[testStarted name='testSkipInCleanup(before)' flowId='tst_Counting'] ##teamcity[testFinished name='testSkipInCleanup(before)' flowId='tst_Counting'] -##teamcity[testIgnored name='testSkipInCleanup(skip)' message='Skip in cleanup() |[Loc: ../counting/tst_counting.cpp(236)|]' flowId='tst_Counting'] +##teamcity[testIgnored name='testSkipInCleanup(skip)' message='Skip in cleanup() |[Loc: qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)|]' flowId='tst_Counting'] ##teamcity[testStarted name='testSkipInCleanup(after)' flowId='tst_Counting'] ##teamcity[testStdOut name='testSkipInCleanup(after)' out='QDEBUG: This test function should execute and then QSKIP in cleanup()' flowId='tst_Counting'] ##teamcity[testFinished name='testSkipInCleanup(after)' flowId='tst_Counting'] diff --git a/tests/auto/testlib/selftests/expected_verbose2.txt b/tests/auto/testlib/selftests/expected_verbose2.txt index 8e4e01b526..a46c398a4f 100644 --- a/tests/auto/testlib/selftests/expected_verbose2.txt +++ b/tests/auto/testlib/selftests/expected_verbose2.txt @@ -1,105 +1,105 @@ ********* Start testing of tst_Counting ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library INFO : tst_Counting::initTestCase() entering PASS : tst_Counting::initTestCase() INFO : tst_Counting::testPassPass() entering INFO : tst_Counting::testPassPass(row 1) QVERIFY(true) - Loc: [../counting/tst_counting.cpp(111)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] INFO : tst_Counting::testPassPass(row 1) QCOMPARE(2 + 1, 3) - Loc: [../counting/tst_counting.cpp(112)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] PASS : tst_Counting::testPassPass(row 1) INFO : tst_Counting::testPassPass(row 2) QVERIFY(true) - Loc: [../counting/tst_counting.cpp(111)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] INFO : tst_Counting::testPassPass(row 2) QCOMPARE(2 + 1, 3) - Loc: [../counting/tst_counting.cpp(112)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] PASS : tst_Counting::testPassPass(row 2) INFO : tst_Counting::testPassSkip() entering INFO : tst_Counting::testPassSkip(row 1) QVERIFY(true) - Loc: [../counting/tst_counting.cpp(111)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] INFO : tst_Counting::testPassSkip(row 1) QCOMPARE(2 + 1, 3) - Loc: [../counting/tst_counting.cpp(112)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] PASS : tst_Counting::testPassSkip(row 1) SKIP : tst_Counting::testPassSkip(row 2) Skipping - Loc: [../counting/tst_counting.cpp(118)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] INFO : tst_Counting::testPassFail() entering INFO : tst_Counting::testPassFail(row 1) QVERIFY(true) - Loc: [../counting/tst_counting.cpp(111)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] INFO : tst_Counting::testPassFail(row 1) QCOMPARE(2 + 1, 3) - Loc: [../counting/tst_counting.cpp(112)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] PASS : tst_Counting::testPassFail(row 1) INFO : tst_Counting::testPassFail(row 2) QVERIFY(false) - Loc: [../counting/tst_counting.cpp(115)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] FAIL! : tst_Counting::testPassFail(row 2) 'false' returned FALSE. () - Loc: [../counting/tst_counting.cpp(115)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] INFO : tst_Counting::testSkipPass() entering SKIP : tst_Counting::testSkipPass(row 1) Skipping - Loc: [../counting/tst_counting.cpp(118)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] INFO : tst_Counting::testSkipPass(row 2) QVERIFY(true) - Loc: [../counting/tst_counting.cpp(111)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] INFO : tst_Counting::testSkipPass(row 2) QCOMPARE(2 + 1, 3) - Loc: [../counting/tst_counting.cpp(112)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] PASS : tst_Counting::testSkipPass(row 2) INFO : tst_Counting::testSkipSkip() entering SKIP : tst_Counting::testSkipSkip(row 1) Skipping - Loc: [../counting/tst_counting.cpp(118)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] SKIP : tst_Counting::testSkipSkip(row 2) Skipping - Loc: [../counting/tst_counting.cpp(118)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] INFO : tst_Counting::testSkipFail() entering SKIP : tst_Counting::testSkipFail(row 1) Skipping - Loc: [../counting/tst_counting.cpp(118)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] INFO : tst_Counting::testSkipFail(row 2) QVERIFY(false) - Loc: [../counting/tst_counting.cpp(115)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] FAIL! : tst_Counting::testSkipFail(row 2) 'false' returned FALSE. () - Loc: [../counting/tst_counting.cpp(115)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] INFO : tst_Counting::testFailPass() entering INFO : tst_Counting::testFailPass(row 1) QVERIFY(false) - Loc: [../counting/tst_counting.cpp(115)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] FAIL! : tst_Counting::testFailPass(row 1) 'false' returned FALSE. () - Loc: [../counting/tst_counting.cpp(115)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] INFO : tst_Counting::testFailPass(row 2) QVERIFY(true) - Loc: [../counting/tst_counting.cpp(111)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] INFO : tst_Counting::testFailPass(row 2) QCOMPARE(2 + 1, 3) - Loc: [../counting/tst_counting.cpp(112)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] PASS : tst_Counting::testFailPass(row 2) INFO : tst_Counting::testFailSkip() entering INFO : tst_Counting::testFailSkip(row 1) QVERIFY(false) - Loc: [../counting/tst_counting.cpp(115)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] FAIL! : tst_Counting::testFailSkip(row 1) 'false' returned FALSE. () - Loc: [../counting/tst_counting.cpp(115)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] SKIP : tst_Counting::testFailSkip(row 2) Skipping - Loc: [../counting/tst_counting.cpp(118)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] INFO : tst_Counting::testFailFail() entering INFO : tst_Counting::testFailFail(row 1) QVERIFY(false) - Loc: [../counting/tst_counting.cpp(115)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] FAIL! : tst_Counting::testFailFail(row 1) 'false' returned FALSE. () - Loc: [../counting/tst_counting.cpp(115)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] INFO : tst_Counting::testFailFail(row 2) QVERIFY(false) - Loc: [../counting/tst_counting.cpp(115)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] FAIL! : tst_Counting::testFailFail(row 2) 'false' returned FALSE. () - Loc: [../counting/tst_counting.cpp(115)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] INFO : tst_Counting::testFailInInit() entering PASS : tst_Counting::testFailInInit(before) FAIL! : tst_Counting::testFailInInit(fail) Fail in init() - Loc: [../counting/tst_counting.cpp(234)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] PASS : tst_Counting::testFailInInit(after) INFO : tst_Counting::testFailInCleanup() entering PASS : tst_Counting::testFailInCleanup(before) QDEBUG : tst_Counting::testFailInCleanup(fail) This test function should execute and then QFAIL in cleanup() FAIL! : tst_Counting::testFailInCleanup(fail) Fail in cleanup() - Loc: [../counting/tst_counting.cpp(242)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] PASS : tst_Counting::testFailInCleanup(after) INFO : tst_Counting::testSkipInInit() entering PASS : tst_Counting::testSkipInInit(before) SKIP : tst_Counting::testSkipInInit(skip) Skip in init() - Loc: [../counting/tst_counting.cpp(236)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] PASS : tst_Counting::testSkipInInit(after) INFO : tst_Counting::testSkipInCleanup() entering PASS : tst_Counting::testSkipInCleanup(before) QDEBUG : tst_Counting::testSkipInCleanup(skip) This test function should execute and then QSKIP in cleanup() SKIP : tst_Counting::testSkipInCleanup(skip) Skip in cleanup() - Loc: [../counting/tst_counting.cpp(244)] + Loc: [qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(0)] PASS : tst_Counting::testSkipInCleanup(after) INFO : tst_Counting::cleanupTestCase() entering PASS : tst_Counting::cleanupTestCase() -Totals: 16 passed, 8 failed, 8 skipped, 0 blacklisted +Totals: 16 passed, 8 failed, 8 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_Counting ********* diff --git a/tests/auto/testlib/selftests/expected_verbose2.xml b/tests/auto/testlib/selftests/expected_verbose2.xml index 94fef3eed7..b7226db3bf 100644 --- a/tests/auto/testlib/selftests/expected_verbose2.xml +++ b/tests/auto/testlib/selftests/expected_verbose2.xml @@ -7,185 +7,185 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testPassPass"> -<Message type="info" file="../counting/tst_counting.cpp" line="111"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QVERIFY(true)]]></Description> </Message> -<Message type="info" file="../counting/tst_counting.cpp" line="112"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QCOMPARE(2 + 1, 3)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Message type="info" file="../counting/tst_counting.cpp" line="111"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QVERIFY(true)]]></Description> </Message> -<Message type="info" file="../counting/tst_counting.cpp" line="112"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QCOMPARE(2 + 1, 3)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testPassSkip"> -<Message type="info" file="../counting/tst_counting.cpp" line="111"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QVERIFY(true)]]></Description> </Message> -<Message type="info" file="../counting/tst_counting.cpp" line="112"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QCOMPARE(2 + 1, 3)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Message type="skip" file="../counting/tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testPassFail"> -<Message type="info" file="../counting/tst_counting.cpp" line="111"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QVERIFY(true)]]></Description> </Message> -<Message type="info" file="../counting/tst_counting.cpp" line="112"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QCOMPARE(2 + 1, 3)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 1]]></DataTag> </Incident> -<Message type="info" file="../counting/tst_counting.cpp" line="115"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QVERIFY(false)]]></Description> </Message> -<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipPass"> -<Message type="skip" file="../counting/tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Message type="info" file="../counting/tst_counting.cpp" line="111"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QVERIFY(true)]]></Description> </Message> -<Message type="info" file="../counting/tst_counting.cpp" line="112"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QCOMPARE(2 + 1, 3)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipSkip"> -<Message type="skip" file="../counting/tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Message type="skip" file="../counting/tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipFail"> -<Message type="skip" file="../counting/tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Message type="info" file="../counting/tst_counting.cpp" line="115"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QVERIFY(false)]]></Description> </Message> -<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailPass"> -<Message type="info" file="../counting/tst_counting.cpp" line="115"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QVERIFY(false)]]></Description> </Message> -<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Message type="info" file="../counting/tst_counting.cpp" line="111"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QVERIFY(true)]]></Description> </Message> -<Message type="info" file="../counting/tst_counting.cpp" line="112"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QCOMPARE(2 + 1, 3)]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[row 2]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailSkip"> -<Message type="info" file="../counting/tst_counting.cpp" line="115"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QVERIFY(false)]]></Description> </Message> -<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Message type="skip" file="../counting/tst_counting.cpp" line="118"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[Skipping]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailFail"> -<Message type="info" file="../counting/tst_counting.cpp" line="115"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA[QVERIFY(false)]]></Description> </Message> -<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 1]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Message type="info" file="../counting/tst_counting.cpp" line="115"> +<Message type="info" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA[QVERIFY(false)]]></Description> </Message> -<Incident type="fail" file="../counting/tst_counting.cpp" line="115"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[row 2]]></DataTag> <Description><![CDATA['false' returned FALSE. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailInInit"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Incident type="fail" file="../counting/tst_counting.cpp" line="234"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[fail]]></DataTag> <Description><![CDATA[Fail in init()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailInCleanup"> <Incident type="pass" file="" line="0"> @@ -195,27 +195,27 @@ <DataTag><![CDATA[fail]]></DataTag> <Description><![CDATA[This test function should execute and then QFAIL in cleanup()]]></Description> </Message> -<Incident type="fail" file="../counting/tst_counting.cpp" line="242"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[fail]]></DataTag> <Description><![CDATA[Fail in cleanup()]]></Description> </Incident> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipInInit"> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[before]]></DataTag> </Incident> -<Message type="skip" file="../counting/tst_counting.cpp" line="236"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in init()]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testSkipInCleanup"> <Incident type="pass" file="" line="0"> @@ -225,18 +225,18 @@ <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description> </Message> -<Message type="skip" file="../counting/tst_counting.cpp" line="244"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="0"> <DataTag><![CDATA[skip]]></DataTag> <Description><![CDATA[Skip in cleanup()]]></Description> </Message> <Incident type="pass" file="" line="0"> <DataTag><![CDATA[after]]></DataTag> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.lightxml b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.lightxml index d38363fb6e..6dd5260e80 100644 --- a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.lightxml +++ b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.lightxml @@ -5,58 +5,58 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testCorrectStdTypes"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testCorrectStdExceptions"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testCorrectMyExceptions"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailInt"> -<Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="128"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp" line="0"> <Description><![CDATA[Expected exception of type double to be thrown but unknown exception caught]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailStdString"> -<Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="133"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp" line="0"> <Description><![CDATA[Expected exception of type char* to be thrown but unknown exception caught]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailStdRuntimeError"> -<Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="138"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp" line="0"> <Description><![CDATA[Expected exception of type std::runtime_error to be thrown but std::exception caught with message: logic error]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailMyException"> -<Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="143"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp" line="0"> <Description><![CDATA[Expected exception of type MyBaseException to be thrown but std::exception caught with message: logic error]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailMyDerivedException"> -<Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="148"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp" line="0"> <Description><![CDATA[Expected exception of type std::runtime_error to be thrown but std::exception caught with message: MyDerivedException]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailNoException"> -<Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="153"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp" line="0"> <Description><![CDATA[Expected exception of type std::exception to be thrown but no exception caught]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.teamcity b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.teamcity index 25490bca78..030da58195 100644 --- a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.teamcity +++ b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.teamcity @@ -8,22 +8,22 @@ ##teamcity[testStarted name='testCorrectMyExceptions()' flowId='tst_VerifyExceptionThrown'] ##teamcity[testFinished name='testCorrectMyExceptions()' flowId='tst_VerifyExceptionThrown'] ##teamcity[testStarted name='testFailInt()' flowId='tst_VerifyExceptionThrown'] -##teamcity[testFailed name='testFailInt()' message='Failure! |[Loc: tst_verifyexceptionthrown.cpp(120)|]' details='Expected exception of type double to be thrown but unknown exception caught' flowId='tst_VerifyExceptionThrown'] +##teamcity[testFailed name='testFailInt()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp(0)|]' details='Expected exception of type double to be thrown but unknown exception caught' flowId='tst_VerifyExceptionThrown'] ##teamcity[testFinished name='testFailInt()' flowId='tst_VerifyExceptionThrown'] ##teamcity[testStarted name='testFailStdString()' flowId='tst_VerifyExceptionThrown'] -##teamcity[testFailed name='testFailStdString()' message='Failure! |[Loc: tst_verifyexceptionthrown.cpp(125)|]' details='Expected exception of type char* to be thrown but unknown exception caught' flowId='tst_VerifyExceptionThrown'] +##teamcity[testFailed name='testFailStdString()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp(0)|]' details='Expected exception of type char* to be thrown but unknown exception caught' flowId='tst_VerifyExceptionThrown'] ##teamcity[testFinished name='testFailStdString()' flowId='tst_VerifyExceptionThrown'] ##teamcity[testStarted name='testFailStdRuntimeError()' flowId='tst_VerifyExceptionThrown'] -##teamcity[testFailed name='testFailStdRuntimeError()' message='Failure! |[Loc: tst_verifyexceptionthrown.cpp(130)|]' details='Expected exception of type std::runtime_error to be thrown but std::exception caught with message: logic error' flowId='tst_VerifyExceptionThrown'] +##teamcity[testFailed name='testFailStdRuntimeError()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp(0)|]' details='Expected exception of type std::runtime_error to be thrown but std::exception caught with message: logic error' flowId='tst_VerifyExceptionThrown'] ##teamcity[testFinished name='testFailStdRuntimeError()' flowId='tst_VerifyExceptionThrown'] ##teamcity[testStarted name='testFailMyException()' flowId='tst_VerifyExceptionThrown'] -##teamcity[testFailed name='testFailMyException()' message='Failure! |[Loc: tst_verifyexceptionthrown.cpp(135)|]' details='Expected exception of type MyBaseException to be thrown but std::exception caught with message: logic error' flowId='tst_VerifyExceptionThrown'] +##teamcity[testFailed name='testFailMyException()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp(0)|]' details='Expected exception of type MyBaseException to be thrown but std::exception caught with message: logic error' flowId='tst_VerifyExceptionThrown'] ##teamcity[testFinished name='testFailMyException()' flowId='tst_VerifyExceptionThrown'] ##teamcity[testStarted name='testFailMyDerivedException()' flowId='tst_VerifyExceptionThrown'] -##teamcity[testFailed name='testFailMyDerivedException()' message='Failure! |[Loc: tst_verifyexceptionthrown.cpp(140)|]' details='Expected exception of type std::runtime_error to be thrown but std::exception caught with message: MyDerivedException' flowId='tst_VerifyExceptionThrown'] +##teamcity[testFailed name='testFailMyDerivedException()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp(0)|]' details='Expected exception of type std::runtime_error to be thrown but std::exception caught with message: MyDerivedException' flowId='tst_VerifyExceptionThrown'] ##teamcity[testFinished name='testFailMyDerivedException()' flowId='tst_VerifyExceptionThrown'] ##teamcity[testStarted name='testFailNoException()' flowId='tst_VerifyExceptionThrown'] -##teamcity[testFailed name='testFailNoException()' message='Failure! |[Loc: tst_verifyexceptionthrown.cpp(145)|]' details='Expected exception of type std::exception to be thrown but no exception caught' flowId='tst_VerifyExceptionThrown'] +##teamcity[testFailed name='testFailNoException()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp(0)|]' details='Expected exception of type std::exception to be thrown but no exception caught' flowId='tst_VerifyExceptionThrown'] ##teamcity[testFinished name='testFailNoException()' flowId='tst_VerifyExceptionThrown'] ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_VerifyExceptionThrown'] ##teamcity[testFinished name='cleanupTestCase()' flowId='tst_VerifyExceptionThrown'] diff --git a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.txt b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.txt index 43fc30c969..c982fbc5e7 100644 --- a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.txt +++ b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.txt @@ -1,21 +1,21 @@ ********* Start testing of tst_VerifyExceptionThrown ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_VerifyExceptionThrown::initTestCase() PASS : tst_VerifyExceptionThrown::testCorrectStdTypes() PASS : tst_VerifyExceptionThrown::testCorrectStdExceptions() PASS : tst_VerifyExceptionThrown::testCorrectMyExceptions() FAIL! : tst_VerifyExceptionThrown::testFailInt() Expected exception of type double to be thrown but unknown exception caught - Loc: [tst_verifyexceptionthrown.cpp(128)] + Loc: [qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp(0)] FAIL! : tst_VerifyExceptionThrown::testFailStdString() Expected exception of type char* to be thrown but unknown exception caught - Loc: [tst_verifyexceptionthrown.cpp(133)] + Loc: [qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp(0)] FAIL! : tst_VerifyExceptionThrown::testFailStdRuntimeError() Expected exception of type std::runtime_error to be thrown but std::exception caught with message: logic error - Loc: [tst_verifyexceptionthrown.cpp(138)] + Loc: [qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp(0)] FAIL! : tst_VerifyExceptionThrown::testFailMyException() Expected exception of type MyBaseException to be thrown but std::exception caught with message: logic error - Loc: [tst_verifyexceptionthrown.cpp(143)] + Loc: [qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp(0)] FAIL! : tst_VerifyExceptionThrown::testFailMyDerivedException() Expected exception of type std::runtime_error to be thrown but std::exception caught with message: MyDerivedException - Loc: [tst_verifyexceptionthrown.cpp(148)] + Loc: [qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp(0)] FAIL! : tst_VerifyExceptionThrown::testFailNoException() Expected exception of type std::exception to be thrown but no exception caught - Loc: [tst_verifyexceptionthrown.cpp(153)] + Loc: [qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp(0)] PASS : tst_VerifyExceptionThrown::cleanupTestCase() -Totals: 5 passed, 6 failed, 0 skipped, 0 blacklisted +Totals: 5 passed, 6 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_VerifyExceptionThrown ********* diff --git a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xml b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xml index 8c57fe5c0f..c8329197db 100644 --- a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xml +++ b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xml @@ -7,59 +7,59 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testCorrectStdTypes"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testCorrectStdExceptions"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testCorrectMyExceptions"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailInt"> -<Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="128"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp" line="0"> <Description><![CDATA[Expected exception of type double to be thrown but unknown exception caught]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailStdString"> -<Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="133"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp" line="0"> <Description><![CDATA[Expected exception of type char* to be thrown but unknown exception caught]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailStdRuntimeError"> -<Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="138"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp" line="0"> <Description><![CDATA[Expected exception of type std::runtime_error to be thrown but std::exception caught with message: logic error]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailMyException"> -<Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="143"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp" line="0"> <Description><![CDATA[Expected exception of type MyBaseException to be thrown but std::exception caught with message: logic error]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailMyDerivedException"> -<Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="148"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp" line="0"> <Description><![CDATA[Expected exception of type std::runtime_error to be thrown but std::exception caught with message: MyDerivedException]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFailNoException"> -<Incident type="fail" file="tst_verifyexceptionthrown.cpp" line="153"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/verifyexceptionthrown/tst_verifyexceptionthrown.cpp" line="0"> <Description><![CDATA[Expected exception of type std::exception to be thrown but no exception caught]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_warnings.lightxml b/tests/auto/testlib/selftests/expected_warnings.lightxml index afbbf5b5e2..9d5a106500 100644 --- a/tests/auto/testlib/selftests/expected_warnings.lightxml +++ b/tests/auto/testlib/selftests/expected_warnings.lightxml @@ -5,7 +5,7 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testWarnings"> <Message type="qwarn" file="" line="0"> @@ -39,7 +39,7 @@ <Description><![CDATA[Babablabla]]></Description> </Message> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testMissingWarnings"> <Message type="info" file="" line="0"> @@ -51,7 +51,7 @@ <Incident type="fail" file="" line="0"> <Description><![CDATA[Not all expected messages were received]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testMissingWarningsRegularExpression"> <Message type="info" file="" line="0"> @@ -60,7 +60,7 @@ <Incident type="fail" file="" line="0"> <Description><![CDATA[Not all expected messages were received]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testMissingWarningsWithData"> <Message type="info" file="" line="0"> @@ -87,10 +87,10 @@ <DataTag><![CDATA[second row]]></DataTag> <Description><![CDATA[Not all expected messages were received]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_warnings.txt b/tests/auto/testlib/selftests/expected_warnings.txt index 9f7393e90f..0a65213b79 100644 --- a/tests/auto/testlib/selftests/expected_warnings.txt +++ b/tests/auto/testlib/selftests/expected_warnings.txt @@ -1,5 +1,5 @@ ********* Start testing of tst_Warnings ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_Warnings::initTestCase() QWARN : tst_Warnings::testWarnings() Warning QWARN : tst_Warnings::testWarnings() Warning @@ -24,5 +24,5 @@ INFO : tst_Warnings::testMissingWarningsWithData(second row) Did not receive m INFO : tst_Warnings::testMissingWarningsWithData(second row) Did not receive message: "Warning1" FAIL! : tst_Warnings::testMissingWarningsWithData(second row) Not all expected messages were received PASS : tst_Warnings::cleanupTestCase() -Totals: 3 passed, 4 failed, 0 skipped, 0 blacklisted +Totals: 3 passed, 4 failed, 0 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_Warnings ********* diff --git a/tests/auto/testlib/selftests/expected_warnings.xml b/tests/auto/testlib/selftests/expected_warnings.xml index 7023e35e0c..1b17dbbf5d 100644 --- a/tests/auto/testlib/selftests/expected_warnings.xml +++ b/tests/auto/testlib/selftests/expected_warnings.xml @@ -7,7 +7,7 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testWarnings"> <Message type="qwarn" file="" line="0"> @@ -41,7 +41,7 @@ <Description><![CDATA[Babablabla]]></Description> </Message> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testMissingWarnings"> <Message type="info" file="" line="0"> @@ -53,7 +53,7 @@ <Incident type="fail" file="" line="0"> <Description><![CDATA[Not all expected messages were received]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testMissingWarningsRegularExpression"> <Message type="info" file="" line="0"> @@ -62,7 +62,7 @@ <Incident type="fail" file="" line="0"> <Description><![CDATA[Not all expected messages were received]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testMissingWarningsWithData"> <Message type="info" file="" line="0"> @@ -89,11 +89,11 @@ <DataTag><![CDATA[second row]]></DataTag> <Description><![CDATA[Not all expected messages were received]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/expected_xunit.lightxml b/tests/auto/testlib/selftests/expected_xunit.lightxml index 95ab8f03f0..863501bddf 100644 --- a/tests/auto/testlib/selftests/expected_xunit.lightxml +++ b/tests/auto/testlib/selftests/expected_xunit.lightxml @@ -5,60 +5,60 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFunc1"> -<Message type="warn" file="tst_xunit.cpp" line="67"> +<Message type="warn" file="qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp" line="0"> <Description><![CDATA[just a QWARN() !]]></Description> </Message> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFunc2"> <Message type="qdebug" file="" line="0"> <Description><![CDATA[a qDebug() call with comment-ending stuff -->]]></Description> </Message> -<Incident type="fail" file="tst_xunit.cpp" line="74"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp" line="0"> <Description><![CDATA[Compared values are not the same Actual (2): 2 Expected (3): 3]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFunc3"> -<Message type="skip" file="tst_xunit.cpp" line="79"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp" line="0"> <Description><![CDATA[skipping this function!]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFunc4"> -<Incident type="fail" file="tst_xunit.cpp" line="84"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp" line="0"> <Description><![CDATA[a forced failure!]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFunc5"> -<Incident type="xfail" file="tst_xunit.cpp" line="98"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp" line="0"> <Description><![CDATA[this failure is expected]]></Description> </Incident> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFunc6"> -<Incident type="xfail" file="tst_xunit.cpp" line="104"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp" line="0"> <Description><![CDATA[this failure is also expected]]></Description> </Incident> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFunc7"> -<Incident type="xpass" file="tst_xunit.cpp" line="110"> +<Incident type="xpass" file="qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp" line="0"> <Description><![CDATA['true' returned TRUE unexpectedly. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> diff --git a/tests/auto/testlib/selftests/expected_xunit.teamcity b/tests/auto/testlib/selftests/expected_xunit.teamcity index 7f8ea3de3b..9969624413 100644 --- a/tests/auto/testlib/selftests/expected_xunit.teamcity +++ b/tests/auto/testlib/selftests/expected_xunit.teamcity @@ -2,24 +2,24 @@ ##teamcity[testStarted name='initTestCase()' flowId='tst_Xunit'] ##teamcity[testFinished name='initTestCase()' flowId='tst_Xunit'] ##teamcity[testStarted name='testFunc1()' flowId='tst_Xunit'] -##teamcity[testStdOut name='testFunc1()' out='WARNING |[Loc: tst_xunit.cpp(59)|]: just a QWARN() !' flowId='tst_Xunit'] +##teamcity[testStdOut name='testFunc1()' out='WARNING |[Loc: qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp(0)|]: just a QWARN() !' flowId='tst_Xunit'] ##teamcity[testFinished name='testFunc1()' flowId='tst_Xunit'] ##teamcity[testStarted name='testFunc2()' flowId='tst_Xunit'] -##teamcity[testFailed name='testFunc2()' message='Failure! |[Loc: tst_xunit.cpp(66)|]' details='Compared values are not the same|n Actual (2): 2|n Expected (3): 3' flowId='tst_Xunit'] +##teamcity[testFailed name='testFunc2()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp(0)|]' details='Compared values are not the same|n Actual (2): 2|n Expected (3): 3' flowId='tst_Xunit'] ##teamcity[testStdOut name='testFunc2()' out='QDEBUG: a qDebug() call with comment-ending stuff -->' flowId='tst_Xunit'] ##teamcity[testFinished name='testFunc2()' flowId='tst_Xunit'] -##teamcity[testIgnored name='testFunc3()' message='skipping this function! |[Loc: tst_xunit.cpp(71)|]' flowId='tst_Xunit'] +##teamcity[testIgnored name='testFunc3()' message='skipping this function! |[Loc: qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp(0)|]' flowId='tst_Xunit'] ##teamcity[testStarted name='testFunc4()' flowId='tst_Xunit'] -##teamcity[testFailed name='testFunc4()' message='Failure! |[Loc: tst_xunit.cpp(76)|]' details='a forced failure!' flowId='tst_Xunit'] +##teamcity[testFailed name='testFunc4()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp(0)|]' details='a forced failure!' flowId='tst_Xunit'] ##teamcity[testFinished name='testFunc4()' flowId='tst_Xunit'] ##teamcity[testStarted name='testFunc5()' flowId='tst_Xunit'] -##teamcity[testStdOut name='testFunc5()' out='XFAIL |[Loc: tst_xunit.cpp(90)|]: this failure is expected' flowId='tst_Xunit'] +##teamcity[testStdOut name='testFunc5()' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp(0)|]: this failure is expected' flowId='tst_Xunit'] ##teamcity[testFinished name='testFunc5()' flowId='tst_Xunit'] ##teamcity[testStarted name='testFunc6()' flowId='tst_Xunit'] -##teamcity[testStdOut name='testFunc6()' out='XFAIL |[Loc: tst_xunit.cpp(96)|]: this failure is also expected' flowId='tst_Xunit'] +##teamcity[testStdOut name='testFunc6()' out='XFAIL |[Loc: qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp(0)|]: this failure is also expected' flowId='tst_Xunit'] ##teamcity[testFinished name='testFunc6()' flowId='tst_Xunit'] ##teamcity[testStarted name='testFunc7()' flowId='tst_Xunit'] -##teamcity[testFailed name='testFunc7()' message='Failure! |[Loc: tst_xunit.cpp(102)|]' details='|'true|' returned TRUE unexpectedly. ()' flowId='tst_Xunit'] +##teamcity[testFailed name='testFunc7()' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp(0)|]' details='|'true|' returned TRUE unexpectedly. ()' flowId='tst_Xunit'] ##teamcity[testFinished name='testFunc7()' flowId='tst_Xunit'] ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_Xunit'] ##teamcity[testFinished name='cleanupTestCase()' flowId='tst_Xunit'] diff --git a/tests/auto/testlib/selftests/expected_xunit.txt b/tests/auto/testlib/selftests/expected_xunit.txt index 4863711bd0..bc6f50a58f 100644 --- a/tests/auto/testlib/selftests/expected_xunit.txt +++ b/tests/auto/testlib/selftests/expected_xunit.txt @@ -1,26 +1,26 @@ ********* Start testing of tst_Xunit ********* -Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ +Config: Using QtTest library PASS : tst_Xunit::initTestCase() WARNING: tst_Xunit::testFunc1() just a QWARN() ! - Loc: [tst_xunit.cpp(67)] + Loc: [qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp(0)] PASS : tst_Xunit::testFunc1() QDEBUG : tst_Xunit::testFunc2() a qDebug() call with comment-ending stuff --> FAIL! : tst_Xunit::testFunc2() Compared values are not the same Actual (2): 2 Expected (3): 3 - Loc: [tst_xunit.cpp(74)] + Loc: [qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp(0)] SKIP : tst_Xunit::testFunc3() skipping this function! - Loc: [tst_xunit.cpp(79)] + Loc: [qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp(0)] FAIL! : tst_Xunit::testFunc4() a forced failure! - Loc: [tst_xunit.cpp(84)] + Loc: [qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp(0)] XFAIL : tst_Xunit::testFunc5() this failure is expected - Loc: [tst_xunit.cpp(98)] + Loc: [qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp(0)] PASS : tst_Xunit::testFunc5() XFAIL : tst_Xunit::testFunc6() this failure is also expected - Loc: [tst_xunit.cpp(104)] + Loc: [qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp(0)] PASS : tst_Xunit::testFunc6() XPASS : tst_Xunit::testFunc7() 'true' returned TRUE unexpectedly. () - Loc: [tst_xunit.cpp(110)] + Loc: [qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp(0)] PASS : tst_Xunit::cleanupTestCase() -Totals: 5 passed, 3 failed, 1 skipped, 0 blacklisted +Totals: 5 passed, 3 failed, 1 skipped, 0 blacklisted, 0ms ********* Finished testing of tst_Xunit ********* diff --git a/tests/auto/testlib/selftests/expected_xunit.xml b/tests/auto/testlib/selftests/expected_xunit.xml index f56ca947be..723ae6c914 100644 --- a/tests/auto/testlib/selftests/expected_xunit.xml +++ b/tests/auto/testlib/selftests/expected_xunit.xml @@ -7,61 +7,61 @@ </Environment> <TestFunction name="initTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFunc1"> -<Message type="warn" file="tst_xunit.cpp" line="67"> +<Message type="warn" file="qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp" line="0"> <Description><![CDATA[just a QWARN() !]]></Description> </Message> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFunc2"> <Message type="qdebug" file="" line="0"> <Description><![CDATA[a qDebug() call with comment-ending stuff -->]]></Description> </Message> -<Incident type="fail" file="tst_xunit.cpp" line="74"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp" line="0"> <Description><![CDATA[Compared values are not the same Actual (2): 2 Expected (3): 3]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFunc3"> -<Message type="skip" file="tst_xunit.cpp" line="79"> +<Message type="skip" file="qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp" line="0"> <Description><![CDATA[skipping this function!]]></Description> </Message> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFunc4"> -<Incident type="fail" file="tst_xunit.cpp" line="84"> +<Incident type="fail" file="qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp" line="0"> <Description><![CDATA[a forced failure!]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFunc5"> -<Incident type="xfail" file="tst_xunit.cpp" line="98"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp" line="0"> <Description><![CDATA[this failure is expected]]></Description> </Incident> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFunc6"> -<Incident type="xfail" file="tst_xunit.cpp" line="104"> +<Incident type="xfail" file="qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp" line="0"> <Description><![CDATA[this failure is also expected]]></Description> </Incident> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="testFunc7"> -<Incident type="xpass" file="tst_xunit.cpp" line="110"> +<Incident type="xpass" file="qtbase/tests/auto/testlib/selftests/xunit/tst_xunit.cpp" line="0"> <Description><![CDATA['true' returned TRUE unexpectedly. ()]]></Description> </Incident> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <TestFunction name="cleanupTestCase"> <Incident type="pass" file="" line="0" /> -<Duration msecs="0"/> + <Duration msecs="0"/> </TestFunction> <Duration msecs="0"/> </TestCase> diff --git a/tests/auto/testlib/selftests/generate_expected_output.py b/tests/auto/testlib/selftests/generate_expected_output.py index a3a66da98b..6c14d75ea6 100755 --- a/tests/auto/testlib/selftests/generate_expected_output.py +++ b/tests/auto/testlib/selftests/generate_expected_output.py @@ -252,7 +252,13 @@ def generateTestData(testname, clean, def main(name, *args): """Minimal argument parsing and driver for the real work""" - os.environ['LC_ALL'] = 'C' + os.environ.update( + LC_ALL = 'C', # Use standard locale + # Avoid interference from any qtlogging.ini files, e.g. in + # /etc/xdg/QtProject/, (must match tst_selftests.cpp's + # processEnvironment()'s value): + QT_LOGGING_RULES = '*.debug=true;qt.qpa.screen=false') + herePath = os.getcwd() cleaner = Cleaner(herePath, name) diff --git a/tests/auto/testlib/selftests/selftests.pri b/tests/auto/testlib/selftests/selftests.pri index 0287e35447..42c62d3b55 100644 --- a/tests/auto/testlib/selftests/selftests.pri +++ b/tests/auto/testlib/selftests/selftests.pri @@ -15,6 +15,8 @@ SUBPROGRAMS = \ crashes \ datatable \ datetime \ + deleteLater \ + deleteLater_noApp \ differentexec \ exceptionthrow \ expectfail \ diff --git a/tests/auto/testlib/selftests/selftests.qrc b/tests/auto/testlib/selftests/selftests.qrc index 02e8adb6b4..75d3375394 100644 --- a/tests/auto/testlib/selftests/selftests.qrc +++ b/tests/auto/testlib/selftests/selftests.qrc @@ -1,6 +1,5 @@ <RCC> <qresource prefix="/"> - <file>expected_alive.txt</file> <file>expected_assert.lightxml</file> <file>expected_assert.teamcity</file> <file>expected_assert.txt</file> @@ -11,29 +10,40 @@ <file>expected_badxml.txt</file> <file>expected_badxml.xml</file> <file>expected_badxml.xunitxml</file> - <file>expected_benchlibcallgrind.txt</file> + <file>expected_benchlibcallgrind_0.txt</file> + <file>expected_benchlibcallgrind_1.txt</file> <file>expected_benchlibcallgrind.csv</file> + <file>expected_benchlibcallgrind.lightxml</file> + <file>expected_benchlibcallgrind.xml</file> + <file>expected_benchlibcallgrind.xunitxml</file> + <file>expected_benchlibcounting.csv</file> <file>expected_benchlibcounting.lightxml</file> <file>expected_benchlibcounting.txt</file> <file>expected_benchlibcounting.xml</file> <file>expected_benchlibcounting.xunitxml</file> - <file>expected_benchlibcounting.csv</file> + <file>expected_benchlibeventcounter.csv</file> <file>expected_benchlibeventcounter.lightxml</file> <file>expected_benchlibeventcounter.txt</file> <file>expected_benchlibeventcounter.xml</file> <file>expected_benchlibeventcounter.xunitxml</file> - <file>expected_benchlibeventcounter.csv</file> + <file>expected_benchliboptions.lightxml</file> <file>expected_benchliboptions.txt</file> + <file>expected_benchliboptions.xml</file> + <file>expected_benchliboptions.xunitxml</file> + <file>expected_benchlibtickcounter.csv</file> <file>expected_benchlibtickcounter.lightxml</file> <file>expected_benchlibtickcounter.txt</file> <file>expected_benchlibtickcounter.xml</file> <file>expected_benchlibtickcounter.xunitxml</file> - <file>expected_benchlibtickcounter.csv</file> + <file>expected_benchlibwalltime.csv</file> <file>expected_benchlibwalltime.lightxml</file> <file>expected_benchlibwalltime.txt</file> <file>expected_benchlibwalltime.xml</file> <file>expected_benchlibwalltime.xunitxml</file> - <file>expected_benchlibwalltime.csv</file> + <file>expected_blacklisted.lightxml</file> + <file>expected_blacklisted.txt</file> + <file>expected_blacklisted.xml</file> + <file>expected_blacklisted.xunitxml</file> <file>expected_cmptest.lightxml</file> <file>expected_cmptest.teamcity</file> <file>expected_cmptest.txt</file> @@ -62,7 +72,10 @@ <file>expected_datetime.txt</file> <file>expected_datetime.xml</file> <file>expected_datetime.xunitxml</file> + <file>expected_differentexec.lightxml</file> <file>expected_differentexec.txt</file> + <file>expected_differentexec.xml</file> + <file>expected_differentexec.xunitxml</file> <file>expected_exceptionthrow.lightxml</file> <file>expected_exceptionthrow.teamcity</file> <file>expected_exceptionthrow.txt</file> @@ -98,7 +111,10 @@ <file>expected_findtestdata.txt</file> <file>expected_findtestdata.xml</file> <file>expected_findtestdata.xunitxml</file> + <file>expected_float.lightxml</file> <file>expected_float.txt</file> + <file>expected_float.xml</file> + <file>expected_float.xunitxml</file> <file>expected_globaldata.lightxml</file> <file>expected_globaldata.teamcity</file> <file>expected_globaldata.txt</file> @@ -114,7 +130,10 @@ <file>expected_maxwarnings.txt</file> <file>expected_maxwarnings.xml</file> <file>expected_maxwarnings.xunitxml</file> + <file>expected_multiexec.lightxml</file> <file>expected_multiexec.txt</file> + <file>expected_multiexec.xml</file> + <file>expected_multiexec.xunitxml</file> <file>expected_pairdiagnostics.lightxml</file> <file>expected_pairdiagnostics.teamcity</file> <file>expected_pairdiagnostics.txt</file> @@ -122,9 +141,15 @@ <file>expected_pairdiagnostics.xunitxml</file> <file>expected_printdatatags.txt</file> <file>expected_printdatatagswithglobaltags.txt</file> + <file>expected_qexecstringlist.lightxml</file> <file>expected_qexecstringlist.txt</file> + <file>expected_qexecstringlist.xml</file> + <file>expected_qexecstringlist.xunitxml</file> + <file>expected_silent.lightxml</file> <file>expected_silent.teamcity</file> <file>expected_silent.txt</file> + <file>expected_silent.xml</file> + <file>expected_silent.xunitxml</file> <file>expected_singleskip.lightxml</file> <file>expected_singleskip.teamcity</file> <file>expected_singleskip.txt</file> @@ -150,8 +175,11 @@ <file>expected_skipinitdata.txt</file> <file>expected_skipinitdata.xml</file> <file>expected_skipinitdata.xunitxml</file> + <file>expected_sleep.lightxml</file> <file>expected_sleep.teamcity</file> <file>expected_sleep.txt</file> + <file>expected_sleep.xml</file> + <file>expected_sleep.xunitxml</file> <file>expected_strcmp.lightxml</file> <file>expected_strcmp.teamcity</file> <file>expected_strcmp.txt</file> @@ -187,6 +215,5 @@ <file>expected_xunit.txt</file> <file>expected_xunit.xml</file> <file>expected_xunit.xunitxml</file> - <file>expected_blacklisted.txt</file> </qresource> </RCC> diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp index 64f324e26c..9bb3c9b2d4 100644 --- a/tests/auto/testlib/selftests/tst_selftests.cpp +++ b/tests/auto/testlib/selftests/tst_selftests.cpp @@ -568,6 +568,10 @@ static QProcessEnvironment processEnvironment() if (useVariable) result.insert(key, systemEnvironment.value(key)); } + // Avoid interference from any qtlogging.ini files, e.g. in /etc/xdg/QtProject/: + result.insert(QStringLiteral("QT_LOGGING_RULES"), + // Must match generate_expected_output.py's main()'s value: + QStringLiteral("*.debug=true;qt.qpa.screen=false")); } return result; } |