summaryrefslogtreecommitdiffstats
path: root/src/testlib/qtestelementattribute.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/testlib/qtestelementattribute.cpp')
-rw-r--r--src/testlib/qtestelementattribute.cpp119
1 files changed, 7 insertions, 112 deletions
diff --git a/src/testlib/qtestelementattribute.cpp b/src/testlib/qtestelementattribute.cpp
index 595ecda6cc..57e68fc40b 100644
--- a/src/testlib/qtestelementattribute.cpp
+++ b/src/testlib/qtestelementattribute.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) 2016 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/qtestelementattribute_p.h>
#include <QtCore/qbytearray.h>
@@ -44,70 +8,6 @@
QT_BEGIN_NAMESPACE
-/*! \enum QTest::AttributeIndex
- This enum numbers the different tests.
-
- \value AI_Undefined
-
- \value AI_Name
-
- \value AI_Result
-
- \value AI_Tests
-
- \value AI_Failures
-
- \value AI_Errors
-
- \value AI_Type
-
- \value AI_Description
-
- \value AI_PropertyValue
-
- \value AI_QTestVersion
-
- \value AI_QtVersion
-
- \value AI_File
-
- \value AI_Line
-
- \value AI_Metric
-
- \value AI_Tag
-
- \value AI_Value
-
- \value AI_Iterations
-
- \value AI_Time
-
- \value AI_Timestamp
-*/
-
-/*! \enum QTest::LogElementType
- The enum specifies the kinds of test log messages.
-
- \value LET_Undefined
-
- \value LET_Property
-
- \value LET_Properties
-
- \value LET_Failure
-
- \value LET_Error
-
- \value LET_TestCase
-
- \value LET_TestSuite
-
- \value LET_Benchmark
-
- \value LET_SystemError
-*/
-
QTestElementAttribute::QTestElementAttribute() = default;
QTestElementAttribute::~QTestElementAttribute()
@@ -125,23 +25,18 @@ const char *QTestElementAttribute::name() const
const char *AttributeNames[] =
{
"name",
- "result",
"tests",
"failures",
"errors",
"type",
- "description",
+ "message",
"value",
- "qtestversion",
- "qtversion",
- "file",
- "line",
- "metric",
- "tag",
"value",
- "iterations",
"time",
- "timestamp"
+ "timestamp",
+ "hostname",
+ "classname",
+ "skipped"
};
if (attributeIndex != QTest::AI_Undefined)