Ubuntu UI Toolkit

Merge lp:~canonical-platform-qa/ubuntu-ui-toolkit/textfield-use-osk into lp:ubuntu-ui-toolkit/staging

textfield-use-osk
Merge into staging

Proposed by Leo Arias on 2015-06-04

Status:

Merged

Approved by:

Cris Dywan on 2015-06-22

Approved revision:

1215

Merged at revision:

1537

Proposed branch:

lp:~canonical-platform-qa/ubuntu-ui-toolkit/textfield-use-osk

Merge into:

lp:ubuntu-ui-toolkit/staging

Diff against target:

432 lines (+235/-61)

7 files modified

debian/control (+1/-0)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py (+141/-3)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textarea.py (+28/-5)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textfield.py (+58/-40)
tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py (+2/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textarea.py (+2/-11)
tests/autopilot/ubuntuuitoolkit/tests/gallery/test_textinput.py (+3/-2)

To merge this branch:

bzr merge lp:~canonical-platform-qa/ubuntu-ui-toolkit/textfield-use-osk

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration	2015-06-04	Approve on 2015-06-22
Cris Dywan		2015-06-04	Approve on 2015-06-22
Leo Arias		2015-06-10	Pending
Review via email: mp+261098@code.launchpad.net

This proposal supersedes a proposal from 2015-06-03.

Commit message

Use the real OSK for keyboard input

Description of the change

Use the OSK in text fields to enter text.

This change will restart maliit-server with testability enabled if it is not already done. The keyboard type returned from get_keyboard() is based on whether maliit-server is running or not. Some project tests will stop maliit-server and use simulated key events, so this change will not affect that behaviour.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-04: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1198
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2209/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3081/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/33/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/33/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3079/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2209/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-04: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1199
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2210/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3085/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/34/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/34/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3083/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2210/rebuild

review: Needs Fixing (continuous-integration)

lp:~canonical-platform-qa/ubuntu-ui-toolkit/textfield-use-osk updated on 2015-06-04

1200. By Leo Arias on 2015-06-04: Merged with staging.
1201. By Leo Arias on 2015-06-04: Reverted the po changes.
1202. By Leo Arias on 2015-06-04: Reverted the po changes.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-04:

FAILED: Continuous integration, rev:1199
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1857/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3089/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/585/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/587/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/584/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3087/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1857/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-04:

FAILED: Continuous integration, rev:1202
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1858/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3091/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/586/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/588/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/585/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3089/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1858/rebuild

review: Needs Fixing (continuous-integration)

lp:~canonical-platform-qa/ubuntu-ui-toolkit/textfield-use-osk updated on 2015-06-05

1203. By Richard Huddie on 2015-06-05: Delay import in _go_to_end() until it is needed.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-05:

FAILED: Continuous integration, rev:1203
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1859/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3096/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/587/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/589/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/586/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3094/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1859/rebuild

review: Needs Fixing (continuous-integration)

lp:~canonical-platform-qa/ubuntu-ui-toolkit/textfield-use-osk updated on 2015-06-05

1204. By Richard Huddie on 2015-06-05: Use activeFocus instead of focus property.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-05:

FAILED: Continuous integration, rev:1204
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1860/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3097/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/588/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/590/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/587/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3095/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1860/rebuild

review: Needs Fixing (continuous-integration)

lp:~canonical-platform-qa/ubuntu-ui-toolkit/textfield-use-osk updated on 2015-06-08

1205. By Richard Huddie on 2015-06-08: Fix flake8 by using ToolkitException.
1206. By Richard Huddie on 2015-06-08: Docstring fix.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-08:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1867/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-08:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1868/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Richard Huddie (rhuddie) wrote on 2015-06-10:

There are several failures in the test results where it is claimed that the OSK is not displayed, but the failure screenshots show that it is. I have raised a bug on ubuntu-keyboard for this: https://bugs.launchpad.net/ubuntu-keyboard/+bug/1463906

lp:~canonical-platform-qa/ubuntu-ui-toolkit/textfield-use-osk updated on 2015-06-11

1207. By Richard Huddie on 2015-06-11: Fix test_textinput tests to use correct textfield.write() method rather than directly calling keyboard.type().

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-11:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1875/rebuild

review: Needs Fixing (continuous-integration)

lp:~canonical-platform-qa/ubuntu-ui-toolkit/textfield-use-osk updated on 2015-06-11

1208. By Richard Huddie on 2015-06-11: Only run test which uses shift+left key combination on desktop.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-11:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1876/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-11:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1877/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Sergio Cazzolato (sergio-j-cazzolato) wrote on 2015-06-11:

Seems to be ok +1. Nice job.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-11:

FAILED: Continuous integration, rev:1208
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1880/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3171/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/608/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/610/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/607/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3169/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1880/rebuild

review: Needs Fixing (continuous-integration)

lp:~canonical-platform-qa/ubuntu-ui-toolkit/textfield-use-osk updated on 2015-06-12

1209. By Richard Huddie on 2015-06-12: Merge with staging branch.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-12:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1882/rebuild

review: Needs Fixing (continuous-integration)

lp:~canonical-platform-qa/ubuntu-ui-toolkit/textfield-use-osk updated on 2015-06-12

1210. By Richard Huddie on 2015-06-12: Fix for textarea and test_textinput failing tests.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-12:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1883/rebuild

review: Needs Fixing (continuous-integration)

lp:~canonical-platform-qa/ubuntu-ui-toolkit/textfield-use-osk updated on 2015-06-17

1211. By Richard Huddie on 2015-06-17: Fixes for failing tests. Also wait 5 seconds after re-launching maliit-server to allow it to be ready.
1212. By Richard Huddie on 2015-06-17: Merge from staging branch.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-17:

PASSED: Continuous integration, rev:1211
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1911/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3237
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/639
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/641
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/641/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/638
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2707
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3235
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3235/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21253

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1911/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-17:

PASSED: Continuous integration, rev:1212
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1913/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3242
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/641
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/643
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/643/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/640
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2710
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3240
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3240/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21261

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1913/rebuild

review: Approve (continuous-integration)

Revision history for this message

Cris Dywan (kalikiana) wrote on 2015-06-18:

+ if is_maliit_process_running():
+ configure_osk_settings()
+ restart_maliit_with_testability()
+ return input.Keyboard.create('OSK')
+ else:
+ return input.Keyboard.create()
+
+
+def restart_maliit_with_testability():
+ """Restart maliit-server with testability enabled."""
+ if is_maliit_process_running():

The if..running is redundant given that restart only occurs if that's already the case. Also the function name inherently requires that.

+ # This is needed to work around launchpad.net/bugs/1248913
+ time.sleep(5)

Please use https so bug links can actually be opened.

review: Needs Fixing

lp:~canonical-platform-qa/ubuntu-ui-toolkit/textfield-use-osk updated on 2015-06-18

1213. By Richard Huddie on 2015-06-18: Fix review comments. Also don't enforce en language, re-enable test_clear_with_clear_button as prediction is now set off.
1214. By Richard Huddie on 2015-06-18: Merge from staging branch.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-18:

PASSED: Continuous integration, rev:1214
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1922/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3256
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/650
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/652
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/652/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/649
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2719
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3254
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3254/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21305

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1922/rebuild

review: Approve (continuous-integration)

Revision history for this message

Richard Huddie (rhuddie) wrote on 2015-06-19:

> + if is_maliit_process_running():
> + configure_osk_settings()
> + restart_maliit_with_testability()
> + return input.Keyboard.create('OSK')
> + else:
> + return input.Keyboard.create()
> +
> +
> +def restart_maliit_with_testability():
> + """Restart maliit-server with testability enabled."""
> + if is_maliit_process_running():
>
> The if..running is redundant given that restart only occurs if that's already
> the case. Also the function name inherently requires that.
>
> + # This is needed to work around launchpad.net/bugs/1248913
> + time.sleep(5)
>
> Please use https so bug links can actually be opened.

Thanks for review, I've made those updates.

lp:~canonical-platform-qa/ubuntu-ui-toolkit/textfield-use-osk updated on 2015-06-19

1215. By Richard Huddie on 2015-06-19: Set the osk language to en.

Revision history for this message

Richard Huddie (rhuddie) wrote on 2015-06-19:

I've discovered that some of the key names differ between simulated keyboard and osk.
E.g. The webbrowser tests use the key 'Enter' to navigate to a url, but on the osk the key is called 'Return'. This will cause test failures unless the key names are aligned fully.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-19:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1926/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Richard Huddie (rhuddie) wrote on 2015-06-22:

See bug report for improving compatibility of OSK with simulated keyboard: https://bugs.launchpad.net/ubuntu-keyboard/+bug/1467449

Revision history for this message

Cris Dywan (kalikiana) wrote on 2015-06-22:

Thank you, looking good now (the failures in CI are false positives)!

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) on 2015-06-22:

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Canonical Platform QA Team

