Merge lp:~tiagosh/messaging-app/fix-1376793 into lp:messaging-app

[Tiago Salem Herrmann]

Query thread messages when searchTerm changes.

Query thread messages when searchTerm changes.

--Checklist--
Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~boiko/history-service/fix_filter_passing/+merge/245799

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/messaging-app) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed UI labels, did you update the pot file?
N/A

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:285
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/500/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/714
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/374
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/13
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/618
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/712
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/712/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16911
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/307
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/380
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/380/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/500/rebuild

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/messaging-app/fix-1376793]

286. By Tiago Salem Herrmann on 2015-01-08

display information about the matched event

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:286
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/501/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/741
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/377
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/14
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/643
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/739
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/739/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16947
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/309
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/383
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/383/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/501/rebuild

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/messaging-app/fix-1376793]

287. By Tiago Salem Herrmann on 2015-01-09

scroll to the item that matched the search

288. By Tiago Salem Herrmann on 2015-01-09

merge trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:288
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/502/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/759
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/380
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/15
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/660
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/757
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/757/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16975
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/312
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/386
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/386/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/502/rebuild

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

173 + HistoryEventModel {

Can you create this inside a loader so that when not searching there is no memory penalty?

review: Needs Fixing

[lp:~tiagosh/messaging-app/fix-1376793]

289. By Tiago Salem Herrmann on 2015-01-16

use a Loader to avoid creating instances of the model when not required

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:289
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/505/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/846
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/407
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/18
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/739
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/844
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/844/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17168
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/332
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/431
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/431/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/505/rebuild

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/messaging-app/fix-1376793]

290. By Tiago Salem Herrmann on 2015-01-19

- make loader asynchronous
- fix dates when searching

291. By Tiago Salem Herrmann on 2015-01-19

show spinner while searching

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:291
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/506/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/857
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/411
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/19
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/749
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/855
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/855/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17199
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/336
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/444
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/444/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/506/rebuild

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/messaging-app/fix-1376793]

292. By Tiago Salem Herrmann on 2015-01-21

update search when delegates are created

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:292
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/507/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/901
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/422/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/20
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/792
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/899
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/899/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17284
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/344/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/484
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/484/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/507/rebuild

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/messaging-app/fix-1376793]

293. By Tiago Salem Herrmann on 2015-01-21

hide bottom panel when searching
use a timer to retrieve more items from history

294. By Tiago Salem Herrmann on 2015-01-21

anchor to the bottom of the screen while searching

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:294
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/508/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/905
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/423
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/21
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/796
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/903
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/903/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17294
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/345
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/485
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/485/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/508/rebuild

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
No, but not related to this change

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good and works as expected!

review: Approve

[lp:~tiagosh/messaging-app/fix-1376793]

295. By Tiago Salem Herrmann on 2015-01-23

add autopilot test for message search

296. By Tiago Salem Herrmann on 2015-01-23

merge trunk

297. By Tiago Salem Herrmann on 2015-01-23

fix broken test

[Gustavo Pichorim Boiko (boiko)]

331 + time.sleep(2)
332 + count = 0
333 + for thread in threads:
334 + if thread.height != 0:
335 + count+=1
336 +
337 + self.assertThat(count, Equals(3))

