git.iko.soy/unity8
on xenial help sign in
Make the test more stable
8498c84Albert Astals Cid
tests/qmltests/Dash/tst_PageHeader.qml+16−12
compare with xenial
unifiedsplit
@@ -33,13 +33,18 @@ Item {
33
33
34 property alias searchEnabled : pageHeader.searchEntryEnabled
34 property alias searchEnabled : pageHeader.searchEntryEnabled
35 property alias searchQuery : pageHeader.searchQuery
35 property alias searchQuery : pageHeader.searchQuery
36+ property var headerContainer: findChild(pageHeader, "headerContainer")
36
37
37 function doTypeString(text) {
38 function doTypeString(text) {
38− var headerContainer = findChild(pageHeader, "headerContainer");
39 tryCompare(headerContainer, "contentY", 0);
39 tryCompare(headerContainer, "contentY", 0);
40 typeString(text);
40 typeString(text);
41 }
41 }
42
42
43+ function doResetSearch() {
44+ pageHeader.resetSearch();
45+ tryCompare(headerContainer, "contentY", headerContainer.height);
46+ }
47+
43 function init() {
48 function init() {
44 searchEnabled = true;
49 searchEnabled = true;
45
50
@@ -49,14 +54,13 @@ Item {
49 pageHeader.searchHistory.clear();
54 pageHeader.searchHistory.clear();
50
55
51 // Check initial state
56 // Check initial state
52− var headerContainer = findChild(pageHeader, "headerContainer");
53 tryCompareFunction(function() { return headerContainer.popover === null; }, true);
57 tryCompareFunction(function() { return headerContainer.popover === null; }, true);
54 compare(pageHeader.searchHistory.count, 0);
58 compare(pageHeader.searchHistory.count, 0);
55 }
59 }
56
60
57 function test_search_disabled() {
61 function test_search_disabled() {
58 searchEnabled = false
62 searchEnabled = false
59− pageHeader.resetSearch()
63+ doResetSearch();
60
64
61 pageHeader.triggerSearch()
65 pageHeader.triggerSearch()
62 keyClick(Qt.Key_S)
66 keyClick(Qt.Key_S)
@@ -66,7 +70,7 @@ Item {
66
70
67 function test_search_enable() {
71 function test_search_enable() {
68 searchEnabled = true
72 searchEnabled = true
69− pageHeader.resetSearch()
73+ doResetSearch();
70
74
71 pageHeader.triggerSearch()
75 pageHeader.triggerSearch()
72 doTypeString("test")
76 doTypeString("test")
@@ -84,42 +88,42 @@ Item {
84
88
85 function test_reset_search() {
89 function test_reset_search() {
86 searchEnabled = true
90 searchEnabled = true
87− pageHeader.resetSearch()
91+ doResetSearch();
88
92
89 pageHeader.triggerSearch()
93 pageHeader.triggerSearch()
90 keyClick(Qt.Key_S)
94 keyClick(Qt.Key_S)
91
95
92 compare(searchQuery, "s", "Could not type in TextField.")
96 compare(searchQuery, "s", "Could not type in TextField.")
93
97
94− pageHeader.resetSearch()
98+ doResetSearch();
95 compare(searchQuery, "", "Reset search did not reset searchQuery correctly.")
99 compare(searchQuery, "", "Reset search did not reset searchQuery correctly.")
96 }
100 }
97
101
98 function test_history() {
102 function test_history() {
99 pageHeader.triggerSearch()
103 pageHeader.triggerSearch()
100 doTypeString("humppa1")
104 doTypeString("humppa1")
101− pageHeader.resetSearch()
105+ doResetSearch();
102
106
103 tryCompare(pageHeader.searchHistory, "count", 1)
107 tryCompare(pageHeader.searchHistory, "count", 1)
104 compare(pageHeader.searchHistory.get(0).query, "humppa1")
108 compare(pageHeader.searchHistory.get(0).query, "humppa1")
105
109
106 pageHeader.triggerSearch()
110 pageHeader.triggerSearch()
107 doTypeString("humppa2")
111 doTypeString("humppa2")
108− pageHeader.resetSearch()
112+ doResetSearch();
109
113
110 compare(pageHeader.searchHistory.count, 2)
114 compare(pageHeader.searchHistory.count, 2)
111 compare(pageHeader.searchHistory.get(0).query, "humppa2")
115 compare(pageHeader.searchHistory.get(0).query, "humppa2")
112
116
113 pageHeader.triggerSearch()
117 pageHeader.triggerSearch()
114 doTypeString("humppa3")
118 doTypeString("humppa3")
115− pageHeader.resetSearch()
119+ doResetSearch();
116
120
117 compare(pageHeader.searchHistory.count, 3)
121 compare(pageHeader.searchHistory.count, 3)
118 compare(pageHeader.searchHistory.get(0).query, "humppa3")
122 compare(pageHeader.searchHistory.get(0).query, "humppa3")
119
123
120 pageHeader.triggerSearch()
124 pageHeader.triggerSearch()
121 doTypeString("humppa4")
125 doTypeString("humppa4")
122− pageHeader.resetSearch()
126+ doResetSearch();
123
127
124 compare(pageHeader.searchHistory.count, 3)
128 compare(pageHeader.searchHistory.count, 3)
125 compare(pageHeader.searchHistory.get(0).query, "humppa4")
129 compare(pageHeader.searchHistory.get(0).query, "humppa4")
@@ -139,7 +143,7 @@ Item {
139 }
143 }
140
144
141 function cleanup() {
145 function cleanup() {
142− pageHeader.resetSearch();
146+ doResetSearch();
143 }
147 }
144
148
145 function test_popover() {
149 function test_popover() {
@@ -223,7 +227,7 @@ Item {
223 tryCompare(headerContainer, "showSearch", !data.hideSearch);
227 tryCompare(headerContainer, "showSearch", !data.hideSearch);
224 tryCompareFunction(function() { return headerContainer.popover === null; }, true);
228 tryCompareFunction(function() { return headerContainer.popover === null; }, true);
225
229
226− pageHeader.resetSearch();
230+ doResetSearch();
227 }
231 }
228
232
229 function test_search_change_shows_search() {
233 function test_search_change_shows_search() {