Merge lp:~carla-sella/ubuntu-rssreader-app/view_feeds_test-new into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Carla Sella]

Autopilot tests for ubuntu-rssreader-app.

Fixed all tests, and fixed removal of feed by swiping.

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

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

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

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'RssFeedPage.qml'
--- RssFeedPage.qml	2013-10-05 10:51:56 +0000
+++ RssFeedPage.qml	2013-10-06 13:11:36 +0000
@@ -15,6 +15,7 @@
 import "databasemodule_v2.js" as DB
 
 Page {
+     objectName: "rssfeedpage"
     id: pageRoot
 
     property string rssModelUrl: ""
@@ -45,6 +46,7 @@
     }
 
     tools: ToolbarItems {
+        objectName: "pageBackBtn"
         id: toolbar
 
         ToolbarButton {
 
=== modified file 'listview/ListModePage.qml'
--- listview/ListModePage.qml	2013-10-05 14:41:06 +0000
+++ listview/ListModePage.qml	2013-10-06 13:11:36 +0000
@@ -142,6 +142,7 @@
             color: model.status == "1" ? Qt.rgba(0, 0, 0, 0.3) : Qt.rgba(0, 0, 0, 0.0)
 
             ListItems.Subtitled {
+                objectName: "feedlistitems"
                 id: listItem
 
                 text: model.title
 
=== modified file 'rssreader-app.qml'
--- rssreader-app.qml	2013-10-05 09:34:23 +0000
+++ rssreader-app.qml	2013-10-06 13:11:36 +0000
@@ -112,6 +112,7 @@
             id: mainCommonToolbar
 
             back: ToolbarButton {
+                objectName: "rsspagerefreshbutton"
                 action: Action {
                     text:  i18n.tr("Refresh")
                     iconSource: Qt.resolvedUrl("./icons_tmp/reload.svg")
 
=== modified file 'tests/autopilot/ubuntu_rssreader_app/emulators.py'
--- tests/autopilot/ubuntu_rssreader_app/emulators.py	2013-10-03 19:48:34 +0000
+++ tests/autopilot/ubuntu_rssreader_app/emulators.py	2013-10-06 13:11:36 +0000
@@ -43,6 +43,18 @@
             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]
@@ -77,42 +89,45 @@
         return self.select_single("FeedComponent", text=feed)
 
     def get_add_a_topic(self):
-        return self.select_single("QQuickItem", objectName = "addTopic")
+        return self.select_single("QQuickItem", objectName="addTopic")
 
     #### edit feed page objects
     def get_delete_button(self):
-        return self.select_single("Button", objectName = "deleteButton")
+        return self.select_single("Button", objectName="deleteButton")
 
 
     #### Page Calls
 
     def get_append_page(self):
-        return self.select_single("AppendFeedPage", objectName = "appendfeedpage")
+        return self.select_single("AppendFeedPage", objectName="appendfeedpage")
 
     def get_topics_page(self):
-        return self.select_single("ChooseTopicPage", objectName = "choosetopicpage")
+        return self.select_single("ChooseTopicPage", objectName="choosetopicpage")
 
     def get_feedlist_page(self):
-        return self.select_single("FeedListPage", objectName = "feedlistpage")
+        return self.select_single_retry("FeedListPage", objectName="feedlistpage")
 
     def get_articlelist_page(self):
-        return self.select_single("ArticleListPage", objectName = "articlelistpage")
+        return self.select_single("ArticleListPage", objectName="articlelistpage")
 
     def get_feed_management_page(self):
-        return self.select_single_retry("TopicManagement", objectName = "topicmanagement")
+        return self.select_single_retry("TopicManagement", objectName="topicmanagement")
 
     def get_edit_feed_page(self):
-        return self.select_single("EditFeed", objectName = "editfeedpage")
+        return self.select_single("EditFeed", objectName="editfeedpage")
 
     def get_manage_topics_page(self):
          return self.select_single("ManageTopicsPage")
 
+    def get_rss_feed_page(self):
+        return self.select_single_retry(
+            "RssFeedPage", objectName="rssfeedpage")
     ####
     def get_topics(self):
-        return self.select_single("QQuickListView", objectName = "topiclist")
+        return self.select_single("QQuickListView", objectName="topiclist")
 
     def get_feeds(self):
-        return self.select_many("Standard", objectName = "FeedListItem")
+        return self.select_many("Standard", objectName="FeedListItem")
 
     def get_header(self):
         return self.select_many("Header")
@@ -121,26 +136,46 @@
         return self.select_single("Subtitled", text = "All articles")
 
     def get_refresh_button(self):
-        return self.select_single("AbstractButton", objectName = "refreshbutton")
+        return self.select_single("AbstractButton", objectName="refreshbutton")
 
     def get_list_view_button(self):
-        return self.select_single("AbstractButton", objectName = "listviewbutton")
+        return self.select_single("AbstractButton", objectName="listviewbutton")
 
     def get_add_feed_button(self):
-        return self.select_single("AbstractButton", objectName = "addfeedbutton")
+        return self.select_single("AbstractButton", objectName="addfeedbutton")
 
     def get_edit_topic_button(self):
-        return self.select_single("AbstractButton", objectName = "edittopicbutton")
+        return self.select_single("AbstractButton", objectName="edittopicbutton")
 
     def get_refresh_feed_dialog(self):
-        return self.select_single("Dialog", objectName = "refreshWaitDialog")
+        return self.select_single("Dialog", objectName="refreshWaitDialog")
 
     def get_refresh_dialog_cancel_button(self):
-        return self.select_single("Button", objectName = "refreshCancel")
+        return self.select_single("Button", objectName="refreshCancel")
 
     def get_toolbar_back_button(self):
-        return self.select_single("ActionItem", text = "Back")
+        return self.select_single("ActionItem", text="Back")
 
     def get_activityIndicator(self):
         return self.select_single_retry(
             "ActivityIndicator", objectName="activityindicator")
+
+    def get_canonical_tab(self):
+        return self.select_single_retry(
+            "TopicTab", title="CanonicalTopic")
+
+    def get_canonical_feed_in_feedlist(self):
+        canonicalTab=self.get_canonical_tab()
+        itemList= canonicalTab.select_many(
+            "Subtitled", objectName="feedlistitems")
+        for item in itemList:
+                splititem = item.subText.split(",")
+                if splititem[1] == " Canonical":
+                    return item
+
+    def get_page_back_btn(self):
+        back_btn = self.select_single(
+            "ToolbarItems", objectName="pageBackBtn")
+        back_btn_ActionItem = back_btn.select_single(
+            "ActionItem", text="Back")
+        return back_btn_ActionItem
 
=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py'
--- tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-10-03 19:48:34 +0000
+++ tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-10-06 13:11:36 +0000
@@ -101,33 +101,6 @@
         logger.debug("input topic")
         self._input_new_topic(topicName)
 
-        #A new topic is now automatically selected as the topic
-        #select new topic
-        #logger.debug("assert new topic")
-        #newNumTopics = len(self.main_view.get_choose_topics_items)
-        #self.assertThat(newNumTopics, Eventually(Equals(numTopics + 1)))
-        #logger.debug("grab new topic")
-        #topics = self.main_view.get_choose_topics_items()
-        #numTopics = len(topics)
-        #logger.debug("found " + str(numTopics) + " topics")
-        #for topic in topics:
-        #    logger.debug("Topic: ") + str(topic.text)
-        #newTopic = self.main_view.get_choose_topics_items()[-1]
-        #newTopic = topics[-1]
-        #logger.debug("click new topic, ") + str(newTopic.text)
-        #self.pointing_device.click_object(newTopic)
-        #logger.debug("topic clicked")
-
-        #wait for any updates to finish before beginning tests
-        #this transition currently locks the device https://bugs.launchpad.net/ubuntu-rssreader-app/+bug/1221893
-        #logger.debug("check for network updates")
-        #self.assertThat(self.main_view.get_network_activity, Eventually(Not(Is(None))))
-        #logger.debug("assert no network updates")
-        #self.assertThat(self.main_view.get_network_activity, Eventually(Is(None)))
-        #logger.debug("assert we're back on main view")
-        #self.assertThat(self.main_view.visible, Eventually(Equals(True)))
-        #logger.debug("finished with add_feed_topic")
-
     def _remove_feed(self, feedName, topicName):
         logger.debug("removing feed")
         #open toolbar
@@ -140,33 +113,59 @@
 
         #verify we are on the Management page
         logger.debug("assert feedlist page")
-        feedlistpage = lambda: self.main_view.get_feed_management_page().visible
-        self.assertThat(feedlistpage, Eventually(Equals(True)))
+        feedlistpage = self.main_view.get_feed_management_page()
+        self.assertThat(feedlistpage.visible, Eventually(Equals(True)))
 
         #select topic
         logger.debug("grabbing topic")
         self._get_topic(topicName)
 
-        #select feed
+        ##select feed
         logger.debug("assert feed")
         self.assertThat(lambda: self.main_view.get_feedlist_feed(feedName), Eventually(Not(Is(None))))
         logger.debug("grabbing feed")
         feed = self.main_view.get_feedlist_feed(feedName)
-        logger.debug("clicking feed")
-        self.pointing_device.click_object(feed)
-
-        #verify we are on the Edit Feed page
-        logger.debug("assert editfeedpage")
-        editFeedPage = self.main_view.get_edit_feed_page()
-        self.assertThat(editFeedPage.visible, Eventually(Equals(True)))
-
-        #press delete button
-        logger.debug("assert delete button")
-        self.assertThat(self.main_view.get_delete_button, Eventually(Not(Is(None))))
-        logger.debug("grab delete button")
-        deleteButton = self.main_view.get_delete_button()
-        logger.debug("click delete button")
-        self.pointing_device.click_object(deleteButton)
+
+
+
+
+        self.assertThat(
+            self.main_view.get_feed_management_page,
+                Eventually(NotEquals(None)))
+
+        #swipe to delete canonical topic
+        startX = int(feedlistpage.x + feedlistpage.width * 0.30)
+        stopX = int(feedlistpage.x + feedlistpage.width)
+        lineY = feed.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)
+
+
+
+
+
+
+
+
+
+        #logger.debug("clicking feed")
+        #self.pointing_device.click_object(feed)
+
+        ##verify we are on the Edit Feed page
+        #logger.debug("assert editfeedpage")
+        #editFeedPage = self.main_view.get_edit_feed_page()
+        #self.assertThat(editFeedPage.visible, Eventually(Equals(True)))
+
+        ##press delete button
+        #logger.debug("assert delete button")
+        #self.assertThat(self.main_view.get_delete_button, Eventually(Not(Is(None))))
+        #logger.debug("grab delete button")
+        #deleteButton = self.main_view.get_delete_button()
+        #logger.debug("click delete button")
+        #self.pointing_device.click_object(deleteButton)
 
         #verify we are on the Management page
         logger.debug("assert feedlistpage")
@@ -210,8 +209,6 @@
         #select topic
         topic = self._get_topic(topicName)
 
-        #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)))
 
@@ -225,9 +222,11 @@
         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))
+        #verify we are on the Topic Management page **for timing issue
+        topicmanagementpage = self.main_view.get_feed_management_page()
+        self.assertThat(self.main_view.get_feed_management_page, Eventually(NotEquals(None)))
+        self.assertThat(self.main_view.get_feed_management_page().visible, Eventually(Equals(True)))
+        self.assertThat(self.main_view.get_feed_management_page().objectName, Eventually(Equals("topicmanagement")))
 
         #check that it is gone
         topic = self.main_view.get_feedlist_topic(topicName)
@@ -288,77 +287,56 @@
         #remove added topic
         self._remove_topic(topicName)
 
-
-    @unittest.skip("Topic page broken, see https://bugs.launchpad.net/ubuntu-rssreader-app/+bug/1206248")
     def test_view_feeds(self):
         """test view feeds"""
 
-        self.assertThat(self.main_view.get_topics_page(), NotEquals(None))
-
-        #-----> view all news:
+        feed = "http://www.canonical.com/rss.xml"
+        feedName = "Canonical"
+        topicName = "CanonicalTopic"
+
+        #add topic and feed
+        self._add_feed_and_topic(feed, topicName)
+
+        #verify we are on the CanonicalTopic Tab
+        canonicalTab = self.main_view.get_canonical_tab()
+        self.assertThat(lambda: canonicalTab.visible, Eventually(Equals(True)))
+
         #open toolbar
         toolbar = self.main_view.open_toolbar()
 
-        #click on add reads toolbar button
-        toolbar.click_button("List view")
-
-        #verify we are on the Feeds page
-        feedlistpage = self.main_view.get_feedlist_page()
-        self.assertThat(feedlistpage.visible, Eventually(Equals(True)))
-
-        #select All articles
-        allFeeds = self.main_view.get_all_feeds()
-        self.assertThat(allFeeds, NotEquals("None"))
-        self.pointing_device.click_object(allFeeds )
-
-        #verify we are on the All articles page
-        articlelistpage = self.main_view.get_articlelist_page()
-        self.assertThat(articlelistpage.visible, Eventually(Equals(True)))
-
-        toolbar = self.main_view.open_toolbar()
-
-        #click on back toolbar button
-        toolbar.click_button("Back")
-
-        #verify we are on the Feeds page
-        feedlistpage = lambda: self.main_view.get_feedlist_page().visible
-        self.assertThat(feedlistpage, Eventually(Equals(True)))
-
-        #-----> view individual feed:
-        #add topic and feed
-        self._add_feed_and_topic()
+        #click on list view toolbar button
+        toolbar.click_button("rsspagerefreshbutton")
+
+        #wait for any updates to finish before continuing tests
+        try:
+            self.main_view.get_activityIndicator().running.wait_for(False)
+        except:
+            self.assertThat(
+                lambda:self.main_view.get_canonical_tab,
+                Eventually(NotEquals(None)))
 
         #select Canonical feed
-        canonicalFeed = lambda: self.main_view.get_canonical_feed_labelvisual()
-        self.assertThat(canonicalFeed, Eventually(Not(Is(None))))
+        canonicalFeed = self.main_view.get_canonical_feed_in_feedlist()
+        self.assertThat(canonicalFeed, NotEquals(None))
         self.pointing_device.click_object(canonicalFeed)
 
-        #verify we are on the Canonical page
-        header = lambda: self.main_view.get_header()[0].title
-        self.assertThat(header, Eventually(Equals("Canonical")))
+        #verify we are on RSS feed page
+        rssfeedpage = self.main_view.get_rss_feed_page()
+        self.assertThat(rssfeedpage.visible, Eventually(Equals(True)))
 
-        #toggle toolbar
+        #open toolbar
         toolbar = self.main_view.open_toolbar()
 
         #click on back toolbar button
-        toolbar.click_button("Back")
-
-        #verify we are on the Feeds page
-        feedlistpage = lambda: self.main_view.get_feedlist_page().visible
-        self.assertThat(feedlistpage, Eventually(Equals(True)))
-
-        #toggle toolbar
-        toolbar = self.main_view.open_toolbar()
-
-        #click on shorts toolbar button
-        toolbar.click_button("shorts")
-
-        #verify we are on the Shorts page
-        shortsPage = lambda: self.main_view.switch_to_tab_by_index(0).visible
-        self.assertThat(shortsPage, Eventually(Equals(True)))
+        rssfeedpageBackBtn = self.main_view.get_page_back_btn()
+        self.pointing_device.click_object(rssfeedpageBackBtn)
+
+        #verify we are on the CanonicalTopic Tab
+        canonicalTab = self.main_view.get_canonical_tab()
+        self.assertThat(lambda: canonicalTab.visible, Eventually(Equals(True)))
+
+        #remove added Canonical feed
+        self._remove_feed(feedName, topicName)
 
         #remove added Canonical topic
-        self._remove_topic()
-
-        #remove added Canonical feed
-        self._remove_feed()
+        self._remove_topic(topicName)