diff options
| author |   Dan Zivkovic <zivkovic@google.com> | 2015-03-09 16:20:06 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2015-03-09 16:20:06 +0000 |
| commit | fdd4fdb516a6d7396265ba7a6f67dc74fc02913a (patch) | |
| tree | 0792d97204a55d469a0e42a1c9e387f891f6a6a3 /tests/src | |
| parent | 80b74754c63a8bf808b1266b828432e3cdb22c0a (diff) | |
| parent | 491ca900a7535ddb19c3ad633475bb68ba18113c (diff) | |
| download | latinime-fdd4fdb516a6d7396265ba7a6f67dc74fc02913a.tar.gz latinime-fdd4fdb516a6d7396265ba7a6f67dc74fc02913a.tar.xz latinime-fdd4fdb516a6d7396265ba7a6f67dc74fc02913a.zip | |
am 491ca900: Merge "Handle null InputMethodSubtype."
* commit '491ca900a7535ddb19c3ad633475bb68ba18113c':
Handle null InputMethodSubtype.
Diffstat (limited to 'tests/src')
| -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()); + } } |