diff options
Diffstat (limited to 'src/testlib/qtestcoreelement_p.h')
-rw-r--r-- | src/testlib/qtestcoreelement_p.h | 77 |
1 files changed, 21 insertions, 56 deletions
diff --git a/src/testlib/qtestcoreelement_p.h b/src/testlib/qtestcoreelement_p.h index 4eb7361a5c..7c6bf9dd18 100644 --- a/src/testlib/qtestcoreelement_p.h +++ b/src/testlib/qtestcoreelement_p.h @@ -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) 2022 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 #ifndef QTESTCOREELEMENT_P_H #define QTESTCOREELEMENT_P_H @@ -51,21 +15,23 @@ // We mean it. // -#include <QtTest/private/qtestcorelist_p.h> +#include <QtTest/qttestglobal.h> #include <QtTest/private/qtestelementattribute_p.h> +#include <vector> + QT_BEGIN_NAMESPACE template <class ElementType> -class QTestCoreElement: public QTestCoreList<ElementType> +class QTestCoreElement { public: - QTestCoreElement( int type = -1 ); + QTestCoreElement(QTest::LogElementType type = QTest::LET_Undefined); virtual ~QTestCoreElement(); void addAttribute(const QTest::AttributeIndex index, const char *value); - QTestElementAttribute *attributes() const; + const std::vector<QTestElementAttribute*> &attributes() const; const char *attributeValue(QTest::AttributeIndex index) const; const char *attributeName(QTest::AttributeIndex index) const; const QTestElementAttribute *attribute(QTest::AttributeIndex index) const; @@ -74,20 +40,21 @@ class QTestCoreElement: public QTestCoreList<ElementType> QTest::LogElementType elementType() const; private: - QTestElementAttribute *listOfAttributes = nullptr; + std::vector<QTestElementAttribute*> listOfAttributes; QTest::LogElementType type; }; template<class ElementType> -QTestCoreElement<ElementType>::QTestCoreElement(int t) - : type(QTest::LogElementType(t)) +QTestCoreElement<ElementType>::QTestCoreElement(QTest::LogElementType t) + : type(t) { } template<class ElementType> QTestCoreElement<ElementType>::~QTestCoreElement() { - delete listOfAttributes; + for (auto *attribute : listOfAttributes) + delete attribute; } template <class ElementType> @@ -98,11 +65,11 @@ void QTestCoreElement<ElementType>::addAttribute(const QTest::AttributeIndex att QTestElementAttribute *testAttribute = new QTestElementAttribute; testAttribute->setPair(attributeIndex, value); - testAttribute->addToList(&listOfAttributes); + listOfAttributes.push_back(testAttribute); } template <class ElementType> -QTestElementAttribute *QTestCoreElement<ElementType>::attributes() const +const std::vector<QTestElementAttribute*> &QTestCoreElement<ElementType>::attributes() const { return listOfAttributes; } @@ -138,9 +105,10 @@ const char *QTestCoreElement<ElementType>::elementName() const "error", "testcase", "testsuite", - "benchmark", + "message", "system-err", - "system-out" + "system-out", + "skipped" }; if (type != QTest::LET_Undefined) @@ -158,12 +126,9 @@ QTest::LogElementType QTestCoreElement<ElementType>::elementType() const template <class ElementType> const QTestElementAttribute *QTestCoreElement<ElementType>::attribute(QTest::AttributeIndex index) const { - QTestElementAttribute *iterator = listOfAttributes; - while (iterator) { - if (iterator->index() == index) - return iterator; - - iterator = iterator->nextElement(); + for (auto *attribute : listOfAttributes) { + if (attribute->index() == index) + return attribute; } return nullptr; |