diff options
Diffstat (limited to 'tests/src')
| -rw-r--r-- | tests/src/com/android/inputmethod/keyboard/layout/Sinhala.java | 12 | ||||
| -rw-r--r-- | tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java | 43 |
2 files changed, 24 insertions, 31 deletions
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Sinhala.java b/tests/src/com/android/inputmethod/keyboard/layout/Sinhala.java index bfd94d5fc..5c0ffb4f9 100644 --- a/tests/src/com/android/inputmethod/keyboard/layout/Sinhala.java +++ b/tests/src/com/android/inputmethod/keyboard/layout/Sinhala.java @@ -129,25 +129,17 @@ public final class Sinhala extends LayoutBase { private static final ExpectedKey[][] ALPHABET_SHIFTED_COMMON = new ExpectedKeyboardBuilder() .setKeysOfRow(1, // U+0DD6: "ූ" SINHALA VOWEL SIGN DIGA PAA-PILLA - key("\u0DD6", moreKey("1")), // U+0D8B: "උ" SINHALA LETTER UYANNA - key("\u0D8B", moreKey("2")), // U+0DD1: "ෑ" SINHALA VOWEL SIGN DIGA AEDA-PILLA - key("\u0DD1", moreKey("3")), // U+0D8D: "ඍ" SINHALA LETTER IRUYANNA - key("\u0D8D", moreKey("4")), // U+0D94: "ඔ" SINHALA LETTER OYANNA - key("\u0D94", moreKey("5")), // U+0DC1: "ශ" SINHALA LETTER TAALUJA SAYANNA - key("\u0DC1", moreKey("6")), // U+0DB9: "ඹ" SINHALA LETTER AMBA BAYANNA - key("\u0DB9", moreKey("7")), // U+0DC2: "ෂ" SINHALA LETTER MUURDHAJA SAYANNA - key("\u0DC2", moreKey("8")), // U+0DB0: "ධ" SINHALA LETTER MAHAAPRAANA DAYANNA - key("\u0DB0", moreKey("9")), // U+0DA1: "ඡ" SINHALA LETTER MAHAAPRAANA CAYANNA - key("\u0DA1", moreKey("0")), + "\u0DD6", "\u0D8B", "\u0DD1", "\u0D8D", "\u0D94", "\u0DC1", "\u0DB9", "\u0DC2", + "\u0DB0", "\u0DA1", // U+0DA5: "ඥ" SINHALA LETTER TAALUJA SANYOOGA NAAKSIKYAYA // U+0DF4: "෴" SINHALA PUNCTUATION KUNDDALIYA key("\u0DA5", moreKey("\u0DF4"))) diff --git a/tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java b/tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java index 2d92e691b..199922491 100644 --- a/tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java +++ b/tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java @@ -32,6 +32,7 @@ import android.view.inputmethod.InputConnectionWrapper; import com.android.inputmethod.latin.PrevWordsInfo.WordInfo; import com.android.inputmethod.latin.settings.SpacingAndPunctuations; +import com.android.inputmethod.latin.utils.PrevWordsInfoUtils; import com.android.inputmethod.latin.utils.RunInLocale; import com.android.inputmethod.latin.utils.ScriptUtils; import com.android.inputmethod.latin.utils.StringUtils; @@ -157,24 +158,24 @@ public class RichInputConnectionAndTextRangeTests extends AndroidTestCase { */ public void testGetPreviousWord() { // If one of the following cases breaks, the bigram suggestions won't work. - assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( + assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord( "abc def", mSpacingAndPunctuations, 2).mPrevWordsInfo[0].mWord, "abc"); - assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( + assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord( "abc", mSpacingAndPunctuations, 2), PrevWordsInfo.BEGINNING_OF_SENTENCE); - assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( + assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord( "abc. def", mSpacingAndPunctuations, 2), PrevWordsInfo.BEGINNING_OF_SENTENCE); - assertFalse(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( + assertFalse(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord( "abc def", mSpacingAndPunctuations, 2).mPrevWordsInfo[0].mIsBeginningOfSentence); - assertTrue(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( + assertTrue(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord( "abc", mSpacingAndPunctuations, 2).mPrevWordsInfo[0].mIsBeginningOfSentence); // For n-gram - assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( + assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord( "abc def", mSpacingAndPunctuations, 1).mPrevWordsInfo[0].mWord, "def"); - assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( + assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord( "abc def", mSpacingAndPunctuations, 1).mPrevWordsInfo[1].mWord, "abc"); - assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( + assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord( "abc def", mSpacingAndPunctuations, 2).mPrevWordsInfo[1], WordInfo.BEGINNING_OF_SENTENCE); @@ -185,32 +186,32 @@ public class RichInputConnectionAndTextRangeTests extends AndroidTestCase { // this function if needed - especially since it does not seem very // logical. These tests are just there to catch any unintentional // changes in the behavior of the RichInputConnection#getPreviousWord method. - assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( + assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord( "abc def ", mSpacingAndPunctuations, 2).mPrevWordsInfo[0].mWord, "abc"); - assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( + assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord( "abc def.", mSpacingAndPunctuations, 2).mPrevWordsInfo[0].mWord, "abc"); - assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( + assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord( "abc def .", mSpacingAndPunctuations, 2).mPrevWordsInfo[0].mWord, "def"); - assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( + assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord( "abc ", mSpacingAndPunctuations, 2), PrevWordsInfo.BEGINNING_OF_SENTENCE); - assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( + assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord( "abc def", mSpacingAndPunctuations, 1).mPrevWordsInfo[0].mWord, "def"); - assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( + assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord( "abc def ", mSpacingAndPunctuations, 1).mPrevWordsInfo[0].mWord, "def"); - assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( + assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord( "abc 'def", mSpacingAndPunctuations, 1).mPrevWordsInfo[0].mWord, "'def"); - assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( + assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord( "abc def.", mSpacingAndPunctuations, 1), PrevWordsInfo.BEGINNING_OF_SENTENCE); - assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( + assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord( "abc def .", mSpacingAndPunctuations, 1), PrevWordsInfo.BEGINNING_OF_SENTENCE); - assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( + assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord( "abc, def", mSpacingAndPunctuations, 2), PrevWordsInfo.EMPTY_PREV_WORDS_INFO); - assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( + assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord( "abc? def", mSpacingAndPunctuations, 2), PrevWordsInfo.EMPTY_PREV_WORDS_INFO); - assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( + assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord( "abc! def", mSpacingAndPunctuations, 2), PrevWordsInfo.EMPTY_PREV_WORDS_INFO); - assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( + assertEquals(PrevWordsInfoUtils.getPrevWordsInfoFromNthPreviousWord( "abc 'def", mSpacingAndPunctuations, 2), PrevWordsInfo.EMPTY_PREV_WORDS_INFO); } |