I think it would be better to write a function to count the threads and use:
self.assertThat(count_visible_threads(threads), Eventually(Equals(3))

so that we don't have to rely on timers.

review: Needs Fixing

[lp:~tiagosh/messaging-app/fix-1376793]

298. By Tiago Salem Herrmann on 2015-01-23

do not rely on timers

299. By Tiago Salem Herrmann on 2015-01-23

use Eventually()

300. By Tiago Salem Herrmann on 2015-01-23

use lamba functions

[Gustavo Pichorim Boiko (boiko)]

Looks good now!

review: Approve

=== modified file 'src/qml/MainPage.qml'
--- src/qml/MainPage.qml	2015-01-05 20:35:11 +0000
+++ src/qml/MainPage.qml	2015-01-23 15:31:27 +0000
@@ -43,6 +43,7 @@
 
     TextField {
         id: searchField
+        objectName: "searchField"
         visible: mainPage.searching
         anchors {
             left: parent.left
@@ -179,6 +180,7 @@
         }
         listModel: threadModel
         clip: true
+        cacheBuffer: threadList.height * 2
         section.property: "eventDate"
         //spacing: searchField.text === "" ? units.gu(-2) : 0
         section.delegate: searching && searchField.text !== ""  ? null : sectionDelegate
@@ -203,6 +205,9 @@
                 } else {
                     var properties = model.properties
                     properties["keyboardFocus"] = false
+                    if (displayedEvent != null) {
+                        properties["scrollToEventId"] = displayedEvent.eventId
+                    }
                     if (model.participants[0].alias) {
                         properties["firstRecipientAlias"] = model.participants[0].alias;
                     }

=== modified file 'src/qml/Messages.qml'
--- src/qml/Messages.qml	2015-01-05 19:47:07 +0000
+++ src/qml/Messages.qml	2015-01-23 15:31:27 +0000
@@ -50,6 +50,8 @@
     property alias contactWatcher: contactWatcherInternal
     property string lastFilter: ""
     property string text: ""
+    property string scrollToEventId: ""
+    property bool isSearching: scrollToEventId !== ""
     property string latestEventId: ""
 
     function addAttachmentsToModel(transfer) {
@@ -109,6 +111,16 @@
         onAccountChanged: messages.account = mainView.account
     }
 
+    ActivityIndicator {
+        id: activityIndicator
+        anchors {
+            verticalCenter: parent.verticalCenter
+            horizontalCenter: parent.horizontalCenter
+        }
+        running: isSearching
+        visible: running
+    }
+
     ListModel {
         id: attachments
     }
@@ -549,12 +561,47 @@
                 latestEventId = eventModel.get(0).eventId
                 messageList.positionViewAtBeginning()
             }
+            if (isSearching) {
+                // if we ask for more items manually listview will stop working,
+                // so we only set again once the item was found
+                messageList.listModel = null
+                // always check last 15 items
+                var maxItems = 15
+                for (var i = count-1; count >= i; i--) {
+                    if (--maxItems < 0) {
+                        break;
+                    }
+                    if (eventModel.get(i).eventId == scrollToEventId) {
+                        scrollToEventId = ""
+                        messageList.listModel = eventModel
+                        messageList.positionViewAtIndex(i, ListView.Center)
+                        return;
+                    }
+                }
+
+                if (eventModel.canFetchMore && isSearching) {
+                    fetchMoreTimer.running = true
+                } else {
+                    // event not found
+                    scrollToEventId = ""
+                    messageList.listModel = eventModel
+                }
+            }
         }
     }
 
