diff options
Diffstat (limited to 'tests/src')
| -rw-r--r-- | tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java b/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java index 6fbe769d0..729120bba 100644 --- a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java +++ b/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java @@ -52,19 +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); -// -// // 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); + releaseKey(CODE_SHIFT, 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. @@ -110,16 +109,15 @@ public class KeyboardStateMultiTouchTests extends KeyboardStateTestsBase { // Release shift key, switch back to symbols shifted state. releaseKey(CODE_SHIFT, SYMBOLS_SHIFTED); - // TODO: This test fails due to bug. -// // Press "ABC" key and hold, enter into choring alphabet state. -// pressKey(CODE_SYMBOL, ALPHABET_UNSHIFTED); -// -// // Press/release letter keys. -// chordingPressAndReleaseKey('a', ALPHABET_UNSHIFTED, ALPHABET_UNSHIFTED); -// chordingPressAndReleaseKey('b', ALPHABET_UNSHIFTED, ALPHABET_UNSHIFTED); -// -// // Release "ABC" key, switch back to symbols. -// releaseKey(CODE_SYMBOL, SYMBOLS_SHIFTED); + // Press "ABC" key and hold, enter into choring alphabet state. + pressKey(CODE_SYMBOL, ALPHABET_UNSHIFTED); + + // Press/release letter keys. + chordingPressAndReleaseKey('a', ALPHABET_UNSHIFTED, ALPHABET_UNSHIFTED); + chordingPressAndReleaseKey('b', ALPHABET_UNSHIFTED, ALPHABET_UNSHIFTED); + + // Release "ABC" key, switch back to symbols. + releaseKey(CODE_SYMBOL, SYMBOLS_SHIFTED); } // Chording shift key in automatic upper case. |