diff options
| author |   Keisuke Kuroyanagi <ksk@google.com> | 2014-05-23 14:55:37 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-05-23 14:55:37 +0000 |
| commit | 0ae5c6e750d030583d61459b67dca72601a99df8 (patch) | |
| tree | 133bac119070133ed2ec9d5371882d523da9b05a /tests/src | |
| parent | c639ee6bcf1d5d1be4c098345f70248ff477a4d7 (diff) | |
| parent | 9f9988e996bdf6c9a2944a20780a1220986ecf2f (diff) | |
| download | latinime-0ae5c6e750d030583d61459b67dca72601a99df8.tar.gz latinime-0ae5c6e750d030583d61459b67dca72601a99df8.tar.xz latinime-0ae5c6e750d030583d61459b67dca72601a99df8.zip | |
am 9f9988e9: Merge "Introduce EMPTY_PREV_WORDS_INFO and BEGINNING_OF_SENTENCE."
* commit '9f9988e996bdf6c9a2944a20780a1220986ecf2f':
Introduce EMPTY_PREV_WORDS_INFO and BEGINNING_OF_SENTENCE.
Diffstat (limited to 'tests/src')
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/src/com/android/inputmethod/latin/DistracterFilterTest.java b/tests/src/com/android/inputmethod/latin/DistracterFilterTest.java index ddbc8ac34..33f379467 100644 --- a/tests/src/com/android/inputmethod/latin/DistracterFilterTest.java +++ b/tests/src/com/android/inputmethod/latin/DistracterFilterTest.java @@ -37,7 +37,7 @@ public class DistracterFilterTest extends InputTestsBase { } public void testIsDistractorToWordsInDictionaries() { - final PrevWordsInfo EMPTY_PREV_WORDS_INFO = new PrevWordsInfo(null); + final PrevWordsInfo EMPTY_PREV_WORDS_INFO = PrevWordsInfo.EMPTY_PREV_WORDS_INFO; final Locale localeEnUs = new Locale("en", "US"); String typedWord = "alot"; diff --git a/tests/src/com/android/inputmethod/latin/WordComposerTests.java b/tests/src/com/android/inputmethod/latin/WordComposerTests.java index 17e718541..274555a03 100644 --- a/tests/src/com/android/inputmethod/latin/WordComposerTests.java +++ b/tests/src/com/android/inputmethod/latin/WordComposerTests.java @@ -74,7 +74,7 @@ public class WordComposerTests extends AndroidTestCase { CoordinateUtils.newCoordinateArray(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR.length, Constants.NOT_A_COORDINATE, Constants.NOT_A_COORDINATE); wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, COORDINATES_WITH_SUPPLEMENTARY_CHAR, - new PrevWordsInfo(null)); + PrevWordsInfo.EMPTY_PREV_WORDS_INFO); assertEquals(wc.size(), CODEPOINTS_WITH_SUPPLEMENTARY_CHAR.length); assertFalse(wc.isCursorFrontOrMiddleOfComposingWord()); wc.setCursorPositionWithinWord(3); @@ -109,7 +109,7 @@ public class WordComposerTests extends AndroidTestCase { assertEquals(PREV_WORDS_INFO_STR_WITHIN_BMP, wc.getPrevWordsInfoForSuggestion()); - final PrevWordsInfo PREV_WORDS_INFO_NULL = new PrevWordsInfo(null); + final PrevWordsInfo PREV_WORDS_INFO_NULL = PrevWordsInfo.EMPTY_PREV_WORDS_INFO; wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, COORDINATES_WITH_SUPPLEMENTARY_CHAR, PREV_WORDS_INFO_NULL); wc.setCursorPositionWithinWord(3); diff --git a/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java b/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java index bc8686410..7d3214a3d 100644 --- a/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java +++ b/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java @@ -110,7 +110,7 @@ public class UserHistoryDictionaryTests extends AndroidTestCase { } private static void addToDict(final UserHistoryDictionary dict, final List<String> words) { - PrevWordsInfo prevWordsInfo = new PrevWordsInfo(null); + PrevWordsInfo prevWordsInfo = PrevWordsInfo.EMPTY_PREV_WORDS_INFO; for (String word : words) { UserHistoryDictionary.addToDictionary(dict, prevWordsInfo, word, true, (int)TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis())); |