Merge lp:~elopio/ubuntu-rssreader-app/autopilot-1.4 into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Leo Arias]

Update tests for autopilot 1.4

Tests are failing because of bug https://bugs.launchpad.net/ubuntu-rssreader-app/+bug/1246501
They fail with autopilot 1.3 and 1.4.

[Joey Chan (qqworini)]

So... do I need to fix bug #1246501 first or approve this first ?

[Leo Arias (elopio)]

First fix the bug, please. This branch can't land until the Jenkins runners are using autopilot 1.4.

[Thomi Richards (thomir-deactivatedaccount)]

LGTM. Do not approve until AP 1.4 lands.

review: Approve

[lp:~elopio/ubuntu-rssreader-app/autopilot-1.4]

131. By Leo Arias on 2013-11-05

Merged with trunk.

132. By Leo Arias on 2013-11-05

Use the qmlscene launch command from the toolkit.

133. By Leo Arias on 2013-11-05

Merged with precondition branch.

[Chris Gagnon (chris.gagnon)]

161 + self.assertThat(
162 + self.main_view.get_feedlist_topic(topicName), Not(Is(None)))

This will never return none, a dbus.StateNotFound error will be raised first.

review: Needs Fixing

[lp:~elopio/ubuntu-rssreader-app/autopilot-1.4]

134. By Leo Arias on 2013-11-05

The method will never return None.

Unmerged revisions

=== modified file 'listview/ListModePage.qml'
--- listview/ListModePage.qml	2013-10-30 20:05:10 +0000
+++ listview/ListModePage.qml	2013-11-05 03:02:07 +0000
@@ -149,6 +149,7 @@
 
                     Label {
                         id: labelFeedname
+                        objectName: "labelFeedname"
 
                         text: model.feed_name
                         fontSize: "x-small"
 
=== modified file 'tests/autopilot/ubuntu_rssreader_app/emulators.py'
--- tests/autopilot/ubuntu_rssreader_app/emulators.py	2013-10-10 16:52:39 +0000
+++ tests/autopilot/ubuntu_rssreader_app/emulators.py	2013-11-05 03:02:07 +0000
@@ -33,30 +33,6 @@
                 requested = action
         self.pointing_device.click_object(requested)
 
-    def select_single_retry(self, object_type, **kwargs):
-        """Returns the item that is searched for with app.select_single
-        In case of the item was not found (not created yet) a second attempt is
-        taken 1 second later."""
-        item = self.select_single(object_type, **kwargs)
-        tries = 10
-        while item is None and tries > 0:
-            sleep(self.retry_delay)
-            item = self.select_single(object_type, **kwargs)
-            tries = tries - 1
-        return item
-
-    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]
@@ -85,7 +61,7 @@
 
     #### feed list page objects
     def get_feedlist_topic(self, name):
-        return self.select_single_retry("TopicComponent", topicName=name)
+        return self.wait_select_single("TopicComponent", topicName=name)
 
     def get_feedlist_feed(self, feed):
         return self.select_single("FeedComponent", text=feed)
@@ -107,7 +83,7 @@
                                   objectName="choosetopicpage")
 
     def get_feedlist_page(self):
-        return self.select_single_retry("FeedListPage",
+        return self.wait_select_single("FeedListPage",
                                         objectName="feedlistpage")
 
     def get_articlelist_page(self):
@@ -115,7 +91,7 @@
                                   objectName="articlelistpage")
 
     def get_feed_management_page(self):
