Merge lp:~carla-sella/ubuntu-rssreader-app/view-feeds-test into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Carla Sella]

autopilot ubuntu-rssreader-app view feed test

Completed view all feeds an view feed test.

[Nicholas Skaggs (nskaggs)]

A quick glance at this, I don't see anything that jumps out at me. I'll do a better review tomorrow if it's not merged by then ;-)

[lp:~carla-sella/ubuntu-rssreader-app/view-feeds-test]

30. By Roman Shchekin on 2013-08-05

A lot of little fixes of careless mistakes.

Approved by Ubuntu Phone Apps Jenkins Bot, Joey Chan.

31. By Roman Shchekin on 2013-08-08

ListModePage.qml now can display concrete topic too.

Approved by Ubuntu Phone Apps Jenkins Bot.

32. By Roman Shchekin on 2013-08-08

Added dialog for "Refresh" operation!.

Approved by Ubuntu Phone Apps Jenkins Bot.

33. By Roman Shchekin on 2013-08-10

Debian package fix (icons included).

Approved by Ubuntu Phone Apps Jenkins Bot.

[Nicholas Skaggs (nskaggs)]

Converting this to the emulator and rebasing to upstream trunk

[Nicholas Skaggs (nskaggs)]

Looks good Carla, plenty of asserts in here to make sure timing doesn't bite you :-) Having all those asserts to check each step is really good. A couple things to note;

As you know English strings break things when we run in other languages, like Italian ;-) So, use the .visible property to ensure your on the proper page rather than the page title. This won't break when they rename the pages either! No need to check the title if we got the object (page) and it's visible.

We can also assert when things like text entry boxes come into focus via the .focus property. Pretty handy to make sure our text entry goes in the proper place :-)

These little things could cause issues when run on the devices, but likely doesn't effect the desktop runs, so it doesn't come up while writing.

[Nicholas Skaggs (nskaggs)]

One other thing, the proper syntax for a lambda function within an assert is;

self.assertThat(lambda: checkboxBtn, Eventually(NotEquals(None)))

In some cases there were a few that looked like this:

lambda: self.assertThat(checkboxBtn, Eventually(NotEquals(None)))

[Nicholas Skaggs (nskaggs)]

This is equivalent

    def get_canonical_feed_labelvisual(self):
        itemList = self.select_many('LabelVisual', text = 'Canonical')
        for item in itemList:
            if item.text == "Canonical":
                return item

to this:

    def get_canonical_feed_labelvisual(self):
        itemList = self.app.select_many('LabelVisual', text = 'Canonical')
        index = -1
        for item in itemList:
            index += 1
            if item.text == "Canonical":
               return itemList[index]

See the difference? You can use item directly as it's equal to itemList[index].

[lp:~carla-sella/ubuntu-rssreader-app/view-feeds-test]

34. By Nicholas Skaggs on 2013-08-13

merge carla's changes, plus initial conversion to sdk emulator

35. By Nicholas Skaggs on 2013-08-13

first working version

36. By Nicholas Skaggs on 2013-08-13

cleaned up comments, etc

37. By Nicholas Skaggs on 2013-08-13

Tweak autopilot tests, force new build into ppa.

Approved by Ubuntu Phone Apps Jenkins Bot.

38. By Nicholas Skaggs on 2013-08-14

Tweak autopilot tests, force new build into ppa.

Approved by Ubuntu Phone Apps Jenkins Bot.

39. By Nicholas Skaggs on 2013-08-15

Small cleanups for dependencies.

Approved by Ubuntu Phone Apps Jenkins Bot.

40. By Carla Sella on 2013-08-16

Autopilot view feed test needs review.

Unmerged revisions

40. By Carla Sella on 2013-08-16

Autopilot view feed test needs review.

