From 3460847697ec6c5efa097df6969a37d494b09b2e Mon Sep 17 00:00:00 2001 From: Vladimir Belyavsky Date: Tue, 21 Nov 2023 14:12:15 +0300 Subject: [PATCH] tst_container: fail on warnings Enable fail on warnings for all tests in init() method. Also, as a drive-by change, replace 'var' with 'let' Task-number: QTBUG-98718 Change-Id: Ic5e416aed529118fb7223a2ea567bbee33b13dc7 Reviewed-by: Mitch Curtis (cherry picked from commit 2b53be6238ce234cc76a37d0a5ff5f4ff4ca0f06) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit c9bc8d15b46a3cb0cd09746a87bcbbc84653f056) --- .../controls/data/tst_container.qml | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/tests/auto/quickcontrols/controls/data/tst_container.qml b/tests/auto/quickcontrols/controls/data/tst_container.qml index 9988625744..552889c966 100644 --- a/tests/auto/quickcontrols/controls/data/tst_container.qml +++ b/tests/auto/quickcontrols/controls/data/tst_container.qml @@ -24,16 +24,18 @@ TestCase { Rectangle { } } - function test_defaults() { + function init() { failOnWarning(/.?/) + } + function test_defaults() { let control = createTemporaryObject(container, testCase) verify(control) compare(control.count, 0) } function test_implicitSize() { - var control = createTemporaryObject(container, testCase) + let control = createTemporaryObject(container, testCase) verify(control) compare(control.implicitWidth, 0) @@ -53,16 +55,16 @@ TestCase { } function test_currentIndex() { - var control1 = createTemporaryObject(container, testCase) + let control1 = createTemporaryObject(container, testCase) verify(control1) - var control2 = createTemporaryObject(container, testCase) + let control2 = createTemporaryObject(container, testCase) verify(control2) compare(control1.currentIndex, -1) compare(control2.currentIndex, -1) - for (var i = 0; i < 3; ++i) { + for (let i = 0; i < 3; ++i) { control1.addItem(rectangle.createObject(control1)) control2.addItem(rectangle.createObject(control2)) } @@ -130,7 +132,7 @@ TestCase { // don't crash (QTBUG-61310) function test_repeater(data) { - var control = createTemporaryObject(data.component, testCase) + let control = createTemporaryObject(data.component, testCase) verify(control) compare(control.itemAt(0).objectName, "0") @@ -140,12 +142,12 @@ TestCase { } function test_removeTakeItem() { - var control = createTemporaryObject(container, testCase) + let control = createTemporaryObject(container, testCase) verify(control) - var item1 = rectangle.createObject(control) - var item2 = rectangle.createObject(control) - var item3 = rectangle.createObject(control) + let item1 = rectangle.createObject(control) + let item2 = rectangle.createObject(control) + let item3 = rectangle.createObject(control) item1.Component.onDestruction.connect(function() { item1 = null }) item2.Component.onDestruction.connect(function() { item2 = null }) @@ -210,9 +212,9 @@ TestCase { } function test_contentItemDeletionOrder() { - var control1 = createTemporaryObject(contentItemDeletionOrder1, testCase) + let control1 = createTemporaryObject(contentItemDeletionOrder1, testCase) verify(control1) - var control2 = createTemporaryObject(contentItemDeletionOrder2, testCase) + let control2 = createTemporaryObject(contentItemDeletionOrder2, testCase) verify(control2) } @@ -251,9 +253,9 @@ TestCase { } function test_backgroundDeletionOrder() { - var control1 = createTemporaryObject(backgroundDeletionOrder1, testCase) + let control1 = createTemporaryObject(backgroundDeletionOrder1, testCase) verify(control1) - var control2 = createTemporaryObject(backgroundDeletionOrder2, testCase) + let control2 = createTemporaryObject(backgroundDeletionOrder2, testCase) verify(control2) } }