diff options
| author | Dan Zivkovic <zivkovic@google.com> | 2015-03-06 14:34:57 -0800 |
|---|---|---|
| committer | Dan Zivkovic <zivkovic@google.com> | 2015-03-06 14:34:57 -0800 |
| commit | b86ca76cea9aedf47a81f9272fb59897de3bbbe7 (patch) | |
| tree | f971bdc960031555d1092ee0a7304e24d0ad8b94 /tests | |
| parent | 8eb2fad5702d4d58476a015a5469a4d84adf4bbc (diff) | |
| download | android_packages_inputmethods_LatinIME-b86ca76cea9aedf47a81f9272fb59897de3bbbe7.tar.gz android_packages_inputmethods_LatinIME-b86ca76cea9aedf47a81f9272fb59897de3bbbe7.tar.bz2 android_packages_inputmethods_LatinIME-b86ca76cea9aedf47a81f9272fb59897de3bbbe7.zip | |
Handle null InputMethodSubtype.
Bug 19627494.
Change-Id: I50dc77c59ced0f2e7c07a49ae0cb040197c2ab35
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java | 2 | ||||
| -rw-r--r-- | tests/src/com/android/inputmethod/latin/RichInputMethodSubtypeTests.java | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java b/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java index 7f828111d..29787acc9 100644 --- a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java +++ b/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java @@ -159,7 +159,7 @@ public abstract class KeyboardLayoutSetTestsBase extends AndroidTestCase { final int keyboardHeight = ResourceUtils.getDefaultKeyboardHeight(res); final Builder builder = new Builder(context, editorInfo); builder.setKeyboardGeometry(keyboardWidth, keyboardHeight) - .setSubtype(new RichInputMethodSubtype(subtype)) + .setSubtype(RichInputMethodSubtype.getRichInputMethodSubtype(subtype)) .setVoiceInputKeyEnabled(voiceInputKeyEnabled) .setLanguageSwitchKeyEnabled(languageSwitchKeyEnabled) .setSplitLayoutEnabledByUser(splitLayoutEnabled); diff --git a/tests/src/com/android/inputmethod/latin/RichInputMethodSubtypeTests.java b/tests/src/com/android/inputmethod/latin/RichInputMethodSubtypeTests.java index 9c8e16511..d59890a96 100644 --- a/tests/src/com/android/inputmethod/latin/RichInputMethodSubtypeTests.java +++ b/tests/src/com/android/inputmethod/latin/RichInputMethodSubtypeTests.java @@ -318,4 +318,11 @@ public class RichInputMethodSubtypeTests extends AndroidTestCase { public void testAdditionalSubtypeForSpacebarInFrench() { testsAdditionalSubtypesForSpacebar.runInLocale(mRes, Locale.FRENCH); } + + public void testRichInputMethodSubtypeForNullInputMethodSubtype() { + RichInputMethodSubtype subtype = RichInputMethodSubtype.getRichInputMethodSubtype(null); + assertNotNull(subtype); + assertEquals("zz", subtype.getRawSubtype().getLocale()); + assertEquals("keyboard", subtype.getRawSubtype().getMode()); + } } |