Merge lp:~carla-sella/ubuntu-rssreader-app/add-feed-test into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

[Carla Sella]

Add new feed autopilot test.

Add new feed test.
Please check if clicking confirm button part (lines 38-44 of test_rssreader.py) is ok.

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

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~carla-sella/ubuntu-rssreader-app/add-feed-test/+merge/171652/+edit-commit-message

review: Needs Fixing (continuous-integration)

[David Planella (dpm)]

Thanks a lot Carla! Remember that for core apps you need to set the commit message in addition to the description in the merge proposal, so that Jenkins can use it for the commit. I've added it for you on this one, but it might be worth remembering for the next ones.

[Carla Sella (carla-sella)]

Ok thanks David.

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-autolanding/2/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-autolanding/2/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-autolanding/2/console

review: Needs Fixing (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-autolanding/3/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-rssreader-app-quantal-amd64-autolanding/3/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-autolanding/3/console

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Carla, it seems like your merge is removing quite a bit of files. I'm guessing this is on accident ;-) Can you take a look and check your branch again to make sure only the changes you intended are include? Thanks!

review: Needs Fixing

[Nicholas Skaggs (nskaggs)]

I would say this has no been superseded by https://code.launchpad.net/~carla-sella/ubuntu-rssreader-app/view-feeds-test/+merge/178470

Unmerged revisions

15. By Carla Sella on 2013-06-26

ubuntu rss app - adding feed test done

=== modified file 'FeedListPage.qml'
--- FeedListPage.qml	2013-06-16 07:43:59 +0000
+++ FeedListPage.qml	2013-06-26 19:56:29 +0000
@@ -480,6 +480,7 @@
                 anchors.centerIn: parent
 
                 TextField {
+                    objectName: "newFeedUrl"
                     id: tfFeedUrl
                     anchors.horizontalCenter: parent.horizontalCenter
                     width: parent.width

=== removed directory 'tests/autopilot/ubuntu_rssreader_app'
=== removed file 'tests/autopilot/ubuntu_rssreader_app/__init__.py'
--- tests/autopilot/ubuntu_rssreader_app/__init__.py	2013-05-31 12:59:55 +0000
+++ tests/autopilot/ubuntu_rssreader_app/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,8 +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 tests and emulators - top level package."""

=== removed directory 'tests/autopilot/ubuntu_rssreader_app/emulators'
=== 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-05-31 12:59:55 +0000
+++ tests/autopilot/ubuntu_rssreader_app/emulators/main_window.py	1970-01-01 00:00:00 +0000
@@ -1,24 +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_qml_view(self):
-        """Get the main QML view"""
-        return self.app.select_single("QQuickView")
-
-    def get_toolbar(self):
-        return self.app.select_single("Toolbar")

=== removed directory 'tests/autopilot/ubuntu_rssreader_app/tests'
=== removed file 'tests/autopilot/ubuntu_rssreader_app/tests/__init__.py'
--- tests/autopilot/ubuntu_rssreader_app/tests/__init__.py	2013-05-31 12:59:55 +0000
+++ tests/autopilot/ubuntu_rssreader_app/tests/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,55 +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.
-
-"""RSSReader app autopilot tests."""
-
-import os.path
-
-from autopilot.input import Mouse, Touch, Pointer
-from autopilot.platform import model
-from autopilot.testcase import AutopilotTestCase
-
-from ubuntu_rssreader_app.emulators.main_window import MainWindow
-
-
-class RssreaderTestCase(AutopilotTestCase):
-
-    """A common test case class that provides several useful methods for
-    rrsreader-app tests.
-
-    """
-    if model() == 'Desktop':
-        scenarios = [('with mouse', dict(input_device_class=Mouse))]
-    else:
-        scenarios = [('with touch', dict(input_device_class=Touch))]
-
-    local_location = "../../ubuntu-rssreader-app.qml"
-
-    def setUp(self):
-        self.pointing_device = Pointer(self.input_device_class.create())
-        super(RssreaderTestCase, self).setUp()
-        if os.path.exists(self.local_location):
-            self.launch_test_local()
-        else:
-            self.launch_test_installed()
-
-    def launch_test_local(self):
-        self.app = self.launch_test_application(
-            "qmlscene",
-            self.local_location,
-            app_type='qt')
-
-    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')
-
-    @property
-    def main_window(self):
-        return MainWindow(self.app)

=== removed file 'tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py'
--- tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	2013-05-31 12:59:55 +0000
+++ tests/autopilot/ubuntu_rssreader_app/tests/test_rssreader.py	1970-01-01 00:00:00 +0000
@@ -1,38 +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 tests."""
-
-from __future__ import absolute_import
-
-from autopilot.matchers import Eventually
-from testtools.matchers import Equals
-
-from ubuntu_rssreader_app.tests import RssreaderTestCase
-
-
-class TestMainWindow(RssreaderTestCase):
-
-    def setUp(self):
-        super(TestMainWindow, self).setUp()
-        self.assertThat(
-            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
-
-    def tearDown(self):
-        super(TestMainWindow, self).tearDown()
-
-    def test_toolbar_shows(self):
-        """Make sure that dragging from the bottom reveals the hidden
-        toolbar."""
-        toolbar = self.main_window.get_toolbar()
-
-        x, y, w, h = toolbar.globalRect
-        tx = x + (w / 2)
-        ty = y + (h - 2)
-
-        self.pointing_device.drag(tx, ty, tx, ty - h)
-        self.assertThat(toolbar.state, Eventually(Equals("spread")))