diff options
author | 2014-10-03 12:07:59 +0000 | |
---|---|---|
committer | 2014-10-03 12:07:59 +0000 | |
commit | fd1233f81cf8db1287fb94b7859524c858c23fcd (patch) | |
tree | 6c2b89f313e675f5a0d789251fcef89f80f60080 /tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java | |
parent | 863e61371a03e094835b46204c247b3b0f340277 (diff) | |
parent | 3a41528cbe4dbca8781b63457e49c78a78285338 (diff) | |
download | latinime-fd1233f81cf8db1287fb94b7859524c858c23fcd.tar.gz latinime-fd1233f81cf8db1287fb94b7859524c858c23fcd.tar.xz latinime-fd1233f81cf8db1287fb94b7859524c858c23fcd.zip |
am 3a41528c: Merge "Fix testCharacterTableIsPresent to use BinaryDictUtils.getDictFile"
* commit '3a41528cbe4dbca8781b63457e49c78a78285338':
Fix testCharacterTableIsPresent to use BinaryDictUtils.getDictFile
Diffstat (limited to 'tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java')
-rw-r--r-- | tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java b/tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java index 965479d73..8eabf749d 100644 --- a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java +++ b/tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java @@ -30,6 +30,8 @@ public class BinaryDictUtils { public static final FormatSpec.FormatOptions VERSION2_OPTIONS = new FormatSpec.FormatOptions(FormatSpec.VERSION2); + public static final FormatSpec.FormatOptions VERSION201_OPTIONS = + new FormatSpec.FormatOptions(FormatSpec.VERSION201); public static final FormatSpec.FormatOptions VERSION4_OPTIONS_WITHOUT_TIMESTAMP = new FormatSpec.FormatOptions(FormatSpec.VERSION4, false /* hasTimestamp */); public static final FormatSpec.FormatOptions VERSION4_OPTIONS_WITH_TIMESTAMP = @@ -52,7 +54,8 @@ public class BinaryDictUtils { public static File getDictFile(final String name, final String version, final FormatOptions formatOptions, final File directory) { - if (formatOptions.mVersion == FormatSpec.VERSION2) { + if (formatOptions.mVersion == FormatSpec.VERSION2 + || formatOptions.mVersion == FormatSpec.VERSION201) { return new File(directory, name + "." + version + TEST_DICT_FILE_EXTENSION); } else if (formatOptions.mVersion == FormatSpec.VERSION4) { return new File(directory, name + "." + version); |