Merge lp:~acerisara/ubuntu-calculator-app/suite-setup into lp:ubuntu-calculator-app

[Andrea Cerisara]

Ported autopilot suite from old app.

Ported the autopilot suite infrastructure from the old app. Not sure this is enough to be considered a proper bootstrap :)

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

FAILED: Continuous integration, rev:42
http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-ci/9/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/488/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-vivid-amd64-ci/9/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-ci/9/rebuild

review: Needs Fixing (continuous-integration)

[Riccardo Padovani (rpadovani)]

Thanks for the effort, code looks good.
I merged in this other branch[0] to see if your branch resolves all issues with packaging we have.

If it works I'll approve this one. Otherwise, I'll evaluate results from Jenkins and choose how to go on.

Thanks again

[Riccardo Padovani (rpadovani)]

Ok, tested and fixed all Jenkins fails in this branch[0]

I approve this one and do manually merge, last one for this series \o/

[0]https://code.launchpad.net/~rpadovani/ubuntu-calculator-app/debianFolder141211/+merge/245269

review: Approve

=== modified file 'app/tests/autopilot/run'
--- app/tests/autopilot/run	2014-11-30 21:31:04 +0000
+++ app/tests/autopilot/run	2014-12-20 17:57:55 +0000
@@ -7,6 +7,6 @@
 
 SCRIPTPATH=`dirname $0`
 pushd ${SCRIPTPATH}
-autopilot run ubuntu_calculator_app
+autopilot3 run ubuntu_calculator_app
 popd
 

=== modified file 'app/tests/autopilot/ubuntu_calculator_app/__init__.py'
--- app/tests/autopilot/ubuntu_calculator_app/__init__.py	2014-11-10 09:28:27 +0000
+++ app/tests/autopilot/ubuntu_calculator_app/__init__.py	2014-12-20 17:57:55 +0000
@@ -1,133 +1,46 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-
-"""Ubuntu Touch App autopilot tests."""
-
-from os import remove
-import os.path
-from tempfile import mktemp
-import subprocess
-
-from autopilot.input import Mouse, Touch, Pointer
-from autopilot.matchers import Eventually
-from autopilot.platform import model
-from testtools.matchers import Is, Not, Equals
-from autopilot.testcase import AutopilotTestCase
-
-def get_module_include_path():
-    return os.path.abspath(
-        os.path.join(
-            os.path.dirname(__file__),
-            '..',
-            '..',
-            '..',
-            '..',
-            'backend',
-            'modules')
-        )
-
-
-class UbuntuTouchAppTestCase(AutopilotTestCase):
-    """A common test case class that provides several useful methods for the tests."""
-
-    if model() == 'Desktop':
-        scenarios = [
-        ('with mouse', dict(input_device_class=Mouse))
-        ]
-    else:
-        scenarios = [
-        ('with touch', dict(input_device_class=Touch))
-        ]
+#
+# 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/>.
+
+"""Calculator app autopilot emulators."""
+
+import ubuntuuitoolkit
+
+
+class CalculatorApp(object):
+    """Autopilot helper object for the calculator application."""
+
+    def __init__(self, app_proxy, test_type):
+        self.app = app_proxy
+        self.test_type = test_type
+        self.main_view = self.app.select_single(MainView)
 
     @property
