diff options
Diffstat (limited to 'tests/src/com/android/inputmethod')
3 files changed, 20 insertions, 21 deletions
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java b/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java index 5c62c11c5..dc098db1e 100644 --- a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java +++ b/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java @@ -268,13 +268,12 @@ public class KeyboardStateMultiTouchTests extends KeyboardStateTestsBase { // Press 'X' key and hold pressKey('X', ALPHABET_MANUAL_SHIFTED); - // TODO: The following test fails due to a bug. Temporarily commented out. -// // Press 'z' key and hold, switch back to alphabet unshifted. -// chordingPressKey('z', ALPHABET_UNSHIFTED); -// // Release 'X' key -// releaseKey('X', ALPHABET_UNSHIFTED); -// // Release 'z' key -// releaseKey('z', ALPHABET_UNSHIFTED); + // Press 'z' key and hold, switch back to alphabet unshifted. + chordingPressKey('z', ALPHABET_UNSHIFTED); + // Release 'X' key + releaseKey('X', ALPHABET_UNSHIFTED); + // Release 'z' key + releaseKey('z', ALPHABET_UNSHIFTED); } // Multi touch input in automatic upper case. @@ -286,13 +285,12 @@ public class KeyboardStateMultiTouchTests extends KeyboardStateTestsBase { // Press 'X' key and hold pressKey('X', ALPHABET_AUTOMATIC_SHIFTED); - // TODO: The following test fails due to a bug. Temporarily commented out. -// // Press 'z' key and hold, switch back to alphabet unshifted. -// chordingPressKey('z', ALPHABET_UNSHIFTED); -// // Release 'X' key -// releaseKey('X', ALPHABET_UNSHIFTED); -// // Release 'z' key -// releaseKey('z', ALPHABET_UNSHIFTED); + // Press 'z' key and hold, switch back to alphabet unshifted. + chordingPressKey('z', ALPHABET_UNSHIFTED); + // Release 'X' key + releaseKey('X', ALPHABET_UNSHIFTED); + // Release 'z' key + releaseKey('z', ALPHABET_UNSHIFTED); } // Multi touch input in capitalize character mode. diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateTestsBase.java b/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateTestsBase.java index bbe0dbde5..9472a1fe5 100644 --- a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateTestsBase.java +++ b/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateTestsBase.java @@ -64,14 +64,14 @@ public class KeyboardStateTestsBase extends AndroidTestCase assertLayout(afterRotate, mSwitcher.getLayoutId()); } - private void pressKeyWithoutTimerExpire(int code, int afterPress) { - mSwitcher.onPressKey(code); + private void pressKeyWithoutTimerExpire(int code, boolean isSinglePointer, int afterPress) { + mSwitcher.onPressKey(code, isSinglePointer); assertLayout(afterPress, mSwitcher.getLayoutId()); } public void pressKey(int code, int afterPress) { mSwitcher.expireDoubleTapTimeout(); - pressKeyWithoutTimerExpire(code, afterPress); + pressKeyWithoutTimerExpire(code, true, afterPress); } public void releaseKey(int code, int afterRelease) { @@ -86,7 +86,8 @@ public class KeyboardStateTestsBase extends AndroidTestCase } public void chordingPressKey(int code, int afterPress) { - pressKey(code, afterPress); + mSwitcher.expireDoubleTapTimeout(); + pressKeyWithoutTimerExpire(code, false, afterPress); } public void chordingReleaseKey(int code, int afterRelease) { @@ -114,7 +115,7 @@ public class KeyboardStateTestsBase extends AndroidTestCase } public void secondPressAndReleaseKey(int code, int afterPress, int afterRelease) { - pressKeyWithoutTimerExpire(code, afterPress); + pressKeyWithoutTimerExpire(code, true, afterPress); releaseKey(code, afterRelease); } } diff --git a/tests/src/com/android/inputmethod/keyboard/internal/MockKeyboardSwitcher.java b/tests/src/com/android/inputmethod/keyboard/internal/MockKeyboardSwitcher.java index 485ea61e7..dd4caadf1 100644 --- a/tests/src/com/android/inputmethod/keyboard/internal/MockKeyboardSwitcher.java +++ b/tests/src/com/android/inputmethod/keyboard/internal/MockKeyboardSwitcher.java @@ -174,8 +174,8 @@ public class MockKeyboardSwitcher implements KeyboardState.SwitchActions { mState.onSaveKeyboardState(); } - public void onPressKey(int code) { - mState.onPressKey(code); + public void onPressKey(int code, boolean isSinglePointer) { + mState.onPressKey(code, isSinglePointer, mAutoCapsState); } public void onReleaseKey(int code, boolean withSliding) { |