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

Proposed by Carla Sella
Status: Merged
Merged at revision: 141
Proposed branch: lp:~carla-sella/ubuntu-rssreader-app/fix-add_remove_feed_and_topic
Merge into: lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk
Diff against target: 152 lines (+30/-20)
2 files modified
tests/autopilot/ubuntu_rssreader_app/emulators.py (+5/-5)
tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py (+25/-15)
To merge this branch: bzr merge lp:~carla-sella/ubuntu-rssreader-app/fix-add_remove_feed_and_topic
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Needs Fixing
Ubuntu Shorts Developers Pending
Review via email: mp+194750@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
38 return self.select_many("ActionSelectionPopover")[0]38 return self.select_many("ActionSelectionPopover")[0]
3939
40 def get_network_activity(self):40 def get_network_activity(self):
41 return self.select_single("ActivityIndicator", running="True")41 return self.wait.select_single("ActivityIndicator", running="True")
4242
43 #### choose topics page objects43 #### choose topics page objects
4444
@@ -105,6 +105,10 @@
105 return self.wait_select_single(105 return self.wait_select_single(
106 "RssFeedPage", objectName="rssfeedpage")106 "RssFeedPage", objectName="rssfeedpage")
107107
108 def get_shorts_tab(self):
109 return self.wait_select_single(
110 "ShortsTab", objectName="Tab0")
111
108 def get_topics(self):112 def get_topics(self):
109 return self.select_single("QQuickListView", objectName="topiclist")113 return self.select_single("QQuickListView", objectName="topiclist")
110114
@@ -143,10 +147,6 @@
143 def get_editfeed_done_button(self):147 def get_editfeed_done_button(self):
144 return self.wait_select_single("Button", objectName="doneButton")148 return self.wait_select_single("Button", objectName="doneButton")
145149
146 def get_activityIndicator(self):
147 return self.wait_select_single(
148 "ActivityIndicator", objectName="activityindicator")
149
150 def get_topic_tab(self, topic):150 def get_topic_tab(self, topic):
151 return self.wait_select_single("TopicTab", title=topic)151 return self.wait_select_single("TopicTab", title=topic)
152152
153153
=== 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 @@
2828
29 #wait for any updates to finish before beginning tests29 #wait for any updates to finish before beginning tests
30 try:30 try:
31 self.main_view.get_activityIndicator().running.wait_for(False)31 self.main_view.get_network_activity().running.wait_for(False)
32 except:32 except:
33 self.assertThat(33 self.assertThat(
34 self.main_view.get_topics_page, Eventually(NotEquals(None)))34 self.main_view.get_topics_page, Eventually(NotEquals(None)))
@@ -39,7 +39,6 @@
3939
40 self.assertThat(self.main_view.get_topics_page,40 self.assertThat(self.main_view.get_topics_page,
41 Eventually(NotEquals(None)))41 Eventually(NotEquals(None)))
42
43 #open toolbar42 #open toolbar
44 logger.debug("opening toolbar")43 logger.debug("opening toolbar")
45 toolbar = self.main_view.open_toolbar()44 toolbar = self.main_view.open_toolbar()
@@ -114,16 +113,13 @@
114 feedlistpage = self.main_view.get_feed_management_page()113 feedlistpage = self.main_view.get_feed_management_page()
115 self.assertThat(feedlistpage.visible, Eventually(Equals(True)))114 self.assertThat(feedlistpage.visible, Eventually(Equals(True)))
116115
117 #select topic
118 logger.debug("grabbing topic")
119 self._get_topic(topicName)
120
121 ##select feed116 ##select feed
122 logger.debug("assert feed")117 logger.debug("assert feed")
123 self.assertThat(lambda: self.main_view.get_feedlist_feed(feedName),118 self.assertThat(self.main_view.get_feedlist_feed(feedName).text,
124 Eventually(Not(Is(None))))119 Equals(feedName))
125 logger.debug("grabbing feed")120 logger.debug("grabbing feed")
126 feed = self.main_view.get_feedlist_feed(feedName)121 feed = self.main_view.get_feedlist_feed(feedName)
122 feedLabel = feed.select_single('Label', text = feedName)
127123
128 self.assertThat(self.main_view.get_feed_management_page,124 self.assertThat(self.main_view.get_feed_management_page,
129 Eventually(NotEquals(None)))125 Eventually(NotEquals(None)))
@@ -131,7 +127,7 @@
131 #swipe to delete feed127 #swipe to delete feed
132 startX = int(feedlistpage.x + feedlistpage.width * 0.30)128 startX = int(feedlistpage.x + feedlistpage.width * 0.30)
133 stopX = int(feedlistpage.x + feedlistpage.width)129 stopX = int(feedlistpage.x + feedlistpage.width)
134 lineY = feed.globalRect[1]130 lineY = int(feedLabel.globalRect[1])
135131
136 #swipe to remove the feed132 #swipe to remove the feed
137 self.pointing_device.move(startX, lineY)133 self.pointing_device.move(startX, lineY)
@@ -183,6 +179,7 @@
183179
184 #select topic180 #select topic
185 topic = self._get_topic(topicName)181 topic = self._get_topic(topicName)
182 topicLabel = topic.select_single("Label", text=topicName)
186183
187 topicmanagementpage = self.main_view.get_feed_management_page()184 topicmanagementpage = self.main_view.get_feed_management_page()
188 self.assertThat(self.main_view.get_feed_management_page,185 self.assertThat(self.main_view.get_feed_management_page,
@@ -191,7 +188,7 @@
191 #swipe to delete topic188 #swipe to delete topic
192 startX = int(topicmanagementpage.x + topicmanagementpage.width * 0.30)189 startX = int(topicmanagementpage.x + topicmanagementpage.width * 0.30)
193 stopX = int(topicmanagementpage.x + topicmanagementpage.width)190 stopX = int(topicmanagementpage.x + topicmanagementpage.width)
194 lineY = topic.globalRect[1]191 lineY = topicLabel.globalRect[1]
195192
196 #swipe to remove the topic193 #swipe to remove the topic
197 self.pointing_device.move(startX, lineY)194 self.pointing_device.move(startX, lineY)
@@ -207,9 +204,13 @@
207 self.assertThat(self.main_view.get_feed_management_page().objectName,204 self.assertThat(self.main_view.get_feed_management_page().objectName,
208 Eventually(Equals("topicmanagement")))205 Eventually(Equals("topicmanagement")))
209206
210 #check that it is gone207 #check topic has been removed
211 topic = self.main_view.get_feedlist_topic(topicName)208 logger.debug("assert removed topic")
212 self.assertThat(topic, NotEquals(topicName))209 try:
210 self.assertThat(self._get_topic(topicName), Eventually(Equals(None)))
211 except:
212 print('Topic removed.')
213
213214
214 def _input_new_feed(self, rssFeed):215 def _input_new_feed(self, rssFeed):
215 inputField = self.main_view.get_append_feed_input_box()216 inputField = self.main_view.get_append_feed_input_box()
@@ -236,7 +237,7 @@
236 def _get_topic(self, topicName, timeout=10):237 def _get_topic(self, topicName, timeout=10):
237 logger.debug("_get_topic: assert topics")238 logger.debug("_get_topic: assert topics")
238 self.assertThat(lambda: self.main_view.get_feedlist_topic(topicName),239 self.assertThat(lambda: self.main_view.get_feedlist_topic(topicName),
239 Eventually(Not(Is(None))))240 Eventually(Not(Is([]))))
240 logger.debug("_get_topic: grab topic")241 logger.debug("_get_topic: grab topic")
241 topic = self.main_view.get_feedlist_topic(topicName)242 topic = self.main_view.get_feedlist_topic(topicName)
242 logger.debug("_get_topic: click topic")243 logger.debug("_get_topic: click topic")
@@ -258,6 +259,15 @@
258 feedName = "Canonical"259 feedName = "Canonical"
259 topicName = "CanonicalTopic"260 topicName = "CanonicalTopic"
260261
262 #just for timing issues
263 self.assertThat(self.main_view.get_shorts_tab(),
264 NotEquals(None))
265 self.assertThat(self.main_view.get_shorts_tab().objectName,
266 Eventually(Equals("Tab0")))
267 self.assertThat(self.main_view.get_shorts_tab().visible,
268 Eventually(Equals(True)))
269
270 #add feed and topic
261 self._add_feed_and_topic(feed, topicName)271 self._add_feed_and_topic(feed, topicName)
262272
263 #remove added feed273 #remove added feed
@@ -290,7 +300,7 @@
290300
291 #wait for any updates to finish before continuing tests301 #wait for any updates to finish before continuing tests
292 try:302 try:
293 self.main_view.get_activityIndicator().running.wait_for(False)303 self.main_view.get_network_activity().running.wait_for(False)
294 except:304 except:
295 self.assertThat(305 self.assertThat(
296 lambda: self.main_view.get_topic_tab(topicName),306 lambda: self.main_view.get_topic_tab(topicName),

Subscribers

People subscribed via source and target branches