Merge lp:~nskaggs/ubuntu-rssreader-app/convert-tests-to-sdk into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Nicholas Skaggs]

Converted autopilot tests to ubuntu sdk emulator
Merged Carla's restored add and removed feed test

Converted autopilot tests to ubuntu sdk emulator
Merged Carla's restored add and removed feed test

[Nicholas Skaggs (nskaggs)]

A quick glance at this, I don't see anything that jumps out at me. I'll do a better review tomorrow if it's not merged by then ;-)

[Nicholas Skaggs (nskaggs)]

Converting this to the emulator and rebasing to upstream trunk

[Nicholas Skaggs (nskaggs)]

Looks good Carla, plenty of asserts in here to make sure timing doesn't bite you :-) Having all those asserts to check each step is really good. A couple things to note;

As you know English strings break things when we run in other languages, like Italian ;-) So, use the .visible property to ensure your on the proper page rather than the page title. This won't break when they rename the pages either! No need to check the title if we got the object (page) and it's visible.

We can also assert when things like text entry boxes come into focus via the .focus property. Pretty handy to make sure our text entry goes in the proper place :-)

These little things could cause issues when run on the devices, but likely doesn't effect the desktop runs, so it doesn't come up while writing.

[Nicholas Skaggs (nskaggs)]

One other thing, the proper syntax for a lambda function within an assert is;

self.assertThat(lambda: checkboxBtn, Eventually(NotEquals(None)))

In some cases there were a few that looked like this:

lambda: self.assertThat(checkboxBtn, Eventually(NotEquals(None)))

[Nicholas Skaggs (nskaggs)]

This is equivalent

    def get_canonical_feed_labelvisual(self):
        itemList = self.select_many('LabelVisual', text = 'Canonical')
        for item in itemList:
            if item.text == "Canonical":
                return item

to this:

    def get_canonical_feed_labelvisual(self):
        itemList = self.app.select_many('LabelVisual', text = 'Canonical')
        index = -1
        for item in itemList:
            index += 1
            if item.text == "Canonical":
               return itemList[index]

See the difference? You can use item directly as it's equal to itemList[index].

[Nicholas Skaggs (nskaggs)]

Note this still requires some love, but I'm pushing into trunk for the sake of restoring a testsuite to the application so we can avoid regressions that have plagued us.

review: Approve

