Merge lp:~carla-sella/ubuntu-rssreader-app/all-tests-fixed into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Carla Sella]

Autopilot tests for ubuntu-rssreader-app.

Fixed all tests on desktop and device.

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

FAILED: Continuous integration, rev:152
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/127/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/131/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/127
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/127
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-trusty-amd64-ci/14

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

review: Needs Fixing (continuous-integration)

[lp:~carla-sella/ubuntu-rssreader-app/all-tests-fixed]

153. By Carla Sella <email address hidden> on 2013-11-13

Fixing activity indicator issue.

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

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

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

review: Needs Fixing (continuous-integration)

[lp:~carla-sella/ubuntu-rssreader-app/all-tests-fixed]

154. By Carla Sella <email address hidden> on 2013-11-13

Working on activity indicator issue.

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

FAILED: Continuous integration, rev:154
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/129/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/135/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/129
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/129
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-trusty-amd64-ci/16

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

review: Needs Fixing (continuous-integration)

[Joey Chan (qqworini)]

Carla, if u want me to approve it, pls tell me :)

[Carla Sella (carla-sella)]

@ Joey: thanks but I am having some issues with activity indicator that have to be fixed first.

Unmerged revisions

=== modified file 'tests/autopilot/ubuntu_rssreader_app/emulators.py'
--- tests/autopilot/ubuntu_rssreader_app/emulators.py	2013-11-05 02:57:36 +0000
+++ tests/autopilot/ubuntu_rssreader_app/emulators.py	2013-11-13 22:02:46 +0000
@@ -33,12 +33,24 @@
                 requested = action
         self.pointing_device.click_object(requested)
 
+    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]
+        return self.select_many_retry("ActionSelectionPopover")[0]
 
     def get_network_activity(self):
-        return self.select_single("ActivityIndicator", running="True")
+        return self.wait.select_single("ActivityIndicator", running="True")
 
     #### choose topics page objects
 
@@ -64,7 +76,7 @@
         return self.wait_select_single("TopicComponent", topicName=name)
 
     def get_feedlist_feed(self, feed):
-        return self.select_single("FeedComponent", text=feed)
+        return self.wait_select_single("FeedComponent", text=feed)
 
     def get_add_a_topic(self):
         return self.select_single("QQuickItem", objectName="addTopic")
@@ -105,6 +117,10 @@
         return self.wait_select_single(
             "RssFeedPage", objectName="rssfeedpage")
 
+    def get_shorts_tab(self):
+        return self.wait_select_single(
+            "ShortsTab", objectName="Tab0")
+    
     def get_topics(self):
         return self.select_single("QQuickListView", objectName="topiclist")
 
@@ -143,10 +159,6 @@
     def get_editfeed_done_button(self):
         return self.wait_select_single("Button", objectName="doneButton")
 
-    def get_activityIndicator(self):
-        return self.wait_select_single(
-            "ActivityIndicator", objectName="activityindicator")
-
     def get_topic_tab(self, topic):
         return self.wait_select_single("TopicTab", title=topic)
 
 
=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py'
--- tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-11-05 23:54:44 +0000
+++ tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-11-13 22:02:46 +0000
@@ -28,9 +28,9 @@
 
         #wait for any updates to finish before beginning tests
         try:
-            self.main_view.get_activityIndicator().running.wait_for(False)
+            self.main_view.get_network_activity().wait_until_destroyed(timeout=10)
         except:
