Merge lp:~carla-sella/ubuntu-rssreader-app/fix-remove-topic into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Carla Sella]

Autopilot add and remove topic and feed for ubuntu-rssreader-app

Fixed remove topic part of the test_add_remove_feed_and_topic test.
This is still WIP as I have a timing issue to fix at the end of a test, just put a sleep for debugging.

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

FAILED: Continuous integration, rev:88
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/70/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/648
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/70
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/70
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/70
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/70

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:89
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/71/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/651
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/71
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/71
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/71
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/71

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:89
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/72/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests/660/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/72
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/72
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/72
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/72

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

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'rssreader-app.qml'
--- rssreader-app.qml	2013-10-02 03:42:50 +0000
+++ rssreader-app.qml	2013-10-03 19:49:16 +0000
@@ -302,6 +302,7 @@
             title: i18n.tr("Checking for new articles")
 
             ActivityIndicator {
+                objectName: "activityindicator"
                 running: true
             }
 

=== modified file 'tests/autopilot/ubuntu_rssreader_app/emulators.py'
--- tests/autopilot/ubuntu_rssreader_app/emulators.py	2013-09-11 15:18:51 +0000
+++ tests/autopilot/ubuntu_rssreader_app/emulators.py	2013-10-03 19:49:16 +0000
@@ -15,9 +15,12 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 from ubuntuuitoolkit import emulators as toolkit_emulators
+from time import sleep
 
 class MainView(toolkit_emulators.MainView):
 
+    retry_delay = 0.2
+
     #ideally this should be converted to the sdk and use object name not text names
     #see https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1205144
     def run_action(self, popover, name):
@@ -28,38 +31,50 @@
                 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 get_action_popover(self):
         # Returns all instances, but with current one as first index
         return self.select_many("ActionSelectionPopover")[0]
 
     def get_network_activity(self):
-        return self.select_single("ActivityIndicator", running = "True")
+        return self.select_single("ActivityIndicator", running="True")
 
     #### choose topics page objects
 
     def get_choose_topics_items(self):
-        return self.select_many("Standard", objectName = "topicItem")
+        return self.select_many("Standard", objectName="topicItem")
 
     def get_new_topic_input_box(self):
-        return self.select_single("TextField", objectName = "newTopic")
+        return self.select_single("TextField", objectName="newTopic")
 
     #### append feed page objects
     def get_append_feed_input_box(self):
-        return self.select_single("TextField", objectName = "tfFeedUrl")
+        return self.select_single("TextField", objectName="tfFeedUrl")
 
     def get_append_page_feed(self):
         #grab just the first checkbox
-        return self.select_many("CheckBox", objectName = "feedCheckbox")[0]
+        return self.select_many("CheckBox", objectName="feedCheckbox")[0]
 
     def get_next_button(self):
-        return self.select_single("Button", objectName = "nextButton")
+        return self.select_single("Button", objectName="nextButton")
 
     #### feed list page objects
     def get_feedlist_topic(self, name):
-        return self.select_single("TopicComponent", topicName = name)
+        return self.select_single_retry("TopicComponent", topicName=name)
 
     def get_feedlist_feed(self, feed):
-        return self.select_single("FeedComponent", text = feed)
+        return self.select_single("FeedComponent", text=feed)
 
     def get_add_a_topic(self):
         return self.select_single("QQuickItem", objectName = "addTopic")
@@ -84,7 +99,7 @@
         return self.select_single("ArticleListPage", objectName = "articlelistpage")
 
     def get_feed_management_page(self):
-        return self.select_single("TopicManagement", objectName = "topicmanagement")
+        return self.select_single_retry("TopicManagement", objectName = "topicmanagement")
 
     def get_edit_feed_page(self):
         return self.select_single("EditFeed", objectName = "editfeedpage")
@@ -122,3 +137,10 @@
 
     def get_refresh_dialog_cancel_button(self):
         return self.select_single("Button", objectName = "refreshCancel")
+
+    def get_toolbar_back_button(self):
+        return self.select_single("ActionItem", text = "Back")
+
+    def get_activityIndicator(self):
+        return self.select_single_retry(
+            "ActivityIndicator", objectName="activityindicator")

=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py'
--- tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-10-01 20:46:41 +0000
+++ tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-10-03 19:49:16 +0000
@@ -32,13 +32,17 @@
         self.assertThat(self.main_view.visible, Eventually(Equals(True)))
 
         #wait for any updates to finish before beginning tests
