diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2020-06-05 11:50:25 +0200 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2020-06-05 14:19:18 +0200 |
commit | de867d237094b3ba7953aea68a739d13da056a76 (patch) | |
tree | 9d3384e37becefec0f51ed69c46fdf96b9d53a29 /tests/auto | |
parent | e2565d8c18183f54cf41ad7b29e2f015ecde66f4 (diff) |
Platform: remove deprecated iconName, iconSource API
[ChangeLog][Platform][Menu] The deprecated iconName and iconSource
properties were removed. Use the icon property instead.
[ChangeLog][Platform][MenuItem] The deprecated iconName and iconSource
properties were removed. Use the icon property instead.
[ChangeLog][Platform][SystemTrayIcon] The deprecated iconName and
iconSource properties were removed. Use the icon property instead.
Task-number: QTBUG-84715
Change-Id: I91a8ceb1a291b78fc342756de24e18b818a49b4b
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/platform/data/tst_menuitem.qml | 31 | ||||
-rw-r--r-- | tests/auto/platform/data/tst_systemtrayicon.qml | 46 |
2 files changed, 42 insertions, 35 deletions
diff --git a/tests/auto/platform/data/tst_menuitem.qml b/tests/auto/platform/data/tst_menuitem.qml index 29d369bc..316af97d 100644 --- a/tests/auto/platform/data/tst_menuitem.qml +++ b/tests/auto/platform/data/tst_menuitem.qml @@ -68,8 +68,9 @@ TestCase { } } - SignalSpy { - id: spy + Component { + id: signalSpyComponent + SignalSpy {} } function test_properties_data() { @@ -81,30 +82,32 @@ TestCase { {tag: "checked", signal: "checkedChanged", init: false, value: true}, {tag: "role", signal: "roleChanged", init: MenuItem.TextHeuristicRole, value: MenuItem.AboutRole}, {tag: "text", signal: "textChanged", init: "", value: "text"}, - {tag: "iconSource", signal: "iconSourceChanged", init: "", value: "qrc:/undo.png"}, - {tag: "iconName", signal: "iconNameChanged", init: "", value: "edit-undo"}, + {tag: "icon.source", signal: "iconChanged", init: "", value: "qrc:/undo.png"}, + {tag: "icon.name", signal: "iconChanged", init: "", value: "edit-undo"}, {tag: "shortcut", signal: "shortcutChanged", init: undefined, value: StandardKey.Undo} ] } function test_properties(data) { - var item = menuItem.createObject(testCase) + let item = createTemporaryObject(menuItem, testCase) verify(item) - spy.target = item - spy.signalName = data.signal + let groupedProperty = data.tag.indexOf(".") !== -1 + let spy = createTemporaryObject(signalSpyComponent, testCase, { + target: item, signalName: data.signal + }) + verify(spy) verify(spy.valid) - compare(item[data.tag], data.init) - item[data.tag] = data.value + let propertyName = groupedProperty ? data.tag.split('.')[1] : data.tag + let object = !groupedProperty ? item : item.icon + compare(object[propertyName], data.init) + object[propertyName] = data.value compare(spy.count, 1) - compare(item[data.tag], data.value) + compare(object[propertyName], data.value) - item[data.tag] = data.value + object[propertyName] = data.value compare(spy.count, 1) - - spy.clear() - item.destroy() } function test_role() { diff --git a/tests/auto/platform/data/tst_systemtrayicon.qml b/tests/auto/platform/data/tst_systemtrayicon.qml index ce7d8b8d..d7a63551 100644 --- a/tests/auto/platform/data/tst_systemtrayicon.qml +++ b/tests/auto/platform/data/tst_systemtrayicon.qml @@ -61,44 +61,48 @@ TestCase { name: "SystemTrayIcon" Component { - id: systemTrayIcon + id: systemTrayIconComponent // Check that icon.name can be used in this Qt.labs.platform version SystemTrayIcon { icon.name: "" } } - SignalSpy { - id: spy + Component { + id: signalSpyComponent + SignalSpy {} } function test_properties_data() { return [ {tag: "visible", signal: "visibleChanged", init: false, value: true}, - {tag: "iconSource", signal: "iconSourceChanged", init: "", value: "qrc:/tray.png"}, - {tag: "iconName", signal: "iconNameChanged", init: "", value: "icon-name"}, + {tag: "icon.source", signal: "iconChanged", init: "", value: "qrc:/tray.png"}, + {tag: "icon.name", signal: "iconChanged", init: "", value: "icon-name"}, {tag: "tooltip", signal: "tooltipChanged", init: "", value: "tooltip"}, ] } function test_properties(data) { - var icon = systemTrayIcon.createObject(testCase) + let icon = createTemporaryObject(systemTrayIconComponent, testCase) verify(icon) - spy.target = icon - spy.signalName = data.signal + let groupedProperty = data.tag.indexOf(".") !== -1 + let spy = createTemporaryObject(signalSpyComponent, testCase, { + target: icon, signalName: data.signal + }) + verify(spy) verify(spy.valid) - compare(icon[data.tag], data.init) - icon[data.tag] = data.value - compare(spy.count, 1) - compare(icon[data.tag], data.value) + let propertyName = groupedProperty ? data.tag.split('.')[1] : data.tag + let object = !groupedProperty ? icon : icon.icon + compare(object[propertyName], data.init) - icon[data.tag] = data.value + object[propertyName] = data.value compare(spy.count, 1) + compare(object[propertyName], data.value) - spy.clear() - icon.destroy() + object[propertyName] = data.value + compare(spy.count, 1) } function test_messageIcon() { @@ -119,17 +123,17 @@ TestCase { } function test_activated() { - var icon = systemTrayIcon.createObject(testCase) + let icon = createTemporaryObject(systemTrayIconComponent, testCase) verify(icon) - spy.target = icon - spy.signalName = "activated" + let spy = createTemporaryObject(signalSpyComponent, testCase, { + target: icon, signalName: "activated" + }) + verify(spy) + verify(spy.valid) icon.activated(SystemTrayIcon.Trigger) compare(spy.count, 1) compare(spy.signalArguments[0][0], SystemTrayIcon.Trigger) - - spy.clear() - icon.destroy() } } |