@@ -33,13 +33,18 @@ Item {
3333
3434 property alias searchEnabled : pageHeader.searchEntryEnabled
3535 property alias searchQuery : pageHeader.searchQuery
36+ property var headerContainer: findChild(pageHeader, "headerContainer")
3637
3738 function doTypeString(text) {
38− var headerContainer = findChild(pageHeader, "headerContainer");
3939 tryCompare(headerContainer, "contentY", 0);
4040 typeString(text);
4141 }
4242
43+ function doResetSearch() {
44+ pageHeader.resetSearch();
45+ tryCompare(headerContainer, "contentY", headerContainer.height);
46+ }
47+
4348 function init() {
4449 searchEnabled = true;
4550
@@ -49,14 +54,13 @@ Item {
4954 pageHeader.searchHistory.clear();
5055
5156 // Check initial state
52− var headerContainer = findChild(pageHeader, "headerContainer");
5357 tryCompareFunction(function() { return headerContainer.popover === null; }, true);
5458 compare(pageHeader.searchHistory.count, 0);
5559 }
5660
5761 function test_search_disabled() {
5862 searchEnabled = false
59− pageHeader.resetSearch()
63+ doResetSearch();
6064
6165 pageHeader.triggerSearch()
6266 keyClick(Qt.Key_S)
@@ -66,7 +70,7 @@ Item {
6670
6771 function test_search_enable() {
6872 searchEnabled = true
69− pageHeader.resetSearch()
73+ doResetSearch();
7074
7175 pageHeader.triggerSearch()
7276 doTypeString("test")
@@ -84,42 +88,42 @@ Item {
8488
8589 function test_reset_search() {
8690 searchEnabled = true
87− pageHeader.resetSearch()
91+ doResetSearch();
8892
8993 pageHeader.triggerSearch()
9094 keyClick(Qt.Key_S)
9195
9296 compare(searchQuery, "s", "Could not type in TextField.")
9397
94− pageHeader.resetSearch()
98+ doResetSearch();
9599 compare(searchQuery, "", "Reset search did not reset searchQuery correctly.")
96100 }
97101
98102 function test_history() {
99103 pageHeader.triggerSearch()
100104 doTypeString("humppa1")
101− pageHeader.resetSearch()
105+ doResetSearch();
102106
103107 tryCompare(pageHeader.searchHistory, "count", 1)
104108 compare(pageHeader.searchHistory.get(0).query, "humppa1")
105109
106110 pageHeader.triggerSearch()
107111 doTypeString("humppa2")
108− pageHeader.resetSearch()
112+ doResetSearch();
109113
110114 compare(pageHeader.searchHistory.count, 2)
111115 compare(pageHeader.searchHistory.get(0).query, "humppa2")
112116
113117 pageHeader.triggerSearch()
114118 doTypeString("humppa3")
115− pageHeader.resetSearch()
119+ doResetSearch();
116120
117121 compare(pageHeader.searchHistory.count, 3)
118122 compare(pageHeader.searchHistory.get(0).query, "humppa3")
119123
120124 pageHeader.triggerSearch()
121125 doTypeString("humppa4")
122− pageHeader.resetSearch()
126+ doResetSearch();
123127
124128 compare(pageHeader.searchHistory.count, 3)
125129 compare(pageHeader.searchHistory.get(0).query, "humppa4")
@@ -139,7 +143,7 @@ Item {
139143 }
140144
141145 function cleanup() {
142− pageHeader.resetSearch();
146+ doResetSearch();
143147 }
144148
145149 function test_popover() {
@@ -223,7 +227,7 @@ Item {
223227 tryCompare(headerContainer, "showSearch", !data.hideSearch);
224228 tryCompareFunction(function() { return headerContainer.popover === null; }, true);
225229
226− pageHeader.resetSearch();
230+ doResetSearch();
227231 }
228232
229233 function test_search_change_shows_search() {