aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/platform/data
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/platform/data')
-rw-r--r--tests/auto/platform/data/tst_colordialog.qml6
-rw-r--r--tests/auto/platform/data/tst_filedialog.qml6
-rw-r--r--tests/auto/platform/data/tst_folderdialog.qml6
-rw-r--r--tests/auto/platform/data/tst_fontdialog.qml6
-rw-r--r--tests/auto/platform/data/tst_menu.qml6
-rw-r--r--tests/auto/platform/data/tst_menubar.qml6
-rw-r--r--tests/auto/platform/data/tst_menuitem.qml37
-rw-r--r--tests/auto/platform/data/tst_menuitemgroup.qml6
-rw-r--r--tests/auto/platform/data/tst_menuseparator.qml6
-rw-r--r--tests/auto/platform/data/tst_messagedialog.qml6
-rw-r--r--tests/auto/platform/data/tst_standardpaths.qml6
-rw-r--r--tests/auto/platform/data/tst_systemtrayicon.qml52
12 files changed, 78 insertions, 71 deletions
diff --git a/tests/auto/platform/data/tst_colordialog.qml b/tests/auto/platform/data/tst_colordialog.qml
index 98122c25..12055a5a 100644
--- a/tests/auto/platform/data/tst_colordialog.qml
+++ b/tests/auto/platform/data/tst_colordialog.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import Qt.labs.platform 1.0
+import QtQuick
+import QtTest
+import Qt.labs.platform
TestCase {
id: testCase
diff --git a/tests/auto/platform/data/tst_filedialog.qml b/tests/auto/platform/data/tst_filedialog.qml
index 775e24d3..5a63dd23 100644
--- a/tests/auto/platform/data/tst_filedialog.qml
+++ b/tests/auto/platform/data/tst_filedialog.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import Qt.labs.platform 1.0
+import QtQuick
+import QtTest
+import Qt.labs.platform
TestCase {
id: testCase
diff --git a/tests/auto/platform/data/tst_folderdialog.qml b/tests/auto/platform/data/tst_folderdialog.qml
index 5f44b995..37881c1a 100644
--- a/tests/auto/platform/data/tst_folderdialog.qml
+++ b/tests/auto/platform/data/tst_folderdialog.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import Qt.labs.platform 1.0
+import QtQuick
+import QtTest
+import Qt.labs.platform
TestCase {
id: testCase
diff --git a/tests/auto/platform/data/tst_fontdialog.qml b/tests/auto/platform/data/tst_fontdialog.qml
index 8166964f..edb62e52 100644
--- a/tests/auto/platform/data/tst_fontdialog.qml
+++ b/tests/auto/platform/data/tst_fontdialog.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import Qt.labs.platform 1.0
+import QtQuick
+import QtTest
+import Qt.labs.platform
TestCase {
id: testCase
diff --git a/tests/auto/platform/data/tst_menu.qml b/tests/auto/platform/data/tst_menu.qml
index bb37c17b..7e389222 100644
--- a/tests/auto/platform/data/tst_menu.qml
+++ b/tests/auto/platform/data/tst_menu.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import Qt.labs.platform 1.0
+import QtQuick
+import QtTest
+import Qt.labs.platform
TestCase {
id: testCase
diff --git a/tests/auto/platform/data/tst_menubar.qml b/tests/auto/platform/data/tst_menubar.qml
index 199c5010..0dd9eb91 100644
--- a/tests/auto/platform/data/tst_menubar.qml
+++ b/tests/auto/platform/data/tst_menubar.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import Qt.labs.platform 1.0
+import QtQuick
+import QtTest
+import Qt.labs.platform
TestCase {
id: testCase
diff --git a/tests/auto/platform/data/tst_menuitem.qml b/tests/auto/platform/data/tst_menuitem.qml
index 29d369bc..0120832d 100644
--- a/tests/auto/platform/data/tst_menuitem.qml
+++ b/tests/auto/platform/data/tst_menuitem.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import Qt.labs.platform 1.1
+import QtQuick
+import QtTest
+import Qt.labs.platform
TestCase {
id: testCase
@@ -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_menuitemgroup.qml b/tests/auto/platform/data/tst_menuitemgroup.qml
index c65150ca..117f79ce 100644
--- a/tests/auto/platform/data/tst_menuitemgroup.qml
+++ b/tests/auto/platform/data/tst_menuitemgroup.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import Qt.labs.platform 1.0
+import QtQuick
+import QtTest
+import Qt.labs.platform
TestCase {
id: testCase
diff --git a/tests/auto/platform/data/tst_menuseparator.qml b/tests/auto/platform/data/tst_menuseparator.qml
index 29c48f6b..52bb349f 100644
--- a/tests/auto/platform/data/tst_menuseparator.qml
+++ b/tests/auto/platform/data/tst_menuseparator.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import Qt.labs.platform 1.0
+import QtQuick
+import QtTest
+import Qt.labs.platform
TestCase {
id: testCase
diff --git a/tests/auto/platform/data/tst_messagedialog.qml b/tests/auto/platform/data/tst_messagedialog.qml
index d5f2e21f..23a5c821 100644
--- a/tests/auto/platform/data/tst_messagedialog.qml
+++ b/tests/auto/platform/data/tst_messagedialog.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import Qt.labs.platform 1.0
+import QtQuick
+import QtTest
+import Qt.labs.platform
TestCase {
id: testCase
diff --git a/tests/auto/platform/data/tst_standardpaths.qml b/tests/auto/platform/data/tst_standardpaths.qml
index 35f0d23b..841731be 100644
--- a/tests/auto/platform/data/tst_standardpaths.qml
+++ b/tests/auto/platform/data/tst_standardpaths.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import Qt.labs.platform 1.0
+import QtQuick
+import QtTest
+import Qt.labs.platform
TestCase {
id: testCase
diff --git a/tests/auto/platform/data/tst_systemtrayicon.qml b/tests/auto/platform/data/tst_systemtrayicon.qml
index ce7d8b8d..09f10261 100644
--- a/tests/auto/platform/data/tst_systemtrayicon.qml
+++ b/tests/auto/platform/data/tst_systemtrayicon.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.12
-import QtTest 1.0
-import Qt.labs.platform 1.1
+import QtQuick
+import QtTest
+import Qt.labs.platform
TestCase {
id: testCase
@@ -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()
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 18:52:45 +0000