37bc11e707
The various variants duplicated some rather complex code around varying setup in the middle. Rework in terms of a macro that defines main() and takes the setup code as a parameter. That setup code also had some common structure, so package that in a setup macro that takes the class to be used. Reworked various testlib selftests that were using QTEST_MAIN_IMPL(); change to use the new QTEST_MAIN_WRAPPER() and TEST_MAIN_SETUP(). These might be better dealt with by supporting a second form of the initMain() test-setup function in the test classes, that takes references for argc and argv, to let a test massage its command-line options. Change-Id: I7fb16b38d51c80ba2f5c9c82f3b7a37ffc636795 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
76 lines
2.3 KiB
C++
76 lines
2.3 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2021 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$
|
|
**
|
|
****************************************************************************/
|
|
|
|
|
|
#include <QtCore/QCoreApplication>
|
|
#include <QTest>
|
|
|
|
/*!
|
|
\internal
|
|
\since 4.4
|
|
\brief Tests that reporting of tables are done in a certain way.
|
|
*/
|
|
class tst_DataTable: public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
private slots:
|
|
|
|
void fiveTablePasses() const;
|
|
void fiveTablePasses_data() const;
|
|
};
|
|
|
|
void tst_DataTable::fiveTablePasses() const
|
|
{
|
|
QFETCH(bool, test);
|
|
|
|
QVERIFY(test);
|
|
}
|
|
|
|
void tst_DataTable::fiveTablePasses_data() const
|
|
{
|
|
QTest::addColumn<bool>("test");
|
|
|
|
QTest::newRow("fiveTablePasses_data1") << true;
|
|
QTest::newRow("fiveTablePasses_data2") << true;
|
|
QTest::newRow("fiveTablePasses_data3") << true;
|
|
QTest::newRow("fiveTablePasses_data4") << true;
|
|
QTest::newRow("fiveTablePasses_data5") << true;
|
|
}
|
|
|
|
QTEST_MAIN_WRAPPER(tst_DataTable,
|
|
std::vector<const char*> args(argv, argv + argc);
|
|
args.push_back("fiveTablePasses");
|
|
args.push_back("fiveTablePasses:fiveTablePasses_data1");
|
|
args.push_back("-v2");
|
|
argc = int(args.size());
|
|
argv = const_cast<char**>(&args[0]);
|
|
QTEST_MAIN_SETUP())
|
|
|
|
#include "tst_commandlinedata.moc"
|