diff options
author | Kirill Burtsev <kirill.burtsev@qt.io> | 2018-10-05 11:14:31 +0200 |
---|---|---|
committer | Kirill Burtsev <kirill.burtsev@qt.io> | 2018-11-07 14:54:49 +0000 |
commit | 74a5ce02667ceefe31aba9a23246b9c512527014 (patch) | |
tree | c6a5cc0f6a8a4180b26c02f3fe1d250abf7a54c9 /tests/auto/quicktest | |
parent | 1d024222d8d57ffa03050a177409be6a8ebb73e1 (diff) |
Fix TestCase::skip to ignore rest of the data rows in TestCase
Fixes: QTBUG-53131
Change-Id: Ic24fe4b5db0e404b1b089a054ce76265763f2682
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests/auto/quicktest')
-rw-r--r-- | tests/auto/quicktest/testfiltering/quicktestmain/tst_third.qml | 62 | ||||
-rw-r--r-- | tests/auto/quicktest/testfiltering/tst_testfiltering.cpp | 3 |
2 files changed, 64 insertions, 1 deletions
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); } |