Merge lp:~michael-sheldon/ubuntu-keyboard/autopilot-cursor-movement into lp:ubuntu-keyboard

[Michael Sheldon]

Allow autopilot to perform cursor movement via maliit

Allow autopilot to perform cursor movement via maliit (required for replacing fake keyboard input with real OSK)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:391
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/618/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3438/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/119
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/119/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/119
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3435/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/618/rebuild

review: Needs Fixing (continuous-integration)

[lp:~michael-sheldon/ubuntu-keyboard/autopilot-cursor-movement]

392. By Michael Sheldon on 2015-07-17

Merge build fixes from lp:~michael-sheldon/ubuntu-keyboard/fix-build-against-new-libplatform

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:392
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/620/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3447
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/121
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/121
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/121/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/121
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2871
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3444
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3444/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21949

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/620/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

=== modified file 'qml/Keyboard.qml'
--- qml/Keyboard.qml	2015-04-13 12:30:10 +0000
+++ qml/Keyboard.qml	2015-07-17 14:19:53 +0000
@@ -287,4 +287,25 @@
         maliit_geometry.visibleRect = Qt.rect(obj.x, obj.y, obj.width, obj.height);
     }
 
+    // Autopilot needs to be able to move the cursor even when the layout
+    // doesn't provide arrow keys (e.g. in phone mode)
+    function sendLeftKey() {
+        event_handler.onKeyReleased("", "left");
+    }
+    function sendRightKey() {
+        event_handler.onKeyReleased("", "right");
+    }
+    function sendUpKey() {
+        event_handler.onKeyReleased("", "up");
+    }
+    function sendDownKey() {
+        event_handler.onKeyReleased("", "down");
+    }
+    function sendHomeKey() {
+        event_handler.onKeyReleased("", "home");
+    }
+    function sendEndKey() {
+        event_handler.onKeyReleased("", "end");
+    }
+
 } // fullScreenItem

=== modified file 'src/lib/logic/eventhandler.cpp'
--- src/lib/logic/eventhandler.cpp	2015-01-29 05:44:05 +0000
+++ src/lib/logic/eventhandler.cpp	2015-07-17 14:19:53 +0000
@@ -90,6 +90,18 @@
         key.setAction(Key::ActionSpace);
     else if (action == "shift")
         key.setAction(Key::ActionShift);
+    else if (action == "left")
+        key.setAction(Key::ActionLeft);
+    else if (action == "right")
+        key.setAction(Key::ActionRight);
+    else if (action == "up")
+        key.setAction(Key::ActionUp);
+    else if (action == "down")
+        key.setAction(Key::ActionDown);
+    else if (action == "home")
+        key.setAction(Key::ActionHome);
+    else if (action == "end")
+        key.setAction(Key::ActionEnd);
     else
         key.setAction(Key::ActionInsert);
 

=== modified file 'src/lib/models/key.h'
--- src/lib/models/key.h	2013-11-07 17:43:22 +0000
+++ src/lib/models/key.h	2015-07-17 14:19:53 +0000
@@ -69,6 +69,8 @@
         ActionDead, //!< Switches keyboard to deadkey variation, using key's label as lookup.
         ActionLeftLayout, //!< Switch to left/previous language layout.
         ActionRightLayout, //!< Switch to right/next language layout.
+        ActionHome, //!< Key moves cursor to beginning of text.
+        ActionEnd, //!< Key moves cursor to end of text.
         NumActions
     };
 

=== modified file 'src/plugin/ubuntuapplicationapiwrapper.cpp'
--- src/plugin/ubuntuapplicationapiwrapper.cpp	2014-04-16 13:12:34 +0000
+++ src/plugin/ubuntuapplicationapiwrapper.cpp	2015-07-17 14:19:53 +0000
@@ -19,12 +19,6 @@
 // FIXME: this is hacky way of deciding if running on Touch platform or not
 #include <QtCore/qconfig.h>
 
-#ifdef QT_OPENGL_ES_2
-#include <ubuntu/ui/ubuntu_ui_session_service.h>
-#include <ubuntu/application/ui/window_properties.h>
-  #define HAVE_UBUNTU_PLATFORM_API
-#endif
-
 #include <QByteArray>
 #include <QDir>
 #include <QFile>
@@ -95,11 +89,7 @@
 
 int UbuntuApplicationApiWrapper::oskWindowRole() const
 {
-#ifdef HAVE_UBUNTU_PLATFORM_API
-    return static_cast<int>(U_ON_SCREEN_KEYBOARD_ROLE);
-#else
     return 7;
-#endif
 }
 
 void UbuntuApplicationApiWrapper::sendInfoToClientConnection()

=== modified file 'src/view/abstracttexteditor.cpp'
--- src/view/abstracttexteditor.cpp	2015-04-16 15:32:49 +0000
+++ src/view/abstracttexteditor.cpp	2015-07-17 14:19:53 +0000
@@ -546,6 +546,14 @@
         Q_EMIT rightLayoutSelected();
         break;
 
+    case Key::ActionHome:
+        event_key = Qt::Key_Home;
+        break;
+
+    case Key::ActionEnd:
+        event_key = Qt::Key_End;
+        break;
+
     default:
         break;
     }

=== modified file 'tests/autopilot/ubuntu_keyboard/emulators/keyboard.py'
--- tests/autopilot/ubuntu_keyboard/emulators/keyboard.py	2015-06-26 09:09:22 +0000
+++ tests/autopilot/ubuntu_keyboard/emulators/keyboard.py	2015-07-17 14:19:53 +0000
@@ -235,6 +235,24 @@
             self._active_keypad = self._keypad_loader.select_single(KeyPad)
         return self._active_keypad
 
+    def send_left_key(self):
+        self.maliit.select_single('Keyboard').slots.sendLeftKey()
+
+    def send_right_key(self):
+        self.maliit.select_single('Keyboard').slots.sendRightKey()
+
+    def send_up_key(self):
+        self.maliit.select_single('Keyboard').slots.sendUpKey()
+
+    def send_down_key(self):
+        self.maliit.select_single('Keyboard').slots.sendDownKey()
+
+    def send_home_key(self):
+        self.maliit.select_single('Keyboard').slots.sendHomeKey()
+
+    def send_end_key(self):
+        self.maliit.select_single('Keyboard').slots.sendEndKey()
+
     @property
     def _keypad_loader(self):
         return self.maliit.select_single(

=== modified file 'tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py'
--- tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py	2015-06-26 09:09:22 +0000
+++ tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py	2015-07-17 14:19:53 +0000
@@ -1361,6 +1361,35 @@
         )
 
 
+class UbuntuKeyboardCursorTests(UbuntuKeyboardTests):
+
+    def test_cursor_movement(self):
+        """Test that autopilot is able to move the cursor
+
+        """
+        text_area = self.launch_test_input_area(
+            input_hints=['Qt.ImhNoPredictiveText'])
+        self.ensure_focus_on_input(text_area)
+        keyboard = Keyboard()
+        self.addCleanup(keyboard.dismiss)
+
+        keyboard.type("Cursor Test")
+
+        keyboard.send_home_key()
+        keyboard.send_right_key()
+        keyboard.send_right_key()
+        keyboard.type("\b")
+        keyboard.send_end_key()
+        keyboard.send_left_key()
+        keyboard.type("\b")
+
+        expected = "Crsor Tet"
+        self.assertThat(
+            text_area.text,
+            Eventually(Equals(expected))
+        )
+
+
 def maliit_cleanup():
     presagedir = os.path.expanduser("~/.presage")
     if os.path.exists(presagedir + ".bak") and os.path.exists(presagedir):