diff options
| author |   Dan Zivkovic <zivkovic@google.com> | 2015-03-16 21:49:27 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2015-03-16 21:49:27 +0000 |
| commit | b0e4b90800c708b4a5f1cb5f3611bc2392d7fe7a (patch) | |
| tree | 8ec1ca961a7d3caec605cbe6eb78952d2afccdde | |
| parent | eb2c2f3f15dedb6082b5ff14a1a9c1e08e198697 (diff) | |
| parent | 52dafe8c321663338ba458f7ad1a08c0c838f156 (diff) | |
| download | latinime-b0e4b90800c708b4a5f1cb5f3611bc2392d7fe7a.tar.gz latinime-b0e4b90800c708b4a5f1cb5f3611bc2392d7fe7a.tar.xz latinime-b0e4b90800c708b4a5f1cb5f3611bc2392d7fe7a.zip | |
am 52dafe8c: Don\'t test format version 403 twice.
* commit '52dafe8c321663338ba458f7ad1a08c0c838f156':
Don't test format version 403 twice.
| -rw-r--r-- | java/src/com/android/inputmethod/latin/makedict/FormatSpec.java | 3 | ||||
| -rw-r--r-- | tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java b/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java index 32a746d37..288261bf0 100644 --- a/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java +++ b/java/src/com/android/inputmethod/latin/makedict/FormatSpec.java @@ -180,11 +180,10 @@ public final class FormatSpec { public static final int VERSION402 = 402; public static final int VERSION403 = 403; public static final int VERSION4 = VERSION403; - public static final int VERSION4_DEV = VERSION403; public static final int MINIMUM_SUPPORTED_STATIC_VERSION = VERSION202; public static final int MAXIMUM_SUPPORTED_STATIC_VERSION = VERSION_DELIGHT3; static final int MINIMUM_SUPPORTED_DYNAMIC_VERSION = VERSION4; - static final int MAXIMUM_SUPPORTED_DYNAMIC_VERSION = VERSION4_DEV; + static final int MAXIMUM_SUPPORTED_DYNAMIC_VERSION = VERSION403; // TODO: Make this value adaptative to content data, store it in the header, and // use it in the reading code. diff --git a/tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java b/tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java index 752051775..89167f744 100644 --- a/tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java +++ b/tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java @@ -24,7 +24,6 @@ import android.util.Pair; import com.android.inputmethod.latin.NgramContext.WordInfo; import com.android.inputmethod.latin.common.CodePointUtils; import com.android.inputmethod.latin.common.FileUtils; -import com.android.inputmethod.latin.define.DecoderSpecificConstants; import com.android.inputmethod.latin.makedict.DictionaryHeader; import com.android.inputmethod.latin.makedict.FormatSpec; import com.android.inputmethod.latin.makedict.WeightedString; @@ -44,7 +43,7 @@ public class BinaryDictionaryTests extends AndroidTestCase { private static final String TEST_DICT_FILE_EXTENSION = ".testDict"; private static final String TEST_LOCALE = "test"; private static final int[] DICT_FORMAT_VERSIONS = - new int[] { FormatSpec.VERSION402, FormatSpec.VERSION403, FormatSpec.VERSION4_DEV }; + new int[] { FormatSpec.VERSION402, FormatSpec.VERSION403 }; private static final String DICTIONARY_ID = "TestBinaryDictionary"; private static boolean supportsNgram(final int formatVersion) { |