diff options
Diffstat (limited to 'tests/src')
3 files changed, 3 insertions, 13 deletions
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateNonDistinctTests.java b/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateNonDistinctTests.java index 59acd1666..e3f0e0718 100644 --- a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateNonDistinctTests.java +++ b/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateNonDistinctTests.java @@ -342,8 +342,6 @@ public class KeyboardStateNonDistinctTests extends AndroidTestCase mSwitcher.onPressKey(CODE_SHIFT); assertAlphabetManualShifted(); // Long press recognized in LatinKeyboardView.KeyTimerHandler. - mSwitcher.toggleCapsLock(); - assertAlphabetShiftLocked(); mSwitcher.onCodeInput(CODE_CAPSLOCK); assertAlphabetShiftLocked(); mSwitcher.onReleaseKey(CODE_SHIFT); @@ -355,8 +353,6 @@ public class KeyboardStateNonDistinctTests extends AndroidTestCase mSwitcher.onPressKey(CODE_SHIFT); assertAlphabetManualShifted(); // Long press recognized in LatinKeyboardView.KeyTimerHandler. - mSwitcher.toggleCapsLock(); - assertAlphabetNormal(); mSwitcher.onCodeInput(CODE_CAPSLOCK); assertAlphabetNormal(); mSwitcher.onReleaseKey(CODE_SHIFT); @@ -396,8 +392,6 @@ public class KeyboardStateNonDistinctTests extends AndroidTestCase assertAlphabetManualShifted(); // Second shift key tap. // Double tap recognized in LatinKeyboardView.KeyTimerHandler. - mSwitcher.toggleCapsLock(); - assertAlphabetShiftLocked(); mSwitcher.onCodeInput(CODE_CAPSLOCK); assertAlphabetShiftLocked(); diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateTests.java b/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateTests.java index fc5f68b1b..19339f72e 100644 --- a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateTests.java +++ b/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateTests.java @@ -16,8 +16,6 @@ package com.android.inputmethod.keyboard.internal; -import com.android.inputmethod.keyboard.Keyboard; - public class KeyboardStateTests extends KeyboardStateNonDistinctTests { @Override public boolean hasDistinctMultitouch() { @@ -27,7 +25,7 @@ public class KeyboardStateTests extends KeyboardStateNonDistinctTests { // Shift key chording input. public void testShiftChording() { // Press shift key and hold, enter into choring shift state. - mSwitcher.onPressKey(Keyboard.CODE_SHIFT); + mSwitcher.onPressKey(CODE_SHIFT); assertAlphabetManualShifted(); // Press/release letter keys. @@ -114,4 +112,6 @@ public class KeyboardStateTests extends KeyboardStateNonDistinctTests { } // TODO: Multitouch test + + // TODO: n-Keys roll over test } diff --git a/tests/src/com/android/inputmethod/keyboard/internal/MockKeyboardSwitcher.java b/tests/src/com/android/inputmethod/keyboard/internal/MockKeyboardSwitcher.java index 71de0ce8a..1e294d179 100644 --- a/tests/src/com/android/inputmethod/keyboard/internal/MockKeyboardSwitcher.java +++ b/tests/src/com/android/inputmethod/keyboard/internal/MockKeyboardSwitcher.java @@ -121,10 +121,6 @@ public class MockKeyboardSwitcher implements KeyboardState.SwitchActions { mState.onUpdateShiftState(mAutoCapsMode && mAutoCapsState); } - public void toggleCapsLock() { - mState.onToggleCapsLock(); - } - public void updateShiftState() { mState.onUpdateShiftState(mAutoCapsMode && mAutoCapsState); } |