nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 5fa4ad6a: Merge "Fix some more tests" 

* commit '5fa4ad6a85e41989d8bb0e2b876324755330b010':
  Fix some more tests
main
Jean Chalard 2013-12-02 04:46:35 -08:00 committed by Android Git Automerger
parent ffd6027167 5fa4ad6a85
commit bc7e6e271a
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
java/src/com/android/inputmethod/latin/utils/UserHistoryDictIOUtils.java
View File

@ -73,8 +73,8 @@ public final class UserHistoryDictIOUtils {
@UsedForTesting @UsedForTesting
public static void writeDictionary(final DictEncoder dictEncoder, public static void writeDictionary(final DictEncoder dictEncoder,
final BigramDictionaryInterface dict, final UserHistoryDictionaryBigramList bigrams, final BigramDictionaryInterface dict, final UserHistoryDictionaryBigramList bigrams,
final FormatOptions formatOptions) { final FormatOptions formatOptions, final HashMap<String, String> options) {
final FusionDictionary fusionDict = constructFusionDictionary(dict, bigrams); final FusionDictionary fusionDict = constructFusionDictionary(dict, bigrams, options);
fusionDict.addOptionAttribute(USES_FORGETTING_CURVE_KEY, USES_FORGETTING_CURVE_VALUE); fusionDict.addOptionAttribute(USES_FORGETTING_CURVE_KEY, USES_FORGETTING_CURVE_VALUE);
fusionDict.addOptionAttribute(LAST_UPDATED_TIME_KEY, fusionDict.addOptionAttribute(LAST_UPDATED_TIME_KEY,
String.valueOf(TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis()))); String.valueOf(TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis())));
@ -92,10 +92,10 @@ public final class UserHistoryDictIOUtils {
* Constructs a new FusionDictionary from BigramDictionaryInterface. * Constructs a new FusionDictionary from BigramDictionaryInterface.
*/ */
@UsedForTesting @UsedForTesting
static FusionDictionary constructFusionDictionary( static FusionDictionary constructFusionDictionary(final BigramDictionaryInterface dict,
final BigramDictionaryInterface dict, final UserHistoryDictionaryBigramList bigrams) { final UserHistoryDictionaryBigramList bigrams, final HashMap<String, String> options) {
final FusionDictionary fusionDict = new FusionDictionary(new PtNodeArray(), final FusionDictionary fusionDict = new FusionDictionary(new PtNodeArray(),
new FusionDictionary.DictionaryOptions(new HashMap<String, String>(), false, new FusionDictionary.DictionaryOptions(options, false,
false)); false));
int profTotal = 0; int profTotal = 0;
for (final String word1 : bigrams.keySet()) { for (final String word1 : bigrams.keySet()) {

8
tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java
View File

@ -558,12 +558,12 @@ public class BinaryDictionaryTests extends AndroidTestCase {
dictFile.delete(); dictFile.delete();
} }
public void testRandomOperetionsAndFlashWithGC() { public void testRandomOperationsAndFlashWithGC() {
testRandomOperetionsAndFlashWithGC(3 /* formatVersion */); testRandomOperationsAndFlashWithGC(3 /* formatVersion */);
testRandomOperetionsAndFlashWithGC(4 /* formatVersion */); testRandomOperationsAndFlashWithGC(4 /* formatVersion */);
} }
private void testRandomOperetionsAndFlashWithGC(final int formatVersion) { private void testRandomOperationsAndFlashWithGC(final int formatVersion) {
final int flashWithGCIterationCount = 50; final int flashWithGCIterationCount = 50;
final int operationCountInEachIteration = 200; final int operationCountInEachIteration = 200;
final int initialUnigramCount = 100; final int initialUnigramCount = 100;

14
tests/src/com/android/inputmethod/latin/utils/UserHistoryDictIOUtilsTests.java
View File

@ -24,6 +24,7 @@ import android.util.Log;
import com.android.inputmethod.latin.makedict.DictDecoder; import com.android.inputmethod.latin.makedict.DictDecoder;
import com.android.inputmethod.latin.makedict.DictEncoder; import com.android.inputmethod.latin.makedict.DictEncoder;
import com.android.inputmethod.latin.makedict.FormatSpec; import com.android.inputmethod.latin.makedict.FormatSpec;
import com.android.inputmethod.latin.makedict.FormatSpec.FileHeader;
import com.android.inputmethod.latin.makedict.FusionDictionary; import com.android.inputmethod.latin.makedict.FusionDictionary;
import com.android.inputmethod.latin.makedict.FusionDictionary.PtNode; import com.android.inputmethod.latin.makedict.FusionDictionary.PtNode;
import com.android.inputmethod.latin.makedict.UnsupportedFormatException; import com.android.inputmethod.latin.makedict.UnsupportedFormatException;
@ -53,6 +54,12 @@ public class UserHistoryDictIOUtilsTests extends AndroidTestCase
private static final ArrayList<String> NOT_HAVE_BIGRAM = new ArrayList<String>(); private static final ArrayList<String> NOT_HAVE_BIGRAM = new ArrayList<String>();
private static final FormatSpec.FormatOptions FORMAT_OPTIONS = new FormatSpec.FormatOptions(2); private static final FormatSpec.FormatOptions FORMAT_OPTIONS = new FormatSpec.FormatOptions(2);
private static final String TEST_DICT_FILE_EXTENSION = ".testDict"; private static final String TEST_DICT_FILE_EXTENSION = ".testDict";
private static final HashMap<String, String> HEADER_OPTIONS = new HashMap<String, String>();
static {
HEADER_OPTIONS.put(FileHeader.DICTIONARY_LOCALE_ATTRIBUTE, "en_US");
HEADER_OPTIONS.put(FileHeader.DICTIONARY_ID_ATTRIBUTE, "test");
HEADER_OPTIONS.put(FileHeader.DICTIONARY_VERSION_ATTRIBUTE, "1000");
}
/** /**
* Return same frequency for all words and bigrams * Return same frequency for all words and bigrams
@ -140,7 +147,8 @@ public class UserHistoryDictIOUtilsTests extends AndroidTestCase
private void writeDictToFile(final File file, private void writeDictToFile(final File file,
final UserHistoryDictionaryBigramList bigramList) { final UserHistoryDictionaryBigramList bigramList) {
final DictEncoder dictEncoder = new Ver3DictEncoder(file); final DictEncoder dictEncoder = new Ver3DictEncoder(file);
UserHistoryDictIOUtils.writeDictionary(dictEncoder, this, bigramList, FORMAT_OPTIONS); UserHistoryDictIOUtils.writeDictionary(dictEncoder, this, bigramList, FORMAT_OPTIONS,
HEADER_OPTIONS);
} }
private void readDictFromFile(final File file, final OnAddWordListener listener) private void readDictFromFile(final File file, final OnAddWordListener listener)
@ -159,8 +167,8 @@ public class UserHistoryDictIOUtilsTests extends AndroidTestCase
addBigramToBigramList("this", "was", addedWords, originalList); addBigramToBigramList("this", "was", addedWords, originalList);
addBigramToBigramList("hello", "world", addedWords, originalList); addBigramToBigramList("hello", "world", addedWords, originalList);
final FusionDictionary fusionDict = final FusionDictionary fusionDict = UserHistoryDictIOUtils.constructFusionDictionary(
UserHistoryDictIOUtils.constructFusionDictionary(this, originalList); this, originalList, HEADER_OPTIONS);
checkWordsInFusionDict(fusionDict, addedWords); checkWordsInFusionDict(fusionDict, addedWords);
} }