git.iko.soy/unity8
on xenial help sign in
add objectNames for wizard tests
9d2e0c0Omer Akram
qml/Wizard/Pages/10-welcome.qml+6−1
compare with xenial
unifiedsplit
@@ -110,6 +110,7 @@ LocalComponents.Page {
110
110
111 ListView {
111 ListView {
112 id: languagesListView
112 id: languagesListView
113+ objectName: "languagesListView"
113 clip: true
114 clip: true
114 snapMode: ListView.SnapToItem
115 snapMode: ListView.SnapToItem
115
116
@@ -124,12 +125,16 @@ LocalComponents.Page {
124
125
125 delegate: ListItem {
126 delegate: ListItem {
126 id: itemDelegate
127 id: itemDelegate
127− objectName: "languageDelegate" + index
128+ objectName: getObjectName()
128 highlightColor: backgroundColor
129 highlightColor: backgroundColor
129 divider.colorFrom: dividerColor
130 divider.colorFrom: dividerColor
130 divider.colorTo: backgroundColor
131 divider.colorTo: backgroundColor
131 readonly property bool isCurrent: index === ListView.view.currentIndex
132 readonly property bool isCurrent: index === ListView.view.currentIndex
132
133
134+ function getObjectName() {
135+ return "languageDelegate_" + langLabel.text.toLowerCase().replace(/\s+/g, '_')
136+ }
137+
133 Label {
138 Label {
134 id: langLabel
139 id: langLabel
135 text: modelData
140 text: modelData
qml/Wizard/Pages/30-wifi.qml+6−1
@@ -72,7 +72,7 @@ LocalComponents.Page {
72 id: accessPointComponent
72 id: accessPointComponent
73 ListItem {
73 ListItem {
74 id: accessPoint
74 id: accessPoint
75− objectName: "accessPoint"
75+ objectName: getObjectName()
76 highlightColor: backgroundColor
76 highlightColor: backgroundColor
77 enabled: menuData && menuData.sensitive || false
77 enabled: menuData && menuData.sensitive || false
78 divider.colorFrom: dividerColor
78 divider.colorFrom: dividerColor
@@ -93,6 +93,10 @@ LocalComponents.Page {
93 readonly property int signalStrength: strengthAction.valid ? strengthAction.state : 0
93 readonly property int signalStrength: strengthAction.valid ? strengthAction.state : 0
94 property int menuIndex: -1
94 property int menuIndex: -1
95
95
96+ function getObjectName() {
97+ "accessPoint_" + apName.text.toLowerCase().replace(/\s+/g, '_')
98+ }
99+
96 function loadAttributes() {
100 function loadAttributes() {
97 if (!unityMenuModel || menuIndex == -1) return;
101 if (!unityMenuModel || menuIndex == -1) return;
98 unityMenuModel.loadExtendedAttributes(menuIndex, {'x-canonical-wifi-ap-is-adhoc': 'bool',
102 unityMenuModel.loadExtendedAttributes(menuIndex, {'x-canonical-wifi-ap-is-adhoc': 'bool',
@@ -166,6 +170,7 @@ LocalComponents.Page {
166
170
167 ListView {
171 ListView {
168 id: listview
172 id: listview
173+ objectName: "accessPointsListView"
169 anchors.left: parent.left
174 anchors.left: parent.left
170 anchors.right: parent.right
175 anchors.right: parent.right
171 clip: true
176 clip: true
tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml+1−1
@@ -580,7 +580,7 @@ Item {
580 loader.data = menuData;
580 loader.data = menuData;
581 loader.sourceComponent = factory.load(menuData);
581 loader.sourceComponent = factory.load(menuData);
582 tryCompareFunction(function() { return loader.item != undefined; }, true);
582 tryCompareFunction(function() { return loader.item != undefined; }, true);
583− compare(loader.item.objectName, "accessPoint", "Should have created a access point menu");
583+ compare(loader.item.objectName, "accessPoint_" + menuData.label, "Should have created a access point menu");
584
584
585 compare(loader.item.text, data.label, "Label does not match data");
585 compare(loader.item.text, data.label, "Label does not match data");
586 compare(loader.item.strengthAction.name, "action::strength", "Strength action incorrect");
586 compare(loader.item.strengthAction.name, "action::strength", "Strength action incorrect");
tests/qmltests/Wizard/tst_Wizard.qml+1−1
@@ -223,7 +223,7 @@ Item {
223
223
224 function test_languageChange() {
224 function test_languageChange() {
225 var page = goToPage("languagePage");
225 var page = goToPage("languagePage");
226− tap(findChild(page, "languageDelegate1")); // should invoke "fr" lang
226+ tap(findChild(page, "languageDelegate_français_(france)")); // should invoke "fr" lang
227
227
228 tryCompare(i18n, "language", "fr_FR");
228 tryCompare(i18n, "language", "fr_FR");
229 tap(findChild(page, "forwardButton"));
229 tap(findChild(page, "forwardButton"));