-    def main_window(self):
-        return MainWindow(self.app)
-
-
-    def setUp(self):
-        self.pointing_device = Pointer(self.input_device_class.create())
-        super(UbuntuTouchAppTestCase, self).setUp()
-        self.launch_test_qml()
-
-
-    def launch_test_qml(self):
-        # If the test class has defined a 'test_qml' class attribute then we
-        # write it to disk and launch it inside the QML Scene. If not, then we
-        # silently do nothing (presumably the test has something else planned).
-        arch = subprocess.check_output(["dpkg-architecture",
-        "-qDEB_HOST_MULTIARCH"]).strip()
-        if hasattr(self, 'test_qml') and isinstance(self.test_qml, basestring):
-            qml_path = mktemp(suffix='.qml')
-            open(qml_path, 'w').write(self.test_qml)
-            self.addCleanup(remove, qml_path)
-
-            self.app = self.launch_test_application(
-                "/usr/lib/" + arch + "/qt5/bin/qmlscene",
-                "-I", get_module_include_path(),
-                qml_path,
-                app_type='qt')
-
-        if hasattr(self, 'test_qml_file') and isinstance(self.test_qml_file, basestring):
-            qml_path = self.test_qml_file
-            self.app = self.launch_test_application(
-                "/usr/lib/" + arch + "/qt5/bin/qmlscene",
-                "-I", get_module_include_path(),
-                qml_path,
-                app_type='qt')
-
-        self.assertThat(self.get_qml_view().visible, Eventually(Equals(True)))
-
-
-    def get_qml_view(self):
-        """Get the main QML view"""
-
-        return self.app.select_single("QQuickView")
-
-    def get_mainview(self):
-        """Get the QML MainView"""
-
-        mainView = self.app.select_single("MainView")
-        self.assertThat(mainView, Not(Is(None)))
-        return mainView
-
-
-    def get_object(self,objectName):
-        """Get a object based on the objectName"""
-
-        obj = self.app.select_single(objectName=objectName)
-        self.assertThat(obj, Not(Is(None)))
-        return obj
-
-
-    def mouse_click(self,objectName):
-        """Move mouse on top of the object and click on it"""
-
-        obj = self.get_object(objectName)
-        self.pointing_device.move_to_object(obj)
-        self.pointing_device.click()
-
-
-    def mouse_press(self,objectName):
-        """Move mouse on top of the object and press mouse button (without releasing it)"""
-
-        obj = self.get_object(objectName)
-        self.pointing_device.move_to_object(obj)
-        self.pointing_device.press()
-
-
-    def mouse_release(self):
-        """Release mouse button"""
-
-        self.pointing_device.release()     
-
-
-    def type_string(self, string):
-        """Type a string with keyboard"""
-
-        self.keyboard.type(string)
-
-
-    def type_key(self, key):
-        """Type a single key with keyboard"""
-
-        self.keyboard.key(key)
-
+    def pointing_device(self):
+        return self.app.pointing_device
+
+
+class MainView(ubuntuuitoolkit.MainView):
+    """Calculator MainView Autopilot emulator."""
+
+    def __init__(self, *args):
+        super(MainView, self).__init__(*args)
+        self.visible.wait_for(True)
+
+    def clear(self):
+        pass
+
+    def press(self, button):
+        pass

=== removed directory 'app/tests/autopilot/ubuntu_calculator_app/main'
=== removed file 'app/tests/autopilot/ubuntu_calculator_app/main/__init__.py'
--- app/tests/autopilot/ubuntu_calculator_app/main/__init__.py	2014-11-10 09:28:27 +0000
+++ app/tests/autopilot/ubuntu_calculator_app/main/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-""" A main.qml test suite """
-

=== removed file 'app/tests/autopilot/ubuntu_calculator_app/main/test_main.py'
--- app/tests/autopilot/ubuntu_calculator_app/main/test_main.py	2014-11-30 21:31:04 +0000
+++ app/tests/autopilot/ubuntu_calculator_app/main/test_main.py	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-
-"""Tests for the Hello World"""
-
-from autopilot.matchers import Eventually
-from textwrap import dedent
-from testtools.matchers import Is, Not, Equals
-from testtools import skip
-import os
-from ubuntu_calculator_app import UbuntuTouchAppTestCase
-
-
-class MainTests(UbuntuTouchAppTestCase):
-    """Generic tests for the Hello World"""
-
-    test_qml_file = "%s/%s.qml" % (os.path.dirname(os.path.realpath(__file__)),"../../../../ubuntu_calculator_app")
-
-    def test_0_can_select_mainView(self):
-        """Must be able to select the mainview."""
-
-        mainView = self.get_mainview()
-        self.assertThat(mainView.visible,Eventually(Equals(True)))
-
-

