@@ -26,174 +26,174 @@ Item {
2626 width: units.gu(110)
2727 height: units.gu(30)
2828
29− Scopes {
30− id: scopes
29+ Scope {
30+ id: scopeMock
3131 }
3232
33− ScopeView {
34− id: scopeView
35− anchors.fill: parent
33+ UT.UnityTestCase {
34+ name: "PageHeaderTest"
35+ when: windowShown
3636
37− UT.UnityTestCase {
38− name: "PageHeaderTest"
39− when: scopes.loaded
37+ property alias searchEnabled : pageHeader.searchEntryEnabled
38+ property alias searchQuery : pageHeader.searchQuery
4039
41− property alias searchEnabled : pageHeader.searchEntryEnabled
42− property alias searchQuery : pageHeader.searchQuery
40+ function test_search_disabled() {
41+ searchEnabled = false
42+ pageHeader.resetSearch()
4343
44− function init() {
45− scopeView.scope = scopes.get(0)
46− }
44+ pageHeader.triggerSearch()
45+ keyClick(Qt.Key_S)
4746
48− function test_search_disabled() {
49− searchEnabled = false
50− pageHeader.resetSearch()
47+ compare(searchQuery, "", "Search entry not disabled properly (could still type in textfield).")
48+ }
5149
52− pageHeader.triggerSearch()
53− keyClick(Qt.Key_S)
50+ function test_search_enable() {
51+ searchEnabled = true
52+ pageHeader.resetSearch()
5453
55− compare(searchQuery, "", "Search entry not disabled properly (could still type in textfield).")
56− }
54+ pageHeader.triggerSearch()
55+ typeString("test")
5756
58− function test_search_enable() {
59− searchEnabled = true
60− pageHeader.resetSearch()
57+ compare(searchQuery, "test", "Typing in the search field did not change searchQuery")
58+ }
6159
62− pageHeader.triggerSearch()
63− typeString("test")
60+ function test_search_hard_coded() {
61+ searchEnabled = true
62+ pageHeader.triggerSearch()
63+ searchQuery = "test1"
64+ typeString("test2")
65+ compare(searchQuery, "test1test2", "Setting searchQuery text does not update the TextField")
66+ }
6467
65− compare(searchQuery, "test", "Typing in the search field did not change searchQuery")
66− }
68+ function test_reset_search() {
69+ searchEnabled = true
70+ pageHeader.resetSearch()
6771
68− function test_search_hard_coded() {
69− searchEnabled = true
70− pageHeader.triggerSearch()
71− searchQuery = "test1"
72− typeString("test2")
73− compare(searchQuery, "test1test2", "Setting searchQuery text does not update the TextField")
74− }
72+ pageHeader.triggerSearch()
73+ keyClick(Qt.Key_S)
7574
76− function test_reset_search() {
77− searchEnabled = true
78− pageHeader.resetSearch()
75+ compare(searchQuery, "s", "Could not type in TextField.")
7976
80− pageHeader.triggerSearch()
81− keyClick(Qt.Key_S)
77+ pageHeader.resetSearch()
78+ compare(searchQuery, "", "Reset search did not reset searchQuery correctly.")
79+ }
8280
83− compare(searchQuery, "s", "Could not type in TextField.")
81+ function test_move_search_by_width()
82+ {
83+ searchEnabled = true
84+ pageHeader.resetSearch()
8485
85− pageHeader.resetSearch()
86− compare(searchQuery, "", "Reset search did not reset searchQuery correctly.")
87− }
86+ var searchContainer = findChild(pageHeader, "searchContainer")
8887
89− function test_move_search_by_width()
90− {
91− searchEnabled = true
92− pageHeader.resetSearch()
88+ parent.width = units.gu(40)
9389
94− var searchContainer = findChild(pageHeader, "searchContainer")
90+ verify(searchContainer !== undefined)
91+ verify(searchContainer.y <= 0)
9592
96− parent.width = units.gu(40)
93+ pageHeader.triggerSearch()
94+ verify(searchContainer.y >= 0)
9795
98− verify(searchContainer !== undefined)
99− verify(searchContainer.y <= 0)
96+ pageHeader.resetSearch()
97+ verify(searchContainer.y <= 0)
10098
101− pageHeader.triggerSearch()
102− verify(searchContainer.y >= 0)
99+ parent.width = units.gu(110)
100+ verify(searchContainer.y >= 0)
103101
104− pageHeader.resetSearch()
105− verify(searchContainer.y <= 0)
102+ pageHeader.triggerSearch()
103+ tryCompare(searchContainer, "narrowMode", false)
104+ tryCompare(searchContainer, "state", "active")
105+ tryCompare(searchContainer, "width", units.gu(40))
106+ }
106107
107− parent.width = units.gu(110)
108− verify(searchContainer.y >= 0)
108+ function test_history() {
109+ pageHeader.searchHistory.clear()
110+ compare(pageHeader.searchHistory.count, 0)
109111
110− pageHeader.triggerSearch()
111− tryCompare(searchContainer, "narrowMode", false)
112− tryCompare(searchContainer, "state", "active")
113− tryCompare(searchContainer, "width", units.gu(40))
114− }
112+ pageHeader.triggerSearch()
113+ typeString("humppa1")
114+ pageHeader.resetSearch()
115115
116− function test_history() {
117− pageHeader.searchHistory.clear()
118− compare(pageHeader.searchHistory.count, 0)
116+ compare(pageHeader.searchHistory.count, 1)
117+ compare(pageHeader.searchHistory.get(0).query, "humppa1")
119118
120− pageHeader.triggerSearch()
121− typeString("humppa1")
122− pageHeader.resetSearch()
119+ pageHeader.triggerSearch()
120+ typeString("humppa2")
121+ pageHeader.resetSearch()
123122
124− compare(pageHeader.searchHistory.count, 1)
125− compare(pageHeader.searchHistory.get(0).query, "humppa1")
123+ compare(pageHeader.searchHistory.count, 2)
124+ compare(pageHeader.searchHistory.get(0).query, "humppa2")
126125
127− pageHeader.triggerSearch()
128− typeString("humppa2")
129− pageHeader.resetSearch()
126+ pageHeader.triggerSearch()
127+ typeString("humppa3")
128+ pageHeader.resetSearch()
130129
131− compare(pageHeader.searchHistory.count, 2)
132− compare(pageHeader.searchHistory.get(0).query, "humppa2")
130+ compare(pageHeader.searchHistory.count, 3)
131+ compare(pageHeader.searchHistory.get(0).query, "humppa3")
133132
134− pageHeader.triggerSearch()
135− typeString("humppa3")
136− pageHeader.resetSearch()
133+ pageHeader.triggerSearch()
134+ typeString("humppa4")
135+ pageHeader.resetSearch()
137136
138− compare(pageHeader.searchHistory.count, 3)
139− compare(pageHeader.searchHistory.get(0).query, "humppa3")
137+ compare(pageHeader.searchHistory.count, 3)
138+ compare(pageHeader.searchHistory.get(0).query, "humppa4")
139+ }
140140
141− pageHeader.triggerSearch()
142− typeString("humppa4")
143− pageHeader.resetSearch()
141+ function test_search_indicator() {
142+ pageHeader.triggerSearch()
143+ typeString("test")
144+ tryCompare(pageHeader, "searchInProgress", true)
145+ pageHeader.resetSearch()
146+ }
147+ }
148+
149+ Column {
150+ anchors.fill: parent
151+ spacing: units.gu(1)
144152
145− compare(pageHeader.searchHistory.count, 3)
146− compare(pageHeader.searchHistory.get(0).query, "humppa4")
153+ PageHeader {
154+ id: pageHeader
155+ anchors {
156+ left: parent.left
157+ right: parent.right
147158 }
148− }
149159
150− Column {
151− anchors.fill: parent
152− spacing: units.gu(1)
160+ scope: scopeMock
153161
154− PageHeader {
155− id: pageHeader
156− anchors {
157− left: parent.left
158− right: parent.right
159− }
162+ searchEntryEnabled: true
163+ text: "%^$%^%^&%^&%^$%GHR%"
164+ }
160165
161− searchEntryEnabled: true
162− text: "%^$%^%^&%^&%^$%GHR%"
166+ Row {
167+ spacing: units.gu(1)
168+ anchors {
169+ left: parent.left
170+ right: parent.right
163171 }
164−
165− Row {
166− spacing: units.gu(1)
167− anchors {
168− left: parent.left
169− right: parent.right
170− }
171− Button {
172− text: "Set search query programmatically"
173− onClicked: pageHeader.searchQuery = "testsearch"
174− width: units.gu(40)
175− }
176− Label {
177− text: "searchQuery: \"" + pageHeader.searchQuery + "\""
178− anchors.verticalCenter: parent.verticalCenter
179− }
172+ Button {
173+ text: "Set search query programmatically"
174+ onClicked: pageHeader.searchQuery = "testsearch"
175+ width: units.gu(40)
176+ }
177+ Label {
178+ text: "searchQuery: \"" + pageHeader.searchQuery + "\""
179+ anchors.verticalCenter: parent.verticalCenter
180180 }
181+ }
181182
182− Row {
183− spacing: units.gu(1)
184− anchors {
185− left: parent.left
186− right: parent.right
187− }
188− Button {
189− text: "Clear history model"
190− onClicked: pageHeader.searchHistory.clear()
191− width: units.gu(40)
192− }
193− Label {
194− text: "History count: " + pageHeader.searchHistory.count
195− anchors.verticalCenter: parent.verticalCenter
196− }
183+ Row {
184+ spacing: units.gu(1)
185+ anchors {
186+ left: parent.left
187+ right: parent.right
188+ }
189+ Button {
190+ text: "Clear history model"
191+ onClicked: pageHeader.searchHistory.clear()
192+ width: units.gu(40)
193+ }
194+ Label {
195+ text: "History count: " + pageHeader.searchHistory.count
196+ anchors.verticalCenter: parent.verticalCenter
197197 }
198198 }
199199 }