Merge lp:~nskaggs/ubuntu-rssreader-app/ap-tweaks-force-build into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Nicholas Skaggs]

Tweak autopilot tests, force new build into ppa

Tweak autopilot tests, force new build into ppa

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

PASSED: Continuous integration, rev:38
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/112/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-precise-amd64-ci/107
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-ci/112
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/112
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/107

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

review: Approve (continuous-integration)

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

review: Approve (continuous-integration)

[lp:~nskaggs/ubuntu-rssreader-app/ap-tweaks-force-build]

39. By Nicholas Skaggs on 2013-08-13

fix lambda nonsense, change notequals(none) to not(is(none))

Unmerged revisions

=== modified file 'tests/autopilot/ubuntu_rssreader_app/emulators.py'
--- tests/autopilot/ubuntu_rssreader_app/emulators.py	2013-08-13 04:46:19 +0000
+++ tests/autopilot/ubuntu_rssreader_app/emulators.py	2013-08-13 21:03:36 +0000
@@ -35,6 +35,12 @@
     def get_append_page(self):
         return self.select_single("AppendFeedPage", objectName = "appendfeedpage")
 
+    def get_feedlist_page(self):
+        return self.select_single("FeedListPage", objectName = "feedlistpage")
+
+    def get_articlelist_page(self):
+        return self.select_single("ArticleListPage", objectName = "articlelistpage")
+
     def get_feed_management_page(self):
         return self.select_single("TopicManagement", objectName = "topicmanagement")
 

=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py'
--- tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-08-13 04:46:19 +0000
+++ tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-08-13 21:03:36 +0000
@@ -58,6 +58,7 @@
 
         #check that feed is updated, not empty
         canonicalFeed = self.main_view.get_canonical_feed_labelvisual()
+        self.assertThat(lambda: canonicalFeed, Eventually(NotEquals(None)))
         self.assertThat(lambda: canonicalFeed.text, Eventually(Equals("Canonical")))
 
         #click on checkbox to confirm feed
@@ -228,25 +229,23 @@
         #remove added Canonical feed
         self._remove_feed()
 
-    @unittest.skip("Topic page broken")
+    @unittest.skip("Topic page broken, see https://bugs.launchpad.net/ubuntu-rssreader-app/+bug/1206248")
     def test_view_feeds(self):
         """test view feeds"""
 
-        #this has NOT BEEN converted to the sdk, and needs to be done before activating
-
         #verify we are on the first page
         self.main_view.switch_to_tab_by_index(0)
         self.assertThat(lambda: shortsPage.visible, Eventually(Equals(True)))
 
         #-----> view all news:
         #open toolbar
-        self.main_view.open_toolbar()
+        toolbar = self.main_view.open_toolbar()
 
         #click on add reads toolbar button
-        self.main_view.click_toolbar_button("List view")
+        toolbar.click_button("List view")
 
         #verify we are on the Feeds page
-        feedlistpage = self.main_view.get_object("FeedListPage", "feedlistpage")
+        feedlistpage = self.main_view.get_feedlist_page()
         self.assertThat(lambda: feedlistpage.visible, Eventually(Equals(True)))
 
         #select All articles
@@ -255,19 +254,17 @@
         self.pointing_device.click_object(allFeeds )
 
         #verify we are on the All articles page
-        articlelistpage = self.main_view.get_object("ArticleListPage", "articlelistpage")
+        articlelistpage = self.main_view.get_articlelist_page()
         self.assertThat(lambda: articlelistpage.visible, Eventually(Equals(True)))
 
-        #toggle toolbar
-        self.main_view.open_toolbar()
-        self.assertThat(self.main_view.get_toolbar().opened, Eventually(Equals(True)))
+        toolbar = self.main_view.open_toolbar()
 
         #click on back toolbar button
-        self.main_view.click_toolbar_button("Back")
+        toolbar.click_button("Back")
 
         #verify we are on the Feeds page
-        feedlistpage = self.main_view.get_object("FeedListPage", "feedlistpage")
-        self.assertThat(feedlistpage.title, Eventually(Equals("Feeds")))
+        feedlistpage = self.main_view.get_feedlist_page()
+        self.assertThat(lambda: feedlistpage.visible, Eventually(Equals(True)))
 
         #-----> view individual feed:
         #add topic and feed
@@ -275,34 +272,32 @@
 
         #select Canonical feed
         canonicalFeed = self.main_view.get_canonical_feed_labelvisual()
-        self.assertThat(canonicalFeed, NotEquals(None))
+        self.assertThat(lambda: canonicalFeed, Eventually(NotEquals(None)))
         self.pointing_device.click_object(canonicalFeed)
 
         #verify we are on the Canonical page
         header = self.main_view.get_header()[0]
-        self.assertThat(header.title, Eventually(Equals("Canonical")))
+        self.assertThat(lambda: header.title, Eventually(Equals("Canonical")))
 
         #toggle toolbar
-        self.main_view.open_toolbar()
-        self.assertThat(self.main_view.get_toolbar().opened, Eventually(Equals(True)))
+        toolbar = self.main_view.open_toolbar()
 
         #click on back toolbar button
-        self.main_view.click_toolbar_button("Back")
+        toolbar.click_button("Back")
 
         #verify we are on the Feeds page
-        feedlistpage = self.main_view.get_object("FeedListPage", "feedlistpage")
-        self.assertThat(feedlistpage.title, Eventually(Equals("Feeds")))
+        feedlistpage = self.main_view.get_feedlist_page()
+        self.assertThat(lambda: feedlistpage.visible, Eventually(Equals(True)))
 
         #toggle toolbar
-        self.main_view.open_toolbar()
-        self.assertThat(self.main_view.get_toolbar().opened, Eventually(Equals(True)))
+        toolbar = self.main_view.open_toolbar()
 
-        #click on back toolbar button
-        self.main_view.click_toolbar_button("Shorts")
+        #click on shorts toolbar button
+        toolbar.click_button("shorts")
 
         #verify we are on the Shorts page
-        pageName = self.main_view.get_object("Tab", "Tab0")
-        self.assertThat(pageName.title, Eventually(Equals("Shorts")))
+        self.main_view.switch_to_tab_by_index(0)
+        self.assertThat(lambda: shortsPage.visible, Eventually(Equals(True)))
 
         #remove added Canonical topic
         self._remove_topic()