-        return self.select_single_retry("TopicManagement",
+        return self.wait_select_single("TopicManagement",
                                         objectName="topicmanagement")
 
     def get_edit_feed_page(self):
@@ -126,7 +102,7 @@
         return self.select_single("ManageTopicsPage")
 
     def get_rss_feed_page(self):
-        return self.select_single_retry(
+        return self.wait_select_single(
             "RssFeedPage", objectName="rssfeedpage")
 
     def get_topics(self):
@@ -165,25 +141,25 @@
         return self.select_single("ActionItem", text="Back")
 
     def get_editfeed_done_button(self):
-        return self.select_single_retry("Button", objectName="doneButton")
+        return self.wait_select_single("Button", objectName="doneButton")
 
     def get_activityIndicator(self):
-        return self.select_single_retry(
+        return self.wait_select_single(
             "ActivityIndicator", objectName="activityindicator")
 
     def get_topic_tab(self, topic):
-        return self.select_single_retry("TopicTab", title=topic)
+        return self.wait_select_single("TopicTab", title=topic)
 
     def get_feed_in_feedlist(self, topic, feed):
         tab = self.get_topic_tab(topic)
-        itemList = tab.select_many("Subtitled", objectName="feedlistitems")
+        itemList = tab.select_many("UbuntuShape", objectName="feedlistitems")
         for item in itemList:
-                splititem = item.subText.split(",")
-                if splititem[1] == " " + feed:
-                    return item
+            label = item.select_single("Label", objectName="labelFeedname")
+            if label.text == feed:
+               return item
 
     def get_editfeed_topic_valueselector(self):
-        return self.select_single_retry(
+        return self.wait_select_single(
             "ValueSelector", objectName="valueselector")
 
     def get_editfeed_valueselector_value(self, name):
 
=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/__init__.py'
--- tests/autopilot/ubuntu_rssreader_app/tests/__init__.py	2013-10-07 12:49:31 +0000
+++ tests/autopilot/ubuntu_rssreader_app/tests/__init__.py	2013-11-05 03:02:07 +0000
@@ -28,7 +28,11 @@
 from autopilot.platform import model
 from autopilot.testcase import AutopilotTestCase
 
-from ubuntuuitoolkit import emulators as toolkit_emulators
+from ubuntuuitoolkit import (
+    base,
+    emulators as toolkit_emulators
+)
+
 from ubuntu_rssreader_app import emulators
 
 logger = logging.getLogger(__name__)
@@ -74,14 +78,14 @@
 
     def launch_test_local(self):
         self.app = self.launch_test_application(
-            "qmlscene",
+            base.get_qmlscene_launch_command(),
             self.local_location,
             app_type='qt',
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     def launch_test_installed(self):
         self.app = self.launch_test_application(
-            "qmlscene",
+            base.get_qmlscene_launch_command(),
             self.installed_location,
             "--desktop_file_hint=/usr/share/applications/"
             "rssreader-app.desktop",
 
=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py'
--- tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-10-10 18:12:28 +0000
+++ tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-11-05 03:02:07 +0000
@@ -145,13 +145,14 @@
 
         #check topic
         logger.debug("assert topic remains")
-        self.assertThat(lambda: self.main_view.get_feedlist_topic(topicName),
-                        Eventually(Not(Is(None))))
+        self.assertThat(
+            self.main_view.get_feedlist_topic(topicName), Not(Is(None)))
 
         #check feed has been removed
         logger.debug("assert removed feed")
-        self.assertThat(lambda: self.main_view.get_feedlist_feed(feedName),
-                        Eventually(Equals(None)))
+        self.assertThat(
+            lambda: self.main_view.select_many('FeedComponent', text=feedName),
+            Eventually(Equals([])))
 
     def _remove_topic(self, topicName):
         self.assertThat(self.main_view.get_topics_page,
@@ -360,9 +361,9 @@
 
         #click on news topic
         topicValueselectorValue = self.main_view. \
-                                  get_editfeed_valueselector_value("news")
+                                  get_editfeed_valueselector_value("Ubuntu")
         self.pointing_device.click_object(topicValueselectorValue)
 
         #verify topic has changed
         self.assertThat(topicValueselectorValue.text,
-                        Eventually(Equals("news")))
+                        Eventually(Equals("Ubuntu")))