Dan Chapman 

Tom Mirmar

Ubuntu SDK team

 === modified file 'debian/control'
 --- debian/control	2015-06-02 17:18:53 +0000
 +++ debian/control	2015-06-19 14:49:08 +0000
@@ -147,6 +147,7 @@
           python3-autopilot (>= 1.4),
           python3-autopilot-trace,
           qttestability-autopilot,
++         ubuntu-keyboard-autopilot,
           ubuntu-ui-toolkit-examples (>= ${source:Version}),
           upstart,
           url-dispatcher-tools,
 === modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py'
 --- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py	2015-04-14 21:02:06 +0000
 +++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py	2015-06-19 14:49:08 +0000
@@ -17,7 +17,10 @@
  """Common helpers for Ubuntu UI Toolkit Autopilot custom proxy objects."""
  import logging
++import subprocess
++import time
  from distutils import version
++from gi.repository import Gio
  import autopilot
  from autopilot import (
@@ -27,9 +30,10 @@
+ )
  from autopilot.introspection import dbus
--
  logger = logging.getLogger(__name__)
++MALIIT = 'maliit-server'
++
  class ToolkitException(Exception):
      """Exception raised when there is an error with the custom proxy object."""
@@ -51,8 +55,142 @@
  def get_keyboard():
      """Return the keyboard device."""
