diff --git a/src/testlib/doc/src/qttestlib-manual.qdoc b/src/testlib/doc/src/qttestlib-manual.qdoc index 89edabf3f3..3acc08d8f4 100644 --- a/src/testlib/doc/src/qttestlib-manual.qdoc +++ b/src/testlib/doc/src/qttestlib-manual.qdoc @@ -237,7 +237,7 @@ \list \li \c -o \e{filename,format} \br Writes output to the specified file, in the specified format (one of - \c txt, \c xml, \c lightxml, \c xunitxml or \c tap). The special filename \c - + \c txt, \c xml, \c lightxml, \c junitxml or \c tap). The special filename \c - may be used to log to standard output. \li \c -o \e filename \br Writes output to the specified file. @@ -247,8 +247,8 @@ Outputs results as an XML document. \li \c -lightxml \br Outputs results as a stream of XML tags. - \li \c -xunitxml \br - Outputs results as an Xunit XML document. + \li \c -junitxml \br + Outputs results as an JUnit XML document. \li \c -csv \br Outputs results as comma-separated values (CSV). This mode is only suitable for benchmarks, since it suppresses normal pass/fail messages. @@ -264,7 +264,7 @@ If the first version of the \c -o option is used, neither the second version of the \c -o option nor the \c -txt, \c -xml, \c -lightxml, \c -teamcity, - \c -xunitxml or \c -tap options should be used. + \c -junitxml or \c -tap options should be used. If neither version of the \c -o option is used, test results will be logged to standard output. If no format option is used, test results will be logged in diff --git a/src/testlib/qxunittestlogger.cpp b/src/testlib/qjunittestlogger.cpp similarity index 93% rename from src/testlib/qxunittestlogger.cpp rename to src/testlib/qjunittestlogger.cpp index b3cac9cb82..2d71f7967b 100644 --- a/src/testlib/qxunittestlogger.cpp +++ b/src/testlib/qjunittestlogger.cpp @@ -37,9 +37,9 @@ ** ****************************************************************************/ -#include +#include #include -#include +#include #include #include #include @@ -57,27 +57,27 @@ QT_BEGIN_NAMESPACE -QXunitTestLogger::QXunitTestLogger(const char *filename) +QJUnitTestLogger::QJUnitTestLogger(const char *filename) : QAbstractTestLogger(filename) { } -QXunitTestLogger::~QXunitTestLogger() +QJUnitTestLogger::~QJUnitTestLogger() { delete currentLogElement; delete logFormatter; } -void QXunitTestLogger::startLogging() +void QJUnitTestLogger::startLogging() { QAbstractTestLogger::startLogging(); - logFormatter = new QTestXunitStreamer(this); + logFormatter = new QTestJUnitStreamer(this); delete errorLogElement; errorLogElement = new QTestElement(QTest::LET_SystemError); } -void QXunitTestLogger::stopLogging() +void QJUnitTestLogger::stopLogging() { QTestElement *iterator = listOfTestcases; @@ -132,7 +132,7 @@ void QXunitTestLogger::stopLogging() QAbstractTestLogger::stopLogging(); } -void QXunitTestLogger::enterTestFunction(const char *function) +void QJUnitTestLogger::enterTestFunction(const char *function) { currentLogElement = new QTestElement(QTest::LET_TestCase); currentLogElement->addAttribute(QTest::AI_Name, function); @@ -141,11 +141,11 @@ void QXunitTestLogger::enterTestFunction(const char *function) ++testCounter; } -void QXunitTestLogger::leaveTestFunction() +void QJUnitTestLogger::leaveTestFunction() { } -void QXunitTestLogger::addIncident(IncidentTypes type, const char *description, +void QJUnitTestLogger::addIncident(IncidentTypes type, const char *description, const char *file, int line) { const char *typeBuf = nullptr; @@ -242,15 +242,15 @@ void QXunitTestLogger::addIncident(IncidentTypes type, const char *description, currentLogElement->addAttribute(QTest::AI_Line, buf); /* - Since XFAIL does not add a failure to the testlog in xunitxml, add a message, so we still + Since XFAIL does not add a failure to the testlog in junitxml, add a message, so we still have some information about the expected failure. */ if (type == QAbstractTestLogger::XFail) { - QXunitTestLogger::addMessage(QAbstractTestLogger::Info, QString::fromUtf8(description), file, line); + QJUnitTestLogger::addMessage(QAbstractTestLogger::Info, QString::fromUtf8(description), file, line); } } -void QXunitTestLogger::addBenchmarkResult(const QBenchmarkResult &result) +void QJUnitTestLogger::addBenchmarkResult(const QBenchmarkResult &result) { QTestElement *benchmarkElement = new QTestElement(QTest::LET_Benchmark); @@ -268,7 +268,7 @@ void QXunitTestLogger::addBenchmarkResult(const QBenchmarkResult &result) currentLogElement->addLogElement(benchmarkElement); } -void QXunitTestLogger::addTag(QTestElement* element) +void QJUnitTestLogger::addTag(QTestElement* element) { const char *tag = QTestResult::currentDataTag(); const char *gtag = QTestResult::currentGlobalDataTag(); @@ -289,7 +289,7 @@ void QXunitTestLogger::addTag(QTestElement* element) element->addAttribute(QTest::AI_Tag, buf.constData()); } -void QXunitTestLogger::addMessage(MessageTypes type, const QString &message, const char *file, int line) +void QJUnitTestLogger::addMessage(MessageTypes type, const QString &message, const char *file, int line) { QTestElement *errorElement = new QTestElement(QTest::LET_Error); const char *typeBuf = nullptr; diff --git a/src/testlib/qxunittestlogger_p.h b/src/testlib/qjunittestlogger_p.h similarity index 91% rename from src/testlib/qxunittestlogger_p.h rename to src/testlib/qjunittestlogger_p.h index 518ba098f4..6fd4e4c331 100644 --- a/src/testlib/qxunittestlogger_p.h +++ b/src/testlib/qjunittestlogger_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QXUNITTESTLOGGER_P_H -#define QXUNITTESTLOGGER_P_H +#ifndef QJUNITTESTLOGGER_P_H +#define QJUNITTESTLOGGER_P_H // // W A R N I N G @@ -55,14 +55,14 @@ QT_BEGIN_NAMESPACE -class QTestXunitStreamer; +class QTestJUnitStreamer; class QTestElement; -class QXunitTestLogger : public QAbstractTestLogger +class QJUnitTestLogger : public QAbstractTestLogger { public: - QXunitTestLogger(const char *filename); - ~QXunitTestLogger(); + QJUnitTestLogger(const char *filename); + ~QJUnitTestLogger(); void startLogging() override; void stopLogging() override; @@ -82,7 +82,7 @@ class QXunitTestLogger : public QAbstractTestLogger QTestElement *listOfTestcases = nullptr; QTestElement *currentLogElement = nullptr; QTestElement *errorLogElement = nullptr; - QTestXunitStreamer *logFormatter = nullptr; + QTestJUnitStreamer *logFormatter = nullptr; int testCounter = 0; int failureCounter = 0; @@ -91,4 +91,4 @@ class QXunitTestLogger : public QAbstractTestLogger QT_END_NAMESPACE -#endif // QXUNITTESTLOGGER_P_H +#endif // QJUNITTESTLOGGER_P_H diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 372e208919..189009ee16 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -541,7 +541,7 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, const char *const argv[], bool " Valid formats are:\n" " txt : Plain text\n" " csv : CSV format (suitable for benchmarks)\n" - " xunitxml : XML XUnit document\n" + " junitxml : XML JUnit document\n" " xml : XML document\n" " lightxml : A stream of XML tags\n" " teamcity : TeamCity format\n" @@ -553,7 +553,7 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, const char *const argv[], bool " -o filename : Write the output into file\n" " -txt : Output results in Plain Text\n" " -csv : Output results in a CSV format (suitable for benchmarks)\n" - " -xunitxml : Output results as XML XUnit document\n" + " -junitxml : Output results as XML JUnit document\n" " -xml : Output results as XML document\n" " -lightxml : Output results as stream of XML tags\n" " -teamcity : Output results in TeamCity format\n" @@ -637,8 +637,8 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, const char *const argv[], bool logFormat = QTestLog::Plain; } else if (strcmp(argv[i], "-csv") == 0) { logFormat = QTestLog::CSV; - } else if (strcmp(argv[i], "-xunitxml") == 0) { - logFormat = QTestLog::XunitXML; + } else if (strcmp(argv[i], "-junitxml") == 0 || strcmp(argv[i], "-xunitxml") == 0) { + logFormat = QTestLog::JUnitXML; } else if (strcmp(argv[i], "-xml") == 0) { logFormat = QTestLog::XML; } else if (strcmp(argv[i], "-lightxml") == 0) { @@ -677,14 +677,14 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, const char *const argv[], bool logFormat = QTestLog::LightXML; else if (strcmp(format, "xml") == 0) logFormat = QTestLog::XML; - else if (strcmp(format, "xunitxml") == 0) - logFormat = QTestLog::XunitXML; + else if (strcmp(format, "junitxml") == 0 || strcmp(format, "xunitxml") == 0) + logFormat = QTestLog::JUnitXML; else if (strcmp(format, "teamcity") == 0) logFormat = QTestLog::TeamCity; else if (strcmp(format, "tap") == 0) logFormat = QTestLog::TAP; else { - fprintf(stderr, "output format must be one of txt, csv, lightxml, xml, tap, teamcity or xunitxml\n"); + fprintf(stderr, "output format must be one of txt, csv, lightxml, xml, tap, teamcity or junitxml\n"); exit(1); } if (strcmp(filename, "-") == 0 && QTestLog::loggerUsingStdout()) { diff --git a/src/testlib/qtestxunitstreamer.cpp b/src/testlib/qtestjunitstreamer.cpp similarity index 89% rename from src/testlib/qtestxunitstreamer.cpp rename to src/testlib/qtestjunitstreamer.cpp index bdbdfa9610..9c3a9c9ca5 100644 --- a/src/testlib/qtestxunitstreamer.cpp +++ b/src/testlib/qtestjunitstreamer.cpp @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#include -#include +#include +#include #include #include #include @@ -48,15 +48,15 @@ QT_BEGIN_NAMESPACE -QTestXunitStreamer::QTestXunitStreamer(QXunitTestLogger *logger) +QTestJUnitStreamer::QTestJUnitStreamer(QJUnitTestLogger *logger) : testLogger(logger) { QTEST_ASSERT(testLogger); } -QTestXunitStreamer::~QTestXunitStreamer() = default; +QTestJUnitStreamer::~QTestJUnitStreamer() = default; -void QTestXunitStreamer::indentForElement(const QTestElement* element, char* buf, int size) +void QTestJUnitStreamer::indentForElement(const QTestElement* element, char* buf, int size) { if (size == 0) return; @@ -74,7 +74,7 @@ void QTestXunitStreamer::indentForElement(const QTestElement* element, char* buf } } -void QTestXunitStreamer::formatStart(const QTestElement *element, QTestCharBuffer *formatted) const +void QTestJUnitStreamer::formatStart(const QTestElement *element, QTestCharBuffer *formatted) const { if (!element || !formatted ) return; @@ -95,7 +95,7 @@ void QTestXunitStreamer::formatStart(const QTestElement *element, QTestCharBuffe QTest::qt_asprintf(formatted, "%s<%s", indent, element->elementName()); } -void QTestXunitStreamer::formatEnd(const QTestElement *element, QTestCharBuffer *formatted) const +void QTestJUnitStreamer::formatEnd(const QTestElement *element, QTestCharBuffer *formatted) const { if (!element || !formatted ) return; @@ -111,7 +111,7 @@ void QTestXunitStreamer::formatEnd(const QTestElement *element, QTestCharBuffer QTest::qt_asprintf(formatted, "%s\n", indent, element->elementName()); } -void QTestXunitStreamer::formatAttributes(const QTestElement* element, const QTestElementAttribute *attribute, QTestCharBuffer *formatted) const +void QTestJUnitStreamer::formatAttributes(const QTestElement* element, const QTestElementAttribute *attribute, QTestCharBuffer *formatted) const { if (!attribute || !formatted ) return; @@ -143,7 +143,7 @@ void QTestXunitStreamer::formatAttributes(const QTestElement* element, const QTe } } -void QTestXunitStreamer::formatAfterAttributes(const QTestElement *element, QTestCharBuffer *formatted) const +void QTestJUnitStreamer::formatAfterAttributes(const QTestElement *element, QTestCharBuffer *formatted) const { if (!element || !formatted ) return; @@ -164,7 +164,7 @@ void QTestXunitStreamer::formatAfterAttributes(const QTestElement *element, QTes QTest::qt_asprintf(formatted, ">\n"); } -void QTestXunitStreamer::output(QTestElement *element) const +void QTestJUnitStreamer::output(QTestElement *element) const { QTEST_ASSERT(element); @@ -172,7 +172,7 @@ void QTestXunitStreamer::output(QTestElement *element) const outputElements(element); } -void QTestXunitStreamer::outputElements(QTestElement *element, bool) const +void QTestJUnitStreamer::outputElements(QTestElement *element, bool) const { QTestCharBuffer buf; bool hasChildren; @@ -205,7 +205,7 @@ void QTestXunitStreamer::outputElements(QTestElement *element, bool) const } } -void QTestXunitStreamer::outputElementAttributes(const QTestElement* element, QTestElementAttribute *attribute) const +void QTestJUnitStreamer::outputElementAttributes(const QTestElement* element, QTestElementAttribute *attribute) const { QTestCharBuffer buf; while (attribute) { @@ -215,7 +215,7 @@ void QTestXunitStreamer::outputElementAttributes(const QTestElement* element, QT } } -void QTestXunitStreamer::outputString(const char *msg) const +void QTestJUnitStreamer::outputString(const char *msg) const { testLogger->outputString(msg); } diff --git a/src/testlib/qtestxunitstreamer_p.h b/src/testlib/qtestjunitstreamer_p.h similarity index 91% rename from src/testlib/qtestxunitstreamer_p.h rename to src/testlib/qtestjunitstreamer_p.h index db6d2896f7..7d91e2b66c 100644 --- a/src/testlib/qtestxunitstreamer_p.h +++ b/src/testlib/qtestjunitstreamer_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QTESTXUNITSTREAMER_P_H -#define QTESTXUNITSTREAMER_P_H +#ifndef QTESTJUNITSTREAMER_P_H +#define QTESTJUNITSTREAMER_P_H // // W A R N I N G @@ -58,14 +58,14 @@ QT_BEGIN_NAMESPACE class QTestElement; class QTestElementAttribute; -class QXunitTestLogger; +class QJUnitTestLogger; struct QTestCharBuffer; -class QTestXunitStreamer +class QTestJUnitStreamer { public: - QTestXunitStreamer(QXunitTestLogger *logger); - ~QTestXunitStreamer(); + QTestJUnitStreamer(QJUnitTestLogger *logger); + ~QTestJUnitStreamer(); void formatStart(const QTestElement *element, QTestCharBuffer *formatted) const; void formatEnd(const QTestElement *element, QTestCharBuffer *formatted) const; @@ -78,10 +78,9 @@ class QTestXunitStreamer void outputString(const char *msg) const; private: - void displayXunitXmlHeader() const; static void indentForElement(const QTestElement* element, char* buf, int size); - QXunitTestLogger *testLogger; + QJUnitTestLogger *testLogger; }; QT_END_NAMESPACE diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp index 2776740784..7e5f9182b8 100644 --- a/src/testlib/qtestlog.cpp +++ b/src/testlib/qtestlog.cpp @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include #include @@ -456,8 +456,8 @@ void QTestLog::addLogger(LogMode mode, const char *filename) case QTestLog::LightXML: logger = new QXmlTestLogger(QXmlTestLogger::Light, filename); break; - case QTestLog::XunitXML: - logger = new QXunitTestLogger(filename); + case QTestLog::JUnitXML: + logger = new QJUnitTestLogger(filename); break; case QTestLog::TeamCity: logger = new QTeamCityLogger(filename); diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h index fff36f290d..959aef6968 100644 --- a/src/testlib/qtestlog_p.h +++ b/src/testlib/qtestlog_p.h @@ -71,7 +71,7 @@ public: Q_DISABLE_COPY_MOVE(QTestLog) enum LogMode { - Plain = 0, XML, LightXML, XunitXML, CSV, TeamCity, TAP + Plain = 0, XML, LightXML, JUnitXML, CSV, TeamCity, TAP #if defined(QT_USE_APPLE_UNIFIED_LOGGING) , Apple #endif diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro index 530bc6b425..0a0547688a 100644 --- a/src/testlib/testlib.pro +++ b/src/testlib/testlib.pro @@ -51,10 +51,10 @@ HEADERS = \ qtestblacklist_p.h \ qtesthelpers_p.h \ qttestglobal.h \ - qtestxunitstreamer_p.h \ + qtestjunitstreamer_p.h \ qtaptestlogger_p.h \ qxmltestlogger_p.h \ - qxunittestlogger_p.h + qjunittestlogger_p.h SOURCES = \ qtestcase.cpp \ @@ -77,8 +77,8 @@ SOURCES = \ qtestelement.cpp \ qtestelementattribute.cpp \ qtestmouse.cpp \ - qtestxunitstreamer.cpp \ - qxunittestlogger.cpp \ + qtestjunitstreamer.cpp \ + qjunittestlogger.cpp \ qtestblacklist.cpp \ qtaptestlogger.cpp diff --git a/tests/auto/testlib/selftests/expected_assert.xunitxml b/tests/auto/testlib/selftests/expected_assert.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_assert.xunitxml rename to tests/auto/testlib/selftests/expected_assert.junitxml diff --git a/tests/auto/testlib/selftests/expected_badxml.xunitxml b/tests/auto/testlib/selftests/expected_badxml.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_badxml.xunitxml rename to tests/auto/testlib/selftests/expected_badxml.junitxml diff --git a/tests/auto/testlib/selftests/expected_benchlibcallgrind.xunitxml b/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_benchlibcallgrind.xunitxml rename to tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml diff --git a/tests/auto/testlib/selftests/expected_benchlibcounting.xunitxml b/tests/auto/testlib/selftests/expected_benchlibcounting.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_benchlibcounting.xunitxml rename to tests/auto/testlib/selftests/expected_benchlibcounting.junitxml diff --git a/tests/auto/testlib/selftests/expected_benchlibeventcounter.xunitxml b/tests/auto/testlib/selftests/expected_benchlibeventcounter.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_benchlibeventcounter.xunitxml rename to tests/auto/testlib/selftests/expected_benchlibeventcounter.junitxml diff --git a/tests/auto/testlib/selftests/expected_benchliboptions.xunitxml b/tests/auto/testlib/selftests/expected_benchliboptions.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_benchliboptions.xunitxml rename to tests/auto/testlib/selftests/expected_benchliboptions.junitxml diff --git a/tests/auto/testlib/selftests/expected_benchlibtickcounter.xunitxml b/tests/auto/testlib/selftests/expected_benchlibtickcounter.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_benchlibtickcounter.xunitxml rename to tests/auto/testlib/selftests/expected_benchlibtickcounter.junitxml diff --git a/tests/auto/testlib/selftests/expected_benchlibwalltime.xunitxml b/tests/auto/testlib/selftests/expected_benchlibwalltime.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_benchlibwalltime.xunitxml rename to tests/auto/testlib/selftests/expected_benchlibwalltime.junitxml diff --git a/tests/auto/testlib/selftests/expected_blacklisted.xunitxml b/tests/auto/testlib/selftests/expected_blacklisted.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_blacklisted.xunitxml rename to tests/auto/testlib/selftests/expected_blacklisted.junitxml diff --git a/tests/auto/testlib/selftests/expected_cmptest.xunitxml b/tests/auto/testlib/selftests/expected_cmptest.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_cmptest.xunitxml rename to tests/auto/testlib/selftests/expected_cmptest.junitxml diff --git a/tests/auto/testlib/selftests/expected_commandlinedata.xunitxml b/tests/auto/testlib/selftests/expected_commandlinedata.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_commandlinedata.xunitxml rename to tests/auto/testlib/selftests/expected_commandlinedata.junitxml diff --git a/tests/auto/testlib/selftests/expected_counting.xunitxml b/tests/auto/testlib/selftests/expected_counting.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_counting.xunitxml rename to tests/auto/testlib/selftests/expected_counting.junitxml diff --git a/tests/auto/testlib/selftests/expected_datatable.xunitxml b/tests/auto/testlib/selftests/expected_datatable.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_datatable.xunitxml rename to tests/auto/testlib/selftests/expected_datatable.junitxml diff --git a/tests/auto/testlib/selftests/expected_datetime.xunitxml b/tests/auto/testlib/selftests/expected_datetime.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_datetime.xunitxml rename to tests/auto/testlib/selftests/expected_datetime.junitxml diff --git a/tests/auto/testlib/selftests/expected_differentexec.xunitxml b/tests/auto/testlib/selftests/expected_differentexec.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_differentexec.xunitxml rename to tests/auto/testlib/selftests/expected_differentexec.junitxml diff --git a/tests/auto/testlib/selftests/expected_exceptionthrow.xunitxml b/tests/auto/testlib/selftests/expected_exceptionthrow.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_exceptionthrow.xunitxml rename to tests/auto/testlib/selftests/expected_exceptionthrow.junitxml diff --git a/tests/auto/testlib/selftests/expected_expectfail.xunitxml b/tests/auto/testlib/selftests/expected_expectfail.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_expectfail.xunitxml rename to tests/auto/testlib/selftests/expected_expectfail.junitxml diff --git a/tests/auto/testlib/selftests/expected_failcleanup.xunitxml b/tests/auto/testlib/selftests/expected_failcleanup.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_failcleanup.xunitxml rename to tests/auto/testlib/selftests/expected_failcleanup.junitxml diff --git a/tests/auto/testlib/selftests/expected_faildatatype.xunitxml b/tests/auto/testlib/selftests/expected_faildatatype.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_faildatatype.xunitxml rename to tests/auto/testlib/selftests/expected_faildatatype.junitxml diff --git a/tests/auto/testlib/selftests/expected_failfetchtype.xunitxml b/tests/auto/testlib/selftests/expected_failfetchtype.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_failfetchtype.xunitxml rename to tests/auto/testlib/selftests/expected_failfetchtype.junitxml diff --git a/tests/auto/testlib/selftests/expected_failinit.xunitxml b/tests/auto/testlib/selftests/expected_failinit.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_failinit.xunitxml rename to tests/auto/testlib/selftests/expected_failinit.junitxml diff --git a/tests/auto/testlib/selftests/expected_failinitdata.xunitxml b/tests/auto/testlib/selftests/expected_failinitdata.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_failinitdata.xunitxml rename to tests/auto/testlib/selftests/expected_failinitdata.junitxml diff --git a/tests/auto/testlib/selftests/expected_fetchbogus.xunitxml b/tests/auto/testlib/selftests/expected_fetchbogus.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_fetchbogus.xunitxml rename to tests/auto/testlib/selftests/expected_fetchbogus.junitxml diff --git a/tests/auto/testlib/selftests/expected_findtestdata.xunitxml b/tests/auto/testlib/selftests/expected_findtestdata.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_findtestdata.xunitxml rename to tests/auto/testlib/selftests/expected_findtestdata.junitxml diff --git a/tests/auto/testlib/selftests/expected_float.xunitxml b/tests/auto/testlib/selftests/expected_float.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_float.xunitxml rename to tests/auto/testlib/selftests/expected_float.junitxml diff --git a/tests/auto/testlib/selftests/expected_globaldata.xunitxml b/tests/auto/testlib/selftests/expected_globaldata.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_globaldata.xunitxml rename to tests/auto/testlib/selftests/expected_globaldata.junitxml diff --git a/tests/auto/testlib/selftests/expected_keyboard.xunitxml b/tests/auto/testlib/selftests/expected_keyboard.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_keyboard.xunitxml rename to tests/auto/testlib/selftests/expected_keyboard.junitxml diff --git a/tests/auto/testlib/selftests/expected_longstring.xunitxml b/tests/auto/testlib/selftests/expected_longstring.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_longstring.xunitxml rename to tests/auto/testlib/selftests/expected_longstring.junitxml diff --git a/tests/auto/testlib/selftests/expected_maxwarnings.xunitxml b/tests/auto/testlib/selftests/expected_maxwarnings.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_maxwarnings.xunitxml rename to tests/auto/testlib/selftests/expected_maxwarnings.junitxml diff --git a/tests/auto/testlib/selftests/expected_multiexec.xunitxml b/tests/auto/testlib/selftests/expected_multiexec.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_multiexec.xunitxml rename to tests/auto/testlib/selftests/expected_multiexec.junitxml diff --git a/tests/auto/testlib/selftests/expected_pairdiagnostics.xunitxml b/tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_pairdiagnostics.xunitxml rename to tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml diff --git a/tests/auto/testlib/selftests/expected_qexecstringlist.xunitxml b/tests/auto/testlib/selftests/expected_qexecstringlist.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_qexecstringlist.xunitxml rename to tests/auto/testlib/selftests/expected_qexecstringlist.junitxml diff --git a/tests/auto/testlib/selftests/expected_signaldumper.xunitxml b/tests/auto/testlib/selftests/expected_signaldumper.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_signaldumper.xunitxml rename to tests/auto/testlib/selftests/expected_signaldumper.junitxml diff --git a/tests/auto/testlib/selftests/expected_silent.xunitxml b/tests/auto/testlib/selftests/expected_silent.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_silent.xunitxml rename to tests/auto/testlib/selftests/expected_silent.junitxml diff --git a/tests/auto/testlib/selftests/expected_singleskip.xunitxml b/tests/auto/testlib/selftests/expected_singleskip.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_singleskip.xunitxml rename to tests/auto/testlib/selftests/expected_singleskip.junitxml diff --git a/tests/auto/testlib/selftests/expected_skip.xunitxml b/tests/auto/testlib/selftests/expected_skip.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_skip.xunitxml rename to tests/auto/testlib/selftests/expected_skip.junitxml diff --git a/tests/auto/testlib/selftests/expected_skipcleanup.xunitxml b/tests/auto/testlib/selftests/expected_skipcleanup.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_skipcleanup.xunitxml rename to tests/auto/testlib/selftests/expected_skipcleanup.junitxml diff --git a/tests/auto/testlib/selftests/expected_skipinit.xunitxml b/tests/auto/testlib/selftests/expected_skipinit.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_skipinit.xunitxml rename to tests/auto/testlib/selftests/expected_skipinit.junitxml diff --git a/tests/auto/testlib/selftests/expected_skipinitdata.xunitxml b/tests/auto/testlib/selftests/expected_skipinitdata.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_skipinitdata.xunitxml rename to tests/auto/testlib/selftests/expected_skipinitdata.junitxml diff --git a/tests/auto/testlib/selftests/expected_sleep.xunitxml b/tests/auto/testlib/selftests/expected_sleep.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_sleep.xunitxml rename to tests/auto/testlib/selftests/expected_sleep.junitxml diff --git a/tests/auto/testlib/selftests/expected_strcmp.xunitxml b/tests/auto/testlib/selftests/expected_strcmp.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_strcmp.xunitxml rename to tests/auto/testlib/selftests/expected_strcmp.junitxml diff --git a/tests/auto/testlib/selftests/expected_subtest.xunitxml b/tests/auto/testlib/selftests/expected_subtest.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_subtest.xunitxml rename to tests/auto/testlib/selftests/expected_subtest.junitxml diff --git a/tests/auto/testlib/selftests/expected_testlib.xunitxml b/tests/auto/testlib/selftests/expected_testlib.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_testlib.xunitxml rename to tests/auto/testlib/selftests/expected_testlib.junitxml diff --git a/tests/auto/testlib/selftests/expected_tuplediagnostics.xunitxml b/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_tuplediagnostics.xunitxml rename to tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml diff --git a/tests/auto/testlib/selftests/expected_verbose1.xunitxml b/tests/auto/testlib/selftests/expected_verbose1.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_verbose1.xunitxml rename to tests/auto/testlib/selftests/expected_verbose1.junitxml diff --git a/tests/auto/testlib/selftests/expected_verbose2.xunitxml b/tests/auto/testlib/selftests/expected_verbose2.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_verbose2.xunitxml rename to tests/auto/testlib/selftests/expected_verbose2.junitxml diff --git a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.xunitxml b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_verifyexceptionthrown.xunitxml rename to tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml diff --git a/tests/auto/testlib/selftests/expected_warnings.xunitxml b/tests/auto/testlib/selftests/expected_warnings.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_warnings.xunitxml rename to tests/auto/testlib/selftests/expected_warnings.junitxml diff --git a/tests/auto/testlib/selftests/expected_watchdog.xunitxml b/tests/auto/testlib/selftests/expected_watchdog.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_watchdog.xunitxml rename to tests/auto/testlib/selftests/expected_watchdog.junitxml diff --git a/tests/auto/testlib/selftests/expected_xunit.xunitxml b/tests/auto/testlib/selftests/expected_xunit.junitxml similarity index 100% rename from tests/auto/testlib/selftests/expected_xunit.xunitxml rename to tests/auto/testlib/selftests/expected_xunit.junitxml diff --git a/tests/auto/testlib/selftests/generate_expected_output.py b/tests/auto/testlib/selftests/generate_expected_output.py index 48ecbf0289..1c0beff7fb 100755 --- a/tests/auto/testlib/selftests/generate_expected_output.py +++ b/tests/auto/testlib/selftests/generate_expected_output.py @@ -86,7 +86,7 @@ class Cleaner (object): # Build details: (r'(Config: Using QtTest library).*', r'\1'), # txt (r'( *[^<]+', r'\1/>'), # xml, lightxml - (r'()', r'\1\2'), # xunitxml + (r'()', r'\1\2'), # junitxml # Line numbers in source files: (r'(ASSERT: ".*" in file .*, line) \d+', r'\1 0'), # lightxml (r'(Loc: \[[^[\]()]+)\(\d+\)', r'\1(0)'), # txt @@ -295,7 +295,7 @@ def testEnv(testname, return data def generateTestData(testname, clean, - formats = ('xml', 'txt', 'xunitxml', 'lightxml', 'teamcity', 'tap'), + formats = ('xml', 'txt', 'junitxml', 'lightxml', 'teamcity', 'tap'), # Make sure this matches tst_Selftests::runSubTest_data(): extraArgs = { "commandlinedata": "fiveTablePasses fiveTablePasses:fiveTablePasses_data1 -v2", diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp index 331ae48135..6e4a7896f6 100644 --- a/tests/auto/testlib/selftests/tst_selftests.cpp +++ b/tests/auto/testlib/selftests/tst_selftests.cpp @@ -280,13 +280,17 @@ QList tst_Selftests::allLoggerSets() const QStringList() << "xml", QStringList() << "-xml" << "-o" << logName("xml") ) - << LoggerSet("old stdout xunitxml", - QStringList() << "stdout xunitxml", - QStringList() << "-xunitxml" + << LoggerSet("old stdout junitxml", + QStringList() << "stdout junitxml", + QStringList() << "-junitxml" ) - << LoggerSet("old xunitxml", - QStringList() << "xunitxml", - QStringList() << "-xunitxml" << "-o" << logName("xunitxml") + << LoggerSet("old junitxml", + QStringList() << "junitxml", + QStringList() << "-junitxml" << "-o" << logName("junitxml") + ) + << LoggerSet("old xunitxml compatibility", + QStringList() << "junitxml", + QStringList() << "-xunitxml" << "-o" << logName("junitxml") ) << LoggerSet("old stdout lightxml", QStringList() << "stdout lightxml", @@ -335,13 +339,17 @@ QList tst_Selftests::allLoggerSets() const QStringList() << "xml", QStringList() << "-o" << logName("xml")+",xml" ) - << LoggerSet("new stdout xunitxml", - QStringList() << "stdout xunitxml", + << LoggerSet("new stdout junitxml", + QStringList() << "stdout junitxml", + QStringList() << "-o" << "-,junitxml" + ) + << LoggerSet("new stdout xunitxml compatibility", + QStringList() << "stdout junitxml", QStringList() << "-o" << "-,xunitxml" ) - << LoggerSet("new xunitxml", - QStringList() << "xunitxml", - QStringList() << "-o" << logName("xunitxml")+",xunitxml" + << LoggerSet("new junitxml", + QStringList() << "junitxml", + QStringList() << "-o" << logName("junitxml")+",junitxml" ) << LoggerSet("new stdout lightxml", QStringList() << "stdout lightxml", @@ -384,24 +392,24 @@ QList tst_Selftests::allLoggerSets() const QStringList() << "-o" << logName("xml")+",xml" << "-o" << "-,txt" ) - << LoggerSet("txt + xunitxml", - QStringList() << "txt" << "xunitxml", + << LoggerSet("txt + junitxml", + QStringList() << "txt" << "junitxml", QStringList() << "-o" << logName("txt")+",txt" - << "-o" << logName("xunitxml")+",xunitxml" + << "-o" << logName("junitxml")+",junitxml" ) - << LoggerSet("lightxml + stdout xunitxml", - QStringList() << "lightxml" << "stdout xunitxml", + << LoggerSet("lightxml + stdout junitxml", + QStringList() << "lightxml" << "stdout junitxml", QStringList() << "-o" << logName("lightxml")+",lightxml" - << "-o" << "-,xunitxml" + << "-o" << "-,junitxml" ) // All loggers at the same time (except csv) << LoggerSet("all loggers", - QStringList() << "txt" << "xml" << "lightxml" << "stdout txt" << "xunitxml" << "tap", + QStringList() << "txt" << "xml" << "lightxml" << "stdout txt" << "junitxml" << "tap", QStringList() << "-o" << logName("txt")+",txt" << "-o" << logName("xml")+",xml" << "-o" << logName("lightxml")+",lightxml" << "-o" << "-,txt" - << "-o" << logName("xunitxml")+",xunitxml" + << "-o" << logName("junitxml")+",junitxml" << "-o" << logName("teamcity")+",teamcity" << "-o" << logName("tap")+",tap" )