Merge lp:~elopio/qtcreator-plugin-ubuntu/update_tabs_autopilot_template into lp:qtcreator-plugin-ubuntu

[Leo Arias]

Updated the tabs autopilot template to be more similar to the one of the simple app.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:192
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/327/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-amd64-ci/95
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-armhf-ci/95

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/327/rebuild

review: Approve (continuous-integration)

[Josh Arenson (josharenson)]

This works nicely if you create an "App With Tabbed UI", but doesn't work if you create an "App With QML Extension Library" (which is an just app with a tabbed ui and a backend library). Was this intended?

review: Needs Information

[Josh Arenson (josharenson)]

149 + self.app = self.launch_click_package(self.pacakge_id, self.app_name)

"package" is spelled incorrectly.

review: Needs Fixing

[Leo Arias (elopio)]

> 149 + self.app = self.launch_click_package(self.pacakge_id,
> self.app_name)
>
> "package" is spelled incorrectly.

Nice catch, I've fixed it. That means we need to test this also on the phone :'(

[Leo Arias (elopio)]

> This works nicely if you create an "App With Tabbed UI", but doesn't work if
> you create an "App With QML Extension Library" (which is an just app with a
> tabbed ui and a backend library). Was this intended?

Well, that's a different template that needs the same treatment.
I'll report the bug, because this week I won't have time to do it.

[Josh Arenson (josharenson)]

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:193
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/329/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-amd64-ci/97
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-armhf-ci/97

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/329/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:194
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/330/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-amd64-ci/98
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-armhf-ci/98

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/330/rebuild

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

OK

review: Approve

[Zoltan Balogh (bzoltan)]

The new project wizzard will conflict with this MR, so it is better to wait for the wizzard MR to land.

review: Needs Fixing

Unmerged revisions

194. By Leo Arias on 2014-07-03

Fixed get_path_to_source_root.

193. By Leo Arias on 2014-07-02

Fixed typo.

192. By Leo Arias on 2014-07-02

Finished the updates on the tabbs sample app.

191. By Leo Arias on 2014-07-02

Initial changes to the tabs project autopilot template.

=== modified file 'share/qtcreator/templates/wizards/ubuntu/projectypes.json'
--- share/qtcreator/templates/wizards/ubuntu/projectypes.json	2014-05-27 08:58:10 +0000
+++ share/qtcreator/templates/wizards/ubuntu/projectypes.json	2014-07-03 00:47:32 +0000
@@ -88,13 +88,10 @@
                "fileName": "tests/autopilot/run"
            },
            {
-               "fileName": "tests/autopilot/displayName/main/test_main.py"
+               "fileName": "tests/autopilot/displayName/test_main.py"
            },
            {
                "fileName": "tests/autopilot/displayName/__init__.py"
-           },
-           {
-               "fileName": "tests/autopilot/displayName/main/__init__.py"
            }
        ]
     },

=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/displayName/__init__.py'
--- share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/displayName/__init__.py	2013-10-25 05:05:39 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/displayName/__init__.py	2014-07-03 00:47:32 +0000
@@ -3,7 +3,6 @@
 """Ubuntu Touch App autopilot tests."""
 
 import os
-import subprocess
 
 from autopilot import input, platform
 from autopilot.matchers import Eventually
@@ -17,8 +16,7 @@
 
 def get_path_to_source_root():
     return os.path.abspath(
-        os.path.join(
-            os.path.dirname(__file__), '..', '..', '..', '..'))
+        os.path.join(os.path.dirname(__file__), '..', '..', '..'))
 
 
 class ClickAppTestCase(base.UbuntuUIToolkitAppTestCase):
@@ -56,15 +54,12 @@
 
     def _get_app_qml_source_path(self):
         qml_file_name = '{0}.qml'.format(self.app_name)
-        return os.path.join(self._get_path_to_app_source(), qml_file_name)
-
-    def _get_path_to_app_source(self):
-        return os.path.join(get_path_to_source_root(), self.app_name)
+        return os.path.join(get_path_to_source_root(), qml_file_name)
 
     def _launch_application_from_phablet(self):
         # On phablet, we only run the tests against the installed click
         # package.
-        self.app = self.launch_click_package(self.pacakge_id, self.app_name)
+        self.app = self.launch_click_package(self.package_id, self.app_name)
 
     @property
     def main_view(self):

=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/run'
--- share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/run	2013-08-08 07:26:20 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple/tests/autopilot/run	2014-07-03 00:47:32 +0000
@@ -1,11 +1,11 @@
 #!/bin/bash
 
-if [[ -z `which autopilot` ]]; then
-  echo "Autopilot is not installed. Skip"
+if [[ -z `which autopilot3` ]]; then
+  echo "python3-autopilot is not installed. Skip"
   exit
 fi
 
 SCRIPTPATH=`dirname $0`
 pushd ${SCRIPTPATH}
-autopilot run %DISPLAYNAME%
+autopilot3 run %DISPLAYNAME%
 popd

=== modified file 'share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/displayName/__init__.py'
--- share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/displayName/__init__.py	2013-08-08 07:26:20 +0000
+++ share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/displayName/__init__.py	2014-07-03 00:47:32 +0000
@@ -2,130 +2,65 @@
 
 """Ubuntu Touch App autopilot tests."""
 
-from os import remove
-import os.path
-from tempfile import mktemp
-import subprocess
+import os
 
