1 files changed, 19 insertions, 43 deletions

diff --git a/src/testlib/qjunittestlogger_p.h b/src/testlib/qjunittestlogger_p.h
index 0be9e8aeb0..6a7ff31615 100644
--- a/src/testlib/qjunittestlogger_p.h
+++ b/src/testlib/qjunittestlogger_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) 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
 
 #ifndef QJUNITTESTLOGGER_P_H
 #define QJUNITTESTLOGGER_P_H
@@ -51,7 +15,12 @@
 // We mean it.
 //
 
+#include <QtTest/qttestglobal.h>
+
 #include <QtTest/private/qabstracttestlogger_p.h>
+#include <QtTest/private/qtestelementattribute_p.h>
+
+#include <vector>
 
 QT_BEGIN_NAMESPACE
 
@@ -70,18 +39,25 @@ class QJUnitTestLogger : public QAbstractTestLogger
         void enterTestFunction(const char *function) override;
         void leaveTestFunction() override;
 
+        void enterTestData(QTestData *) override;
+
         void addIncident(IncidentTypes type, const char *description,
                      const char *file = nullptr, int line = 0) override;
-        void addBenchmarkResult(const QBenchmarkResult &result) override;
-        void addTag(QTestElement* element);
-
         void addMessage(MessageTypes type, const QString &message,
                     const char *file = nullptr, int line = 0) override;
 
+        void addBenchmarkResult(const QBenchmarkResult &) override {}
+
     private:
+        void enterTestCase(const char *name);
+        void leaveTestCase();
+
+        void addFailure(QTest::LogElementType elementType,
+            const char *failureType, const QString &failureDescription);
+
         QTestElement *currentTestSuite = nullptr;
-        QTestElement *listOfTestcases = nullptr;
-        QTestElement *currentLogElement = nullptr;
+        std::vector<QTestElement*> listOfTestcases;
+        QTestElement *currentTestCase = nullptr;
         QTestElement *systemOutputElement = nullptr;
         QTestElement *systemErrorElement = nullptr;
         QTestJUnitStreamer *logFormatter = nullptr;