+    Timer {
+       id: fetchMoreTimer
+       running: false
+       interval: 100
+       repeat: false
+       onTriggered: eventModel.fetchMore()
+    }
+
     MessagesListView {
         id: messageList
         objectName: "messageList"
+        visible: !isSearching
 
         // because of the header
         clip: true
@@ -568,11 +615,11 @@
 
     Item {
         id: bottomPanel
-        anchors.bottom: keyboard.top
+        anchors.bottom: isSearching ? parent.bottom : keyboard.top
         anchors.left: parent.left
         anchors.right: parent.right
         height: selectionMode ? 0 : textEntry.height + units.gu(2)
-        visible: !selectionMode
+        visible: !selectionMode && !isSearching
         clip: true
         MouseArea {
             anchors.fill: parent

=== modified file 'src/qml/ThreadDelegate.qml'
--- src/qml/ThreadDelegate.qml	2015-01-05 20:35:11 +0000
+++ src/qml/ThreadDelegate.qml	2015-01-23 15:31:27 +0000
@@ -22,6 +22,8 @@
 import Ubuntu.Telephony 0.1
 import Ubuntu.Contacts 0.1
 import QtContacts 5.0
+import Ubuntu.History 0.1
+import "dateUtils.js" as DateUtils
 
 ListItemWithActions {
     id: delegate
@@ -32,6 +34,10 @@
     property string phoneNumber: delegateHelper.phoneNumber
     property bool unknownContact: delegateHelper.isUnknown
     property string threadId: model.threadId
+    property var displayedEvent: null
+    property var displayedEventTextAttachments: displayedEvent ? displayedEvent.textMessageAttachments : eventTextAttachments
+    property var displayedEventTimestamp: displayedEvent ? displayedEvent.timestamp : eventTimestamp
+    property var displayedEventTextMessage: displayedEvent ? displayedEvent.textMessage : eventTextMessage
     property string groupChatLabel: {
         var firstRecipient
         if (unknownContact) {
@@ -53,15 +59,15 @@
         var videoCount = 0
         var contactCount = 0
         var attachmentCount = 0
-        for (var i = 0; i < eventTextAttachments.length; i++) {
-            if (startsWith(eventTextAttachments[i].contentType, "text/plain")) {
-                return application.readTextFile(eventTextAttachments[i].filePath)
-            } else if (startsWith(eventTextAttachments[i].contentType, "image/")) {
+        for (var i = 0; i < displayedEventTextAttachments.length; i++) {
+            if (startsWith(displayedEventTextAttachments[i].contentType, "text/plain")) {
+                return application.readTextFile(displayedEventTextAttachments[i].filePath)
+            } else if (startsWith(displayedEventTextAttachments[i].contentType, "image/")) {
                 imageCount++
-            } else if (startsWith(eventTextAttachments[i].contentType, "video/")) {
+            } else if (startsWith(displayedEventTextAttachments[i].contentType, "video/")) {
                 videoCount++
-            } else if (startsWith(eventTextAttachments[i].contentType, "text/vcard") ||
-                      startsWith(eventTextAttachments[i].contentType, "text/x-vcard")) {
+            } else if (startsWith(displayedEventTextAttachments[i].contentType, "text/vcard") ||
+                      startsWith(displayedEventTextAttachments[i].contentType, "text/x-vcard")) {
                 contactCount++
             }
         }
@@ -79,26 +85,11 @@
         if (attachmentCount > 0) {
             return i18n.tr("Attachment: %1 file", "Attachments: %1 files").arg(attachmentCount)
         }
-        return eventTextMessage
+        return displayedEventTextMessage
     }
     anchors.left: parent.left
     anchors.right: parent.right
     height: units.gu(10)
-    // WORKAROUND: history-service can't filter by contact names
-    onSearchTermChanged: {
-        var found = false
-        var searchTermLowerCase = searchTerm.toLowerCase()
-        if (searchTerm !== "") {
-            if ((delegateHelper.phoneNumber.toLowerCase().search(searchTermLowerCase) !== -1)
-            || (!unknownContact && delegateHelper.alias.toLowerCase().search(searchTermLowerCase) !== -1)) {
-                found = true
-            }
-        } else {
-            found = true
-        }
-
-        height = found ? units.gu(8) : 0
-    }
 
     leftSideAction: Action {
         iconName: "delete"
@@ -108,6 +99,12 @@
         }
     }
 
+    Component.onCompleted: {
+        if (searchTerm !== "") {
+            delegateHelper.updateSearch()
+        }
+    }
+
     ContactAvatar {
         id: avatar
 
@@ -151,7 +148,13 @@
             right: parent.right
         }
 
-        text: Qt.formatTime(eventTimestamp, Qt.DefaultLocaleShortDate)
+        text: {
+            if (!displayedEvent) {
+                Qt.formatTime(displayedEventTimestamp, Qt.DefaultLocaleShortDate)
+            } else {
+                DateUtils.friendlyDay(Qt.formatDate(displayedEventTimestamp, "yyyy/MM/dd"))
+            }
+        }
         fontSize: "small"
     }
 
@@ -215,6 +218,66 @@
         property alias contexts: phoneDetail.contexts
         property bool isUnknown: contactId === ""
         property string phoneNumberSubTypeLabel: ""
+        property var searchHistoryFilter: HistoryIntersectionFilter {
+            HistoryFilter { filterProperty: "threadId"; filterValue: model.threadId }
+            HistoryFilter { filterProperty: "accountId"; filterValue: model.accountId }
+            HistoryFilter { filterProperty: "message"; filterValue: searchTerm; matchFlags: HistoryFilter.MatchContains }
+        }
+
+        function updateSearch() {
+            var found = false
+            var searchTermLowerCase = searchTerm.toLowerCase()
+            if (searchTerm !== "") {
+                if ((delegateHelper.phoneNumber.toLowerCase().search(searchTermLowerCase) !== -1)
+                || (!unknownContact && delegateHelper.alias.toLowerCase().search(searchTermLowerCase) !== -1)) {
+                    found = true
+                } else {
+                    searchEventModelLoader.active = true
+                }
+            } else {
+                delegate.displayedEvent = null
+                searchEventModelLoader.active = false
+                found = true
+            }
+
+            delegate.height = found ? units.gu(8) : 0
+        }
+
+        // WORKAROUND: history-service can't filter by contact names
+        Connections {
+            target: delegate
+            onSearchTermChanged: {
+                delegateHelper.updateSearch()
+            }
+        }
+
+        Loader {
+            id: searchEventModelLoader
+            active: false
+            asynchronous: true
+            sourceComponent: searchEventModelComponent
+        }
+
+        Component {
+            id: searchEventModelComponent
+            HistoryEventModel {
+                id: eventModel
+                type: HistoryThreadModel.EventTypeText
+                filter: delegateHelper.searchHistoryFilter
+                onCountChanged: {
+                    if (count > 0) {
+                        delegate.height = units.gu(8)
+                        delegate.displayedEvent = eventModel.get(0)
+                    } else if (searchTerm == "") {
+                        delegate.height = units.gu(8)
+                        delegate.displayedEvent = null
+                    } else {
+                        delegate.displayedEvent = null
+                        delegate.height = 0
+                    }
+                }
+            }
+        }
 
         function updateSubTypeLabel() {
             var subLabel = "";

=== modified file 'tests/autopilot/messaging_app/tests/test_messaging.py'
--- tests/autopilot/messaging_app/tests/test_messaging.py	2014-12-09 17:46:14 +0000
+++ tests/autopilot/messaging_app/tests/test_messaging.py	2015-01-23 15:31:27 +0000
@@ -22,6 +22,8 @@
 from messaging_app import helpers
 from messaging_app.tests import MessagingAppTestCase
 
+import ubuntuuitoolkit
+
 
 class BaseMessagingTestCase(MessagingAppTestCase):
 
@@ -298,6 +300,45 @@
         list_view = self.main_view.get_multiple_selection_list_view()
         self.assertThat(list_view.count, Eventually(Equals(0)))
 
+    def test_search_for_message(self):
+        def count_visible_threads(threads):
+            count = 0
+            for thread in threads:
+                if thread.height != 0:
+                    count += 1
+            return count
+
+        # populate history
+        helpers.receive_sms('08151', 'Ubuntu')
+        helpers.receive_sms('08152', 'Ubuntu1')
+        helpers.receive_sms('08153', 'Ubuntu2')
+        helpers.receive_sms('08154', 'Ubuntu22')
+        helpers.receive_sms('08155', 'Ubuntu23')
+
+        # verify that we got the messages
+        self.assertThat(self.thread_list.count, Eventually(Equals(5)))
+        threads = self.thread_list.select_many('ThreadDelegate')
+
+        # tap search
+        self.main_view.click_header_action('searchAction')
+        text_field = self.main_view.select_single(
+            ubuntuuitoolkit.TextField,
+            objectName='searchField')
+
+        text_field.write('Ubuntu2')
+        self.assertThat(
+            lambda: count_visible_threads(threads), Eventually(Equals(3)))
+
+        text_field.clear()
+        text_field.write('Ubuntu1')
+        self.assertThat(
+            lambda: count_visible_threads(threads), Eventually(Equals(1)))
+
+        text_field.clear()
+        text_field.write('Ubuntu')
+        self.assertThat(
+            lambda: count_visible_threads(threads), Eventually(Equals(5)))
+
 
 class MessagingTestCaseWithExistingThread(BaseMessagingTestCase):