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

[Carla Sella]

Fixed test test_add_remove_feed_and_topic.
Tried it also on my device and it works.

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

FAILED: Continuous integration, rev:148
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~carla-sella/ubuntu-rssreader-app/fix-add_remove_feed_and_topic/+merge/194750/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/124/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/108/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/124
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/124
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-trusty-amd64-ci/11

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

review: Needs Fixing (continuous-integration)

=== 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-11 20:52:25 +0000
@@ -38,7 +38,7 @@
         return self.select_many("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
 
@@ -105,6 +105,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 +147,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-11 20:52:25 +0000
@@ -28,7 +28,7 @@
 
         #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().running.wait_for(False)
         except:
             self.assertThat(
                 self.main_view.get_topics_page, Eventually(NotEquals(None)))
@@ -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
@@ -290,7 +300,7 @@
 
         #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),