From 0294702c9c174c67de563cfdea5c32548d111a58 Mon Sep 17 00:00:00 2001 From: Caroline Chao Date: Wed, 4 Mar 2015 10:51:28 +0100 Subject: testlib: Fix qml objects not deleted between data tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Call wait(0) after the cleanup() function and not only at the end of the test run (wait(0) is used to call processEvents()). Otherwise, eventual destroy() calls in test function are not executed between data tests. Task-number: QTBUG-30523 Task-number: QTBUG-42185 Change-Id: I1d588ee28c61cda835e25307bc1c565d68b741fe Reviewed-by: Jan Arve Sæther --- tests/auto/qmltest/selftests/tst_destroy.qml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'tests/auto/qmltest') diff --git a/tests/auto/qmltest/selftests/tst_destroy.qml b/tests/auto/qmltest/selftests/tst_destroy.qml index 962f4a70ef..3b1b80520b 100644 --- a/tests/auto/qmltest/selftests/tst_destroy.qml +++ b/tests/auto/qmltest/selftests/tst_destroy.qml @@ -51,4 +51,22 @@ TestCase { // The object created in test above should be deleted compare(testCase.children.length, 0) } + + function test_c_QTBUG_42185_data() { + // Adding dummy data objects for the purpose of calling multiple times the test function + // and checking that the created object (tmp) is destroyed as expected between each data run. + return [{tag: "test 0"}, {tag: "test 1"}, {tag: "test 2"},]; + } + + function test_c_QTBUG_42185() { + compare(testCase.children.length, 0) + var tmp = Qt.createQmlObject('import QtQuick 2.1; Rectangle {width: 20; height: 20;}', testCase, '') + compare(testCase.children.length, 1) + tmp.destroy() + } + + function test_d_QTBUG_42185() { + // The object created in test above should be deleted + compare(testCase.children.length, 0) + } } -- cgit v1.2.3