diff options
Diffstat (limited to 'tests/auto/testlib/selftests/subtest')
4 files changed, 60 insertions, 97 deletions
diff --git a/tests/auto/testlib/selftests/subtest/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/subtest/.prev_CMakeLists.txt deleted file mode 100644 index 39243acfc9..0000000000 --- a/tests/auto/testlib/selftests/subtest/.prev_CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -# Generated from subtest.pro. - -##################################################################### -## subtest Binary: -##################################################################### - -qt_add_executable(subtest - SOURCES - tst_subtest.cpp - PUBLIC_LIBRARIES - Qt::Test -) - -## Scopes: -##################################################################### diff --git a/tests/auto/testlib/selftests/subtest/CMakeLists.txt b/tests/auto/testlib/selftests/subtest/CMakeLists.txt index e27c3a1b4a..3dad026cf3 100644 --- a/tests/auto/testlib/selftests/subtest/CMakeLists.txt +++ b/tests/auto/testlib/selftests/subtest/CMakeLists.txt @@ -1,21 +1,21 @@ -# Generated from subtest.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## subtest Binary: ##################################################################### -qt_add_executable(subtest - NO_INSTALL # special case - OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case +qt_internal_add_executable(subtest + NO_INSTALL + EXCEPTIONS + OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} SOURCES tst_subtest.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Test ) ## Scopes: ##################################################################### -# special case begin -qt_apply_testlib_coverage_options(subtest) -# special case end +qt_internal_apply_testlib_coverage_options(subtest) diff --git a/tests/auto/testlib/selftests/subtest/subtest.pro b/tests/auto/testlib/selftests/subtest/subtest.pro deleted file mode 100644 index b5c294aed6..0000000000 --- a/tests/auto/testlib/selftests/subtest/subtest.pro +++ /dev/null @@ -1,9 +0,0 @@ -SOURCES += tst_subtest.cpp -QT = core testlib - -mac:CONFIG -= app_bundle -CONFIG -= debug_and_release_target - -TARGET = subtest - -include($$QT_SOURCE_TREE/src/testlib/selfcover.pri) diff --git a/tests/auto/testlib/selftests/subtest/tst_subtest.cpp b/tests/auto/testlib/selftests/subtest/tst_subtest.cpp index 7ae878c4b9..023c43e2af 100644 --- a/tests/auto/testlib/selftests/subtest/tst_subtest.cpp +++ b/tests/auto/testlib/selftests/subtest/tst_subtest.cpp @@ -1,35 +1,12 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** 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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +#undef QTEST_THROW_ON_FAILURE // code expects old behavior +#undef QTEST_THROW_ON_SKIP // code expects old behavior #include <QtCore/QCoreApplication> #include <QtCore/QDebug> -#include <QtTest/QtTest> +#include <QTest> class tst_Subtest: public QObject { @@ -47,64 +24,65 @@ private slots: void test2(); void test3_data(); void test3(); + + void multiFail(); + void multiSkip(); +private: + void logNames(const char *caller); + void table_data(); }; +void tst_Subtest::logNames(const char *caller) +{ + auto orNull = [](const char *s) { return s ? s : "(null)"; }; + qDebug("%s %s %s", caller, orNull(QTest::currentTestFunction()), + orNull(QTest::currentDataTag())); +} void tst_Subtest::initTestCase() { - qDebug() << "initTestCase" - << (QTest::currentTestFunction() ? QTest::currentTestFunction() : "(null)") - << (QTest::currentDataTag() ? QTest::currentDataTag() : "(null)"); + logNames("initTestCase"); } void tst_Subtest::cleanupTestCase() { - qDebug() << "cleanupTestCase" - << (QTest::currentTestFunction() ? QTest::currentTestFunction() : "(null)") - << (QTest::currentDataTag() ? QTest::currentDataTag() : "(null)"); + logNames("cleanupTestCase"); } void tst_Subtest::init() { - qDebug() << "init" - << (QTest::currentTestFunction() ? QTest::currentTestFunction() : "(null)") - << (QTest::currentDataTag() ? QTest::currentDataTag() : "(null)"); + logNames("init"); } void tst_Subtest::cleanup() { - qDebug() << "cleanup" - << (QTest::currentTestFunction() ? QTest::currentTestFunction() : "(null)") - << (QTest::currentDataTag() ? QTest::currentDataTag() : "(null)"); + logNames("cleanup"); } void tst_Subtest::test1() { - qDebug() << "test1" - << (QTest::currentTestFunction() ? QTest::currentTestFunction() : "(null)") - << (QTest::currentDataTag() ? QTest::currentDataTag() : "(null)"); + logNames("test1"); } -void tst_Subtest::test2_data() +void tst_Subtest::table_data() { - qDebug() << "test2_data" - << (QTest::currentTestFunction() ? QTest::currentTestFunction() : "(null)") - << (QTest::currentDataTag() ? QTest::currentDataTag() : "(null)"); - QTest::addColumn<QString>("str"); QTest::newRow("data0") << QString("hello0"); QTest::newRow("data1") << QString("hello1"); QTest::newRow("data2") << QString("hello2"); +} +void tst_Subtest::test2_data() +{ + logNames("test2_data"); + table_data(); qDebug() << "test2_data end"; } void tst_Subtest::test2() { - qDebug() << "test2" - << (QTest::currentTestFunction() ? QTest::currentTestFunction() : "(null)") - << (QTest::currentDataTag() ? QTest::currentDataTag() : "(null)"); + logNames("test2"); static int count = 0; @@ -116,31 +94,40 @@ void tst_Subtest::test2() void tst_Subtest::test3_data() { - qDebug() << "test3_data" - << (QTest::currentTestFunction() ? QTest::currentTestFunction() : "(null)") - << (QTest::currentDataTag() ? QTest::currentDataTag() : "(null)"); - - QTest::addColumn<QString>("str"); - - QTest::newRow("data0") << QString("hello0"); - QTest::newRow("data1") << QString("hello1"); - QTest::newRow("data2") << QString("hello2"); - + logNames("test3_data"); + table_data(); qDebug() << "test3_data end"; } void tst_Subtest::test3() { - qDebug() << "test2" - << (QTest::currentTestFunction() ? QTest::currentTestFunction() : "(null)") - << (QTest::currentDataTag() ? QTest::currentDataTag() : "(null)"); + logNames("test3"); QFETCH(QString, str); // second and third time we call this it should FAIL QCOMPARE(str, QString("hello0")); - qDebug() << "test2 end"; + qDebug() << "test3 end"; +} + +void tst_Subtest::multiFail() +{ + const QTest::ThrowOnFailDisabler nothrow; // tests repeated QFAILs + // Simulates tests which call a shared function that does common checks, or + // that do checks in code run asynchronously from a message loop. + for (int i = 0; i < 10; ++i) + []() { QFAIL("This failure message should be repeated ten times"); }(); + QFAIL("But this test should only contribute one to the failure count"); +} + +void tst_Subtest::multiSkip() +{ + const QTest::ThrowOnSkipDisabler nothrow; // tests repeated QSKIPs + // Similar to multiFail() + for (int i = 0; i < 10; ++i) + []() { QSKIP("This skip should be repeated ten times"); }(); + QSKIP("But this test should only contribute one to the skip count"); } QTEST_MAIN(tst_Subtest) |