Merge lp:~veebers/autopilot/1.3_backspace_fix_1237675 into lp:autopilot/1.3

[Christopher Lee]

Keyboard backends: Add alias so Backspace and BackSpace work.

Keyboard backends: Add alias so Backspace and BackSpace work.

[Thomi Richards (thomir-deactivatedaccount)]

64 + keyboard.type("Hello1", 0.01)
79 + keyboard.type("Hello1\b", 0.01)

Please don't change the default timings unless there's a very good reason to. I don't see any need for this here.

review: Needs Fixing

[Christopher Lee (veebers)]

> 64 + keyboard.type("Hello1", 0.01)
> 79 + keyboard.type("Hello1\b", 0.01)
>
> Please don't change the default timings unless there's a very good reason to.
> I don't see any need for this here.

Oh, that's a copy and paste error :-\ Will remove

[lp:~veebers/autopilot/1.3_backspace_fix_1237675]

349. By Christopher Lee on 2013-10-09

Remove timing change in 'type'

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:348
http://jenkins.qa.ubuntu.com/job/autopilot-1.3-ci/31/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.3-saucy-amd64-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.3-saucy-armhf-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.3-saucy-i386-ci/15

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/autopilot-1.3-ci/31/rebuild

review: Approve (continuous-integration)

[Thomi Richards (thomir-deactivatedaccount)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:349
http://jenkins.qa.ubuntu.com/job/autopilot-1.3-ci/32/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.3-saucy-amd64-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.3-saucy-armhf-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-1.3-saucy-i386-ci/16

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/autopilot-1.3-ci/32/rebuild

review: Approve (continuous-integration)

=== modified file 'autopilot/input/_X11.py'
--- autopilot/input/_X11.py	2013-09-04 03:44:07 +0000
+++ autopilot/input/_X11.py	2013-10-09 22:44:27 +0000
@@ -73,6 +73,7 @@
         '\n': "Return",  # for some reason this needs to be cr, not lf
         '\r': "Return",
         '\e': "Escape",
+        '\b': "BackSpace",
         '!': "exclam",
         '#': "numbersign",
         '%': "percent",
@@ -116,6 +117,7 @@
         'Shift': 'Shift_L',
         'Enter': 'Return',
         'Space': ' ',
+        'Backspace': 'BackSpace',
     }
 
     def __init__(self):

=== modified file 'autopilot/input/_uinput.py'
--- autopilot/input/_uinput.py	2013-08-02 02:25:03 +0000
+++ autopilot/input/_uinput.py	2013-10-09 22:44:27 +0000
@@ -459,6 +459,7 @@
     ' ': 'SPACE',
     '\t': 'TAB',
     '\n': 'ENTER',
+    '\b': 'BACKSPACE',
     'CTRL': 'LEFTCTRL',
     'ALT': 'LEFTALT',
     'SHIFT': 'LEFTSHIFT',

=== modified file 'autopilot/tests/functional/test_input_stack.py'
--- autopilot/tests/functional/test_input_stack.py	2013-09-09 20:59:43 +0000
+++ autopilot/tests/functional/test_input_stack.py	2013-10-09 22:44:27 +0000
@@ -158,6 +158,53 @@
                       )
 
 
+class InputStackKeyboardBackspaceTests(InputStackKeyboardBase):
+
+    def start_mock_app(self):
+        window_spec_file = mktemp(suffix='.json')
+        window_spec = {"Contents": "TextEdit"}
+        json.dump(
+            window_spec,
+            open(window_spec_file, 'w')
+        )
+        self.addCleanup(os.remove, window_spec_file)
+
+        return self.launch_test_application(
+            'window-mocker',
+            window_spec_file,
+            app_type='qt'
+        )
+
+    def test_backspace_works(self):
+        app_proxy = self.start_mock_app()
+        text_edit = app_proxy.select_single('QTextEdit')
+
+        self.mouse.click_object(text_edit)
+
+        keyboard = Keyboard.create(self.backend)
+        keyboard.type("Hello1")
+        keyboard.press_and_release("Backspace")
+
+        self.assertThat(text_edit.plainText,
+                        Eventually(Equals("Hello")),
+                        "app shows: " + text_edit.plainText
+                        )
+
+    def test_inline_backspace_works(self):
+        app_proxy = self.start_mock_app()
+        text_edit = app_proxy.select_single('QTextEdit')
+
+        self.mouse.click_object(text_edit)
+
+        keyboard = Keyboard.create(self.backend)
+        keyboard.type("Hello1\b")
+
+        self.assertThat(text_edit.plainText,
+                        Eventually(Equals("Hello")),
+                        "app shows: " + text_edit.plainText
+                        )
+
+
 @skipIf(platform.model() == 'Desktop', "Only on device")
 class OSKBackendTests(AutopilotTestCase):
     """Testing the Onscreen Keyboard (Ubuntu Keyboard) backend specifically.