diff options
Diffstat (limited to 'src/testlib/qtestlog_p.h')
| -rw-r--r-- | src/testlib/qtestlog_p.h | 55 |
1 files changed, 15 insertions, 40 deletions
diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h index ddaf14ed9b..f9bbfa158d 100644 --- a/src/testlib/qtestlog_p.h +++ b/src/testlib/qtestlog_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) 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 #ifndef QTESTLOG_P_H #define QTESTLOG_P_H @@ -64,6 +28,7 @@ QT_BEGIN_NAMESPACE class QBenchmarkResult; class QRegularExpression; class QTestData; +class QAbstractTestLogger; class Q_TESTLIB_EXPORT QTestLog { @@ -98,15 +63,23 @@ public: static void addBXPass(const char *msg, const char *file, int line); static void addBXFail(const char *msg, const char *file, int line); static void addSkip(const char *msg, const char *file, int line); - static void addBenchmarkResult(const QBenchmarkResult &result); + static void addBenchmarkResult(const QList<QBenchmarkResult> &result) + { return addBenchmarkResults({ result }); } + static void addBenchmarkResults(const QList<QBenchmarkResult> &result); static void ignoreMessage(QtMsgType type, const char *msg); #ifndef QT_NO_REGULAREXPRESSION static void ignoreMessage(QtMsgType type, const QRegularExpression &expression); #endif + static void failOnWarning(const char *msg); +#ifndef QT_NO_REGULAREXPRESSION + static void failOnWarning(const QRegularExpression &expression); +#endif static int unhandledIgnoreMessages(); static void printUnhandledIgnoreMessages(); static void clearIgnoreMessages(); + static void clearFailOnWarnings(); + static void clearCurrentTestState(); static void warn(const char *msg, const char *file, int line); static void info(const char *msg, const char *file, int line); @@ -115,8 +88,10 @@ public: static void stopLogging(); static void addLogger(LogMode mode, const char *filename); + static void addLogger(QAbstractTestLogger *logger); - static int loggerCount(); + static bool hasLoggers(); + static bool isRepeatSupported(); static bool loggerUsingStdout(); static void setVerboseLevel(int level); |