aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qmltest
diff options
context:
space:
mode:
authorCaroline Chao <caroline.chao@theqtcompany.com>2015-03-04 10:51:28 +0100
committerCaroline Chao <caroline.chao@theqtcompany.com>2015-03-09 14:43:08 +0000
commit0294702c9c174c67de563cfdea5c32548d111a58 (patch)
tree128370ffc4d9a4b133545258d616518f51b4e712 /tests/auto/qmltest
parente15cf0501113e0242db47f4fa5bf1682d587765a (diff)
testlib: Fix qml objects not deleted between data tests
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 <jan-arve.saether@theqtcompany.com>
Diffstat (limited to 'tests/auto/qmltest')
-rw-r--r--tests/auto/qmltest/selftests/tst_destroy.qml18
1 files changed, 18 insertions, 0 deletions
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)
+ }
}