Merge lp:~michael-sheldon/ubuntu-keyboard/fix-1430744 into lp:ubuntu-keyboard

[Michael Sheldon]

Fix preedit commit when changing layout

Fix preedit commit when changing layout

[Michael Sheldon (michael-sheldon)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/ubuntu-keyboard) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed UI labels, did you update the pot file?

 * No change

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * No change

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:336
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/566/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1731
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/67
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/67
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/67/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/67
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1537
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1729
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1729/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18768

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

review: Needs Fixing (continuous-integration)

=== modified file 'src/plugin/inputmethod.cpp'
--- src/plugin/inputmethod.cpp	2015-02-09 21:14:15 +0000
+++ src/plugin/inputmethod.cpp	2015-03-11 17:12:25 +0000
@@ -544,6 +544,8 @@
     if (d->activeLanguage == newLanguage)
         return;
 
+    d->editor.commitPreedit();
+
     setPreviousLanguage(d->activeLanguage);
     d->activeLanguage = newLanguage;
     d->host->setLanguage(newLanguage);

=== modified file 'src/view/abstracttexteditor.h'
--- src/view/abstracttexteditor.h	2015-01-07 15:00:07 +0000
+++ src/view/abstracttexteditor.h	2015-03-11 17:12:25 +0000
@@ -112,6 +112,7 @@
     Logic::AbstractWordEngine * wordEngine() const;
 
     void checkPreeditReentry(bool uncommittedDelete);
+    void commitPreedit();
 
     Q_SLOT void onKeyPressed(const Key &key);
     Q_SLOT void onKeyReleased(const Key &key);
@@ -169,7 +170,6 @@
 
     virtual void singleBackspace();
 
-    void commitPreedit();
     void removeTrailingWhitespaces();
     Q_SLOT void autoRepeatBackspace();
     void autoRepeatWordBackspace();

=== modified file 'tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py'
--- tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py	2015-02-27 14:12:47 +0000
+++ tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py	2015-03-11 17:12:25 +0000
@@ -855,6 +855,26 @@
 
         keyboard.press_key("language")
 
+    def test_switching_with_preedit(self):
+        """Switching languages whilst text is in preedit should result in
+        that text being committed.
+
+        """
+        text_area = self.launch_test_input_area()
+        self.ensure_focus_on_input(text_area)
+        keyboard = Keyboard()
+        self.addCleanup(keyboard.dismiss)
+
+        keyboard.type('Hello')
+
+        keyboard.press_key("language")
+
+        expected = 'Hello'
+        self.assertThat(
+            text_area.text,
+            Eventually(Equals(expected))
+        )
+        
 
 def maliit_cleanup():
     presagedir = os.path.expanduser("~/.presage")