=== modified file 'TopicTab.qml'
--- TopicTab.qml	2013-08-03 10:06:36 +0000
+++ TopicTab.qml	2013-08-13 04:48:23 +0000
@@ -7,6 +7,7 @@
 
 Tab {
     id: topictab
+    objectName: topictab
 //    title: i18n.tr("test")
 
     property int tag_id
@@ -38,6 +39,7 @@
             id: toolbar
 
             back: ToolbarButton {
+                objectName: "refreshbutton"
                 action: Action {
                     text:  i18n.tr("Refresh")
                     iconSource: Qt.resolvedUrl("./icons_tmp/reload.svg")
@@ -50,6 +52,7 @@
             }
 
             ToolbarButton {
+                objectName: "listviewbutton"
                 action: Action {
                     text:  i18n.tr("List view")
                     iconSource: Qt.resolvedUrl("./icons_tmp/view-fullscreen.svg")
@@ -60,6 +63,7 @@
             }
 
             ToolbarButton {
+                objectName: "addfeedbutton"
                 id: addReadsBtn
                 action: Action {
                     text:  i18n.tr("Add reads")
@@ -72,6 +76,7 @@
             }
 
             ToolbarButton {
+                objectName: "edittopicbutton"
                 action: Action {
                     text:  i18n.tr("Edit topics")
                     iconSource: Qt.resolvedUrl("./icons_tmp/edit.svg")

=== modified file 'feeds/AppendFeedPage.qml'
--- feeds/AppendFeedPage.qml	2013-08-02 19:00:56 +0000
+++ feeds/AppendFeedPage.qml	2013-08-13 04:48:23 +0000
@@ -9,7 +9,7 @@
 
 Page {
     id: appendFeedPage
-
+    objectName: "appendfeedpage"
     title: "Append feed"
     flickable: null
     visible: false

=== modified file 'feeds/ChooseTopicPage.qml'
--- feeds/ChooseTopicPage.qml	2013-08-04 08:51:35 +0000
+++ feeds/ChooseTopicPage.qml	2013-08-13 04:48:23 +0000
@@ -8,7 +8,7 @@
 
 Page {
     id: chooseTopicPage
-
+    objectName: "choosetopicpage"
     title: "Choose topic"
     flickable: null
     visible: false
@@ -101,6 +101,7 @@
         }
 
         delegate: ListItem.Standard {
+            objectName: "topicItem"
             text: model.tagName
 
             onClicked: {

=== modified file 'feeds/EditFeed.qml'
--- feeds/EditFeed.qml	2013-08-03 10:06:36 +0000
+++ feeds/EditFeed.qml	2013-08-13 04:48:23 +0000
@@ -8,7 +8,7 @@
 
 Page {
     id: editPage
-
+    objectName: "editfeedpage"
     title: i18n.tr("Edit Feed")
     flickable: null/*content*/
     tools: ToolbarItems {
@@ -27,6 +27,7 @@
         Button
         {
             id: btnDelete
+            objectName: "deleteButton"
             text: i18n.tr("Delete")
             gradient: UbuntuColors.orangeGradient
             anchors.verticalCenter: parent.verticalCenter

=== modified file 'feeds/ManageFeedsPage.qml'
--- feeds/ManageFeedsPage.qml	2013-08-03 14:21:20 +0000
+++ feeds/ManageFeedsPage.qml	2013-08-13 04:48:23 +0000
@@ -8,6 +8,7 @@
 
 Page {
     id: editFeedsPageRoot
+    objectName: "editfeedspage"
     flickable: null
     title: i18n.tr("Feeds")
 

=== modified file 'feeds/TopicManagement.qml'
--- feeds/TopicManagement.qml	2013-08-03 10:06:36 +0000
+++ feeds/TopicManagement.qml	2013-08-13 04:48:23 +0000
@@ -7,6 +7,7 @@
 import "../databasemodule_v2.js" as DB
 
 Page {
+    objectName: "topicmanagement"
     id: topicManagement
 
 //    width: units.gu(50)
@@ -69,6 +70,7 @@
 
             Item {
                 id: itemAddTopic
+                objectName: "addTopic"
                 anchors{ left: parent.left; right: parent.right }
                 height: units.gu(8)
 

=== modified file 'listview/ArticleListPage.qml'
--- listview/ArticleListPage.qml	2013-07-29 18:31:05 +0000
+++ listview/ArticleListPage.qml	2013-08-13 04:48:23 +0000
@@ -8,7 +8,7 @@
 import "../databasemodule_v2.js" as DB
 
 Page {
-
+    objectName: "articlelistpage"
     signal articleSelected(var data) // mb id.
     property var updateData: null
 

=== modified file 'listview/FeedListPage.qml'
--- listview/FeedListPage.qml	2013-08-07 18:09:21 +0000
+++ listview/FeedListPage.qml	2013-08-13 04:48:23 +0000
@@ -10,7 +10,7 @@
 
 Page {
     id: pageItself
-
+    objectName: "feedlistpage"
     property var updatingFeed: null
     property bool isDirty: false
 

=== removed directory 'tests/autopilot/ubuntu_rssreader_app/emulators'
=== added file 'tests/autopilot/ubuntu_rssreader_app/emulators.py'
--- tests/autopilot/ubuntu_rssreader_app/emulators.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_rssreader_app/emulators.py	2013-08-13 04:48:23 +0000
@@ -0,0 +1,123 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2013 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from ubuntuuitoolkit import emulators as toolkit_emulators
+
+class MainView(toolkit_emulators.MainView):
+
+    #ideally this should be converted to the sdk and use object name not text names
+    #see https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1205144
+    def run_action(self, popover, name):
+        actions = popover.select_many("Empty")
+        requested = None
+        for action in actions:
+            if action.text == name:
+                requested = action
+        self.pointing_device.click_object(requested)
+
+    def get_action_popover(self):
+        # Returns all instances, but with current one as first index
+        return self.select_many("ActionSelectionPopover")[0]
+
+    def get_append_page(self):
+        return self.select_single("AppendFeedPage", objectName = "appendfeedpage")
+
+    def get_feed_management_page(self):
+        return self.select_single("TopicManagement", objectName = "topicmanagement")
+
+    def get_edit_feed_page(self):
+        return self.select_single("EditFeed", objectName = "editfeedpage")
+
+    def get_checkbox_button(self):
+        return self.select_single("CheckBox", objectName = "feedCheckbox")
+
+    def get_delete_button(self):
+        return self.select_single("Button", objectName = "deleteButton")
+
+    def get_next_button(self):
+        return self.select_single("Button", objectName = "nextButton")
+
+    def get_append_feed_input_box(self):
+        return self.select_single("TextField", objectName = "tfFeedUrl")
+
+    def get_new_topic_input_box(self):
+        return self.select_single("TextField", objectName = "New topic")
+
+    def get_topics_page(self):
+        return self.select_single("ChooseTopicPage", objectName = "choosetopicpage")
+
+    def get_topics(self):
+        return self.select_single("QQuickListView", objectName = "topiclist")
+
+    def get_manage_topics_page(self):
+         return self.select_single("ManageTopicsPage")
+
+    def get_canonical_topic(self):
+        itemList = self.select_many("LabelVisual", text = "CanonicalTopic")
+        for item in itemList:
+            if item.text == "CanonicalTopic":
+                return item
+
+    def get_canonical_feed_labelvisual(self):
+        itemList = self.select_many("LabelVisual", text = "Canonical")
+        for item in itemList:
+            if item.text == "Canonical":
+                return item
+
+    def get_feeds(self):
+        return self.select_many("Standard", objectName = "FeedListItem")
+
+    def get_canonical_feed(self):
+        itemList = self.get_feeds()
+        for item in itemList:
+            if item.text == "Canonical":
+               return item
+
+    def get_header(self):
+        return self.select_many("Header")
+
+    def get_all_feeds(self):
+        return self.select_single("Subtitled", text = "All articles")
+
+    def get_refresh_button(self):
+        return self.select_single("AbstractButton", objectName = "refreshbutton")
+
+    def get_list_view_button(self):
+        return self.select_single("AbstractButton", objectName = "listviewbutton")
+
+    def get_add_feed_button(self):
+        return self.select_single("AbstractButton", objectName = "addfeedbutton")
+
+    def get_edit_topic_button(self):
+        return self.select_single("AbstractButton", objectName = "edittopicbutton")
+
+    def get_canonical_topic_labelvisual(self):
+        itemList = self.select_many("LabelVisual", text = "CanonicalTopic")
+        for item in itemList:
+            if item.text == "CanonicalTopic":
+               return item
+
+    def get_canonical_topic_TopicComponent(self):
+        itemList = self.select_many("TopicComponent", topicName= "CanonicalTopic")
+        for item in itemList:
+                if item.topicName == "CanonicalTopic":
+                    return item
+
+    def get_canonical_feed_FeedComponent(self):
+        return self.select_single("FeedComponent", text = "Canonical")
+
+    def get_add_a_topic(self):
+        return self.select_single("QQuickItem", objectName = "addTopic")

=== removed file 'tests/autopilot/ubuntu_rssreader_app/emulators/__init__.py'
--- tests/autopilot/ubuntu_rssreader_app/emulators/__init__.py	2013-05-31 12:59:55 +0000
+++ tests/autopilot/ubuntu_rssreader_app/emulators/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.

=== removed file 'tests/autopilot/ubuntu_rssreader_app/emulators/main_window.py'
--- tests/autopilot/ubuntu_rssreader_app/emulators/main_window.py	2013-08-03 17:15:11 +0000
+++ tests/autopilot/ubuntu_rssreader_app/emulators/main_window.py	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-
-"""Rss Reader app autopilot emulators."""
-
-
-class MainWindow(object):
-    """An emulator class that makes it easy to interact with the
-    rssreader-app.
-
-    """
-    def __init__(self, app):
-        self.app = app
-
-    def get_action_popover(self):
-        # Returns all instances, but with current one as first index
-        return self.app.select_many("ActionSelectionPopover")[0]
-
-    def get_append_feed_input_box(self):
-        return self.app.select_single("TextField", objectName = "tfFeedUrl")
-
-    def get_new_topic_input_box(self):
-        return self.app.select_single("TextField", objectName = "New topic")
-
-    def get_topics(self):
-        return self.app.select_single('QQuickListView', objectName = 'topiclist')
-
-    def get_manage_topics_page(self):
-         return self.app.select_single('ManageTopicsPage')
-
-    def get_canonical_topic(self):
-        itemList = self.app.select_many('LabelVisual', text = 'CanonicalTopic')
-        index = -1
-        for item in itemList:
-            index += 1
-            if item.text == "CanonicalTopic":
-               return itemList[index]
-
-##    def get_canonical_feed_labelvisual(self):
-##        return self.app.select_single('LabelVisual', text = 'Canonical')
-
-    def get_canonical_feed_labelvisual(self):
-        itemList = self.app.select_many('LabelVisual', text = 'Canonical')
-        index = -1
-        for item in itemList:
-            index += 1
-            if item.text == "Canonical":
-               return itemList[index]
-
-
-    def get_canonical_feed(self):
-        itemList = self.app.select_many('Standard', objectName = 'FeedListItem')
-        index = -1
-        for item in itemList:
-            index += 1
-            if item.text == "Canonical":
-               return itemList[index]
-
-    def get_header(self):
-        return self.app.select_many("Header")

=== removed file 'tests/autopilot/ubuntu_rssreader_app/emulators/ubuntusdk.py'
--- tests/autopilot/ubuntu_rssreader_app/emulators/ubuntusdk.py	2013-08-01 20:01:41 +0000
+++ tests/autopilot/ubuntu_rssreader_app/emulators/ubuntusdk.py	1970-01-01 00:00:00 +0000
@@ -1,153 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# Copyright (C) 2013 Canonical Ltd
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Authored by: Nicholas Skaggs <[e-mail]>
-
-
-class ubuntusdk(object):
-    """An emulator class that makes it easy to interact with the ubuntu sdk
-    applications."""
-
-    def __init__(self, autopilot, app):
-        self.app = app
-        self.autopilot = autopilot
-
-    def get_qml_view(self):
-        """Get the main QML view"""
-        return self.app.select_single("QQuickView")
-
-    def get_object(self, typeName, name):
-        """Get a specific object"""
-        return self.app.select_single(typeName, objectName=name)
-
-    def get_objects(self, typeName, name):
-        """Get more than one object"""
-        return self.app.select_many(typeName, objectName=name)
-
-    def switch_to_tab(self, tab):
-        """Switch to the specified tab number"""
-        tabs = self.get_tabs()
-        currentTab = tabs.selectedTabIndex
-
-        #perform operations until tab == currentTab
-        while tab != currentTab:
-            if tab > currentTab:
-                self._previous_tab()
-            if tab < currentTab:
-                self._next_tab()
-            currentTab = tabs.selectedTabIndex
-
-    def toggle_toolbar(self):
-        """Toggle the toolbar between revealed and hidden"""
-        #check and see if the toolbar is open or not
-        if self.get_toolbar().opened:
-            self.hide_toolbar()
-        else:
-            self.open_toolbar()
-
-    def get_toolbar(self):
-        """Returns the toolbar in the main events view."""
-        return self.app.select_single("Toolbar")
-
-    def get_toolbar_button(self, buttonLabel):
-        """Returns the toolbar button at position index"""
-        toolbar = self.get_toolbar()
-        if not toolbar.opened:
-            self.open_toolbar()
-        row = toolbar.select_single("ToolbarItems")
-        buttonList = row.select_many("ActionItem")
-        for button in buttonList:
-            if button.text == buttonLabel:
-                return button
-
-    def click_toolbar_button(self, buttonLabel):
-        """Clicks the toolbar button with buttonLabel"""
-        #The toolbar button is assumed to be the following format
-        #ToolbarActions {
-        #           Action {
-        #               objectName: "name"
-        #                text: value
-        button = self.get_toolbar_button(buttonLabel)
-        self.autopilot.pointing_device.click_object(button)
-
-    def open_toolbar(self):
-        """Open the toolbar"""
-        qmlView = self.get_qml_view()
-
-        lineX = qmlView.x + qmlView.width * 0.50
-        startY = qmlView.y + qmlView.height - 1
-        stopY = qmlView.y + qmlView.height * 0.95
-
-        self.autopilot.pointing_device.drag(lineX, startY, lineX, stopY)
-
-    def hide_toolbar(self):
-        """Hide the toolbar"""
-        qmlView = self.get_qml_view()
-
-        lineX = qmlView.x + qmlView.width * 0.50
-        startY = qmlView.y + qmlView.height * 0.95
-        stopY = qmlView.y + qmlView.height - 1
-
-        self.autopilot.pointing_device.drag(lineX, startY, lineX, stopY)
-
-    def set_popup_value(self, popover, button, value):
-        """Changes the given popover selector to the request value
-        At the moment this only works for values that are currently visible. To
-        access the remaining items, a help method to drag and recheck is
-        needed."""
-        #The popover is assumed to be the following format
-        #    Popover {
-        #        Column {
-        #            ListView {
-        #                delegate: Standard {
-        #                    objectName: "name"
-        #                    text: value
-
-        self.autopilot.pointing_device.click_object(button)
-        # we'll get all matching objects, incase the popover is reused between
-        # buttons
-        itemList = lambda: self.get_objects("Standard", popover)
-
-        for item in itemList():
-            if item.get_properties()['text'] == value:
-                self.autopilot.pointing_device.click_object(item)
-
-    def get_tabs(self):
-        """Return all tabs"""
-        return self.get_object("Tabs", "rootTabs")
-
-    def _previous_tab(self):
-        """Switch to the previous tab"""
-        qmlView = self.get_qml_view()
-
-        startX = qmlView.x + qmlView.width * 0.35
-        stopX = qmlView.x + qmlView.width * 0.50
-        lineY = qmlView.y + qmlView.height * 0.05
-
-        self.autopilot.pointing_device.drag(startX, lineY, stopX, lineY)
-        self.autopilot.pointing_device.click()
-        self.autopilot.pointing_device.click()
-
-    def _next_tab(self):
-        """Switch to the next tab"""
-        qmlView = self.get_qml_view()
-
-        startX = qmlView.x + qmlView.width * 0.50
-        stopX = qmlView.x + qmlView.width * 0.35
-        lineY = qmlView.y + qmlView.height * 0.05
-
-        self.autopilot.pointing_device.drag(startX, lineY, stopX, lineY)
-        self.autopilot.pointing_device.click()

=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/__init__.py'
--- tests/autopilot/ubuntu_rssreader_app/tests/__init__.py	2013-08-01 19:47:14 +0000
+++ tests/autopilot/ubuntu_rssreader_app/tests/__init__.py	2013-08-13 04:48:23 +0000
@@ -1,29 +1,40 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-
-"""Rssreader app autopilot tests."""
+#
+# Copyright (C) 2013 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Authored by: Renato Araujo Oliveira Filho <[e-mail]>
+
+
+"""rssreader-app autopilot tests."""
 
 import os.path
+import os
 
 from autopilot.input import Mouse, Touch, Pointer
 from autopilot.platform import model
 from autopilot.testcase import AutopilotTestCase
-
-from time import sleep
-
-from ubuntu_rssreader_app.emulators.main_window import MainWindow
-from ubuntu_rssreader_app.emulators.ubuntusdk import ubuntusdk
-
-
-
-class RssreaderTestCase(AutopilotTestCase):
+from autopilot.matchers import Eventually
+from testtools.matchers import GreaterThan
+
+from ubuntuuitoolkit import emulators as toolkit_emulators
+from ubuntu_rssreader_app import emulators
+
+class RssReaderAppTestCase(AutopilotTestCase):
 
     """A common test case class that provides several useful methods for
-    rssreader-app tests.
+    calendar-app tests.
 
     """
     if model() == 'Desktop':
@@ -35,7 +46,7 @@
 
     def setUp(self):
         self.pointing_device = Pointer(self.input_device_class.create())
-        super(RssreaderTestCase, self).setUp()
+        super(RssReaderAppTestCase, self).setUp()
         if os.path.exists(self.local_location):
             self.launch_test_local()
         else:
@@ -45,26 +56,18 @@
         self.app = self.launch_test_application(
             "qmlscene",
             self.local_location,
-            app_type='qt')
+            app_type='qt',
+            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     def launch_test_installed(self):
         self.app = self.launch_test_application(
             "qmlscene",
             "/usr/share/ubuntu-rssreader-app/ubuntu-rssreader-app.qml",
-            "--desktop_file_hint="
-            "/usr/share/applications/ubuntu-rssreader-app.desktop",
-            app_type='qt')
-
-    def tap_item(self, item):
-        self.pointing_device.move_to_object(item)
-        self.pointing_device.press()
-        sleep(1)
-        self.pointing_device.release()
-
-    @property
-    def main_window(self):
-        return MainWindow(self.app)
-
-    @property
-    def ubuntusdk(self):
-        return ubuntusdk(self, self.app)
+            "--desktop_file_hint=/usr/share/applications/"
+            "ubuntu-rssreader-app.desktop",
+            app_type='qt',
+            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
+
+    @property
+    def main_view(self):
+        return self.app.select_single(emulators.MainView)

=== modified file 'tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py'
--- tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-08-03 17:15:11 +0000
+++ tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-08-13 04:48:23 +0000
@@ -10,6 +10,7 @@
 from __future__ import absolute_import
 
 import tempfile
+import unittest
 
 import mock
 import os
@@ -21,139 +22,290 @@
 from testtools.matchers import NotEquals
 
 from autopilot.introspection.dbus import StateNotFoundError
-from ubuntu_rssreader_app.tests import RssreaderTestCase
+from ubuntu_rssreader_app.tests import RssReaderAppTestCase
 
 from time import sleep
 
-class TestMainWindow(RssreaderTestCase):
+class TestMainWindow(RssReaderAppTestCase):
 
     def setUp(self):
         super(TestMainWindow, self).setUp()
-        self.assertThat(
-            self.ubuntusdk.get_qml_view().visible, Eventually(Equals(True)))
-
-
-    def test_add_remove_feed_and_topic(self):
-        #toggle toolbar
-        self.ubuntusdk.toggle_toolbar()
+        self.assertThat(self.main_view.visible, Eventually(Equals(True)))
+
+    def _add_feed_and_topic(self):
+        """test add feed and topic"""
+
+        #verify we are on the first page
+        shortsPage = self.main_view.switch_to_tab_by_index(0)
+        self.assertThat(lambda: shortsPage.visible, Eventually(Equals(True)))
+
+        #open toolbar
+        toolbar = self.main_view.open_toolbar()
 
         #click on add reads toolbar button
-        self.ubuntusdk.click_toolbar_button('Add reads')
+        toolbar.click_button("addreadsbutton")
 
         #click on add feeds popover action
-        addReadsPopover = self.main_window.get_action_popover()
-        self._run_action(addReadsPopover, '+ Add feeds')
+        addReadsPopover = self.main_view.get_action_popover()
+        self.main_view.run_action(addReadsPopover, "+ Add feeds")
 
         #verify Append Feed  page is open
-        header = self.main_window.get_header()[0]
-        self.assertThat(header.title, Eventually(Equals("Append feed")))
+        appendpage = self.main_view.get_append_page()
+        self.assertThat(lambda: appendpage.visible, Eventually(Equals(True)))
 
         #type feed in input field
-        new_Feed_Url = self.main_window.get_append_feed_input_box()
-        self.assertThat(new_Feed_Url, NotEquals(None))
-        self.pointing_device.click_object(new_Feed_Url)
-        self.keyboard.type("http://www.canonical.com/rss.xml")
-        self.keyboard.type("\n")
-        self.assertThat(new_Feed_Url.text, Eventually(Equals("http://www.canonical.com/rss.xml")))
-        #---> TODO fix this
-        sleep(1)
+        self._input_new_feed("http://www.canonical.com/rss.xml")
 
         #check that feed is updated, not empty
-        canonicalFeed = self.main_window.get_canonical_feed_labelvisual()
-        self.assertThat(canonicalFeed.text, Eventually(Equals("Canonical")))
+        canonicalFeed = self.main_view.get_canonical_feed_labelvisual()
+        self.assertThat(lambda: canonicalFeed.text, Eventually(Equals("Canonical")))
 
         #click on checkbox to confirm feed
-        checkboxBtn = self.ubuntusdk.get_object('CheckBox', "feedCheckbox")
-        lambda: self.assertThat(checkboxBtn, Eventually(NotEquals(None)))
+        checkboxBtn = self.main_view.get_checkbox_button()
+        self.assertThat(lambda: checkboxBtn, Eventually(NotEquals(None)))
         self.pointing_device.click_object(checkboxBtn)
-        self.assertThat(checkboxBtn.checked, Eventually(Equals(True)))
+        self.assertThat(lambda: checkboxBtn.checked, Eventually(Equals(True)))
 
         #click on Next button
-        nextButton = self.ubuntusdk.get_object("Button", "nextButton")
-        lambda: self.assertThat(nextButton, Eventually(NotEquals(None)))
+        nextButton = self.main_view.get_next_button()
+        self.assertThat(lambda: nextButton, Eventually(NotEquals(None)))
         self.pointing_device.click_object(nextButton)
-        header = self.main_window.get_header()[0]
-        self.assertThat(header.title, Eventually(Equals("Choose topic")))
+
+        chossetopicpage = self.main_view.get_topics_page()
+        self.assertThat(lambda: chossetopicpage.visible, Eventually(Equals(True)))
 
         #add a new topic
-        new_Topic_Url = self.main_window.get_new_topic_input_box()
-        self.assertThat(new_Topic_Url, NotEquals(None))
-        self.pointing_device.click_object(new_Topic_Url)
-        self.keyboard.type("CanonicalTopic")
-        self.keyboard.type("\n")
+        self._input_new_topic("CanonicalTopic")
 
         #select canonical topic
-        canonicalTopic = self.main_window.get_canonical_topic()
-        self.assertThat(canonicalTopic, NotEquals(None))
+        canonicalTopic = self.main_view.get_canonical_topic_labelvisual()
+        self.assertThat(lambda: canonicalTopic, Eventually(NotEquals(None)))
         self.pointing_device.click_object(canonicalTopic)
 
-        #remove added Canonical topic
-        self._remove_topic()
-
-        #check that it's gone
-        canonicalTopic = self.main_window.get_canonical_topic()
-        #---> TODO fix this
-        sleep(1)
-        self.assertThat(canonicalTopic.text, NotEquals("CanonicalTopic"))
-
-        #remove added Canonical feed
-        self._remove_feed()
+        #just for timing purposes
+        self.assertThat(lambda: canonicalTopic.text, Eventually(Equals("CanonicalTopic")))
+
+        #verify we are on the first page
+        shortsPage = self.main_view.switch_to_tab_by_index(0)
+        self.assertThat(lambda: shortsPage.visible, Eventually(Equals(True)))
 
     def _remove_feed(self):
-        #toggle toolbar
-        self.ubuntusdk.toggle_toolbar()
-        #click on back toolbar button
-        header = self.main_window.get_header()[0]
-        self.assertThat(header.title, Eventually(Equals("Topics")))
-        self.ubuntusdk.click_toolbar_button('Back')
-
-        header = self.main_window.get_header()[0]
-        self.assertThat(header.title, Eventually(Equals("Feeds")))
+        #verify we are on the first page
+        shortsPage = self.main_view.switch_to_tab_by_index(0)
+        self.assertThat(lambda: shortsPage.visible, Eventually(Equals(True)))
+
+        #open toolbar
+        toolbar = self.main_view.open_toolbar()
+
+        #click on back toolbar Button
+        toolbar.click_button("edittopicsbutton")
+
+        #verify we are on the Management page
+        feedlistpage = self.main_view.get_feed_management_page()
+        self.assertThat(feedlistpage.visible, Eventually(Equals(True)))
+
+        #select  canonical topic
+        self._get_canonical_topic()
 
         #select  canonical feed
-        canonicalFeed = self.main_window.get_canonical_feed()
-        self.assertThat(canonicalFeed, NotEquals(None))
-        self.pointing_device.click_object(canonicalFeed, press_duration=2)
-
-         #click on Remove popover action
-        removeFeedPopover = self.main_window.get_action_popover()
-        self._run_action(removeFeedPopover, 'Remove')
+        canonicalFeed = self.main_view.get_canonical_feed_FeedComponent()
+        self.assertThat(lambda: canonicalFeed, Eventually(NotEquals(None)))
+
+        self.pointing_device.click_object(canonicalFeed)
+
+        #verify we are on the Edit Feed page
+        editFeedPage = self.main_view.get_edit_feed_page()
+        self.assertThat(editFeedPage.visible, Eventually(Equals(True)))
+
+        #open toolbar
+        self.main_view.open_toolbar()
+
+        #press delete button
+        deleteButton = self.main_view.get_delete_button()
+        self.assertThat(lambda: deleteButton, Eventually(NotEquals(None)))
+        self.pointing_device.click_object(deleteButton)
+
+        #verify we are on the Management page
+        feedlistpage = self.main_view.get_feed_management_page()
+        self.assertThat(feedlistpage.visible, Eventually(Equals(True)))
+
+        #select  canonical topic
+        canonicalTopic = self.main_view.get_canonical_topic_labelvisual()
+        self.assertThat(lambda: canonicalTopic, Eventually(NotEquals(None)))
+
+        #check feed has been removed
+        canonicalFeed = self.main_view.get_canonical_feed_FeedComponent()
+        self.assertThat(lambda: canonicalFeed, Eventually(Equals(None)))
 
     def _remove_topic(self):
-        #toggle toolbar
-        self.ubuntusdk.toggle_toolbar()
-
-        #click on edit topics toolbar button
-        self.ubuntusdk.click_toolbar_button('Edit topics')
-        header = self.main_window.get_header()[0]
-        self.assertThat(header.title, Eventually(Equals("Feeds")))
-
-        self.ubuntusdk.click_toolbar_button('Topics')
-        header = self.main_window.get_header()[0]
-        self.assertThat(header.title, Eventually(Equals("Topics")))
-
-        #select and swipe canonical topic
-        canonicalTopic = self.main_window.get_canonical_topic()
-        self.assertThat(canonicalTopic, NotEquals(None))
-
-        qmlView = self.ubuntusdk.get_qml_view()
-        topicsPage = self.main_window.get_manage_topics_page()
-
+        #this been quasi converted to the sdk, but does not work as-is
+        #see https://bugs.launchpad.net/ubuntu-rssreader-app/+bug/1211631
+
+        #verify we are on the first page
+        shortsPage = self.main_view.switch_to_tab_by_index(0)
+        self.assertThat(lambda: shortsPage.visible, Eventually(Equals(True)))
+
+        #open toolbar
+        toolbar = self.main_view.open_toolbar()
+
+        #click on back toolbar Button
+        toolbar.click_button("edittopicsbutton")
+
+        #verify we are on the Management page
+        feedlistpage = self.main_view.get_feed_management_page()
+        self.assertThat(feedlistpage.visible, Eventually(Equals(True)))
+
+        #select  canonical topic
+        canonicalTopic = self._get_canonical_topic()
+
+        topicsPage = self.main_view.get_manage_topics_page()
+        self.assertThat(topicsPage, Eventually(NotEquals(None)))
+
+        addATopicItem = self.main_view.get_add_a_topic()
+        self.assertThat(lambda: addATopic, Eventually(NotEquals(None)))
+
+        #swipe to delete canonical topic
         #we have to consider the top tab offset, then create a swipe operation across the width of the page
         startX = int(topicsPage.x + topicsPage.width * 0.20)
         stopX = int(topicsPage.x + topicsPage.width * 0.80)
-        tabHeightOffset = qmlView.height - topicsPage.height
-        lineY = int(qmlView.y + canonicalTopic.y + tabHeightOffset)
+        tabHeightOffset = qmlView.height - topicsPage.height + addATopicItem.height
+        lineY = int(qmlView.y + canonicalTopic.y +  tabHeightOffset)
 
         #swipe to remove the topic
         self.pointing_device.move(startX, lineY)
         self.pointing_device.drag(startX, lineY, stopX, lineY)
 
-    def _run_action(self, popover, name):
-        actions = popover.select_many('Empty')
-        requested = None
-        for action in actions:
-            if action.text == name:
-                requested = action
-        self.pointing_device.click_object(requested)
-
+        #check that it is gone
+        canonicalTopic = self.main_view.get_canonical_topic()
+        self.assertThat(lambda: canonicalTopic.visible, Eventually(Equals(False)))
+
+    def _input_new_feed(self, rssFeed):
+        inputField = self.main_view.get_append_feed_input_box()
+        return self._safe_enter_text(inputField, rssFeed)
+
+    def _input_new_topic(self, topic):
+        inputField = self.main_view.get_new_topic_input_box()
+        return self._safe_enter_text(inputField, topic)
+
+    def _safe_enter_text(self, inputField, text, timeout = 10):
+        self.assertThat(lambda: inputField.visible, Eventually(Equals(True)))
+        #poll clicking for focus for lack of better method, due to screen switching animation
+        #is there a property we can use instead?
+        poll = 0
+        while inputField.focus != True and poll < timeout:
+            self.pointing_device.click_object(inputField)
+            sleep(1)
+            poll += 1
+        self.keyboard.type(text)
+        self.assertThat(inputField.text, Eventually(Equals(text)))
+        self.keyboard.press_and_release("Enter")
+        return inputField
+
+    def _get_canonical_topic(self, timeout = 10):
+        canonicalTopic = self.main_view.get_canonical_topic_TopicComponent()
+        self.assertThat(lambda: canonicalTopic, Eventually(NotEquals(None)))
+        self.pointing_device.click_object(canonicalTopic)
+
+        poll = 0
+        while canonicalTopic.isExpended == False and poll < timeout:
+            self.pointing_device.click_object(canonicalTopic)
+            sleep(1)
+            poll += 1
+        return canonicalTopic
+
+
+    def test_add_remove_feed_and_topic(self):
+        """ test add and remove feed and topic"""
+
+        #add topic and feed
+        self._add_feed_and_topic()
+
+        #remove added Canonical topic
+        #12 Aug 2013, removing topic broken for now
+        #test commented until fixed, see https://bugs.launchpad.net/ubuntu-rssreader-app/+bug/1211631
+        ##        self._remove_topic()
+
+        #remove added Canonical feed
+        self._remove_feed()
+
+    @unittest.skip("Topic page broken")
+    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()
+
+        #click on add reads toolbar button
+        self.main_view.click_toolbar_button("List view")
+
+        #verify we are on the Feeds page
+        feedlistpage = self.main_view.get_object("FeedListPage", "feedlistpage")
+        self.assertThat(lambda: feedlistpage.visible, Eventually(Equals(True)))
+
+        #select All articles
+        allFeeds = self.main_view.get_all_feeds()
+        self.assertThat(allFeeds, NotEquals("None"))
+        self.pointing_device.click_object(allFeeds )
+
+        #verify we are on the All articles page
+        articlelistpage = self.main_view.get_object("ArticleListPage", "articlelistpage")
+        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)))
+
+        #click on back toolbar button
+        self.main_view.click_toolbar_button("Back")
+
+        #verify we are on the Feeds page
+        feedlistpage = self.main_view.get_object("FeedListPage", "feedlistpage")
+        self.assertThat(feedlistpage.title, Eventually(Equals("Feeds")))
+
+        #-----> view individual feed:
+        #add topic and feed
+        self._add_feed_and_topic()
+
+        #select Canonical feed
+        canonicalFeed = self.main_view.get_canonical_feed_labelvisual()
+        self.assertThat(canonicalFeed, 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")))
+
+        #toggle toolbar
+        self.main_view.open_toolbar()
+        self.assertThat(self.main_view.get_toolbar().opened, Eventually(Equals(True)))
+
+        #click on back toolbar button
+        self.main_view.click_toolbar_button("Back")
+
+        #verify we are on the Feeds page
+        feedlistpage = self.main_view.get_object("FeedListPage", "feedlistpage")
+        self.assertThat(feedlistpage.title, Eventually(Equals("Feeds")))
+
+        #toggle toolbar
+        self.main_view.open_toolbar()
+        self.assertThat(self.main_view.get_toolbar().opened, Eventually(Equals(True)))
+
+        #click on back toolbar button
+        self.main_view.click_toolbar_button("Shorts")
+
+        #verify we are on the Shorts page
+        pageName = self.main_view.get_object("Tab", "Tab0")
+        self.assertThat(pageName.title, Eventually(Equals("Shorts")))
+
+        #remove added Canonical topic
+        self._remove_topic()
+
+        #remove added Canonical feed
+        self._remove_feed()

=== modified file 'ubuntu-rssreader-app.qml'
--- ubuntu-rssreader-app.qml	2013-08-08 15:15:39 +0000
+++ ubuntu-rssreader-app.qml	2013-08-13 04:48:23 +0000
@@ -131,6 +131,7 @@
 
             ToolbarButton {
                 id: addReadsBtn
+                objectName: "addreadsbutton"
                 action: Action {
                     text:  i18n.tr("Add reads")
                     iconSource: Qt.resolvedUrl("./icons_tmp/add.svg")
@@ -142,6 +143,7 @@
             }
 
             ToolbarButton {
+                objectName: "edittopicsbutton"
                 action: Action {
                     text:  i18n.tr("Edit topics")
                     iconSource: Qt.resolvedUrl("./icons_tmp/edit.svg")
@@ -336,6 +338,7 @@
 
         ActionSelectionPopover {
             id: addReadsPopover
+            objectName: addreadspopover
 
             actions: ActionList {
                 id: popoverActionsList