diff options
Diffstat (limited to 'tests')
4 files changed, 28 insertions, 8 deletions
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml index 6bd46ccfb..4b08d6acb 100644 --- a/tests/AndroidManifest.xml +++ b/tests/AndroidManifest.xml @@ -17,7 +17,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.inputmethod.latin.tests"> - <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="16" /> + <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="16" /> <uses-permission android:name="android.permission.READ_CONTACTS" /> diff --git a/tests/src/com/android/inputmethod/keyboard/SpacebarTextTests.java b/tests/src/com/android/inputmethod/keyboard/SpacebarTextTests.java index 015c2711c..de323b0d7 100644 --- a/tests/src/com/android/inputmethod/keyboard/SpacebarTextTests.java +++ b/tests/src/com/android/inputmethod/keyboard/SpacebarTextTests.java @@ -18,6 +18,7 @@ package com.android.inputmethod.keyboard; import android.content.Context; import android.content.res.Resources; +import android.preference.PreferenceManager; import android.test.AndroidTestCase; import android.view.inputmethod.InputMethodSubtype; @@ -41,7 +42,8 @@ public class SpacebarTextTests extends AndroidTestCase { protected void setUp() throws Exception { super.setUp(); final Context context = getContext(); - RichInputMethodManager.init(context); + RichInputMethodManager.init( + context, PreferenceManager.getDefaultSharedPreferences(context)); mRichImm = RichInputMethodManager.getInstance(); mRes = context.getResources(); SubtypeLocale.init(context); diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java b/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java index f5ad7239e..053bcb53a 100644 --- a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java +++ b/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java @@ -50,7 +50,7 @@ public class KeyboardStateMultiTouchTests extends KeyboardStateTestsBase { pressKey(CODE_SYMBOL, SYMBOLS_UNSHIFTED); // Press/release symbol letter key. chordingPressAndReleaseKey('1', SYMBOLS_UNSHIFTED, SYMBOLS_UNSHIFTED); - // Release "123?" key, switch back to alphabet shift unshifted. + // Release "123?" key, switch back to alphabet unshifted. releaseKey(CODE_SYMBOL, ALPHABET_UNSHIFTED); } @@ -330,7 +330,7 @@ public class KeyboardStateMultiTouchTests extends KeyboardStateTestsBase { releaseKey('X', ALPHABET_MANUAL_SHIFTED); // Release 'Z' key releaseKey('Z', ALPHABET_MANUAL_SHIFTED); - // Release shift key. + // Release shift key, switch back to alphabet shifted. releaseKey(CODE_SHIFT, ALPHABET_MANUAL_SHIFTED); } @@ -351,8 +351,24 @@ public class KeyboardStateMultiTouchTests extends KeyboardStateTestsBase { releaseKey('X', ALPHABET_MANUAL_SHIFTED); // Release 'Z' key releaseKey('Z', ALPHABET_MANUAL_SHIFTED); - // Release shift key. + // Release shift key, updated to alphabet unshifted. releaseKey(CODE_SHIFT, ALPHABET_UNSHIFTED); + + // Update shift state with auto caps enabled. + pressAndReleaseKey(CODE_AUTO_CAPS_TRIGGER, ALPHABET_UNSHIFTED, ALPHABET_AUTOMATIC_SHIFTED); + + // Press shift key and hold, switch to alphabet shifted. + pressKey(CODE_SHIFT, ALPHABET_MANUAL_SHIFTED); + // Press 'X' key and hold + chordingPressKey('X', ALPHABET_MANUAL_SHIFTED); + // Release 'X' key + releaseKey('X', ALPHABET_MANUAL_SHIFTED); + // Press key and hold, stays in alphabet shifted. + chordingPressKey(CODE_AUTO_CAPS_TRIGGER, ALPHABET_MANUAL_SHIFTED); + // Release 'Z' key + releaseKey(CODE_AUTO_CAPS_TRIGGER, ALPHABET_MANUAL_SHIFTED); + // Release shift key, updated to alphabet automatic shifted. + releaseKey(CODE_SHIFT, ALPHABET_AUTOMATIC_SHIFTED); } // Multi touch shift chording input in capitalize character mode. @@ -372,8 +388,8 @@ public class KeyboardStateMultiTouchTests extends KeyboardStateTestsBase { releaseKey('X', ALPHABET_MANUAL_SHIFTED); // Release 'Z' key releaseKey('Z', ALPHABET_MANUAL_SHIFTED); - // Release shift key. - releaseKey(CODE_SHIFT, ALPHABET_UNSHIFTED); + // Release shift key, updated to alphabet automatic shifted. + releaseKey(CODE_SHIFT, ALPHABET_AUTOMATIC_SHIFTED); } public void testLongPressShiftAndChording() { diff --git a/tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java b/tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java index 4e81de668..0f6fb7371 100644 --- a/tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java +++ b/tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java @@ -18,6 +18,7 @@ package com.android.inputmethod.latin; import android.content.Context; import android.content.res.Resources; +import android.preference.PreferenceManager; import android.test.AndroidTestCase; import android.view.inputmethod.InputMethodSubtype; @@ -37,7 +38,8 @@ public class SubtypeLocaleTests extends AndroidTestCase { protected void setUp() throws Exception { super.setUp(); final Context context = getContext(); - RichInputMethodManager.init(context); + RichInputMethodManager.init( + context, PreferenceManager.getDefaultSharedPreferences(context)); mRichImm = RichInputMethodManager.getInstance(); mRes = context.getResources(); SubtypeLocale.init(context); |