diff options
Diffstat (limited to 'tests/src')
8 files changed, 14 insertions, 254 deletions
diff --git a/tests/src/com/android/inputmethod/latin/BinaryDictionaryDecayingTests.java b/tests/src/com/android/inputmethod/latin/BinaryDictionaryDecayingTests.java index cff489dd5..baac0883e 100644 --- a/tests/src/com/android/inputmethod/latin/BinaryDictionaryDecayingTests.java +++ b/tests/src/com/android/inputmethod/latin/BinaryDictionaryDecayingTests.java @@ -782,8 +782,7 @@ public class BinaryDictionaryDecayingTests extends AndroidTestCase { int prevWordCount = 0; for (int i = 0; i < inputEvents.length; i++) { final String word = CodePointUtils.generateWord(random, codePointSet); - inputEvents[i] = new WordInputEventForPersonalization(word, ngramContext, - true /* isValid */, mCurrentTime); + inputEvents[i] = new WordInputEventForPersonalization(word, ngramContext, mCurrentTime); unigrams.add(word); if (prevWordCount >= 2) { final Pair<String, String> prevWordsPair = bigrams.get(bigrams.size() - 1); diff --git a/tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java b/tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java index 60d2de18c..a8f0d81af 100644 --- a/tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java +++ b/tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java @@ -23,8 +23,8 @@ import android.util.Pair; import com.android.inputmethod.latin.NgramContext.WordInfo; import com.android.inputmethod.latin.common.CodePointUtils; -import com.android.inputmethod.latin.common.Constants; import com.android.inputmethod.latin.common.FileUtils; +import com.android.inputmethod.latin.define.DecoderSpecificConstants; import com.android.inputmethod.latin.makedict.DictionaryHeader; import com.android.inputmethod.latin.makedict.FormatSpec; import com.android.inputmethod.latin.makedict.WeightedString; @@ -171,7 +171,7 @@ public class BinaryDictionaryTests extends AndroidTestCase { private void testAddTooLongWord(final int formatVersion) { final BinaryDictionary binaryDictionary = getEmptyBinaryDictionary(formatVersion); final StringBuffer stringBuilder = new StringBuffer(); - for (int i = 0; i < Constants.DICTIONARY_MAX_WORD_LENGTH; i++) { + for (int i = 0; i < DecoderSpecificConstants.DICTIONARY_MAX_WORD_LENGTH; i++) { stringBuilder.append('a'); } final String validLongWord = stringBuilder.toString(); diff --git a/tests/src/com/android/inputmethod/latin/DictionaryFacilitatorLruCacheTests.java b/tests/src/com/android/inputmethod/latin/DictionaryFacilitatorLruCacheTests.java index 3ad659a99..5340b6fa7 100644 --- a/tests/src/com/android/inputmethod/latin/DictionaryFacilitatorLruCacheTests.java +++ b/tests/src/com/android/inputmethod/latin/DictionaryFacilitatorLruCacheTests.java @@ -23,12 +23,9 @@ import android.test.suitebuilder.annotation.LargeTest; @LargeTest public class DictionaryFacilitatorLruCacheTests extends AndroidTestCase { - static final int MAX_CACHE_SIZE = 2; - static final int MAX_CACHE_SIZE_LARGE = 5; - public void testCacheSize() { final DictionaryFacilitatorLruCache cache = - new DictionaryFacilitatorLruCache(getContext(), MAX_CACHE_SIZE, ""); + new DictionaryFacilitatorLruCache(getContext(), ""); assertEquals(0, cache.getCachedLocalesForTesting().size()); assertNotNull(cache.get(Locale.US)); @@ -42,12 +39,9 @@ public class DictionaryFacilitatorLruCacheTests extends AndroidTestCase { } public void testGetFacilitator() { - testGetFacilitator(new DictionaryFacilitatorLruCache(getContext(), MAX_CACHE_SIZE, "")); - testGetFacilitator(new DictionaryFacilitatorLruCache( - getContext(), MAX_CACHE_SIZE_LARGE, "")); - } + final DictionaryFacilitatorLruCache cache = + new DictionaryFacilitatorLruCache(getContext(), ""); - private static void testGetFacilitator(final DictionaryFacilitatorLruCache cache) { final DictionaryFacilitator dictionaryFacilitatorEnUs = cache.get(Locale.US); assertNotNull(dictionaryFacilitatorEnUs); assertTrue(dictionaryFacilitatorEnUs.isForLocales(new Locale[] { Locale.US })); @@ -62,13 +56,9 @@ public class DictionaryFacilitatorLruCacheTests extends AndroidTestCase { } public void testSetUseContactsDictionary() { - testSetUseContactsDictionary(new DictionaryFacilitatorLruCache( - getContext(), MAX_CACHE_SIZE, "")); - testSetUseContactsDictionary(new DictionaryFacilitatorLruCache( - getContext(), MAX_CACHE_SIZE_LARGE, "")); - } + final DictionaryFacilitatorLruCache cache = + new DictionaryFacilitatorLruCache(getContext(), ""); - private static void testSetUseContactsDictionary(final DictionaryFacilitatorLruCache cache) { assertNull(cache.get(Locale.US).getSubDictForTesting(Dictionary.TYPE_CONTACTS)); cache.setUseContactsDictionary(true /* useContactsDictionary */); assertNotNull(cache.get(Locale.US).getSubDictForTesting(Dictionary.TYPE_CONTACTS)); diff --git a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java b/tests/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java index b104a21f9..a432ca740 100644 --- a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java +++ b/tests/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java @@ -17,7 +17,7 @@ package com.android.inputmethod.latin.makedict; import com.android.inputmethod.annotations.UsedForTesting; -import com.android.inputmethod.latin.common.Constants; +import com.android.inputmethod.latin.define.DecoderSpecificConstants; import com.android.inputmethod.latin.makedict.DictDecoder.DictionaryBufferFactory; import java.io.File; @@ -183,7 +183,7 @@ public final class BinaryDictIOUtils { dictDecoder.readHeader(); int wordPos = 0; final int wordLen = word.codePointCount(0, word.length()); - for (int depth = 0; depth < Constants.DICTIONARY_MAX_WORD_LENGTH; ++depth) { + for (int depth = 0; depth < DecoderSpecificConstants.DICTIONARY_MAX_WORD_LENGTH; ++depth) { if (wordPos >= wordLen) return FormatSpec.NOT_VALID_WORD; do { diff --git a/tests/src/com/android/inputmethod/latin/makedict/FusionDictionary.java b/tests/src/com/android/inputmethod/latin/makedict/FusionDictionary.java index 3cffd001c..a42f0a93d 100644 --- a/tests/src/com/android/inputmethod/latin/makedict/FusionDictionary.java +++ b/tests/src/com/android/inputmethod/latin/makedict/FusionDictionary.java @@ -17,7 +17,7 @@ package com.android.inputmethod.latin.makedict; import com.android.inputmethod.annotations.UsedForTesting; -import com.android.inputmethod.latin.common.Constants; +import com.android.inputmethod.latin.define.DecoderSpecificConstants; import com.android.inputmethod.latin.makedict.FormatSpec.DictionaryOptions; import java.util.ArrayList; @@ -387,7 +387,7 @@ public final class FusionDictionary implements Iterable<WordProperty> { final ArrayList<WeightedString> shortcutTargets, final boolean isNotAWord, final boolean isPossiblyOffensive) { assert(probabilityInfo.mProbability <= FormatSpec.MAX_TERMINAL_FREQUENCY); - if (word.length >= Constants.DICTIONARY_MAX_WORD_LENGTH) { + if (word.length >= DecoderSpecificConstants.DICTIONARY_MAX_WORD_LENGTH) { MakedictLog.w("Ignoring a word that is too long: word.length = " + word.length); return; } diff --git a/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java b/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java index 6dddc971b..e1260f608 100644 --- a/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java +++ b/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTests.java @@ -24,7 +24,6 @@ import com.android.inputmethod.latin.ExpandableBinaryDictionary; import com.android.inputmethod.latin.NgramContext; import com.android.inputmethod.latin.NgramContext.WordInfo; import com.android.inputmethod.latin.utils.BinaryDictionaryUtils; -import com.android.inputmethod.latin.utils.DistracterFilter; import java.io.File; import java.util.List; @@ -252,8 +251,7 @@ public class UserHistoryDictionaryTests extends AndroidTestCase { random); NgramContext ngramContext = NgramContext.EMPTY_PREV_WORDS_INFO; for (final String word : words) { - UserHistoryDictionary.addToDictionary(dict, ngramContext, word, true, mCurrentTime, - DistracterFilter.EMPTY_DISTRACTER_FILTER); + UserHistoryDictionary.addToDictionary(dict, ngramContext, word, true, mCurrentTime); ngramContext = ngramContext.getNextNgramContext(new WordInfo(word)); dict.waitAllTasksForTests(); assertTrue(dict.isInDictionary(word)); diff --git a/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTestsHelper.java b/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTestsHelper.java index d394c0faa..94105aa12 100644 --- a/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTestsHelper.java +++ b/tests/src/com/android/inputmethod/latin/personalization/UserHistoryDictionaryTestsHelper.java @@ -21,7 +21,6 @@ import android.content.Context; import com.android.inputmethod.latin.NgramContext; import com.android.inputmethod.latin.NgramContext.WordInfo; import com.android.inputmethod.latin.common.FileUtils; -import com.android.inputmethod.latin.utils.DistracterFilter; import java.io.File; import java.io.FilenameFilter; @@ -101,8 +100,7 @@ public class UserHistoryDictionaryTestsHelper { final List<String> words, final int timestamp) { NgramContext ngramContext = NgramContext.EMPTY_PREV_WORDS_INFO; for (final String word : words) { - UserHistoryDictionary.addToDictionary(dict, ngramContext, word, true, timestamp, - DistracterFilter.EMPTY_DISTRACTER_FILTER); + UserHistoryDictionary.addToDictionary(dict, ngramContext, word, true, timestamp); ngramContext = ngramContext.getNextNgramContext(new WordInfo(word)); } } diff --git a/tests/src/com/android/inputmethod/latin/utils/DistracterFilterTest.java b/tests/src/com/android/inputmethod/latin/utils/DistracterFilterTest.java deleted file mode 100644 index 8360d53fb..000000000 --- a/tests/src/com/android/inputmethod/latin/utils/DistracterFilterTest.java +++ /dev/null @@ -1,225 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.inputmethod.latin.utils; - -import java.util.ArrayList; -import java.util.Locale; - -import android.content.Context; -import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.LargeTest; -import android.view.inputmethod.InputMethodSubtype; - -import com.android.inputmethod.latin.NgramContext; -import com.android.inputmethod.latin.RichInputMethodManager; -import com.android.inputmethod.latin.utils.DistracterFilter.HandlingType; - -/** - * Unit test for DistracterFilter - */ -@LargeTest -public class DistracterFilterTest extends AndroidTestCase { - private DistracterFilterCheckingExactMatchesAndSuggestions mDistracterFilter; - - @Override - protected void setUp() throws Exception { - super.setUp(); - final Context context = getContext(); - mDistracterFilter = new DistracterFilterCheckingExactMatchesAndSuggestions(context); - RichInputMethodManager.init(context); - final RichInputMethodManager richImm = RichInputMethodManager.getInstance(); - final ArrayList<InputMethodSubtype> subtypes = new ArrayList<>(); - subtypes.add(richImm.findSubtypeByLocaleAndKeyboardLayoutSet( - Locale.US.toString(), "qwerty")); - subtypes.add(richImm.findSubtypeByLocaleAndKeyboardLayoutSet( - Locale.FRENCH.toString(), "azerty")); - subtypes.add(richImm.findSubtypeByLocaleAndKeyboardLayoutSet( - Locale.GERMAN.toString(), "qwertz")); - mDistracterFilter.updateEnabledSubtypes(subtypes); - } - - @Override - protected void tearDown() { - mDistracterFilter.close(); - } - - public void testIsDistracterToWordsInDictionaries() { - final NgramContext EMPTY_PREV_WORDS_INFO = NgramContext.EMPTY_PREV_WORDS_INFO; - - final Locale localeEnUs = new Locale("en", "US"); - String typedWord; - - typedWord = "Bill"; - // For this test case, we consider "Bill" is a distracter to "bill". - assertTrue(mDistracterFilter.isDistracterToWordsInDictionaries( - EMPTY_PREV_WORDS_INFO, typedWord, localeEnUs)); - - typedWord = "nOt"; - // For this test case, we consider "nOt" is a distracter to "not". - assertTrue(mDistracterFilter.isDistracterToWordsInDictionaries( - EMPTY_PREV_WORDS_INFO, typedWord, localeEnUs)); - - typedWord = "youre"; - // For this test case, we consider "youre" is a distracter to "you're". - assertTrue(mDistracterFilter.isDistracterToWordsInDictionaries( - EMPTY_PREV_WORDS_INFO, typedWord, localeEnUs)); - - typedWord = "Banana"; - // For this test case, we consider "Banana" is a distracter to "banana". - assertTrue(mDistracterFilter.isDistracterToWordsInDictionaries( - EMPTY_PREV_WORDS_INFO, typedWord, localeEnUs)); - - typedWord = "orange"; - // For this test case, we consider "orange" is not a distracter to any word in dictionaries. - assertFalse(mDistracterFilter.isDistracterToWordsInDictionaries( - EMPTY_PREV_WORDS_INFO, typedWord, localeEnUs)); - - typedWord = "Orange"; - // For this test case, we consider "Orange" is a distracter to "orange". - assertTrue(mDistracterFilter.isDistracterToWordsInDictionaries( - EMPTY_PREV_WORDS_INFO, typedWord, localeEnUs)); - - typedWord = "café"; - // For this test case, we consider "café" is a distracter to "cafe". - assertTrue(mDistracterFilter.isDistracterToWordsInDictionaries( - EMPTY_PREV_WORDS_INFO, typedWord, localeEnUs)); - - typedWord = "cafe"; - // For this test case, we consider "cafe" is not a distracter to any word in dictionaries. - assertFalse(mDistracterFilter.isDistracterToWordsInDictionaries( - EMPTY_PREV_WORDS_INFO, typedWord, localeEnUs)); - - typedWord = "I'll"; - // For this test case, we consider "I'll" is not a distracter to any word in dictionaries. - assertFalse(mDistracterFilter.isDistracterToWordsInDictionaries( - 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_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_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_WORDS_INFO, typedWord, localeEnUs)); - - typedWord = "thabk"; - // For this test case, we consider "thabk" is a distracter to "thank" - assertTrue(mDistracterFilter.isDistracterToWordsInDictionaries( - EMPTY_PREV_WORDS_INFO, typedWord, localeEnUs)); - - typedWord = "thanks"; - // For this test case, we consider "thanks" is not a distracter to any other word - // in dictionaries. - assertFalse(mDistracterFilter.isDistracterToWordsInDictionaries( - EMPTY_PREV_WORDS_INFO, typedWord, localeEnUs)); - - typedWord = "thabks"; - // For this test case, we consider "thabks" is a distracter to "thanks" - assertTrue(mDistracterFilter.isDistracterToWordsInDictionaries( - EMPTY_PREV_WORDS_INFO, typedWord, localeEnUs)); - - typedWord = "think"; - // For this test case, we consider "think" is not a distracter to any other word - // in dictionaries. - assertFalse(mDistracterFilter.isDistracterToWordsInDictionaries( - EMPTY_PREV_WORDS_INFO, typedWord, localeEnUs)); - - typedWord = "thibk"; - // For this test case, we consider "thibk" is a distracter to "think" - assertTrue(mDistracterFilter.isDistracterToWordsInDictionaries( - EMPTY_PREV_WORDS_INFO, typedWord, localeEnUs)); - - typedWord = "tgis"; - // For this test case, we consider "tgis" is a distracter to "this" - assertTrue(mDistracterFilter.isDistracterToWordsInDictionaries( - EMPTY_PREV_WORDS_INFO, typedWord, localeEnUs)); - - final Locale localeDeDe = new Locale("de"); - - typedWord = "fUEr"; - // For this test case, we consider "fUEr" is a distracter to "für". - assertTrue(mDistracterFilter.isDistracterToWordsInDictionaries( - EMPTY_PREV_WORDS_INFO, typedWord, localeDeDe)); - - typedWord = "fuer"; - // For this test case, we consider "fuer" is a distracter to "für". - assertTrue(mDistracterFilter.isDistracterToWordsInDictionaries( - EMPTY_PREV_WORDS_INFO, typedWord, localeDeDe)); - - typedWord = "fur"; - // For this test case, we consider "fur" is a distracter to "für". - assertTrue(mDistracterFilter.isDistracterToWordsInDictionaries( - EMPTY_PREV_WORDS_INFO, typedWord, localeDeDe)); - - final Locale localeFrFr = new Locale("fr"); - - typedWord = "a"; - // For this test case, we consider "a" is a distracter to "à". - assertTrue(mDistracterFilter.isDistracterToWordsInDictionaries( - EMPTY_PREV_WORDS_INFO, typedWord, localeFrFr)); - - typedWord = "à"; - // For this test case, we consider "à" is not a distracter to any word in dictionaries. - assertFalse(mDistracterFilter.isDistracterToWordsInDictionaries( - EMPTY_PREV_WORDS_INFO, typedWord, localeFrFr)); - - typedWord = "etre"; - // For this test case, we consider "etre" is a distracter to "être". - assertTrue(mDistracterFilter.isDistracterToWordsInDictionaries( - EMPTY_PREV_WORDS_INFO, typedWord, localeFrFr)); - - typedWord = "États-unis"; - // For this test case, we consider "États-unis" is a distracter to "États-Unis". - assertTrue(mDistracterFilter.isDistracterToWordsInDictionaries( - EMPTY_PREV_WORDS_INFO, typedWord, localeFrFr)); - - typedWord = "ÉtatsUnis"; - // For this test case, we consider "ÉtatsUnis" is a distracter to "États-Unis". - assertTrue(mDistracterFilter.isDistracterToWordsInDictionaries( - EMPTY_PREV_WORDS_INFO, typedWord, localeFrFr)); - } - - public void testGetWordHandlingType() { - final Locale localeEnUs = new Locale("en", "US"); - final NgramContext EMPTY_PREV_WORDS_INFO = NgramContext.EMPTY_PREV_WORDS_INFO; - int handlingType = 0; - - handlingType = mDistracterFilter.getWordHandlingType(EMPTY_PREV_WORDS_INFO, - "this", localeEnUs); - assertFalse(HandlingType.shouldBeLowerCased(handlingType)); - assertFalse(HandlingType.shouldBeHandledAsOov(handlingType)); - - handlingType = mDistracterFilter.getWordHandlingType(EMPTY_PREV_WORDS_INFO, - "This", localeEnUs); - assertTrue(HandlingType.shouldBeLowerCased(handlingType)); - assertFalse(HandlingType.shouldBeHandledAsOov(handlingType)); - - handlingType = mDistracterFilter.getWordHandlingType(EMPTY_PREV_WORDS_INFO, - "thibk", localeEnUs); - assertFalse(HandlingType.shouldBeLowerCased(handlingType)); - assertTrue(HandlingType.shouldBeHandledAsOov(handlingType)); - } -} |