Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd1233f8 authored by Ken Wakasa's avatar Ken Wakasa Committed by Android Git Automerger
Browse files

am 3a41528c: Merge "Fix testCharacterTableIsPresent to use BinaryDictUtils.getDictFile" 

* commit '3a41528c':
  Fix testCharacterTableIsPresent to use BinaryDictUtils.getDictFile
parents 863e6137 3a41528c

tests/src/com/android/inputmethod/latin/makedict/BinaryDictDecoderEncoderTests.java

+2 −1
Original line number Diff line number Diff line
@@ -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,

tests/src/com/android/inputmethod/latin/makedict/BinaryDictUtils.java

+4 −1
Original line number Diff line number Diff line
@@ -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);