-            self.assertThat(
+             self.assertThat(
                 self.main_view.get_topics_page, Eventually(NotEquals(None)))
 
     def _add_feed_and_topic(self, feed, topicName):
@@ -39,7 +39,6 @@
 
         self.assertThat(self.main_view.get_topics_page,
                         Eventually(NotEquals(None)))
-
         #open toolbar
         logger.debug("opening toolbar")
         toolbar = self.main_view.open_toolbar()
@@ -114,16 +113,13 @@
         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
         logger.debug("assert feed")
-        self.assertThat(lambda: self.main_view.get_feedlist_feed(feedName),
-                        Eventually(Not(Is(None))))
+        self.assertThat(self.main_view.get_feedlist_feed(feedName).text,
+                        Equals(feedName))
         logger.debug("grabbing feed")
         feed = self.main_view.get_feedlist_feed(feedName)
+        feedLabel = feed.select_single('Label', text = feedName)
 
         self.assertThat(self.main_view.get_feed_management_page,
                         Eventually(NotEquals(None)))
@@ -131,7 +127,7 @@
         #swipe to delete feed
         startX = int(feedlistpage.x + feedlistpage.width * 0.30)
         stopX = int(feedlistpage.x + feedlistpage.width)
-        lineY = feed.globalRect[1]
+        lineY = int(feedLabel.globalRect[1])
 
         #swipe to remove the feed
         self.pointing_device.move(startX, lineY)
@@ -183,6 +179,7 @@
 
         #select topic
         topic = self._get_topic(topicName)
+        topicLabel = topic.select_single("Label", text=topicName)
 
         topicmanagementpage = self.main_view.get_feed_management_page()
         self.assertThat(self.main_view.get_feed_management_page,
@@ -191,7 +188,7 @@
         #swipe to delete topic
         startX = int(topicmanagementpage.x + topicmanagementpage.width * 0.30)
         stopX = int(topicmanagementpage.x + topicmanagementpage.width)
-        lineY = topic.globalRect[1]
+        lineY = topicLabel.globalRect[1]
 
         #swipe to remove the topic
         self.pointing_device.move(startX, lineY)
@@ -207,9 +204,13 @@
         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)
-        self.assertThat(topic, NotEquals(topicName))
+        #check topic has been removed
+        logger.debug("assert removed topic")
+        try:
+            self.assertThat(self._get_topic(topicName), Eventually(Equals(None)))
+        except:
+            print('Topic removed.')
+ 
 
     def _input_new_feed(self, rssFeed):
         inputField = self.main_view.get_append_feed_input_box()
@@ -236,7 +237,7 @@
     def _get_topic(self, topicName, timeout=10):
         logger.debug("_get_topic: assert topics")
         self.assertThat(lambda: self.main_view.get_feedlist_topic(topicName),
-                        Eventually(Not(Is(None))))
+                        Eventually(Not(Is([]))))         
         logger.debug("_get_topic: grab topic")
         topic = self.main_view.get_feedlist_topic(topicName)
         logger.debug("_get_topic: click topic")
@@ -258,6 +259,15 @@
         feedName = "Canonical"
         topicName = "CanonicalTopic"
 
+        #just for timing issues
+        self.assertThat(self.main_view.get_shorts_tab(),
+                        NotEquals(None))
+        self.assertThat(self.main_view.get_shorts_tab().objectName,
+                        Eventually(Equals("Tab0")))
+        self.assertThat(self.main_view.get_shorts_tab().visible,
+                        Eventually(Equals(True)))
+
+        #add feed and topic
         self._add_feed_and_topic(feed, topicName)
 
         #remove added feed
@@ -275,6 +285,14 @@
         feedName = "Canonical"
         topicName = "CanonicalTopic"
 
+        #just for timing issues
+        self.assertThat(self.main_view.get_shorts_tab(),
+                        NotEquals(None))
+        self.assertThat(self.main_view.get_shorts_tab().objectName,
+                        Eventually(Equals("Tab0")))
+        self.assertThat(self.main_view.get_shorts_tab().visible,
+                        Eventually(Equals(True)))
+
         #add topic and feed
         self._add_feed_and_topic(feed, topicName)
 
@@ -290,11 +308,10 @@
 
         #wait for any updates to finish before continuing tests
         try:
-            self.main_view.get_activityIndicator().running.wait_for(False)
+            self.main_view.get_network_activity().running.wait_for(False)
         except:
             self.assertThat(
-                lambda: self.main_view.get_topic_tab(topicName),
-                Eventually(NotEquals(None)))
+                self.main_view.get_topic_tab(topicName), Not(Is([])))
 
         #open toolbar
         toolbar = self.main_view.open_toolbar()
@@ -308,7 +325,7 @@
 
         #select feed
         editFeed = self.main_view.get_feed_in_feedlist(topicName, feedName)
-        self.assertThat(editFeed, NotEquals(None))
+        self.assertThat(editFeed, Not(Is([])))
         self.pointing_device.click_object(editFeed)
 
         #verify we are on RSS feed page