Merge lp:~elopio/reminders-app/test_go_to_accounts into lp:reminders-app

[Leo Arias]

Added an initial autopilot test.

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

FAILED: Continuous integration, rev:104
http://91.189.93.70:8080/job/reminders-app-ci/249/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1964/console
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/249
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/249

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/249/rebuild

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:104
http://91.189.93.70:8080/job/reminders-app-ci/253/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1973
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/253
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/253

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/253/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

This seems to fail with:

http://pastebin.ubuntu.com/7203598/

[David Planella (dpm)]

That was a mistake on my side. The branch assumes no account being set up and I had an active Evernote account.

I'll approve, but still, it'd be good if we could fail more gracefully

review: Approve

[Leo Arias (elopio)]

Something like this David? https://code.launchpad.net/~elopio/reminders-app/test_go_to_accounts-fail_gracefully/+merge/214319

[David Planella (dpm)]

Excellent! I'll review some time this weekend
El dia 04/04/2014 19.51, "Leo Arias" <email address hidden> va escriure:

> Something like this David?
> https://code.launchpad.net/~elopio/reminders-app/test_go_to_accounts-fail_gracefully/+merge/214319
> --
>
> https://code.launchpad.net/~elopio/reminders-app/test_go_to_accounts/+merge/214161
> You are reviewing the proposed merge of
> lp:~elopio/reminders-app/test_go_to_accounts into lp:reminders-app.
>

[Víctor R. Ruiz (vrruiz)]

Leo: The application launch methods should be moved to the app class in reminders/__init__.py. There the app proxy object should be stored as self.app.

review: Needs Fixing (code review)

[Leo Arias (elopio)]

Victor, I tried that but in the end I liked how the launch methods work like a fixture, adding a clean up to close the application when the test is done. So to keep that, I had to pass the test case as a parameter to the __init__ of RemindersApp which didn't look quite right. Lets talk on monday, I'll try to prepare a branch to try that approach to see if it's just what you mean, and discuss with the team what looks better. Thanks for the review.

=== modified file 'debian/control'
--- debian/control	2014-02-26 10:33:02 +0000
+++ debian/control	2014-04-04 06:15:56 +0000
@@ -3,7 +3,7 @@
 Maintainer: Ubuntu App Cats <[e-mail]>
 Build-Depends: cmake,
                debhelper (>= 9),
-	       gettext,
+               gettext,
                libboost-dev,
                libssl-dev,
                python,

=== modified file 'src/app/qml/reminders.qml'
--- src/app/qml/reminders.qml	2014-03-13 18:12:25 +0000
+++ src/app/qml/reminders.qml	2014-04-04 06:15:56 +0000
@@ -283,12 +283,14 @@
         id: noAccountDialog
         Dialog {
             id: noAccount
+            objectName: "noAccountDialog"
             title: i18n.tr("No account available")
             text: i18n.tr("Please setup an account in the system settings")
             Button {
+                objectName: "openAccountButton"
                 text: i18n.tr("Open account settings")
                 color: UbuntuColors.orange
-                onClicked: Qt.openUrlExternally("settings:///system/online-accounts") 
+                onClicked: Qt.openUrlExternally("settings:///system/online-accounts")
             }
         }
    }

