Merge lp:~om26er/messaging-app/fix-test-1418074 into lp:messaging-app

[Omer Akram]

Provide a pre-populated database for search test so that we don't conflict with the On Screen Display Notification

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:303
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/514/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1172
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/540
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/27
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1032
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1170
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1170/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17769
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/437
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/649
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/649/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~om26er/messaging-app/fix-test-1418074]

304. By Omer Akram on 2015-02-06

fix testdata location reference

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:304
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/518/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1224
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/568
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/31
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1080
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1222
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1222/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17854
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/463
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/678
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/678/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good and works as expected!

review: Approve

=== modified file 'tests/autopilot/messaging_app/fixture_setup.py'
--- tests/autopilot/messaging_app/fixture_setup.py	2014-09-10 16:54:37 +0000
+++ tests/autopilot/messaging_app/fixture_setup.py	2015-02-06 16:04:16 +0000
@@ -10,16 +10,22 @@
 import dbus
 import os
 import subprocess
+import shutil
 
 import fixtures
 
 
 class MessagingTestEnvironment(fixtures.Fixture):
 
+    def __init__(self, use_testdata_db=False):
+        self.use_testdata_db = use_testdata_db
+
     def setUp(self):
         super(MessagingTestEnvironment, self).setUp()
         self.useFixture(OfonoPhoneSIM())
         self.useFixture(BackupHistory())
+        if self.use_testdata_db:
+            self.useFixture(FillCustomSmsHistory())
         self.useFixture(RespawnService())
 
 
@@ -45,6 +51,35 @@
             os.rename(self.history + '.orig', self.history)
 
 
+class FillCustomSmsHistory(fixtures.Fixture):
+
+    history_service_dir = os.path.expanduser("~/.local/share/history-service/")
+    history_db = "history.sqlite"
+    testdata_sys = "/usr/lib/python3/dist-packages/messaging_app/testdata/"
+    testdata_local = "messaging_app/testdata/"
+
+    prefilled_history_local = os.path.join(testdata_local, history_db)
+    prefilled_history_system = os.path.join(testdata_sys, history_db)
+
+    def setUp(self):
+        super(FillCustomSmsHistory, self).setUp()
+        self.addCleanup(self._clear_test_data())
+        self._copy_test_data_history()
+
+    def _copy_test_data_history(self):
+        if os.path.exists(self.prefilled_history_local):
+            shutil.copy(
+                self.prefilled_history_local, self.history_service_dir)
+        else:
+            shutil.copy(
+                self.prefilled_history_system, self.history_service_dir)
+
+    def _clear_test_data(self):
+        test_data = os.path.join(self.history_service_dir, self.history_db)
+        if os.path.exists(test_data):
+            os.remove(test_data)
+
+
 class RespawnService(fixtures.Fixture):
 
     def setUp(self):

=== added directory 'tests/autopilot/messaging_app/testdata'
=== added file 'tests/autopilot/messaging_app/testdata/history.sqlite'
Binary files tests/autopilot/messaging_app/testdata/history.sqlite	1970-01-01 00:00:00 +0000 and tests/autopilot/messaging_app/testdata/history.sqlite	2015-02-06 16:04:16 +0000 differ
=== modified file 'tests/autopilot/messaging_app/tests/test_messaging.py'
--- tests/autopilot/messaging_app/tests/test_messaging.py	2015-01-24 20:32:58 +0000
+++ tests/autopilot/messaging_app/tests/test_messaging.py	2015-02-06 16:04:16 +0000
@@ -300,53 +300,6 @@
         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)))
-
-        text_field.clear()
-        text_field.write('%')
-        # as we are testing for items NOT to appear, there is no other way
-        # other than sleeping for awhile before checking if the threads are
-        # visible
-        time.sleep(5)
-        self.assertThat(count_visible_threads(threads), Equals(0))
-
 
 class MessagingTestCaseWithExistingThread(BaseMessagingTestCase):
 
@@ -393,6 +346,56 @@
             remaining_message_text, self.messages[0])
 
 
+class MessagingTestSearch(MessagingAppTestCase):
+
+    def setUp(self):
+        test_setup = fixture_setup.MessagingTestEnvironment(
+            use_testdata_db=True)
+        self.useFixture(test_setup)
+        super(MessagingTestSearch, self).setUp()
+        self.thread_list = self.app.select_single(objectName='threadList')
+
+    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
+
+        # 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)))
+
+        text_field.clear()
+        text_field.write('%')
+        # as we are testing for items NOT to appear, there is no other way
+        # other than sleeping for awhile before checking if the threads are
+        # visible
+        time.sleep(5)
+        self.assertThat(count_visible_threads(threads), Equals(0))
+
+
 class MessagingTestCaseWithArgument(MessagingAppTestCase):
 
     def setUp(self):