Merge lp:~aacid/unity8/make_test_page_header_more_stable into lp:unity8

Proposed by Albert Astals Cid
Status: Merged
Approved by: Andrea Cimitan
Approved revision: 1857
Merged at revision: 1876
Proposed branch: lp:~aacid/unity8/make_test_page_header_more_stable
Merge into: lp:unity8
Diff against target: 67 lines (+12/-6)
1 file modified
tests/qmltests/Dash/tst_PageHeader.qml (+12/-6)
To merge this branch: bzr merge lp:~aacid/unity8/make_test_page_header_more_stable
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Andrea Cimitan (community) Approve
Review via email: mp+264679@code.launchpad.net

Commit message

make testPageHeader more stable

Description of the change

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Test change only

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
Revision history for this message
Andrea Cimitan (cimi) wrote :

waiting CI....

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Andrea Cimitan (cimi) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes
 * Did CI run pass? If not, please explain why.
qmltests did
 * Did you make sure that the branch does not contain spurious tags?
yes

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/qmltests/Dash/tst_PageHeader.qml'
--- tests/qmltests/Dash/tst_PageHeader.qml 2015-01-09 09:15:45 +0000
+++ tests/qmltests/Dash/tst_PageHeader.qml 2015-07-14 08:35:37 +0000
@@ -34,6 +34,12 @@
34 property alias searchEnabled : pageHeader.searchEntryEnabled34 property alias searchEnabled : pageHeader.searchEntryEnabled
35 property alias searchQuery : pageHeader.searchQuery35 property alias searchQuery : pageHeader.searchQuery
3636
37 function doTypeString(text) {
38 var headerContainer = findChild(pageHeader, "headerContainer");
39 tryCompare(headerContainer, "contentY", 0);
40 typeString(text);
41 }
42
37 function init() {43 function init() {
38 searchEnabled = true;44 searchEnabled = true;
3945
@@ -63,7 +69,7 @@
63 pageHeader.resetSearch()69 pageHeader.resetSearch()
6470
65 pageHeader.triggerSearch()71 pageHeader.triggerSearch()
66 typeString("test")72 doTypeString("test")
6773
68 compare(searchQuery, "test", "Typing in the search field did not change searchQuery")74 compare(searchQuery, "test", "Typing in the search field did not change searchQuery")
69 }75 }
@@ -72,7 +78,7 @@
72 searchEnabled = true78 searchEnabled = true
73 pageHeader.triggerSearch()79 pageHeader.triggerSearch()
74 searchQuery = "test1"80 searchQuery = "test1"
75 typeString("test2")81 doTypeString("test2")
76 compare(searchQuery, "test1test2", "Setting searchQuery text does not update the TextField")82 compare(searchQuery, "test1test2", "Setting searchQuery text does not update the TextField")
77 }83 }
7884
@@ -91,28 +97,28 @@
9197
92 function test_history() {98 function test_history() {
93 pageHeader.triggerSearch()99 pageHeader.triggerSearch()
94 typeString("humppa1")100 doTypeString("humppa1")
95 pageHeader.resetSearch()101 pageHeader.resetSearch()
96102
97 tryCompare(pageHeader.searchHistory, "count", 1)103 tryCompare(pageHeader.searchHistory, "count", 1)
98 compare(pageHeader.searchHistory.get(0).query, "humppa1")104 compare(pageHeader.searchHistory.get(0).query, "humppa1")
99105
100 pageHeader.triggerSearch()106 pageHeader.triggerSearch()
101 typeString("humppa2")107 doTypeString("humppa2")
102 pageHeader.resetSearch()108 pageHeader.resetSearch()
103109
104 compare(pageHeader.searchHistory.count, 2)110 compare(pageHeader.searchHistory.count, 2)
105 compare(pageHeader.searchHistory.get(0).query, "humppa2")111 compare(pageHeader.searchHistory.get(0).query, "humppa2")
106112
107 pageHeader.triggerSearch()113 pageHeader.triggerSearch()
108 typeString("humppa3")114 doTypeString("humppa3")
109 pageHeader.resetSearch()115 pageHeader.resetSearch()
110116
111 compare(pageHeader.searchHistory.count, 3)117 compare(pageHeader.searchHistory.count, 3)
112 compare(pageHeader.searchHistory.get(0).query, "humppa3")118 compare(pageHeader.searchHistory.get(0).query, "humppa3")
113119
114 pageHeader.triggerSearch()120 pageHeader.triggerSearch()
115 typeString("humppa4")121 doTypeString("humppa4")
116 pageHeader.resetSearch()122 pageHeader.resetSearch()
117123
118 compare(pageHeader.searchHistory.count, 3)124 compare(pageHeader.searchHistory.count, 3)

Subscribers

People subscribed via source and target branches