diff options
Diffstat (limited to 'tests/src')
4 files changed, 14 insertions, 6 deletions
diff --git a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java b/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java index 0246c49a1..7f828111d 100644 --- a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java +++ b/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java @@ -75,7 +75,7 @@ public abstract class KeyboardLayoutSetTestsBase extends AndroidTestCase { mRichImm = RichInputMethodManager.getInstance(); // Save and reset additional subtypes preference. - mSavedAdditionalSubtypes = mRichImm.getAdditionalSubtypes(context); + mSavedAdditionalSubtypes = mRichImm.getAdditionalSubtypes(); final InputMethodSubtype[] predefinedAdditionalSubtypes = AdditionalSubtypeUtils.createAdditionalSubtypesArray( AdditionalSubtypeUtils.createPrefSubtypes( diff --git a/tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java b/tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java index bcf016ae9..8614ccc0e 100644 --- a/tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java +++ b/tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java @@ -176,7 +176,7 @@ public class RichInputConnectionAndTextRangeTests extends AndroidTestCase { assertEquals(NgramContextUtils.getNgramContextFromNthPreviousWord( "abc def", mSpacingAndPunctuations, 1).getNthPrevWord(2), "abc"); assertTrue(NgramContextUtils.getNgramContextFromNthPreviousWord( - "abc def", mSpacingAndPunctuations, 2).isNthPrevWordBeginningOfSontence(2)); + "abc def", mSpacingAndPunctuations, 2).isNthPrevWordBeginningOfSentence(2)); // The following tests reflect the current behavior of the function // RichInputConnection#getNthPreviousWord. diff --git a/tests/src/com/android/inputmethod/latin/RichInputMethodSubtypeTests.java b/tests/src/com/android/inputmethod/latin/RichInputMethodSubtypeTests.java index aed7d6ad6..9c8e16511 100644 --- a/tests/src/com/android/inputmethod/latin/RichInputMethodSubtypeTests.java +++ b/tests/src/com/android/inputmethod/latin/RichInputMethodSubtypeTests.java @@ -76,7 +76,7 @@ public class RichInputMethodSubtypeTests extends AndroidTestCase { mRichImm = RichInputMethodManager.getInstance(); // Save and reset additional subtypes - mSavedAddtionalSubtypes = mRichImm.getAdditionalSubtypes(context); + mSavedAddtionalSubtypes = mRichImm.getAdditionalSubtypes(); final InputMethodSubtype[] predefinedAddtionalSubtypes = AdditionalSubtypeUtils.createAdditionalSubtypesArray( AdditionalSubtypeUtils.createPrefSubtypes( diff --git a/tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java b/tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java index 03dcdfc78..111d5c56a 100644 --- a/tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java +++ b/tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java @@ -73,7 +73,7 @@ public class SubtypeLocaleUtilsTests extends AndroidTestCase { mRichImm = RichInputMethodManager.getInstance(); // Save and reset additional subtypes - mSavedAddtionalSubtypes = mRichImm.getAdditionalSubtypes(context); + mSavedAddtionalSubtypes = mRichImm.getAdditionalSubtypes(); final InputMethodSubtype[] predefinedAddtionalSubtypes = AdditionalSubtypeUtils.createAdditionalSubtypesArray( AdditionalSubtypeUtils.createPrefSubtypes( @@ -418,9 +418,17 @@ public class SubtypeLocaleUtilsTests extends AndroidTestCase { SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(HI)); // These are preliminary subtypes and may not exist. if (HI_LATN != null) { - assertEquals("hi_ZZ", "हिंग्लिश", + // TODO: Uncommented because of the current translation of these strings + // in Hindi are described in Latin script. + // assertEquals("hi_ZZ", "हिंग्लिश", + // SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(HI_LATN)); + // assertEquals("hi_ZZ", "हिंग्लिश (Dvorak)", + // SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(HI_LATN_DVORAK)); + // TODO: Remove these tests once the translation of these strings in Hindi + // are described in Devanagari script. + assertEquals("hi_ZZ", "Hinglish", SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(HI_LATN)); - assertEquals("hi_ZZ", "हिंग्लिश (Dvorak)", + assertEquals("hi_ZZ", "Hinglish (Dvorak)", SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(HI_LATN_DVORAK)); } return null; |