diff options
| author |   Adrian Velicu <adrianv@google.com> | 2014-10-31 06:49:50 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-10-31 06:49:51 +0000 |
| commit | 61d43e5c941e7a76d614ffbe756137c02a34cdc1 (patch) | |
| tree | a64ba53669c10fda6bd93b55083213b34faacc62 /tests/src/com/android/inputmethod/latin/makedict/BinaryDictEncoderUtils.java | |
| parent | f59c3b62383711a58366bb77caefb62dced3f116 (diff) | |
| parent | 88480f39f6f5d1d678983d1e828bfe7196b021c4 (diff) | |
| download | latinime-61d43e5c941e7a76d614ffbe756137c02a34cdc1.tar.gz latinime-61d43e5c941e7a76d614ffbe756137c02a34cdc1.tar.xz latinime-61d43e5c941e7a76d614ffbe756137c02a34cdc1.zip | |
Merge "Update unit tests for new static dict version."
Diffstat (limited to 'tests/src/com/android/inputmethod/latin/makedict/BinaryDictEncoderUtils.java')
| -rw-r--r-- | tests/src/com/android/inputmethod/latin/makedict/BinaryDictEncoderUtils.java | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictEncoderUtils.java b/tests/src/com/android/inputmethod/latin/makedict/BinaryDictEncoderUtils.java index 60e38250f..ce905c499 100644 --- a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictEncoderUtils.java +++ b/tests/src/com/android/inputmethod/latin/makedict/BinaryDictEncoderUtils.java @@ -819,12 +819,18 @@ public class BinaryDictEncoderUtils { final ArrayList<Entry<Integer, Integer>> codePointOccurrenceArray) throws IOException, UnsupportedFormatException { final int version = formatOptions.mVersion; - if (version < FormatSpec.MINIMUM_SUPPORTED_VERSION - || version > FormatSpec.MAXIMUM_SUPPORTED_VERSION) { + if ((version >= FormatSpec.MINIMUM_SUPPORTED_STATIC_VERSION && + version <= FormatSpec.MAXIMUM_SUPPORTED_STATIC_VERSION) || ( + version >= FormatSpec.MINIMUM_SUPPORTED_DYNAMIC_VERSION && + version <= FormatSpec.MAXIMUM_SUPPORTED_DYNAMIC_VERSION)) { + // Dictionary is valid + } else { throw new UnsupportedFormatException("Requested file format version " + version - + ", but this implementation only supports versions " - + FormatSpec.MINIMUM_SUPPORTED_VERSION + " through " - + FormatSpec.MAXIMUM_SUPPORTED_VERSION); + + ", but this implementation only supports static versions " + + FormatSpec.MINIMUM_SUPPORTED_STATIC_VERSION + " through " + + FormatSpec.MAXIMUM_SUPPORTED_STATIC_VERSION + " and dynamic versions " + + FormatSpec.MINIMUM_SUPPORTED_DYNAMIC_VERSION + " through " + + FormatSpec.MAXIMUM_SUPPORTED_DYNAMIC_VERSION); } ByteArrayOutputStream headerBuffer = new ByteArrayOutputStream(256); |