diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2014-10-03 12:07:59 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-10-03 12:07:59 +0000 |
| commit | fd1233f81cf8db1287fb94b7859524c858c23fcd (patch) | |
| tree | 6c2b89f313e675f5a0d789251fcef89f80f60080 /tests/src | |
| 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')
| -rw-r--r-- | tests/src/com/android/inputmethod/latin/makedict/BinaryDictDecoderEncoderTests.java | 3 | ||||
| -rw-r--r-- | tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictDecoderEncoderTests.java b/tests/src/com/android/inputmethod/latin/makedict/BinaryDictDecoderEncoderTests.java index a3e36ee69..637ea4ec8 100644 --- a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictDecoderEncoderTests.java +++ b/tests/src/com/android/inputmethod/latin/makedict/BinaryDictDecoderEncoderTests.java @@ -311,7 +311,8 @@ public class BinaryDictDecoderEncoderTests extends AndroidTestCase { final String dictName = "codePointTableTest"; final String dictVersion = Long.toString(System.currentTimeMillis()); final String codePointTableAttribute = DictionaryHeader.CODE_POINT_TABLE_KEY; - final File file = new File(dictName); + final File file = BinaryDictUtils.getDictFile(dictName, dictVersion, + BinaryDictUtils.VERSION201_OPTIONS, getContext().getCacheDir()); // Write a test dictionary final DictEncoder dictEncoder = new Ver2DictEncoder(file, 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); |