qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some issues with init_data() for qmltest 

1. should not use hasOwnProperty, replace it with 'in'
2. the default init_data() method is unnessary
3. when init_data() returns empty, the test function should run in non data driven mode

Change-Id: I8cb19d3499b285d07c8b3d04abd9ddf33b1c5395
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
This commit is contained in:
Charles Yin 2012-04-05 10:17:34 +10:00 committed by Qt by Nokia
parent 95cb2a1b5c
commit 82a048c3cf
2 changed files with 86 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/imports/testlib/TestCase.qml
View File

@ -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) {

78
tests/auto/qmltest/selftests/tst_datadriven.qml Normal file
View File

@ -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");}
}
}