b82b3f4067
TestMethods::invokeTest() has an outer loop on global data (albeit with a comment that said otherwise). On its first cycle, we run the test function's *_data() method, if it has one; there is an inner loop on the rows this created. If the *_data() QSKIP()s, we need to skip the whole test; otherwise, a QSKIP() in one sub-test should not lead to skipping the remaining sub-tests. Moved the check for *_data() QSKIP()ping to right after *_data() returns, inside the "first global cycle" block that runs it. Previously, this check was done before entering the loop on local data rows, but outside that "first global cycle" block: consequently, later global cycles would fall foul of this check (even though the *_data() hasn't been run in this cycle, much less QSKIP()ped in it) if the last sub-test of the previous global cycle had QSKIP()ped. When running a single test for one specific data row, if the test's *_data() QSKIP()ped, this misplaced check would also have lead to a misleading "Unknown testdata" warning. Changed testlib/selftests' tst_globaldata::skipSingle() to trigger the bug (by having its last local row of first global row skip, which caused the second global row to be omitted) to verify this is also fixed; and amended one of its comments to reflect what's now to be expected. Updated the test's expected output files. Task-number: QTBUG-61774 Change-Id: I99596b595c6d1184038f23383844c6ff51a0cd91 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
144 lines
4.0 KiB
C++
144 lines
4.0 KiB
C++
/****************************************************************************
|
|
**
|
|
** 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$
|
|
**
|
|
****************************************************************************/
|
|
|
|
|
|
#include <QtCore/QCoreApplication>
|
|
#include <QtTest/QtTest>
|
|
#include <QDebug>
|
|
|
|
class tst_globaldata: public QObject
|
|
{
|
|
Q_OBJECT
|
|
public slots:
|
|
void init();
|
|
void initTestCase();
|
|
void initTestCase_data();
|
|
|
|
void cleanup();
|
|
void cleanupTestCase();
|
|
|
|
private slots:
|
|
void testGlobal_data();
|
|
void testGlobal();
|
|
|
|
void skip_data();
|
|
void skip();
|
|
|
|
void skipLocal_data() { testGlobal_data(); }
|
|
void skipLocal();
|
|
|
|
void skipSingle_data() { testGlobal_data(); }
|
|
void skipSingle();
|
|
};
|
|
|
|
|
|
void tst_globaldata::initTestCase()
|
|
{
|
|
qDebug() << "initTestCase"
|
|
<< (QTest::currentTestFunction() ? QTest::currentTestFunction() : "(null)")
|
|
<< (QTest::currentDataTag() ? QTest::currentDataTag() : "(null)");
|
|
}
|
|
|
|
void tst_globaldata::initTestCase_data()
|
|
{
|
|
// QFETCH_GLOBAL shall iterate these, for every test:
|
|
QTest::addColumn<bool>("global");
|
|
QTest::newRow("global=false") << false;
|
|
QTest::newRow("global=true") << true;
|
|
}
|
|
|
|
void tst_globaldata::cleanupTestCase()
|
|
{
|
|
qDebug() << "cleanupTestCase"
|
|
<< (QTest::currentTestFunction() ? QTest::currentTestFunction() : "(null)")
|
|
<< (QTest::currentDataTag() ? QTest::currentDataTag() : "(null)");
|
|
}
|
|
|
|
void tst_globaldata::init()
|
|
{
|
|
qDebug() << "init"
|
|
<< (QTest::currentTestFunction() ? QTest::currentTestFunction() : "(null)")
|
|
<< (QTest::currentDataTag() ? QTest::currentDataTag() : "(null)");
|
|
}
|
|
|
|
void tst_globaldata::cleanup()
|
|
{
|
|
qDebug() << "cleanup"
|
|
<< (QTest::currentTestFunction() ? QTest::currentTestFunction() : "(null)")
|
|
<< (QTest::currentDataTag() ? QTest::currentDataTag() : "(null)");
|
|
}
|
|
|
|
void tst_globaldata::testGlobal_data()
|
|
{
|
|
QTest::addColumn<bool>("local");
|
|
QTest::newRow("local=false") << false;
|
|
QTest::newRow("local=true") << true;
|
|
}
|
|
|
|
void tst_globaldata::testGlobal()
|
|
{
|
|
QFETCH_GLOBAL(bool, global);
|
|
qDebug() << "global:" << global;
|
|
QFETCH(bool, local);
|
|
qDebug() << "local:" << local;
|
|
}
|
|
|
|
void tst_globaldata::skip_data()
|
|
{
|
|
testGlobal_data();
|
|
QSKIP("skipping");
|
|
}
|
|
|
|
void tst_globaldata::skip()
|
|
{
|
|
// A skip in _data() causes the whole test to be skipped, for all global rows.
|
|
QVERIFY(!"This line should never be reached.");
|
|
}
|
|
|
|
void tst_globaldata::skipSingle()
|
|
{
|
|
QFETCH_GLOBAL(bool, global);
|
|
QFETCH(bool, local);
|
|
|
|
// A skip in the last run of one global row used to suppress the test in the
|
|
// next global row (where a skip in an earlier run of the first row did not).
|
|
if (global ^ local)
|
|
QSKIP("Skipping");
|
|
qDebug() << "global:" << global << "local:" << local;
|
|
QCOMPARE(global, local);
|
|
}
|
|
|
|
void tst_globaldata::skipLocal()
|
|
{
|
|
QSKIP("skipping");
|
|
}
|
|
|
|
QTEST_MAIN(tst_globaldata)
|
|
|
|
#include "tst_globaldata.moc"
|