--    # TODO return the OSK if we are on the phone. --elopio - 2014-01-13
--    return input.Keyboard.create()
++    if is_maliit_process_running():
++        configure_osk_settings()
++        restart_maliit_with_testability()
++        return input.Keyboard.create('OSK')
++    else:
++        return input.Keyboard.create()
++
++
++def restart_maliit_with_testability():
++    """Restart maliit-server with testability enabled."""
++    pid = get_process_pid(MALIIT)
++    if _is_testability_enabled_for_process(pid):
++        return
++    _stop_process(MALIIT)
++    _start_process(MALIIT, 'QT_LOAD_TESTABILITY=1')
++    # This is needed to work around https://launchpad.net/bugs/1248913
++    time.sleep(5)
++
++
++def configure_osk_settings():
++    """Configure OSK ready for testing by turning off all helpers."""
++    gsettings = Gio.Settings.new("com.canonical.keyboard.maliit")
++    gsettings.set_string("active-language", "en")
++    gsettings.set_boolean("auto-capitalization", False)
++    gsettings.set_boolean("auto-completion", False)
++    gsettings.set_boolean("predictive-text", False)
++    gsettings.set_boolean("spell-checking", False)
++    gsettings.set_boolean("double-space-full-stop", False)
++
++
++def _is_testability_enabled_for_process(pid):
++    """Return True if testability is enabled for specified process."""
++    proc_env = '/proc/{pid}/environ'.format(pid=pid)
++    command = ['cat', proc_env]
++    try:
++        output = subprocess.check_output(
++            command,
++            stderr=subprocess.STDOUT,
++            universal_newlines=True,
++        )
++    except subprocess.CalledProcessError as e:
++        e.args += ('Failed to get environment for pid {}: {}.'.format(
++            pid, e.output),)
++        raise
++    return output.find('QT_LOAD_TESTABILITY=1') >= 0
++
++
++def _stop_process(proc_name):
++    """Stop process with name proc_name."""
++    logger.info('Stoping process {}.'.format(proc_name))
++    command = ['/sbin/initctl', 'stop', proc_name]
++    try:
++        output = subprocess.check_output(
++            command,
++            stderr=subprocess.STDOUT,
++            universal_newlines=True,
++        )
++        logger.info(output)
++    except subprocess.CalledProcessError as e:
++        e.args += ('Failed to stop {}: {}.'.format(proc_name, e.output),)
++        raise
++
++
++def _start_process(proc_name, *args):
++    """Start a process.
++
++    :param proc_name: The name of the process.
++    :param args: The arguments to be used when starting the job.
++    :return: The process id of the started job.
++    :raises CalledProcessError: if the job failed to start.
++
++    """
++    logger.info('Starting job {} with arguments {}.'.format(proc_name, args))
++    command = ['/sbin/initctl', 'start', proc_name] + list(args)
++    try:
++        output = subprocess.check_output(
++            command,
++            stderr=subprocess.STDOUT,
++            universal_newlines=True,
++        )
++        logger.info(output)
++        pid = get_process_pid(proc_name)
++    except subprocess.CalledProcessError as e:
++        e.args += ('Failed to start {}: {}.'.format(proc_name, e.output),)
++        raise
++    else:
++        return pid
++
++
++def get_process_pid(proc_name):
++    """Return the process id of a running job.
++
++    :param str name: The name of the job.
++    :raises ToolkitException: if the job is not running.
++
++    """
++    status = get_process_status(proc_name)
++    if "start/" not in status:
++        raise ToolkitException(
++            '{} is not in the running state.'.format(proc_name))
++    return int(status.split()[-1])
++
++
++def get_process_status(name):
++    """
++    Return the status of a process.
++
++    :param str name: The name of the process.
++    :raises ToolkitException: if it's not possible to get status of the job.
++
++    """
++    try:
++        return subprocess.check_output([
++            '/sbin/initctl',
++            'status',
++            name
++        ], universal_newlines=True)
++    except subprocess.CalledProcessError as error:
++        raise ToolkitException(
++            "Unable to get {}'s status: {}".format(name, error)
++        )
++
++
++def is_process_running(name):
++    """Return True if the process is running. Otherwise, False.
++
++    :param str name: The name of the process.
++    :raises ToolkitException: if not possible to get status of the process.
++
++    """
++    return 'start/' in get_process_status(name)
++
++
++def is_maliit_process_running():
++    """Return True if malitt-server process is running, False otherwise."""
++    return is_process_running(MALIIT)
  def check_autopilot_version():
 === modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textarea.py'
 --- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textarea.py	2014-08-20 20:11:35 +0000
 +++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textarea.py	2015-06-19 14:49:08 +0000
