Merge lp:~elopio/ubuntu-rssreader-app/autopilot-1.4 into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Thomi Richards]

Port to autopilot 1.4.

With the prerequisite branch, now all three tests pass.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~elopio/ubuntu-rssreader-app/autopilot-1.4/+merge/194058/+edit-commit-message

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:134
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/123/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/83/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/123
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/123
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-trusty-amd64-ci/10

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/123/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/ubuntu_rssreader_app/emulators.py'
--- tests/autopilot/ubuntu_rssreader_app/emulators.py	2013-11-05 01:43:54 +0000
+++ tests/autopilot/ubuntu_rssreader_app/emulators.py	2013-11-06 03:51:49 +0000
@@ -33,30 +33,6 @@
                 requested = action
         self.pointing_device.click_object(requested)
 
-    def select_single_retry(self, object_type, **kwargs):
-        """Returns the item that is searched for with app.select_single
-        In case of the item was not found (not created yet) a second attempt is
-        taken 1 second later."""
-        item = self.select_single(object_type, **kwargs)
-        tries = 10
-        while item is None and tries > 0:
-            sleep(self.retry_delay)
-            item = self.select_single(object_type, **kwargs)
-            tries = tries - 1
-        return item
-
-    def select_many_retry(self, object_type, **kwargs):
-        """Returns the item that is searched for with app.select_many
-        In case of no item was not found (not created yet) a second attempt is
-        taken 1 second later"""
-        items = self.select_many(object_type, **kwargs)
-        tries = 10
-        while len(items) < 1 and tries > 0:
-            sleep(self.retry_delay)
-            items = self.select_many(object_type, **kwargs)
-            tries = tries - 1
-        return items
-
     def get_action_popover(self):
         # Returns all instances, but with current one as first index
         return self.select_many("ActionSelectionPopover")[0]
@@ -85,7 +61,7 @@
 
     #### feed list page objects
     def get_feedlist_topic(self, name):
-        return self.select_single_retry("TopicComponent", topicName=name)
+        return self.wait_select_single("TopicComponent", topicName=name)
 
     def get_feedlist_feed(self, feed):
         return self.select_single("FeedComponent", text=feed)
@@ -107,7 +83,7 @@
                                   objectName="choosetopicpage")
 
     def get_feedlist_page(self):
-        return self.select_single_retry("FeedListPage",
+        return self.wait_select_single("FeedListPage",
                                         objectName="feedlistpage")
 
     def get_articlelist_page(self):
@@ -115,7 +91,7 @@
                                   objectName="articlelistpage")
 
     def get_feed_management_page(self):
-        return self.select_single_retry("TopicManagement",
+        return self.wait_select_single("TopicManagement",
                                         objectName="topicmanagement")
 
     def get_edit_feed_page(self):
@@ -126,7 +102,7 @@
         return self.select_single("ManageTopicsPage")
 
     def get_rss_feed_page(self):
-        return self.select_single_retry(
+        return self.wait_select_single(
             "RssFeedPage", objectName="rssfeedpage")
 
     def get_topics(self):
@@ -165,14 +141,14 @@
         return self.select_single("ActionItem", text="Back")
 
     def get_editfeed_done_button(self):
-        return self.select_single_retry("Button", objectName="doneButton")
+        return self.wait_select_single("Button", objectName="doneButton")
 
     def get_activityIndicator(self):
-        return self.select_single_retry(
+        return self.wait_select_single(
             "ActivityIndicator", objectName="activityindicator")
 
     def get_topic_tab(self, topic):
-        return self.select_single_retry("TopicTab", title=topic)
+        return self.wait_select_single("TopicTab", title=topic)
 
     def get_feed_in_feedlist(self, topic, feed):
         tab = self.get_topic_tab(topic)
@@ -183,7 +159,7 @@
                return item
 
     def get_editfeed_topic_valueselector(self):
-        return self.select_single_retry(
+        return self.wait_select_single(
             "ValueSelector", objectName="valueselector")
 
     def get_editfeed_valueselector_value(self, name):

=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/__init__.py'
--- tests/autopilot/ubuntu_rssreader_app/tests/__init__.py	2013-10-07 12:49:31 +0000
+++ tests/autopilot/ubuntu_rssreader_app/tests/__init__.py	2013-11-06 03:51:49 +0000
@@ -28,7 +28,11 @@
 from autopilot.platform import model
 from autopilot.testcase import AutopilotTestCase
 
-from ubuntuuitoolkit import emulators as toolkit_emulators
+from ubuntuuitoolkit import (
+    base,
+    emulators as toolkit_emulators
+)
+
 from ubuntu_rssreader_app import emulators
 
 logger = logging.getLogger(__name__)
@@ -74,14 +78,14 @@
 
     def launch_test_local(self):
         self.app = self.launch_test_application(
-            "qmlscene",
+            base.get_qmlscene_launch_command(),
             self.local_location,
             app_type='qt',
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     def launch_test_installed(self):
         self.app = self.launch_test_application(
-            "qmlscene",
+            base.get_qmlscene_launch_command(),
             self.installed_location,
             "--desktop_file_hint=/usr/share/applications/"
             "rssreader-app.desktop",

=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py'
--- tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-11-05 02:14:35 +0000
+++ tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-11-06 03:51:49 +0000
@@ -145,13 +145,14 @@
 
         #check topic
         logger.debug("assert topic remains")
-        self.assertThat(lambda: self.main_view.get_feedlist_topic(topicName),
-                        Eventually(Not(Is(None))))
+        # If the topic is not present, it will raise an error.
+        self.main_view.get_feedlist_topic(topicName)
 
         #check feed has been removed
         logger.debug("assert removed feed")
-        self.assertThat(lambda: self.main_view.get_feedlist_feed(feedName),
-                        Eventually(Equals(None)))
+        self.assertThat(
+            lambda: self.main_view.select_many('FeedComponent', text=feedName),
+            Eventually(Equals([])))
 
     def _remove_topic(self, topicName):
         self.assertThat(self.main_view.get_topics_page,