-from autopilot.input import Mouse, Touch, Pointer
+from autopilot import input, platform
 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():
+from testtools.matchers import Equals
+from ubuntuuitoolkit import base, emulators
+
+
+def _get_module_include_path():
+    return os.path.join(get_path_to_source_root(), 'modules')
+
+
+def get_path_to_source_root():
     return os.path.abspath(
-        os.path.join(
-            os.path.dirname(__file__),
-            '..',
-            '..',
-            '..',
-            '..',
-            '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))
-        ]
+        os.path.join(os.path.dirname(__file__), '..', '..', '..'))
+
+
+class ClickAppTestCase(base.UbuntuUIToolkitAppTestCase):
+    """Common test case that provides several useful methods for the tests."""
+
+    package_id = ''  # TODO
+    app_name = '%DISPLAYNAME%'
+
+    def setUp(self):
+        super(ClickAppTestCase, self).setUp()
+        self.pointing_device = input.Pointer(self.input_device_class.create())
+        self.launch_application()
+
+        self.assertThat(self.main_view.visible, Eventually(Equals(True)))
+
+    def launch_application(self):
+        if platform.model() == 'Desktop':
+            self._launch_application_from_desktop()
+        else:
+            self._launch_application_from_phablet()
+
+    def _launch_application_from_desktop(self):
+        app_qml_source_location = self._get_app_qml_source_path()
+        if os.path.exists(app_qml_source_location):
+            self.app = self.launch_test_application(
+                base.get_qmlscene_launch_command(),
+                '-I' + _get_module_include_path(),
+                app_qml_source_location,
+                app_type='qt',
+                emulator_base=emulators.UbuntuUIToolkitEmulatorBase)
+        else:
+            raise NotImplementedError(
+                "On desktop we can't install click packages yet, so we can "
+                "only run from source.")
+
+    def _get_app_qml_source_path(self):
+        qml_file_name = '{0}.qml'.format(self.app_name)
+        return os.path.join(get_path_to_source_root(), qml_file_name)
+
+    def _launch_application_from_phablet(self):
+        # On phablet, we only run the tests against the installed click
+        # package.
+        self.app = self.launch_click_package(self.package_id, self.app_name)
 
     @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 main_view(self):
+        return self.app.select_single(emulators.MainView)

=== removed directory 'share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/displayName/main'
=== removed file 'share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/displayName/main/__init__.py'
--- share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/displayName/main/__init__.py	2013-08-08 07:26:20 +0000
+++ share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/displayName/main/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-""" A main.qml test suite """

=== removed file 'share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/displayName/main/test_main.py'
--- share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/displayName/main/test_main.py	2013-08-08 07:26:20 +0000
+++ share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/displayName/main/test_main.py	1970-01-01 00:00:00 +0000
@@ -1,23 +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 %DISPLAYNAME% import UbuntuTouchAppTestCase
-
-
-class MainTests(UbuntuTouchAppTestCase):
-    """Generic tests for the Hello World"""
-
-    test_qml_file = "%s/%s.qml" % (os.path.dirname(os.path.realpath(__file__)),"../../../../%DISPLAYNAME%")
-
-    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 file 'share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/displayName/test_main.py'
--- share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/displayName/test_main.py	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/displayName/test_main.py	2014-07-03 00:47:32 +0000
@@ -0,0 +1,38 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+"""Tests for the Hello World"""
+
+import os
+
+from autopilot.matchers import Eventually
+from testtools.matchers import Equals
+
+import %DISPLAYNAME%
+
+
+class MainViewTestCase(%DISPLAYNAME%.ClickAppTestCase):
+
+    """Generic tests for the Hello World with tabs."""
+
+    def setUp(self):
+        super(MainViewTestCase, self).setUp()
+        self.hello_tab_label = self.main_view.select_single(
+            objectName='helloTab_label')
+        self.world_tab_label  = self.main_view.select_single(
+            objectName='worldTab_label')
+
+    def test_initial_tab_must_be_hello(self):
+        self.assertTrue(self.hello_tab_label.visible)
+        self.assertThat(
+            self.hello_tab_label.text,
+            Equals('You can change the Tab from Page title above.'))
+        self.assertFalse(self.world_tab_label.visible)
+
+    def test_go_to_world_tab_must_make_it_visible(self):
+        self.main_view.switch_to_tab('worldTab')
+        self.assertTrue(self.world_tab_label.visible)
+        self.assertThat(
+            self.world_tab_label.text,
+            Equals('Swipe from bottom to up to reveal the toolbar.'))
+        self.assertFalse(self.hello_tab_label.visible)
+

=== modified file 'share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/run'
--- share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/run	2013-08-08 07:26:20 +0000
+++ share/qtcreator/templates/wizards/ubuntu/tabs/tests/autopilot/run	2014-07-03 00:47:32 +0000
@@ -1,11 +1,11 @@
 #!/bin/bash
 
-if [[ -z `which autopilot` ]]; then
-  echo "Autopilot is not installed. Skip"
+if [[ -z `which autopilot3` ]]; then
+  echo "python3-autopilot is not installed. Skip"
   exit
 fi
 
 SCRIPTPATH=`dirname $0`
 pushd ${SCRIPTPATH}
-autopilot run %DISPLAYNAME%
+autopilot3 run %DISPLAYNAME%
 popd