diff options
| -rw-r--r-- | src/imports/testlib/TestCase.qml | 13 | ||||
| -rw-r--r-- | tests/auto/qmltest/selftests/tst_datadriven.qml | 78 |
2 files changed, 86 insertions, 5 deletions
diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml index 694c01a710..371bba9fde 100644 --- a/src/imports/testlib/TestCase.qml +++ b/src/imports/testlib/TestCase.qml @@ -475,7 +475,6 @@ Item { function cleanupTestCase() {} function init() {} function cleanup() {} - function init_data() {} function qtest_runInternal(prop, arg) { try { @@ -609,7 +608,7 @@ Item { } qtest_results.functionName = prop - if (!testCase.hasOwnProperty(datafunc)) + if (!(datafunc in testCase)) datafunc = "init_data"; if (datafunc in testCase) { @@ -629,9 +628,13 @@ Item { qtest_runFunction(prop, row) qtest_results.dataTag = "" } - if (!haveData && datafunc != "init_data") - qtest_results.warn("no data supplied for " + prop + "() by " + datafunc + "()" - , util.callerFile(), util.callerLine()); + if (!haveData) { + if (datafunc === "init_data") + qtest_runFunction(prop, null, isBenchmark) + else + qtest_results.warn("no data supplied for " + prop + "() by " + datafunc + "()" + , util.callerFile(), util.callerLine()); + } qtest_results.clearTestTable() } } else if (isBenchmark) { diff --git a/tests/auto/qmltest/selftests/tst_datadriven.qml b/tests/auto/qmltest/selftests/tst_datadriven.qml new file mode 100644 index 0000000000..0686c12c00 --- /dev/null +++ b/tests/auto/qmltest/selftests/tst_datadriven.qml @@ -0,0 +1,78 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtTest 1.0 + +Item { + TestCase { + name:"data-driven-empty-init-data" + property int tests:0; + property int init_data_called_times:0; + function init_data() {init_data_called_times++;} + function initTestCase() {tests = 0; init_data_called_times = 0;} + function cleanupTestCase() {compare(tests, 2); compare(init_data_called_times, 2);} + + function test_test1() {tests++;} + function test_test2() {tests++;} + } + TestCase { + name:"data-driven-no-init-data" + property int tests:0; + function initTestCase() {tests = 0;} + function cleanupTestCase() {compare(tests, 2);} + + function test_test1() {tests++;} + function test_test2() {tests++;} + } + TestCase { + name:"data-driven-init-data" + property int tests:0; + property int init_data_called_times:0; + function initTestCase() {tests = 0; init_data_called_times = 0;} + function cleanupTestCase() {compare(tests, 2); compare(init_data_called_times, 1);} + function init_data() {init_data_called_times++; return [{tag:"data1", data:"test data 1"}];} + + function test_test1(row) {tests++; compare(row.data, "test data 1");} + function test_test2_data() {return [{tag:"data2", data:"test data 2"}]; } + function test_test2(row) {tests++; compare(row.data, "test data 2");} + } +} |