summaryrefslogtreecommitdiffstats
path: root/src/testlib/qtestjunitstreamer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/testlib/qtestjunitstreamer.cpp')
-rw-r--r--src/testlib/qtestjunitstreamer.cpp152
1 files changed, 40 insertions, 112 deletions
diff --git a/src/testlib/qtestjunitstreamer.cpp b/src/testlib/qtestjunitstreamer.cpp
index 844f80f90c..ee6fee2f2b 100644
--- a/src/testlib/qtestjunitstreamer.cpp
+++ b/src/testlib/qtestjunitstreamer.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtTest module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** 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-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#include <QtTest/private/qtestjunitstreamer_p.h>
#include <QtTest/private/qjunittestlogger_p.h>
@@ -82,13 +46,8 @@ void QTestJUnitStreamer::formatStart(const QTestElement *element, QTestCharBuffe
char indent[20];
indentForElement(element, indent, sizeof(indent));
- // Errors are written as CDATA within system-err, comments elsewhere
- if (element->elementType() == QTest::LET_Error) {
- if (element->parentElement()->elementType() == QTest::LET_SystemError) {
- QTest::qt_asprintf(formatted, "<![CDATA[");
- } else {
- QTest::qt_asprintf(formatted, "%s<!--", indent);
- }
+ if (element->elementType() == QTest::LET_Text) {
+ QTest::qt_asprintf(formatted, "%s<![CDATA[", indent);
return;
}
@@ -100,7 +59,7 @@ void QTestJUnitStreamer::formatEnd(const QTestElement *element, QTestCharBuffer
if (!element || !formatted )
return;
- if (!element->childElements()) {
+ if (element->childElements().empty()) {
formatted->data()[0] = '\0';
return;
}
@@ -111,36 +70,26 @@ void QTestJUnitStreamer::formatEnd(const QTestElement *element, QTestCharBuffer
QTest::qt_asprintf(formatted, "%s</%s>\n", indent, element->elementName());
}
-void QTestJUnitStreamer::formatAttributes(const QTestElement* element, const QTestElementAttribute *attribute, QTestCharBuffer *formatted) const
+bool QTestJUnitStreamer::formatAttributes(const QTestElement* element,
+ const QTestElementAttribute *attribute,
+ QTestCharBuffer *formatted) const
{
if (!attribute || !formatted )
- return;
+ return false;
QTest::AttributeIndex attrindex = attribute->index();
- // For errors within system-err, we only want to output `message'
- if (element && element->elementType() == QTest::LET_Error
- && element->parentElement()->elementType() == QTest::LET_SystemError) {
-
- if (attrindex != QTest::AI_Description) return;
-
- QXmlTestLogger::xmlCdata(formatted, attribute->value());
- return;
+ if (element && element->elementType() == QTest::LET_Text) {
+ QTEST_ASSERT(attrindex == QTest::AI_Value);
+ return QXmlTestLogger::xmlCdata(formatted, attribute->value());
}
- char const* key = nullptr;
- if (attrindex == QTest::AI_Description)
- key = "message";
- else if (attrindex != QTest::AI_File && attrindex != QTest::AI_Line)
- key = attribute->name();
-
- if (key) {
- QTestCharBuffer quotedValue;
- QXmlTestLogger::xmlQuote(&quotedValue, attribute->value());
- QTest::qt_asprintf(formatted, " %s=\"%s\"", key, quotedValue.constData());
- } else {
- formatted->data()[0] = '\0';
+ QTestCharBuffer quotedValue;
+ if (QXmlTestLogger::xmlQuote(&quotedValue, attribute->value())) {
+ return QTest::qt_asprintf(formatted, " %s=\"%s\"",
+ attribute->name(), quotedValue.constData()) != 0;
}
+ return false;
}
void QTestJUnitStreamer::formatAfterAttributes(const QTestElement *element, QTestCharBuffer *formatted) const
@@ -148,17 +97,12 @@ void QTestJUnitStreamer::formatAfterAttributes(const QTestElement *element, QTes
if (!element || !formatted )
return;
- // Errors are written as CDATA within system-err, comments elsewhere
- if (element->elementType() == QTest::LET_Error) {
- if (element->parentElement()->elementType() == QTest::LET_SystemError) {
- QTest::qt_asprintf(formatted, "]]>\n");
- } else {
- QTest::qt_asprintf(formatted, " -->\n");
- }
+ if (element->elementType() == QTest::LET_Text) {
+ QTest::qt_asprintf(formatted, "]]>\n");
return;
}
- if (!element->childElements())
+ if (element->childElements().empty())
QTest::qt_asprintf(formatted, "/>\n");
else
QTest::qt_asprintf(formatted, ">\n");
@@ -168,55 +112,39 @@ void QTestJUnitStreamer::output(QTestElement *element) const
{
QTEST_ASSERT(element);
- outputString("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
- outputElements(element);
-}
+ if (!element->parentElement())
+ outputString("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
-void QTestJUnitStreamer::outputElements(QTestElement *element, bool) const
-{
QTestCharBuffer buf;
- bool hasChildren;
-
- // Elements are in reverse order of occurrence, so
- // start from the end and work our way backwards.
- while (element && element->nextElement())
- element = element->nextElement();
- while (element) {
- hasChildren = element->childElements();
+ formatStart(element, &buf);
+ outputString(buf.data());
- if (element->elementType() != QTest::LET_Benchmark) {
- formatStart(element, &buf);
- outputString(buf.data());
+ outputElementAttributes(element, element->attributes());
- outputElementAttributes(element, element->attributes());
+ formatAfterAttributes(element, &buf);
+ outputString(buf.data());
- formatAfterAttributes(element, &buf);
- outputString(buf.data());
+ if (!element->childElements().empty())
+ outputElements(element->childElements());
- if (hasChildren)
- outputElements(element->childElements(), true);
+ formatEnd(element, &buf);
+ outputString(buf.data());
+}
- formatEnd(element, &buf);
- outputString(buf.data());
- }
- element = element->previousElement();
- }
+void QTestJUnitStreamer::outputElements(const std::vector<QTestElement*> &elements) const
+{
+ for (auto *element : elements)
+ output(element);
}
-void QTestJUnitStreamer::outputElementAttributes(const QTestElement* element, QTestElementAttribute *attribute) const
+void QTestJUnitStreamer::outputElementAttributes(const QTestElement* element, const std::vector<QTestElementAttribute*> &attributes) const
{
QTestCharBuffer buf;
- // Attributes are in reverse order of occurrence, so
- // start from the end and work our way backwards.
- while (attribute && attribute->nextElement())
- attribute = attribute->nextElement();
-
- while (attribute) {
- formatAttributes(element, attribute, &buf);
- outputString(buf.data());
- attribute = attribute->previousElement();
+ for (auto *attribute : attributes) {
+ if (formatAttributes(element, attribute, &buf))
+ outputString(buf.data());
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 21:39:26 +0000