diff options
| -rw-r--r-- | src/imports/testlib/TestCase.qml | 1 | ||||
| -rw-r--r-- | tests/auto/quicktest/testfiltering/quicktestmain/tst_third.qml | 62 | ||||
| -rw-r--r-- | tests/auto/quicktest/testfiltering/tst_testfiltering.cpp | 3 |
3 files changed, 65 insertions, 1 deletions
diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml index 535e29ee70..fd91add04e 100644 --- a/src/imports/testlib/TestCase.qml +++ b/src/imports/testlib/TestCase.qml @@ -1866,6 +1866,7 @@ Item { else qtest_runFunction(prop, row) qtest_results.dataTag = "" + qtest_results.skipped = false } if (!haveData) { if (datafunc === "init_data") diff --git a/tests/auto/quicktest/testfiltering/quicktestmain/tst_third.qml b/tests/auto/quicktest/testfiltering/quicktestmain/tst_third.qml new file mode 100644 index 0000000000..6e26d8171b --- /dev/null +++ b/tests/auto/quicktest/testfiltering/quicktestmain/tst_third.qml @@ -0,0 +1,62 @@ +/**************************************************************************** +** +** Copyright (C) 2018 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$ +** +****************************************************************************/ + +import QtQuick 2.3 +import QtTest 1.1 + +TestCase { + name: "Third" + + function init_data() { + return [ + { tag: "init_0" }, + { tag: "skip_1" }, + { tag: "init_2" }, + { tag: "skip_3" }, + { tag: "init_4" }, + ] + } + + function test_default_tags(data) { + if (data.tag.startsWith("skip_")) + skip("skip '" + data.tag + "' tag") + } + + function test_tags_data() { + return [ + { tag: "foo" }, + { tag: "bar" }, + { tag: "baz" }, + ] + } + + function test_tags(data) { + if (data.tag === "bar") + skip("skip '" + data.tag + "' tag") + } +} diff --git a/tests/auto/quicktest/testfiltering/tst_testfiltering.cpp b/tests/auto/quicktest/testfiltering/tst_testfiltering.cpp index 72bb8f02b7..8817adb3bc 100644 --- a/tests/auto/quicktest/testfiltering/tst_testfiltering.cpp +++ b/tests/auto/quicktest/testfiltering/tst_testfiltering.cpp @@ -56,7 +56,8 @@ void tst_TestFiltering::noFilters() QVERIFY(process.waitForFinished()); const QString output = process.readAll(); - QVERIFY(output.contains(QLatin1String("Totals: 10 passed"))); + QVERIFY(output.contains(QLatin1String("Totals: 17 passed"))); + QVERIFY(output.contains(QLatin1String(", 3 skipped"))); QCOMPARE(process.exitStatus(), QProcess::NormalExit); QCOMPARE(process.exitCode(), 0); } |