@@ -22,12 +22,35 @@
      def clear(self):
          """Clear the text area."""
++        self._ensure_focused()
          if not self.is_empty():
              self._clear_with_keys()
              self.text.wait_for('')
--    def _go_to_end(self):
--        # We override this because the text areas can have more than one line.
--        # XXX Here we are cheating because the on-screen keyboard doesn't have
--        # CTRL nor END keys. --elopio - 2014-08-20
--        self.keyboard.press_and_release('Ctrl+End')
++    def _go_to_end(self, select_text=False):
++        # We override this because the text areas can have more than one line.
++        key = 'Ctrl+End'
++        if select_text:
++            key = 'Shift+' + key
++        if self._is_keyboard_osk():
++            # XXX Here we are cheating because the on-screen keyboard doesn't
++            # have an END key.
++            from autopilot.input import Keyboard
++            keyboard = Keyboard.create()
++        else:
++            keyboard = self.keyboard
++        keyboard.press_and_release(key)
++
++    def _go_to_start(self, select_text=False):
++        # We override this because the text areas can have more than one line.
++        key = 'Ctrl+Home'
++        if select_text:
++            key = 'Shift+' + key
++        if self._is_keyboard_osk():
++            # XXX Here we are cheating because the on-screen keyboard doesn't
++            # have a HOME key.
++            from autopilot.input import Keyboard
++            keyboard = Keyboard.create()
++        else:
++            keyboard = self.keyboard
++        keyboard.press_and_release(key)
 === modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textfield.py'
 --- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textfield.py	2015-04-14 21:02:06 +0000
 +++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textfield.py	2015-06-19 14:49:08 +0000
