git.iko.soy/unity8
on xenial help sign in
Added test for search indicator.
commit64d37498c92e604450cf7b9cab8b33d11b2dcebb authorNicolas d'Offay <nicolas.doffay@canonical.com> dateMon 30 Sep 2013, 16:10 (13 years ago) parenteb5de7f
4 files changed+23−9
compare with xenial
unifiedsplit
Components/PageHeader.qml+2−7 tests/mocks/Unity/fake_scope.cpp+7 tests/mocks/Unity/fake_scope.h+2−1 tests/qmltests/Components/tst_PageHeader.qml+12−1
Components/PageHeader.qml+2−7
@@ -32,7 +32,6 @@ Item {
3232 property alias searchQuery: searchField.text
3333 property ListModel searchHistory: SearchHistoryModel {}
3434 property Scope scope
35− property bool searchInProgress: false
3635
3736 height: units.gu(8.5)
3837 implicitHeight: units.gu(8.5)
@@ -49,11 +48,6 @@ Item {
4948 searchField.focus = false;
5049 }
5150
52− Connections {
53− target: scope
54− onSearchInProgressChanged: searchInProgress = scope.searchInProgress
55− }
56−
5751 Connections {
5852 target: greeter
5953 onShownChanged: if (shown) resetSearch()
@@ -176,7 +170,7 @@ Item {
176170 leftMargin: units.gu(0.5)
177171 }
178172
179− running: searchInProgress && searchField.text !== ""
173+ running: scope.searchInProgress && searchField.text !== ""
180174 opacity: running ? 1 : 0
181175
182176 Behavior on opacity { NumberAnimation { duration: UbuntuAnimation.SnapDuration; easing.type: Easing.Linear } }
@@ -184,6 +178,7 @@ Item {
184178
185179 Image {
186180 id: primaryImage
181+ objectName: "primaryImage"
187182 anchors {
188183 verticalCenter: parent.verticalCenter
189184 left: parent.left
tests/mocks/Unity/fake_scope.cpp+7
@@ -128,6 +128,13 @@ void Scope::setFormFactor(const QString &str) {
128128 }
129129}
130130
131+void Scope::setSearchInProgress(const bool inProg) {
132+ if (inProg != m_searching) {
133+ m_searching = inProg;
134+ Q_EMIT searchInProgressChanged();
135+ }
136+}
137+
131138void Scope::setNoResultsHint(const QString& str) {
132139 if (str != m_noResultsHint) {
133140 m_noResultsHint = str;
tests/mocks/Unity/fake_scope.h+2−1
@@ -32,12 +32,12 @@ class Scope : public QObject
3232 Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)
3333 Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)
3434 Q_PROPERTY(QString searchHint READ searchHint NOTIFY searchHintChanged)
35− Q_PROPERTY(bool searchInProgress READ searchInProgress NOTIFY searchInProgressChanged)
3635 Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)
3736 Q_PROPERTY(QString shortcut READ shortcut NOTIFY shortcutChanged)
3837 Q_PROPERTY(bool connected READ connected NOTIFY connectedChanged)
3938 Q_PROPERTY(Categories* categories READ categories NOTIFY categoriesChanged)
4039
40+ Q_PROPERTY(bool searchInProgress READ searchInProgress WRITE setSearchInProgress NOTIFY searchInProgressChanged)
4141 Q_PROPERTY(QString searchQuery READ searchQuery WRITE setSearchQuery NOTIFY searchQueryChanged)
4242 Q_PROPERTY(QString noResultsHint READ noResultsHint WRITE setNoResultsHint NOTIFY noResultsHintChanged)
4343 Q_PROPERTY(QString formFactor READ formFactor WRITE setFormFactor NOTIFY formFactorChanged)
@@ -66,6 +66,7 @@ public:
6666 void setSearchQuery(const QString& search_query);
6767 void setNoResultsHint(const QString& hint);
6868 void setFormFactor(const QString& form_factor);
69+ void setSearchInProgress(const bool inProg);
6970
7071 Q_INVOKABLE void activate(const QVariant &uri, const QVariant &icon_hint, const QVariant &category,
7172 const QVariant &result_type, const QVariant &mimetype, const QVariant &title,
tests/qmltests/Components/tst_PageHeader.qml+12−1
@@ -139,9 +139,20 @@ Item {
139139 }
140140
141141 function test_search_indicator() {
142+ var searchIndicator = findChild(pageHeader, "searchIndicator")
143+ var primaryImage = findChild(pageHeader, "primaryImage")
144+
145+ scopeMock.searchInProgress = false
146+ compare(searchIndicator.running, false, "Search indicator is running.")
147+ tryCompare(primaryImage, "visible", true)
148+
142149 pageHeader.triggerSearch()
143150 typeString("test")
144− tryCompare(pageHeader, "searchInProgress", true)
151+
152+ scopeMock.searchInProgress = true
153+ compare(searchIndicator.running, true, "Search indicator isn't running.")
154+ tryCompare(primaryImage, "visible", false)
155+
145156 pageHeader.resetSearch()
146157 }
147158 }