diff options
| author |   Jean Chalard <jchalard@google.com> | 2013-12-16 14:17:33 +0900 |
|---|---|---|
| committer | Jean Chalard <jchalard@google.com> | 2013-12-16 14:32:19 +0900 |
| commit | b868375763de60d1a1ff6fa21b121cc1b61df842 (patch) | |
| tree | e909b246d797e1e61bc64770ffba2cfa1bbdd537 /tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java | |
| parent | 2c25c7c9e1c98feaa3fc739244badacfa0719576 (diff) | |
| download | latinime-b868375763de60d1a1ff6fa21b121cc1b61df842.tar.gz latinime-b868375763de60d1a1ff6fa21b121cc1b61df842.tar.xz latinime-b868375763de60d1a1ff6fa21b121cc1b61df842.zip | |
Fix failing tests
- Version 3 is not supported
- Now passing the right string to open v4 dicts. Fix the tests for this.
Change-Id: I7829330c3568a715b96396ba4e4e69c6e17775ab
Diffstat (limited to 'tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java')
| -rw-r--r-- | tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java b/tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java index a568704b4..67d77e05a 100644 --- a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java +++ b/tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java @@ -31,8 +31,6 @@ public class BinaryDictUtils { public static final FormatSpec.FormatOptions VERSION2_OPTIONS = new FormatSpec.FormatOptions(FormatSpec.VERSION2); - public static final FormatSpec.FormatOptions VERSION3_OPTIONS = - new FormatSpec.FormatOptions(FormatSpec.VERSION3); 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 = @@ -48,8 +46,7 @@ public class BinaryDictUtils { public static File getDictFile(final String name, final String version, final FormatOptions formatOptions, final File directory) { - if (formatOptions.mVersion == FormatSpec.VERSION2 - || formatOptions.mVersion == FormatSpec.VERSION3) { + if (formatOptions.mVersion == FormatSpec.VERSION2) { return new File(directory, name + "." + version + TEST_DICT_FILE_EXTENSION); } else if (formatOptions.mVersion == FormatSpec.VERSION4) { return new File(directory, name + "." + version); @@ -59,12 +56,13 @@ public class BinaryDictUtils { } } - public static DictEncoder getDictEncoder(final File file, final FormatOptions formatOptions, - final File cacheDir) { + public static DictEncoder getDictEncoder(final File file, final FormatOptions formatOptions) { if (formatOptions.mVersion == FormatSpec.VERSION4) { - return new Ver4DictEncoder(cacheDir); - } else if (formatOptions.mVersion == FormatSpec.VERSION3 - || formatOptions.mVersion == FormatSpec.VERSION2) { + if (!file.isDirectory()) { + file.mkdir(); + } + return new Ver4DictEncoder(file); + } else if (formatOptions.mVersion == FormatSpec.VERSION2) { return new Ver2DictEncoder(file); } else { throw new RuntimeException("The format option has a wrong version : " |