@@ -16,16 +16,9 @@
  import logging
--from autopilot import (
--    logging as autopilot_logging,
--    platform
--)
--
--from ubuntuuitoolkit._custom_proxy_objects import (
--    _common,
--    _mainview
--)
--
++from autopilot import logging as autopilot_logging
++
++from ubuntuuitoolkit._custom_proxy_objects import _common
  logger = logging.getLogger(__name__)
@@ -47,18 +40,18 @@
              of the text field. Default is True.
          """
--        with self.keyboard.focused_type(self):
--            self.focus.wait_for(True)
--            if clear:
--                self.clear()
--            else:
--                if not self.is_empty():
--                    self.keyboard.press_and_release('End')
--            self.keyboard.type(text)
++        self._ensure_focused()
++        if clear:
++            self.clear()
++        else:
++            if not self.is_empty():
++                self._go_to_end()
++        self.keyboard.type(text)
      @autopilot_logging.log_action(logger.info)
      def clear(self):
          """Clear the text field."""
++        self._ensure_focused()
          if not self.is_empty():
              if self.hasClearButton:
                  self._click_clear_button()
@@ -80,44 +73,69 @@
      @autopilot_logging.log_action(logger.debug)
      def _clear_with_keys(self):
--        if platform.model() == 'Desktop':
--            self._select_all()
--            self.keyboard.press_and_release('BackSpace')
--        else:
++        if self._is_keyboard_osk():
              # Touch tap currently doesn't have a press_duration parameter, so
              # we can't select all the text.
              # Reported as bug http://pad.lv/1268782 --elopio - 2014-01-13
              self._go_to_end()
--            while self.cursorPosition != 0:
--                self._delete_one_character()
++            while self.text != '':
++                self._delete_one_character_using_osk()
++        else:
++            self._select_all()
++            self.keyboard.press_and_release('BackSpace')
          if not self.is_empty():
              raise _common.ToolkitException('Failed to clear the text field.')
      @autopilot_logging.log_action(logger.debug)
      def _select_all(self):
          if not self._is_all_text_selected():
--            # right click is needed
--            self.pointing_device.click_object(self, button=3)
--            root = self.get_root_instance()
--            main_view = root.select_single(_mainview.MainView)
--            popover = main_view.get_text_input_context_menu(
--                'text_input_contextmenu')
--            popover.click_option_by_text('Select All')
++            self._go_to_start()
++            self._go_to_end(select_text=True)
      def _is_all_text_selected(self):
          return self.text == self.selectedText
--    @autopilot_logging.log_action(logger.debug)
--    def _go_to_end(self):
--        # XXX Here we are cheating because the on-screen keyboard doesn't have
--        # an END key. --elopio - 2014-08-20
--        self.keyboard.press_and_release('End')
--
--    @autopilot_logging.log_action(logger.debug)
--    def _delete_one_character(self):
++    def _is_keyboard_osk(self):
++        """Return True if the keyboard instance is the OSK."""
++        return _common.is_maliit_process_running()
++
++    @autopilot_logging.log_action(logger.debug)
++    def _go_to_end(self, select_text=False):
++        key = 'End'
++        if select_text:
++            key = 'Shift+' + key
++        if self._is_keyboard_osk():
++            # XXX Here we are cheating because the on-screen keyboard doesn't
++            # have an END key. --elopio - 2014-08-20
++            from autopilot.input import Keyboard
++            keyboard = Keyboard.create()
++        else:
++            keyboard = self.keyboard
++        keyboard.press_and_release(key)
++
++    @autopilot_logging.log_action(logger.debug)
++    def _go_to_start(self, select_text=False):
++        key = 'Home'
++        if select_text:
++            key = 'Shift+' + key
++        if self._is_keyboard_osk():
++            from autopilot.input import Keyboard
++            keyboard = Keyboard.create()
++        else:
++            keyboard = self.keyboard
++        keyboard.press_and_release(key)
++
++    @autopilot_logging.log_action(logger.debug)
++    def _delete_one_character_using_osk(self):
          original_text = self.text
          # We delete with backspace because the on-screen keyboard has
          # that key.
--        self.keyboard.press_and_release('BackSpace')
++        self.keyboard.press_and_release('backspace')
          if len(self.text) != len(original_text) - 1:
              raise _common.ToolkitException('Failed to delete one character.')
++
++    @autopilot_logging.log_action(logger.debug)
++    def _ensure_focused(self):
++        if not self.activeFocus:
++            self.pointing_device.click_object(self)
++            self.activeFocus.wait_for(True)
 === modified file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py'
 --- tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py	2015-06-03 15:09:52 +0000
 +++ tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py	2015-06-19 14:49:08 +0000
@@ -97,6 +97,8 @@
          self.pointing_device.click_object(self.textfield)
          self.select_cursor('cursorPosition')
++    @testtools.skipUnless(platform.model() == 'Desktop',
++                          'Desktop only due to non-OSK key used.')
      def test_caret_visible_after_selecting(self):
          self.test_caret_hide_while_typing()
          # Select a character
 === modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textarea.py'
 --- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textarea.py	2015-04-14 21:02:06 +0000
 +++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textarea.py	2015-06-19 14:49:08 +0000
@@ -14,9 +14,6 @@
  # 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 unittest import mock
--
--from autopilot import platform
  from testtools.matchers import GreaterThan
  import ubuntuuitoolkit
@@ -56,17 +53,11 @@
          self.simple_text_area.clear()
          self.assertEqual(self.simple_text_area.text, '')
--    def test_clear_with_multiple_lines_on_touch(self):
++    def test_clear_with_multiple_lines(self):
          # This is a regrestion test for http://pad.lv/1359167
          self.simple_text_area.write(
              'Long text that will make it wrap into multiple lines.')
          self.assertThat(self.simple_text_area.lineCount, GreaterThan(1))
--        self.simple_text_area.keyboard.press_and_release('Ctrl+Home')
--        if platform.model() == 'Desktop':
--            # Use a touch mock.
--            patcher = mock.patch('autopilot.platform.model')
--            mock_model = patcher.start()
--            self.addCleanup(patcher.stop)
--            mock_model.return_value = 'not desktop'
++        self.simple_text_area._go_to_start()
          self.simple_text_area.clear()
          self.assertEqual(self.simple_text_area.text, '')
 === modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_textinput.py'
 --- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_textinput.py	2015-04-14 21:02:06 +0000
 +++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_textinput.py	2015-06-19 14:49:08 +0000
@@ -92,6 +92,7 @@
          self.assertFalse(textfield_disabled.enabled)
          disabled_text = textfield_disabled.text
--        self.pointing_device.click_object(textfield_disabled)
--        textfield_disabled.keyboard.type('This should not be written')
++        self.assertRaises(AssertionError,
++                          textfield_disabled.write,
++                          'This should not be written')
          self.assertEqual(disabled_text, textfield_disabled.text)