diff options
Diffstat (limited to 'tests/src/com/android/inputmethod')
| -rw-r--r-- | tests/src/com/android/inputmethod/latin/DistracterFilterTest.java | 18 | ||||
| -rw-r--r-- | tests/src/com/android/inputmethod/latin/WordComposerTests.java | 16 |
2 files changed, 17 insertions, 17 deletions
diff --git a/tests/src/com/android/inputmethod/latin/DistracterFilterTest.java b/tests/src/com/android/inputmethod/latin/DistracterFilterTest.java index d7b57aeea..e98f9eacc 100644 --- a/tests/src/com/android/inputmethod/latin/DistracterFilterTest.java +++ b/tests/src/com/android/inputmethod/latin/DistracterFilterTest.java @@ -36,50 +36,50 @@ public class DistracterFilterTest extends InputTestsBase { } public void testIsDistractorToWordsInDictionaries() { - final String EMPTY_PREV_WORD = null; + final PrevWordsInfo EMPTY_PREV_WORDS_INFO = new PrevWordsInfo(null); final Locale localeEnUs = new Locale("en", "US"); String typedWord = "alot"; // For this test case, we consider "alot" is a distracter to "a lot". assertTrue(mDistracterFilter.isDistracterToWordsInDictionaries( - EMPTY_PREV_WORD, typedWord, localeEnUs)); + EMPTY_PREV_WORDS_INFO, typedWord, localeEnUs)); typedWord = "mot"; // For this test case, we consider "mot" is a distracter to "not". assertTrue(mDistracterFilter.isDistracterToWordsInDictionaries( - EMPTY_PREV_WORD, typedWord, localeEnUs)); + EMPTY_PREV_WORDS_INFO, typedWord, localeEnUs)); typedWord = "wierd"; // For this test case, we consider "wierd" is a distracter to "weird". assertTrue(mDistracterFilter.isDistracterToWordsInDictionaries( - EMPTY_PREV_WORD, typedWord, localeEnUs)); + EMPTY_PREV_WORDS_INFO, typedWord, localeEnUs)); typedWord = "hoe"; // For this test case, we consider "hoe" is a distracter to "how". assertTrue(mDistracterFilter.isDistracterToWordsInDictionaries( - EMPTY_PREV_WORD, typedWord, localeEnUs)); + EMPTY_PREV_WORDS_INFO, typedWord, localeEnUs)); typedWord = "nit"; // For this test case, we consider "nit" is a distracter to "not". assertTrue(mDistracterFilter.isDistracterToWordsInDictionaries( - EMPTY_PREV_WORD, typedWord, localeEnUs)); + EMPTY_PREV_WORDS_INFO, typedWord, localeEnUs)); typedWord = "ill"; // For this test case, we consider "ill" is a distracter to "I'll". assertTrue(mDistracterFilter.isDistracterToWordsInDictionaries( - EMPTY_PREV_WORD, typedWord, localeEnUs)); + EMPTY_PREV_WORDS_INFO, typedWord, localeEnUs)); typedWord = "asdfd"; // For this test case, we consider "asdfd" is not a distracter to any word in dictionaries. assertFalse( mDistracterFilter.isDistracterToWordsInDictionaries( - EMPTY_PREV_WORD, typedWord, localeEnUs)); + EMPTY_PREV_WORDS_INFO, typedWord, localeEnUs)); typedWord = "thank"; // For this test case, we consider "thank" is not a distracter to any other word // in dictionaries. assertFalse( mDistracterFilter.isDistracterToWordsInDictionaries( - EMPTY_PREV_WORD, typedWord, localeEnUs)); + EMPTY_PREV_WORDS_INFO, typedWord, localeEnUs)); } } diff --git a/tests/src/com/android/inputmethod/latin/WordComposerTests.java b/tests/src/com/android/inputmethod/latin/WordComposerTests.java index d68bb5c54..16e8b36b0 100644 --- a/tests/src/com/android/inputmethod/latin/WordComposerTests.java +++ b/tests/src/com/android/inputmethod/latin/WordComposerTests.java @@ -57,14 +57,14 @@ public class WordComposerTests extends AndroidTestCase { assertTrue(wc.moveCursorByAndReturnIfInsideComposingWord(1)); assertFalse(wc.isCursorFrontOrMiddleOfComposingWord()); // Check the previous word is still there - assertEquals(PREVWORD, wc.getPreviousWordForSuggestion()); + assertEquals(PREVWORD, wc.getPrevWordsInfoForSuggestion().mPrevWord); // Move the cursor past the end of the word assertFalse(wc.moveCursorByAndReturnIfInsideComposingWord(1)); assertFalse(wc.moveCursorByAndReturnIfInsideComposingWord(15)); // Do what LatinIME does when the cursor is moved outside of the word, // and check the behavior is correct. wc.reset(); - assertNull(wc.getPreviousWordForSuggestion()); + assertNull(wc.getPrevWordsInfoForSuggestion().mPrevWord); // \uD861\uDED7 is 𨛗, a character outside the BMP final String STR_WITH_SUPPLEMENTARY_CHAR = "abcde\uD861\uDED7fgh"; @@ -83,37 +83,37 @@ public class WordComposerTests extends AndroidTestCase { assertTrue(wc.isCursorFrontOrMiddleOfComposingWord()); assertTrue(wc.moveCursorByAndReturnIfInsideComposingWord(1)); assertFalse(wc.isCursorFrontOrMiddleOfComposingWord()); - assertNull(wc.getPreviousWordForSuggestion()); + assertNull(wc.getPrevWordsInfoForSuggestion().mPrevWord); wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, COORDINATES_WITH_SUPPLEMENTARY_CHAR, STR_WITHIN_BMP); wc.setCursorPositionWithinWord(3); assertTrue(wc.moveCursorByAndReturnIfInsideComposingWord(7)); - assertEquals(STR_WITHIN_BMP, wc.getPreviousWordForSuggestion()); + assertEquals(STR_WITHIN_BMP, wc.getPrevWordsInfoForSuggestion().mPrevWord); wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, COORDINATES_WITH_SUPPLEMENTARY_CHAR, STR_WITH_SUPPLEMENTARY_CHAR); wc.setCursorPositionWithinWord(3); assertTrue(wc.moveCursorByAndReturnIfInsideComposingWord(7)); - assertEquals(STR_WITH_SUPPLEMENTARY_CHAR, wc.getPreviousWordForSuggestion()); + assertEquals(STR_WITH_SUPPLEMENTARY_CHAR, wc.getPrevWordsInfoForSuggestion().mPrevWord); wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, COORDINATES_WITH_SUPPLEMENTARY_CHAR, STR_WITHIN_BMP); wc.setCursorPositionWithinWord(3); assertTrue(wc.moveCursorByAndReturnIfInsideComposingWord(-3)); assertFalse(wc.moveCursorByAndReturnIfInsideComposingWord(-1)); - assertEquals(STR_WITHIN_BMP, wc.getPreviousWordForSuggestion()); + assertEquals(STR_WITHIN_BMP, wc.getPrevWordsInfoForSuggestion().mPrevWord); wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, COORDINATES_WITH_SUPPLEMENTARY_CHAR, null /* previousWord */); wc.setCursorPositionWithinWord(3); assertFalse(wc.moveCursorByAndReturnIfInsideComposingWord(-9)); - assertNull(wc.getPreviousWordForSuggestion()); + assertNull(wc.getPrevWordsInfoForSuggestion().mPrevWord); wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, COORDINATES_WITH_SUPPLEMENTARY_CHAR, STR_WITH_SUPPLEMENTARY_CHAR); assertTrue(wc.moveCursorByAndReturnIfInsideComposingWord(-10)); - assertEquals(STR_WITH_SUPPLEMENTARY_CHAR, wc.getPreviousWordForSuggestion()); + assertEquals(STR_WITH_SUPPLEMENTARY_CHAR, wc.getPrevWordsInfoForSuggestion().mPrevWord); wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, COORDINATES_WITH_SUPPLEMENTARY_CHAR, null /* previousWord */); |