nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am fb0a4ba8: Add unit tests for long press shift key 

* commit 'fb0a4ba8fd7291e1bed0ec61bb7d2b5c8f93c1ad':
  Add unit tests for long press shift key
main
Tadashi G. Takaoka 2012-05-29 03:00:25 -07:00 committed by Android Git Automerger
parent 7291fbce47 fb0a4ba8fd
commit 57da84dac4
2 changed files with 49 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java
View File

@ -375,4 +375,47 @@ public class KeyboardStateMultiTouchTests extends KeyboardStateTestsBase {
// Release shift key. // Release shift key.
releaseKey(CODE_SHIFT, ALPHABET_UNSHIFTED); releaseKey(CODE_SHIFT, ALPHABET_UNSHIFTED);
} }
public void testLongPressShiftAndChording() {
// TODO: The following tests fail due to bug. Temporarily commented.
// // Long press shift key, enter maybe shift locked.
// longPressKey(CODE_SHIFT, ALPHABET_MANUAL_SHIFTED, ALPHABET_MANUAL_SHIFTED);
// // Press/release letter key, remain in manual shifted.
// chordingPressAndReleaseKey('A', ALPHABET_MANUAL_SHIFTED, ALPHABET_MANUAL_SHIFTED);
// // Release shift key, back to alphabet (not shift locked).
// releaseKey(CODE_SHIFT, ALPHABET_UNSHIFTED);
//
// // Long press shift key, enter alphabet shift locked.
// longPressAndReleaseKey(CODE_SHIFT, ALPHABET_MANUAL_SHIFTED, ALPHABET_MANUAL_SHIFTED,
// ALPHABET_SHIFT_LOCKED);
// // Long press shift key, enter maybe alphabet.
// longPressKey(CODE_SHIFT, ALPHABET_SHIFT_LOCK_SHIFTED, ALPHABET_SHIFT_LOCK_SHIFTED);
// // Press/release letter key, remain in manual shifted.
// chordingPressAndReleaseKey('A', ALPHABET_SHIFT_LOCK_SHIFTED, ALPHABET_SHIFT_LOCK_SHIFTED);
// // Release shift key, back to shift locked (not alphabet).
// releaseKey(CODE_SHIFT, ALPHABET_SHIFT_LOCKED);
// // Long press shift key, enter alphabet
// longPressAndReleaseKey(CODE_SHIFT, ALPHABET_SHIFT_LOCK_SHIFTED, ALPHABET_SHIFT_LOCK_SHIFTED,
// ALPHABET_UNSHIFTED);
//
// // Press/release shift key, enter alphabet shifted.
// pressAndReleaseKey(CODE_SHIFT, ALPHABET_MANUAL_SHIFTED, ALPHABET_MANUAL_SHIFTED);
// // Long press shift key, enter maybe alphabet.
// longPressKey(CODE_SHIFT, ALPHABET_MANUAL_SHIFTED, ALPHABET_MANUAL_SHIFTED);
// // Press/release letter key, remain in manual shifted.
// chordingPressAndReleaseKey('A', ALPHABET_MANUAL_SHIFTED, ALPHABET_MANUAL_SHIFTED);
// // Release shift key, back to alphabet shifted (not alphabet).
// releaseKey(CODE_SHIFT, ALPHABET_MANUAL_SHIFTED);
//
// // Set capitalize the first character of all words mode.
// setAutoCapsMode(CAP_MODE_WORDS);
// // Load keyboard, should be in automatic shifted.
// loadKeyboard(ALPHABET_AUTOMATIC_SHIFTED);
// // Long press shift key, enter maybe shift locked.
// longPressKey(CODE_SHIFT, ALPHABET_MANUAL_SHIFTED, ALPHABET_MANUAL_SHIFTED);
// // Press/release letter key, remain in manual shifted.
// chordingPressAndReleaseKey('A', ALPHABET_MANUAL_SHIFTED, ALPHABET_MANUAL_SHIFTED);
// // Release shift key, back to alphabet (not shift locked).
// releaseKey(CODE_SHIFT, ALPHABET_UNSHIFTED);
}
} }

8
tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateTestsBase.java
View File

@ -108,11 +108,15 @@ public class KeyboardStateTestsBase extends AndroidTestCase
assertLayout("afterSlide", afterSlide, mSwitcher.getLayoutId()); assertLayout("afterSlide", afterSlide, mSwitcher.getLayoutId());
} }
public void longPressAndReleaseKey(int code, int afterPress, int afterLongPress, public void longPressKey(int code, int afterPress, int afterLongPress) {
int afterRelease) {
pressKey(code, afterPress); pressKey(code, afterPress);
mSwitcher.onLongPressTimeout(code); mSwitcher.onLongPressTimeout(code);
assertLayout("afterLongPress", afterLongPress, mSwitcher.getLayoutId()); assertLayout("afterLongPress", afterLongPress, mSwitcher.getLayoutId());
}
public void longPressAndReleaseKey(int code, int afterPress, int afterLongPress,
int afterRelease) {
longPressKey(code, afterPress, afterLongPress);
releaseKey(code, afterRelease); releaseKey(code, afterRelease);
} }