=== added directory 'app/tests/autopilot/ubuntu_calculator_app/tests'
=== added file 'app/tests/autopilot/ubuntu_calculator_app/tests/__init__.py'
--- app/tests/autopilot/ubuntu_calculator_app/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ app/tests/autopilot/ubuntu_calculator_app/tests/__init__.py	2014-12-20 17:57:55 +0000
@@ -0,0 +1,104 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2013, 2014 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/>.
+
+"""Calculator app autopilot tests."""
+
+import os
+import shutil
+import logging
+
+import ubuntu_calculator_app
+
+from autopilot.testcase import AutopilotTestCase
+from autopilot import logging as autopilot_logging
+
+import ubuntuuitoolkit
+from ubuntuuitoolkit import base
+
+logger = logging.getLogger(__name__)
+
+
+class CalculatorAppTestCase(AutopilotTestCase):
+    """A common test case class that provides several useful methods for
+    the ubuntu-calculator-app tests.
+
+    """
+
+    local_location = os.path.dirname(os.path.dirname(os.getcwd()))
+
+    local_location_qml = os.path.join(local_location,
+                                      'ubuntu-calculator-app.qml')
+
+    installed_location_qml = os.path.join('/usr/share/ubuntu-calculator-app/',
+                                          'ubuntu-calculator-app.qml')
+
+    def get_launcher_and_type(self):
+        if os.path.exists(self.local_location_qml):
+            launcher = self.launch_test_local
+            test_type = 'local'
+        elif os.path.exists(self.installed_location_qml):
+            launcher = self.launch_test_installed
+            test_type = 'deb'
+        else:
+            launcher = self.launch_test_click
+            test_type = 'click'
+        return launcher, test_type
+
+    def setUp(self):
+        super(CalculatorAppTestCase, self).setUp()
+        self.clear_calculator_database()
+        self.launcher, self.test_type = self.get_launcher_and_type()
+
+        # Unset the current locale to ensure locale-specific data
+        # (day and month names, first day of the week, …) doesn’t get
+        # in the way of test expectations.
+        self.patch_environment('LC_ALL', 'C')
+        self.app = ubuntu_calculator_app.CalculatorApp(self.launcher(),
+                                                       self.test_type)
+
+    @autopilot_logging.log_action(logger.info)
+    def launch_test_local(self):
+        return self.launch_test_application(
+            base.get_qmlscene_launch_command(),
+            self.local_location_qml,
+            app_type='qt',
+            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
+
+    @autopilot_logging.log_action(logger.info)
+    def launch_test_installed(self):
+        return self.launch_test_application(
+            base.get_qmlscene_launch_command(),
+            self.installed_location_qml,
+            app_type='qt',
+            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
+
+    @autopilot_logging.log_action(logger.info)
+    def launch_test_click(self):
+        return self.launch_click_package(
+            "com.ubuntu.calculator",
+            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
+
+    def clear_calculator_database(self):
+        calculator_database_path = os.path.join(
+            os.path.expanduser('~'),
+            '.local',
+            'share',
+            'com.ubuntu.calculator'
+        )
+
+        if os.path.exists(calculator_database_path):
+            shutil.rmtree(calculator_database_path)
+            lambda: os.path.exists(calculator_database_path).wait_for(False)

=== added file 'app/tests/autopilot/ubuntu_calculator_app/tests/test_main.py'
--- app/tests/autopilot/ubuntu_calculator_app/tests/test_main.py	1970-01-01 00:00:00 +0000
+++ app/tests/autopilot/ubuntu_calculator_app/tests/test_main.py	2014-12-20 17:57:55 +0000
@@ -0,0 +1,18 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+"""Calculator app autopilot tests."""
+
+from autopilot.matchers import Eventually
+from testtools.matchers import Equals
+
+from ubuntu_calculator_app.tests import CalculatorAppTestCase
+
+
+class MainTestCase(CalculatorAppTestCase):
+
+    def setUp(self):
+        super(MainTestCase, self).setUp()
+
+    def test_calculator_visible(self):
+        self.assertThat(self.app.main_view.visible,
+                        Eventually(Equals(True)))