diff options
Diffstat (limited to 'tests/src')
| -rw-r--r-- | tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTests.java | 2 | ||||
| -rw-r--r-- | tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java | 40 |
2 files changed, 21 insertions, 21 deletions
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTests.java b/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTests.java index e4879ad2a..f6a0c5604 100644 --- a/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTests.java +++ b/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTests.java @@ -253,7 +253,7 @@ public class KeySpecParserTests extends AndroidTestCase { private static void assertMoreKeys(String message, String[] moreKeys, String[] additionalMoreKeys, String[] expected) { - final String[] actual = KeySpecParser.insertAddtionalMoreKeys( + final String[] actual = KeySpecParser.insertAdditionalMoreKeys( moreKeys, additionalMoreKeys); if (expected == null && actual == null) { return; diff --git a/tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java b/tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java index d34055a54..12711c137 100644 --- a/tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java +++ b/tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java @@ -114,18 +114,18 @@ public class SubtypeLocaleTests extends AndroidTestCase { public void testSampleSubtypes() { final Context context = getContext(); - final InputMethodSubtype EN_US = SubtypeUtils.findSubtypeByLocaleAndKeyboardLayoutSet( - context, Locale.US, AdditionalSubtype.QWERTY); - final InputMethodSubtype EN_GB = SubtypeUtils.findSubtypeByLocaleAndKeyboardLayoutSet( - context, Locale.UK, AdditionalSubtype.QWERTY); - final InputMethodSubtype FR = SubtypeUtils.findSubtypeByLocaleAndKeyboardLayoutSet( - context, Locale.FRENCH, AdditionalSubtype.AZERTY); - final InputMethodSubtype FR_CA = SubtypeUtils.findSubtypeByLocaleAndKeyboardLayoutSet( - context, Locale.CANADA_FRENCH, AdditionalSubtype.QWERTY); - final InputMethodSubtype DE = SubtypeUtils.findSubtypeByLocaleAndKeyboardLayoutSet( - context, Locale.GERMAN, AdditionalSubtype.QWERTZ); - final InputMethodSubtype ZZ = SubtypeUtils.findSubtypeByLocaleAndKeyboardLayoutSet( - context, SubtypeLocale.LOCALE_NO_LANGUAGE, AdditionalSubtype.QWERTY); + final InputMethodSubtype EN_US = ImfUtils.findSubtypeByLocaleAndKeyboardLayoutSet( + context, Locale.US.toString(), AdditionalSubtype.QWERTY); + final InputMethodSubtype EN_GB = ImfUtils.findSubtypeByLocaleAndKeyboardLayoutSet( + context, Locale.UK.toString(), AdditionalSubtype.QWERTY); + final InputMethodSubtype FR = ImfUtils.findSubtypeByLocaleAndKeyboardLayoutSet( + context, Locale.FRENCH.toString(), AdditionalSubtype.AZERTY); + final InputMethodSubtype FR_CA = ImfUtils.findSubtypeByLocaleAndKeyboardLayoutSet( + context, Locale.CANADA_FRENCH.toString(), AdditionalSubtype.QWERTY); + final InputMethodSubtype DE = ImfUtils.findSubtypeByLocaleAndKeyboardLayoutSet( + context, Locale.GERMAN.toString(), AdditionalSubtype.QWERTZ); + final InputMethodSubtype ZZ = ImfUtils.findSubtypeByLocaleAndKeyboardLayoutSet( + context, SubtypeLocale.NO_LANGUAGE, AdditionalSubtype.QWERTY); assertFalse(AdditionalSubtype.isAdditionalSubtype(EN_US)); assertFalse(AdditionalSubtype.isAdditionalSubtype(EN_GB)); @@ -164,14 +164,14 @@ public class SubtypeLocaleTests extends AndroidTestCase { } public void testAdditionalSubtype() { - final InputMethodSubtype DE_QWERTY = AdditionalSubtype.createAddtionalSubtype( - Locale.GERMAN, AdditionalSubtype.QWERTY); - final InputMethodSubtype FR_QWERTZ = AdditionalSubtype.createAddtionalSubtype( - Locale.FRENCH, AdditionalSubtype.QWERTZ); - final InputMethodSubtype EN_AZERTY = AdditionalSubtype.createAddtionalSubtype( - Locale.ENGLISH, AdditionalSubtype.AZERTY); - final InputMethodSubtype ZZ_AZERTY = AdditionalSubtype.createAddtionalSubtype( - SubtypeLocale.LOCALE_NO_LANGUAGE, AdditionalSubtype.AZERTY); + final InputMethodSubtype DE_QWERTY = AdditionalSubtype.createAdditionalSubtype( + Locale.GERMAN.toString(), AdditionalSubtype.QWERTY); + final InputMethodSubtype FR_QWERTZ = AdditionalSubtype.createAdditionalSubtype( + Locale.FRENCH.toString(), AdditionalSubtype.QWERTZ); + final InputMethodSubtype EN_AZERTY = AdditionalSubtype.createAdditionalSubtype( + Locale.ENGLISH.toString(), AdditionalSubtype.AZERTY); + final InputMethodSubtype ZZ_AZERTY = AdditionalSubtype.createAdditionalSubtype( + SubtypeLocale.NO_LANGUAGE, AdditionalSubtype.AZERTY); assertTrue(AdditionalSubtype.isAdditionalSubtype(FR_QWERTZ)); assertTrue(AdditionalSubtype.isAdditionalSubtype(DE_QWERTY)); |