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

Commit 69ffa8b0 authored by Jean Chalard's avatar Jean Chalard Committed by Android Git Automerger
Browse files

am 03d1dff3: Merge "Fix Binary dict tests" 

* commit '03d1dff3':
  Fix Binary dict tests
parents 6246b7c3 03d1dff3

java/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java

+4 −4
Original line number Diff line number Diff line
@@ -1467,8 +1467,8 @@ public final class BinaryDictInputOutput { 
                    if (null == last) continue;

                    builder.append(new String(last.mCharacters, 0, last.mCharacters.length));

                    buffer.position(last.mChildrenAddress + headerSize);

                    groupOffset = last.mChildrenAddress + 1;

                    i = buffer.readUnsignedByte();

                    i = readCharGroupCount(buffer);

                    groupOffset = last.mChildrenAddress + getGroupCountSize(i);

                    last = null;

                    continue;

                }
@@ -1477,8 +1477,8 @@ public final class BinaryDictInputOutput { 
            if (0 == i && hasChildrenAddress(last.mChildrenAddress)) {

                builder.append(new String(last.mCharacters, 0, last.mCharacters.length));

                buffer.position(last.mChildrenAddress + headerSize);

                groupOffset = last.mChildrenAddress + 1;

                i = buffer.readUnsignedByte();

                i = readCharGroupCount(buffer);

                groupOffset = last.mChildrenAddress + getGroupCountSize(i);

                last = null;

                continue;

            }

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

+4 −1
Original line number Diff line number Diff line
@@ -137,7 +137,10 @@ public class BinaryDictIOTests extends AndroidTestCase { 
            if (r < 0) continue;

            // Don't insert 0~20, but insert any other code point.

            // Code points are in the range 0~0x10FFFF.

            builder.appendCodePoint((int)(20 + r % (0x10FFFF - 20)));

            final int candidateCodePoint = (int)(20 + r % (0x10FFFF - 20));

            // Code points between 0xD800 and 0xDFFF are not valid.

            if (candidateCodePoint >= 0xD800 && candidateCodePoint <= 0xDFFF) continue;

            builder.appendCodePoint(candidadeCodePoint);

            --count;

        }

        return builder.toString();