=== modified file 'tests/autopilot/reminders/__init__.py'
--- tests/autopilot/reminders/__init__.py	2014-04-04 06:15:56 +0000
+++ tests/autopilot/reminders/__init__.py	2014-04-04 06:15:56 +0000
@@ -17,3 +17,50 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """Reminders app tests and emulators - top level package."""
+
+import logging
+
+from autopilot import logging as autopilot_logging
+from autopilot.introspection import dbus
+from ubuntuuitoolkit import emulators as toolkit_emulators
+
+
+logger = logging.getLogger(__name__)
+
+
+class RemindersApp(object):
+    """Autopilot helper object for the Reminders application."""
+
+    def __init__(self, app_proxy):
+        self.app = app_proxy
+        self.main_view = self.app.select_single(MainView)
+
+
+class MainView(toolkit_emulators.MainView):
+    """Autopilot custom proxy object for the MainView."""
+
+    def __init__(self, *args):
+        super(MainView, self).__init__(*args)
+        self.visible.wait_for(True)
+        try:
+            self.no_account_dialog = self.select_single(
+                objectName='noAccountDialog')
+        except dbus.StateNotFoundError:
+            # Just don't add the dialog as an attribute.
+            pass
+
+
+class NoAccountDialog(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+
+    @classmethod
+    def validate_dbus_object(cls, path, state):
+        name = dbus.get_classname_from_path(path)
+        if name == 'Dialog':
+            if 'noAccountDialog' == state['objectName'][1]:
+                return True
+        return False
+
+    @autopilot_logging.log_action(logger.info)
+    def open_account_settings(self):
+        button = self.select_single('Button', objectName='openAccountButton')
+        self.pointing_device.click_object(button)

=== removed file 'tests/autopilot/reminders/emulators.py'
--- tests/autopilot/reminders/emulators.py	2014-04-04 06:15:56 +0000
+++ tests/autopilot/reminders/emulators.py	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# Copyright (C) 2013, 2014 Canonical Ltd.
-#
-# This file is part of reminders
-#
-# reminders is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3.
-#
-# reminders 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/>.
-
-import logging
-
-from autopilot import logging as autopilot_logging
-from ubuntuuitoolkit import emulators as toolkit_emulators
-from time import sleep
-
-logger = logging.getLogger(__name__)
-
-
-class MainView(toolkit_emulators.MainView):
-
-    retry_delay = 0.2
-
-    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
-
-    #@autopilot_logging.log_action(logger.info)
-    #def get_evernote_account(self):
-         #"""Get Evernote account """
-        #return self.wait_select_single(
-        #"Standard", objectName="EvernoteAccount")
-
-    #@autopilot_logging.log_action(logger.info)
-    #def get_accountselectorpage(self):
-        #"""Get Account selector page  """
-        #return self.wait_select_single(
-            #"Page", objectName="Accountselectorpage")
-
-    @autopilot_logging.log_action(logger.info)
-    def get_notespageListview(self):
-        """Get notes page list view """
-        return self.wait_select_single(
-            'QQuickListView', objectName='notespageListview')

=== modified file 'tests/autopilot/reminders/tests/__init__.py'
--- tests/autopilot/reminders/tests/__init__.py	2014-04-04 06:15:56 +0000
+++ tests/autopilot/reminders/tests/__init__.py	2014-04-04 06:15:56 +0000
@@ -27,7 +27,7 @@
 from autopilot.testcase import AutopilotTestCase
 from ubuntuuitoolkit import emulators as toolkit_emulators
 
-from reminders import emulators
+import reminders
 
 logger = logging.getLogger(__name__)
 
@@ -50,24 +50,26 @@
         super(RemindersAppTestCase, self).setUp()
 
         if os.path.exists(self.local_location_binary):
-            self.launch_test_local()
+            app_proxy = self.launch_test_local()
         elif os.path.exists(self.installed_location_binary):
-            self.launch_test_installed()
+            app_proxy = self.launch_test_installed()
         else:
-            self.launch_test_click()
+            app_proxy = self.launch_test_click()
+
+        self.app = reminders.RemindersApp(app_proxy)
 
     @autopilot_logging.log_action(logger.info)
     def launch_test_local(self):
         self.useFixture(fixtures.EnvironmentVariable(
             'QML2_IMPORT_PATH', newvalue='../../src/plugin'))
-        self.app = self.launch_test_application(
+        return self.launch_test_application(
             self.local_location_binary,
             app_type='qt',
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     @autopilot_logging.log_action(logger.info)
     def launch_test_installed(self):
-        self.app = self.launch_test_application(
+        return self.launch_test_application(
             self.installed_location_binary,
             '-q ' + self.installed_location_qml,
             '--desktop_file_hint=/usr/share/applications/'
@@ -77,10 +79,6 @@
 
     @autopilot_logging.log_action(logger.info)
     def launch_test_click(self):
-        self.app = self.launch_click_package(
+        return self.launch_click_package(
             'com.ubuntu.reminders-app',
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
-
-    @property
-    def main_view(self):
-        return self.app.select_single(emulators.MainView)

=== modified file 'tests/autopilot/reminders/tests/test_reminders.py'
--- tests/autopilot/reminders/tests/test_reminders.py	2014-04-04 06:15:56 +0000
+++ tests/autopilot/reminders/tests/test_reminders.py	2014-04-04 06:15:56 +0000
@@ -18,23 +18,15 @@
 
 from __future__ import absolute_import
 
-from autopilot.matchers import Eventually
-from testtools.matchers import Equals
-
-from reminders.tests import RemindersAppTestCase
+from reminders import tests
 
 import logging
 
 logger = logging.getLogger(__name__)
 
 
-class TestMainWindow(RemindersAppTestCase):
-
-    def setUp(self):
-        super(TestMainWindow, self).setUp()
-
-        self.assertThat(self.main_view.visible, Eventually(Equals(True)))
-
-    def test_blank(setup):
-        #jenkins requires at least one test
-        return 0
+class RemindersTestCaseWithoutAccount(tests.RemindersAppTestCase):
+
+    def test_open_application_without_account(self):
+        """Test that the No account dialog is visible."""
+        self.assertTrue(self.app.main_view.no_account_dialog.visible)