From 25c884ba655edd5cfce42d31df994baba039479f Mon Sep 17 00:00:00 2001 From: Akifumi Yoshimoto Date: Wed, 10 Sep 2014 18:29:59 +0900 Subject: [PATCH 1/2] Test for code point table (dicttool test) Bug:17097992 Change-Id: I269c9aa86378f32083f8688f4ce91862d47dd181 --- .../BinaryDictDecoderEncoderTests.java | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictDecoderEncoderTests.java b/tests/src/com/android/inputmethod/latin/makedict/BinaryDictDecoderEncoderTests.java index fa20d06c7..3fc06f90e 100644 --- a/tests/src/com/android/inputmethod/latin/makedict/BinaryDictDecoderEncoderTests.java +++ b/tests/src/com/android/inputmethod/latin/makedict/BinaryDictDecoderEncoderTests.java @@ -304,6 +304,39 @@ public class BinaryDictDecoderEncoderTests extends AndroidTestCase { "unigram with various code points")); } + public void testCharacterTableIsPresent() throws IOException, UnsupportedFormatException { + final String[] wordSource = {"words", "used", "for", "testing", "a", "code point", "table"}; + final List words = Arrays.asList(wordSource); + final String correctCodePointTable = "eotdsanirfg bclwup"; + 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); + + // Write a test dictionary + final DictEncoder dictEncoder = new Ver2DictEncoder(file, + Ver2DictEncoder.CODE_POINT_TABLE_ON); + final FormatSpec.FormatOptions formatOptions = + new FormatSpec.FormatOptions( + FormatSpec.MINIMUM_SUPPORTED_VERSION_OF_CODE_POINT_TABLE); + final FusionDictionary sourcedict = new FusionDictionary(new PtNodeArray(), + BinaryDictUtils.makeDictionaryOptions(dictName, dictVersion, formatOptions)); + addUnigrams(words.size(), sourcedict, words, null /* shortcutMap */); + dictEncoder.writeDictionary(sourcedict, formatOptions); + + // Read the dictionary + final DictDecoder dictDecoder = BinaryDictIOUtils.getDictDecoder(file, 0, file.length(), + DictDecoder.USE_BYTEARRAY); + final DictionaryHeader fileHeader = dictDecoder.readHeader(); + // Check if codePointTable is present + assertTrue("codePointTable is not present", + fileHeader.mDictionaryOptions.mAttributes.containsKey(codePointTableAttribute)); + final String codePointTable = + fileHeader.mDictionaryOptions.mAttributes.get(codePointTableAttribute); + // Check if codePointTable is correct + assertEquals("codePointTable is incorrect", codePointTable, correctCodePointTable); + } + // Unit test for CharEncoding.readString and CharEncoding.writeString. public void testCharEncoding() { // the max length of a word in sWords is less than 50. From f51d3667fcaaaebec28ca5376e0027d0ee4c79de Mon Sep 17 00:00:00 2001 From: Akifumi Yoshimoto Date: Thu, 25 Sep 2014 16:54:12 +0900 Subject: [PATCH 2/2] Switch code point table Bug:17097992 Change-Id: I3c1f5ac183ebb5d3757b8ff258655869ab61f2e7 --- .../inputmethod/latin/makedict/Ver2DictEncoder.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/src/com/android/inputmethod/latin/makedict/Ver2DictEncoder.java b/tests/src/com/android/inputmethod/latin/makedict/Ver2DictEncoder.java index eabde4620..2c2152be7 100644 --- a/tests/src/com/android/inputmethod/latin/makedict/Ver2DictEncoder.java +++ b/tests/src/com/android/inputmethod/latin/makedict/Ver2DictEncoder.java @@ -137,10 +137,11 @@ public class Ver2DictEncoder implements DictEncoder { // Make code point conversion table ordered by occurrence of code points // Version 201 or later have codePointTable final CodePointTable codePointTable; - if (formatOptions.mVersion >= FormatSpec.MINIMUM_SUPPORTED_VERSION_OF_CODE_POINT_TABLE) { - codePointTable = makeCodePointTable(dict); - } else { + if (mCodePointTableMode == CODE_POINT_TABLE_OFF || formatOptions.mVersion + < FormatSpec.MINIMUM_SUPPORTED_VERSION_OF_CODE_POINT_TABLE) { codePointTable = new CodePointTable(); + } else { + codePointTable = makeCodePointTable(dict); } BinaryDictEncoderUtils.writeDictionaryHeader(mOutStream, dict, formatOptions,