diff options
| author |   Keisuke Kuroyanagi <ksk@google.com> | 2014-05-23 14:55:38 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-05-23 14:55:38 +0000 |
| commit | c35706af3185863440102fa098d515026310a6a4 (patch) | |
| tree | 0e0c0136045f13876a5af135962921973c3fb90b /tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java | |
| parent | 0ae5c6e750d030583d61459b67dca72601a99df8 (diff) | |
| parent | e782f1f4154690da356fac6939ded66b5f66864d (diff) | |
| download | latinime-c35706af3185863440102fa098d515026310a6a4.tar.gz latinime-c35706af3185863440102fa098d515026310a6a4.tar.xz latinime-c35706af3185863440102fa098d515026310a6a4.zip | |
am e782f1f4: Merge "Update RichInputConnectionAndTextRangeTests."
* commit 'e782f1f4154690da356fac6939ded66b5f66864d':
Update RichInputConnectionAndTextRangeTests.
Diffstat (limited to 'tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java')
| -rw-r--r-- | tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java b/tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java index f3351ff84..c471eca57 100644 --- a/tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java +++ b/tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java @@ -157,10 +157,10 @@ public class RichInputConnectionAndTextRangeTests extends AndroidTestCase { // If one of the following cases breaks, the bigram suggestions won't work. assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( "abc def", mSpacingAndPunctuations, 2).mPrevWord, "abc"); - assertNull(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( - "abc", mSpacingAndPunctuations, 2).mPrevWord); - assertNull(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( - "abc. def", mSpacingAndPunctuations, 2).mPrevWord); + assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( + "abc", mSpacingAndPunctuations, 2), PrevWordsInfo.BEGINNING_OF_SENTENCE); + assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( + "abc. def", mSpacingAndPunctuations, 2), PrevWordsInfo.BEGINNING_OF_SENTENCE); assertFalse(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( "abc def", mSpacingAndPunctuations, 2).mIsBeginningOfSentence); @@ -180,16 +180,22 @@ public class RichInputConnectionAndTextRangeTests extends AndroidTestCase { assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( "abc def .", mSpacingAndPunctuations, 2).mPrevWord, "def"); assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( - "abc ", mSpacingAndPunctuations, 2).mPrevWord, null); + "abc ", mSpacingAndPunctuations, 2), PrevWordsInfo.BEGINNING_OF_SENTENCE); assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( "abc def", mSpacingAndPunctuations, 1).mPrevWord, "def"); assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( "abc def ", mSpacingAndPunctuations, 1).mPrevWord, "def"); - assertNull(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( - "abc def.", mSpacingAndPunctuations, 1).mPrevWord); - assertNull(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( - "abc def .", mSpacingAndPunctuations, 1).mPrevWord); + assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( + "abc def.", mSpacingAndPunctuations, 1), PrevWordsInfo.BEGINNING_OF_SENTENCE); + assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( + "abc def .", mSpacingAndPunctuations, 1), PrevWordsInfo.BEGINNING_OF_SENTENCE); + assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( + "abc, def", mSpacingAndPunctuations, 2), PrevWordsInfo.EMPTY_PREV_WORDS_INFO); + assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( + "abc? def", mSpacingAndPunctuations, 2), PrevWordsInfo.EMPTY_PREV_WORDS_INFO); + assertEquals(RichInputConnection.getPrevWordsInfoFromNthPreviousWord( + "abc! def", mSpacingAndPunctuations, 2), PrevWordsInfo.EMPTY_PREV_WORDS_INFO); } /** |