=== modified file 'feeds/AppendFeedPage.qml'
--- feeds/AppendFeedPage.qml	2013-08-02 19:00:56 +0000
+++ feeds/AppendFeedPage.qml	2013-08-12 19:46:20 +0000
@@ -9,7 +9,7 @@
 
 Page {
     id: appendFeedPage
-
+    objectName: "appendfeedpage"
     title: "Append feed"
     flickable: null
     visible: false

=== modified file 'feeds/ChooseTopicPage.qml'
--- feeds/ChooseTopicPage.qml	2013-08-04 08:51:35 +0000
+++ feeds/ChooseTopicPage.qml	2013-08-12 19:46:20 +0000
@@ -8,7 +8,7 @@
 
 Page {
     id: chooseTopicPage
-
+    objectName: "choosetopicpage"
     title: "Choose topic"
     flickable: null
     visible: false
@@ -101,6 +101,7 @@
         }
 
         delegate: ListItem.Standard {
+            objectName: "topicItem"
             text: model.tagName
 
             onClicked: {

=== modified file 'feeds/EditFeed.qml'
--- feeds/EditFeed.qml	2013-08-03 10:06:36 +0000
+++ feeds/EditFeed.qml	2013-08-12 19:46:20 +0000
@@ -8,7 +8,7 @@
 
 Page {
     id: editPage
-
+    objectName: "editfeedpage"
     title: i18n.tr("Edit Feed")
     flickable: null/*content*/
     tools: ToolbarItems {
@@ -27,6 +27,7 @@
         Button
         {
             id: btnDelete
+            objectName: "deleteButton"
             text: i18n.tr("Delete")
             gradient: UbuntuColors.orangeGradient
             anchors.verticalCenter: parent.verticalCenter

=== modified file 'feeds/ManageFeedsPage.qml'
--- feeds/ManageFeedsPage.qml	2013-08-03 14:21:20 +0000
+++ feeds/ManageFeedsPage.qml	2013-08-12 19:46:20 +0000
@@ -8,6 +8,7 @@
 
 Page {
     id: editFeedsPageRoot
+    objectName: "editfeedspage"
     flickable: null
     title: i18n.tr("Feeds")
 

=== modified file 'feeds/TopicManagement.qml'
--- feeds/TopicManagement.qml	2013-08-03 10:06:36 +0000
+++ feeds/TopicManagement.qml	2013-08-12 19:46:20 +0000
@@ -7,6 +7,7 @@
 import "../databasemodule_v2.js" as DB
 
 Page {
+    objectName: "topicmanagement"
     id: topicManagement
 
 //    width: units.gu(50)
@@ -69,6 +70,7 @@
 
             Item {
                 id: itemAddTopic
+                objectName: "addTopic"
                 anchors{ left: parent.left; right: parent.right }
                 height: units.gu(8)
 

=== modified file 'listview/ArticleListPage.qml'
--- listview/ArticleListPage.qml	2013-07-29 18:31:05 +0000
+++ listview/ArticleListPage.qml	2013-08-12 19:46:20 +0000
@@ -8,7 +8,7 @@
 import "../databasemodule_v2.js" as DB
 
 Page {
-
+    objectName: "articlelistpage"
     signal articleSelected(var data) // mb id.
     property var updateData: null
 

=== modified file 'listview/FeedListPage.qml'
--- listview/FeedListPage.qml	2013-08-07 18:09:21 +0000
+++ listview/FeedListPage.qml	2013-08-12 19:46:20 +0000
@@ -10,7 +10,7 @@
 
 Page {
     id: pageItself
-
+    objectName: "feedlistpage"
     property var updatingFeed: null
     property bool isDirty: false
 

=== modified file 'tests/autopilot/ubuntu_rssreader_app/emulators/main_window.py'
--- tests/autopilot/ubuntu_rssreader_app/emulators/main_window.py	2013-08-03 17:15:11 +0000
+++ tests/autopilot/ubuntu_rssreader_app/emulators/main_window.py	2013-08-12 19:46:20 +0000
@@ -30,9 +30,9 @@
         return self.app.select_single('QQuickListView', objectName = 'topiclist')
 
     def get_manage_topics_page(self):
-         return self.app.select_single('ManageTopicsPage')
+         return self.app.select_single('TopicManagement')
 
-    def get_canonical_topic(self):
+    def get_canonical_topic_labelvisual(self):
         itemList = self.app.select_many('LabelVisual', text = 'CanonicalTopic')
         index = -1
         for item in itemList:
@@ -40,8 +40,13 @@
             if item.text == "CanonicalTopic":
                return itemList[index]
 
-##    def get_canonical_feed_labelvisual(self):
-##        return self.app.select_single('LabelVisual', text = 'Canonical')
+    def get_canonical_topic_TopicComponent(self):
+        itemList = self.app.select_many("TopicComponent", topicName= "CanonicalTopic")
+        index = -1
+        for item in itemList:
+                index +=1
+                if item.topicName == "CanonicalTopic":
+                    return itemList[index]
 
     def get_canonical_feed_labelvisual(self):
         itemList = self.app.select_many('LabelVisual', text = 'Canonical')
@@ -60,5 +65,16 @@
             if item.text == "Canonical":
                return itemList[index]
 
+    def get_canonical_feed_FeedComponent(self):
+        return self.app.select_single("FeedComponent", text = "Canonical")
+
     def get_header(self):
         return self.app.select_many("Header")
+
+    def get_all_feeds(self):
+        return self.app.select_single('Subtitled', text = 'All articles')
+
+    def get_add_a_topic(self):
+        return self.app.select_single("QQuickItem", objectName = "addTopic")
+
+

=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py'
--- tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-08-03 17:15:11 +0000
+++ tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-08-12 19:46:20 +0000
@@ -34,6 +34,106 @@
 
 
     def test_add_remove_feed_and_topic(self):
+        """ test add and remove feed and topic"""
+
+        #add topic and feed
+        self._add_feed_and_topic()
+
+        #remove added Canonical topic
+##        self._remove_topic()
+
+        #remove added Canonical feed
+        self._remove_feed()
+
+
+    def test_view_feeds(self):
+        """test view feeds"""
+
+        #verify we are on the Shorts page
+        pageName = self.ubuntusdk.get_object("Tab", "Tab0")
+        self.assertThat(pageName.title, Eventually(Equals("Shorts")))
+
+        #-----> view all news:
+        #toggle toolbar
+        self.ubuntusdk.toggle_toolbar()
+        self.assertThat(self.ubuntusdk.get_toolbar().opened, Eventually(Equals(True)))
+
+        #click on add reads toolbar button
+        self.ubuntusdk.click_toolbar_button('List view')
+
+        #verify we are on the Feeds page
+        feedlistpage = self.ubuntusdk.get_object("FeedListPage", "feedlistpage")
+##        #self.assertThat(feedlistpage.title, Eventually(Equals("Feeds")))
+        self.assertThat(feedlistpage.title, Eventually(Equals(" ")))
+
+        #select All articles
+        allFeeds = self.main_window.get_all_feeds()
+        self.assertThat(allFeeds, NotEquals("None"))
+        self.pointing_device.click_object(allFeeds )
+
+        #verify we are on the All articles page
+        articlelistpage = self.ubuntusdk.get_object("ArticleListPage", "articlelistpage")
+        self.assertThat(articlelistpage.title, Eventually(Equals("All articles")))
+
+        #toggle toolbar
+        self.ubuntusdk.toggle_toolbar()
+        self.assertThat(self.ubuntusdk.get_toolbar().opened, Eventually(Equals(True)))
+
+        #click on back toolbar button
+        self.ubuntusdk.click_toolbar_button('Back')
+
+        #verify we are on the Feeds page
+        feedlistpage = self.ubuntusdk.get_object("FeedListPage", "feedlistpage")
+        self.assertThat(feedlistpage.title, Eventually(Equals("Feeds")))
+
+        #-----> view individual feed:
+        #add topic and feed
+        self._add_feed_and_topic()
+
+        #select Canonical feed
+        canonicalFeed = self.main_window.get_canonical_feed_labelvisual()
+        self.assertThat(canonicalFeed, NotEquals(None))
+        self.pointing_device.click_object(canonicalFeed)
+
+        #verify we are on the Canonical page
+        header = self.main_window.get_header()[0]
+        self.assertThat(header.title, Eventually(Equals("Canonical")))
+
+        #toggle toolbar
+        self.ubuntusdk.toggle_toolbar()
+        self.assertThat(self.ubuntusdk.get_toolbar().opened, Eventually(Equals(True)))
+
+        #click on back toolbar button
+        self.ubuntusdk.click_toolbar_button('Back')
+
+        #verify we are on the Feeds page
+        feedlistpage = self.ubuntusdk.get_object("FeedListPage", "feedlistpage")
+        self.assertThat(feedlistpage.title, Eventually(Equals("Feeds")))
+
+        #toggle toolbar
+        self.ubuntusdk.toggle_toolbar()
+        self.assertThat(self.ubuntusdk.get_toolbar().opened, Eventually(Equals(True)))
+
+        #click on back toolbar button
+        self.ubuntusdk.click_toolbar_button('Shorts')
+
+       #verify we are on the Shorts page
+        pageName = self.ubuntusdk.get_object("Tab", "Tab0")
+        self.assertThat(pageName.title, Eventually(Equals("Shorts")))
+
+        #remove added Canonical topic
+        self._remove_topic()
+
+        #remove added Canonical feed
+        self._remove_feed()
+
+    def _add_feed_and_topic(self):
+        """test add feed and topic"""
+
+       #verify we are on the Shorts page
+        pageName = self.ubuntusdk.get_object("Tab", "Tab0")
+        self.assertThat(pageName.title, Eventually(Equals("Shorts")))
+
         #toggle toolbar
         self.ubuntusdk.toggle_toolbar()
 
@@ -45,8 +145,8 @@
         self._run_action(addReadsPopover, '+ Add feeds')
 
         #verify Append Feed  page is open
-        header = self.main_window.get_header()[0]
-        self.assertThat(header.title, Eventually(Equals("Append feed")))
+        appendpage = self.ubuntusdk.get_object("AppendFeedPage", "appendfeedpage")
+        self.assertThat(appendpage.title, Eventually(Equals("Append feed")))
 
         #type feed in input field
         new_Feed_Url = self.main_window.get_append_feed_input_box()
@@ -55,8 +155,9 @@
         self.keyboard.type("http://www.canonical.com/rss.xml")
         self.keyboard.type("\n")
         self.assertThat(new_Feed_Url.text, Eventually(Equals("http://www.canonical.com/rss.xml")))
-        #---> TODO fix this
-        sleep(1)
+        #just for timing issue
+        self.assertThat(appendpage.title, Eventually(Equals("Append feed")))
+        self.assertThat(self._canonical_feed, Eventually(Equals("http://www.canonical.com/rss.xml")))
 
         #check that feed is updated, not empty
         canonicalFeed = self.main_window.get_canonical_feed_labelvisual()
@@ -72,8 +173,9 @@
         nextButton = self.ubuntusdk.get_object("Button", "nextButton")
         lambda: self.assertThat(nextButton, Eventually(NotEquals(None)))
         self.pointing_device.click_object(nextButton)
-        header = self.main_window.get_header()[0]
-        self.assertThat(header.title, Eventually(Equals("Choose topic")))
+
+        chossetopicpage = self.ubuntusdk.get_object("ChooseTopicPage", "choosetopicpage")
+        self.assertThat(chossetopicpage.title, Eventually(Equals("Choose topic")))
 
         #add a new topic
         new_Topic_Url = self.main_window.get_new_topic_input_box()
@@ -83,71 +185,124 @@
         self.keyboard.type("\n")
 
         #select canonical topic
-        canonicalTopic = self.main_window.get_canonical_topic()
+        canonicalTopic = self.main_window.get_canonical_topic_labelvisual()
         self.assertThat(canonicalTopic, NotEquals(None))
         self.pointing_device.click_object(canonicalTopic)
-
-        #remove added Canonical topic
-        self._remove_topic()
-
-        #check that it's gone
-        canonicalTopic = self.main_window.get_canonical_topic()
-        #---> TODO fix this
-        sleep(1)
-        self.assertThat(canonicalTopic.text, NotEquals("CanonicalTopic"))
-
-        #remove added Canonical feed
-        self._remove_feed()
+        #just for timing purposes
+        self.assertThat(canonicalTopic.text, Eventually(Equals("CanonicalTopic")))
+
+       #verify we are on the Shorts page
+        pageName = self.ubuntusdk.get_object("Tab", "Tab0")
+        self.assertThat(pageName.title, Eventually(Equals("Shorts")))
 
     def _remove_feed(self):
+        #verify we are on the Shorts page
+        pageName = self.ubuntusdk.get_object("Tab", "Tab0")
+        self.assertThat(pageName.title, Eventually(Equals("Shorts")))
+
         #toggle toolbar
         self.ubuntusdk.toggle_toolbar()
-        #click on back toolbar button
-        header = self.main_window.get_header()[0]
-        self.assertThat(header.title, Eventually(Equals("Topics")))
-        self.ubuntusdk.click_toolbar_button('Back')
-
-        header = self.main_window.get_header()[0]
-        self.assertThat(header.title, Eventually(Equals("Feeds")))
+        self.assertThat(self.ubuntusdk.get_toolbar().opened, Eventually(Equals(True)))
+
+        #click on back toolbar Button
+        self.ubuntusdk.click_toolbar_button('Edit topics')
+
+        #verify we are on the Management page
+        feedlistpage = self.ubuntusdk.get_object("TopicManagement", "topicmanagement")
+        self.assertThat(feedlistpage.title, Eventually(Equals("Management")))
+        self.assertThat(feedlistpage.visible, Eventually(Equals(True)))
+
+        #select  canonical topic
+        canonicalTopic = self.main_window.get_canonical_topic_TopicComponent()
+        self.assertThat(canonicalTopic, NotEquals(None))
+        self.pointing_device.click_object(canonicalTopic)
+        if canonicalTopic.isExpended == False :
+            self.pointing_device.click_object(canonicalTopic)
+        self.assertThat(canonicalTopic.isExpended, Eventually(Equals(True)))
 
         #select  canonical feed
-        canonicalFeed = self.main_window.get_canonical_feed()
+        canonicalFeed = self.main_window.get_canonical_feed_FeedComponent()
         self.assertThat(canonicalFeed, NotEquals(None))
-        self.pointing_device.click_object(canonicalFeed, press_duration=2)
-
-         #click on Remove popover action
-        removeFeedPopover = self.main_window.get_action_popover()
-        self._run_action(removeFeedPopover, 'Remove')
+
+        self.pointing_device.click_object(canonicalFeed)
+
+        #verify we are on the Edit Feed page
+        editFeedPage = self.ubuntusdk.get_object("EditFeed", "editfeedpage")
+        self.assertThat(editFeedPage.title, Eventually(Equals("Edit Feed")))
+
+        #toggle toolbar
+        self.ubuntusdk.toggle_toolbar()
+        self.assertThat(self.ubuntusdk.get_toolbar().opened, Eventually(Equals(True)))
+
+        #press delete button
+        deleteButton = self.ubuntusdk.get_object("Button", "deleteButton")
+        self.assertThat(deleteButton, NotEquals(None))
+        self.pointing_device.click_object(deleteButton)
+
+        #verify we are on the Management page
+        feedlistpage = self.ubuntusdk.get_object("TopicManagement", "topicmanagement")
+        self.assertThat(feedlistpage.title, Eventually(Equals("Management")))
+
+       #select  canonical topic
+        canonicalTopic = self.main_window.get_canonical_topic_labelvisual()
+        self.assertThat(canonicalTopic, NotEquals(None))
+
+        #check feed has been removed
+        canonicalFeed = self.main_window.get_canonical_feed_FeedComponent()
+        self.assertThat(canonicalFeed, Equals(None))
 
     def _remove_topic(self):
+        #verify we are on the Shorts page
+        pageName = self.ubuntusdk.get_object("Tab", "Tab0")
+        self.assertThat(pageName.title, Eventually(Equals("Shorts")))
+
         #toggle toolbar
         self.ubuntusdk.toggle_toolbar()
+        self.assertThat(self.ubuntusdk.get_toolbar().opened, Eventually(Equals(True)))
 
         #click on edit topics toolbar button
         self.ubuntusdk.click_toolbar_button('Edit topics')
-        header = self.main_window.get_header()[0]
-        self.assertThat(header.title, Eventually(Equals("Feeds")))
-
-        self.ubuntusdk.click_toolbar_button('Topics')
-        header = self.main_window.get_header()[0]
-        self.assertThat(header.title, Eventually(Equals("Topics")))
-
-        #select and swipe canonical topic
-        canonicalTopic = self.main_window.get_canonical_topic()
-        self.assertThat(canonicalTopic, NotEquals(None))
-
-        qmlView = self.ubuntusdk.get_qml_view()
-        topicsPage = self.main_window.get_manage_topics_page()
-
-        #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
-        lineY = int(qmlView.y + canonicalTopic.y + tabHeightOffset)
-
-        #swipe to remove the topic
-        self.pointing_device.move(startX, lineY)
-        self.pointing_device.drag(startX, lineY, stopX, lineY)
+
+        #verify we are on the Topics page
+        topicmanagement = self.ubuntusdk.get_object("TopicManagement", "topicmanagement")
+        self.assertThat(topicmanagement.title, Eventually(Equals("Management")))
+
+        #select  canonical topic
+        canonicalTopic = self.main_window.get_canonical_topic()
+        #self.assertThat(canonicalTopic, NotEquals(None))
+        self.assertThat(canonicalTopic.text, Equals("CanonicalTopic"))
+        self.pointing_device.click_object(canonicalTopic)
+
+        #verify Canonical feed is visible
+
+
+
+##        qmlView = self.ubuntusdk.get_qml_view()
+##        self.assertThat(qmlView, NotEquals(None))
+##
+##        topicsPage = self.main_window.get_manage_topics_page()
+##        self.assertThat(topicsPage, NotEquals(None))
+##
+##        addATopicItem = self.main_window.get_add_a_topic()
+##        self.assertThat(addATopic, NotEquals(None))
+##
+##        #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 + canonicalTopic.y +  tabHeightOffset)
+##
+##        #swipe to remove the topic
+##        self.pointing_device.move(startX, lineY)
+##        self.pointing_device.drag(startX, lineY, stopX, lineY)
+
+
+
+
+         #check that it's gone
+        canonicalTopic = None
+        canonicalTopic = self.main_window.get_canonical_topic()
+        self.assertThat(canonicalTopic.visible, Equals(False))
 
     def _run_action(self, popover, name):
         actions = popover.select_many('Empty')
@@ -157,3 +312,9 @@
                 requested = action
         self.pointing_device.click_object(requested)
 
+    def _canonical_feed(self):
+        try:
+            return self.main_window.get_append_feed_input_box().text
+        except StateNotFoundError:
+            return None
+