-        self.assertThat(self.main_view.get_network_activity, Eventually(Not(Is(None))))
+        try:
+            self.main_view.get_activityIndicator().running.wait_for(False)
+        except:
+            self.assertThat(
+                self.main_view.get_topics_page, Eventually(NotEquals(None)))
 
     def _add_feed_and_topic(self, feed, topicName):
         """test add feed and topic"""
         logger.debug("starting test add feed and topic")
 
-        self.assertThat(self.main_view.get_topics_page(), NotEquals(None))
+        self.assertThat(self.main_view.get_topics_page, Eventually(NotEquals(None)))
 
         #open toolbar
         logger.debug("opening toolbar")
@@ -181,10 +185,22 @@
         #this been quasi converted to the sdk, but does not work as-is
         #see https://bugs.launchpad.net/ubuntu-rssreader-app/+bug/1211631
 
+        self.assertThat(self.main_view.get_topics_page, Eventually(NotEquals(None)))
+
         #open toolbar
         toolbar = self.main_view.open_toolbar()
+        self.assertThat(self.main_view.open_toolbar, Eventually(NotEquals(None)))
 
         #click on back toolbar Button
+        backButton = self.main_view.get_toolbar_back_button()
+        self.pointing_device.click_object(backButton)
+        self.assertThat(self.main_view.get_topics_page, Eventually(NotEquals(None)))
+
+        #open toolbar
+        toolbar = self.main_view.open_toolbar()
+        self.assertThat(self.main_view.open_toolbar, Eventually(NotEquals(None)))
+
+        #click on edit topics button
         toolbar.click_button("edittopicsbutton")
 
         #verify we are on the Management page
@@ -194,26 +210,28 @@
         #select topic
         topic = self._get_topic(topicName)
 
-        topicsPage = self.main_view.get_manage_topics_page()
-        self.assertThat(topicsPage, Eventually(Not(Is(None))))
-
-        addATopicItem = lambda: self.main_view.get_add_a_topic()
-        self.assertThat(addATopic, Eventually(Not(Is(None))))
-
-        #swipe to delete topic
-        #we have to consider the top tab offset, then create a swipe operation across the width of the page
-        startX = int(topicsPage.x + topicsPage.width * 0.20)
-        stopX = int(topicsPage.x + topicsPage.width * 0.80)
-        tabHeightOffset = qmlView.height - topicsPage.height + addATopicItem.height
-        lineY = int(qmlView.y + topic.y +  tabHeightOffset)
+        #topicsPage = self.main_view.get_manage_topics_page()
+        #self.assertThat(self.main_view.get_manage_topics_page, Eventually(NotEquals(None)))
+        topicmanagementpage = self.main_view.get_feed_management_page()
+        self.assertThat(self.main_view.get_feed_management_page, Eventually(NotEquals(None)))
+
+        #swipe to delete canonical topic
+        startX = int(topicmanagementpage.x + topicmanagementpage.width * 0.30)
+        stopX = int(topicmanagementpage.x + topicmanagementpage.width)
+        lineY = topic.globalRect[1]
 
         #swipe to remove the topic
         self.pointing_device.move(startX, lineY)
+        self.pointing_device.click()
         self.pointing_device.drag(startX, lineY, stopX, lineY)
 
+        #verify we are on the Management page  *** for timing issues ***
+        feedmanagementpage = self.main_view.get_feed_management_page()
+        self.assertThat(feedmanagementpage, NotEquals(None))
+
         #check that it is gone
-        topic = lambda: self.main_view.get_feedlist_topic(topicName)
-        self.assertThat(topic.visible, Eventually(Equals(False)))
+        topic = self.main_view.get_feedlist_topic(topicName)
+        self.assertThat(topic, NotEquals(topicName))
 
     def _input_new_feed(self, rssFeed):
         inputField = self.main_view.get_append_feed_input_box()
@@ -268,7 +286,7 @@
         self._remove_feed(feedName, topicName)
 
         #remove added topic
-        #self._remove_topic(topicName)
+        self._remove_topic(topicName)
 
 
     @unittest.skip("Topic page broken, see https://bugs.launchpad.net/ubuntu-rssreader-app/+bug/1206248")