diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-01-19 02:14:15 -0800 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-01-19 02:14:15 -0800 |
| commit | 085b659463c41beb01950bf82334f451cca8ed2e (patch) | |
| tree | 63dcb07ebd3b03b4e18b17063cf5e0945a39b3aa /tests/src | |
| parent | 4d229410f0336a56dd9c9a5440aecbbb6a90503a (diff) | |
| parent | d26d63b35d34333a8f6737572b1c306b774eebd0 (diff) | |
| download | latinime-085b659463c41beb01950bf82334f451cca8ed2e.tar.gz latinime-085b659463c41beb01950bf82334f451cca8ed2e.tar.xz latinime-085b659463c41beb01950bf82334f451cca8ed2e.zip | |
Merge "Fix KeyboardState to pass KeyboardStateMultiTouchTests"
Diffstat (limited to 'tests/src')
| -rw-r--r-- | tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java b/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java index 0394ad731..7ca65cd69 100644 --- a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java +++ b/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java @@ -52,21 +52,18 @@ public class KeyboardStateMultiTouchTests extends KeyboardStateTestsBase { chordingPressAndReleaseKey('Z', ALPHABET_MANUAL_SHIFTED, ALPHABET_MANUAL_SHIFTED); chordingPressAndReleaseKey('X', ALPHABET_MANUAL_SHIFTED, ALPHABET_MANUAL_SHIFTED); - // TODO: This test fails due to bug, though external behavior is correct. -// // Release shift key, switch back to alphabet shift locked. -// releaseKey(CODE_SHIFT, ALPHABET_SHIFT_LOCKED); - releaseKey(CODE_SHIFT, ALPHABET_UNSHIFTED); + // Release shift key, switch back to alphabet shift locked. + releaseKey(CODE_SHIFT, ALPHABET_SHIFT_LOCKED); - // TODO: This test fails due to bug, though external behavior is correct. -// // Press symbols key and hold, enter into choring symbols state. -// pressKey(CODE_SYMBOL, SYMBOLS_UNSHIFTED); -// -// // Press/release symbol letter keys. -// chordingPressAndReleaseKey('1', SYMBOLS_UNSHIFTED, SYMBOLS_UNSHIFTED); -// chordingPressAndReleaseKey('2', SYMBOLS_UNSHIFTED, SYMBOLS_UNSHIFTED); -// -// // Release symbols key, switch back to alphabet shift locked. -// releaseKey(CODE_SYMBOL, ALPHABET_SHIFT_LOCKED); + // Press symbols key and hold, enter into choring symbols state. + pressKey(CODE_SYMBOL, SYMBOLS_UNSHIFTED); + + // Press/release symbol letter keys. + chordingPressAndReleaseKey('1', SYMBOLS_UNSHIFTED, SYMBOLS_UNSHIFTED); + chordingPressAndReleaseKey('2', SYMBOLS_UNSHIFTED, SYMBOLS_UNSHIFTED); + + // Release symbols key, switch back to alphabet shift locked. + releaseKey(CODE_SYMBOL, ALPHABET_SHIFT_LOCKED); } // Symbols key chording input. |