diff options
| author |   Treehugger Robot <treehugger-gerrit@google.com> | 2022-10-17 21:24:30 +0000 |
|---|---|---|
| committer |   Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-10-17 21:24:30 +0000 |
| commit | 841942ff6fb6010643040fd6fd7ab53980ef07e2 (patch) | |
| tree | 115745fc2b9edbea9683eaf91d340b0baa58a3e0 /tests | |
| parent | a630a5f60348605ed2957ec373740eedd885836b (diff) | |
| parent | ce22ebc5579ab049de7e4015e0d34c1d7650157a (diff) | |
| download | latinime-841942ff6fb6010643040fd6fd7ab53980ef07e2.tar.gz latinime-841942ff6fb6010643040fd6fd7ab53980ef07e2.tar.xz latinime-841942ff6fb6010643040fd6fd7ab53980ef07e2.zip | |
Merge "Fix errorprone warnings that should be errors" am: 6d585ed76c am: 78a43f6c9c am: ce22ebc557
Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/2256807
Change-Id: I0b54d410fdabe3424e0eff31153048e474e93923
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyOutput.java | 2 | ||||
| -rw-r--r-- | tests/src/com/android/inputmethod/latin/makedict/Ver2DictEncoder.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyOutput.java b/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyOutput.java index e7b0f091d..e2b98bc69 100644 --- a/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyOutput.java +++ b/tests/src/com/android/inputmethod/keyboard/layout/expected/ExpectedKeyOutput.java @@ -131,7 +131,7 @@ abstract class ExpectedKeyOutput { @Override boolean hasSameKeyOutput(final String text) { - return text.equals(text); + return mText.equals(text); } @Override diff --git a/tests/src/com/android/inputmethod/latin/makedict/Ver2DictEncoder.java b/tests/src/com/android/inputmethod/latin/makedict/Ver2DictEncoder.java index c63b972eb..b5694caa3 100644 --- a/tests/src/com/android/inputmethod/latin/makedict/Ver2DictEncoder.java +++ b/tests/src/com/android/inputmethod/latin/makedict/Ver2DictEncoder.java @@ -34,6 +34,7 @@ import java.util.Comparator; import java.util.HashMap; import java.util.Iterator; import java.util.Map.Entry; +import java.util.Objects; /** * An implementation of DictEncoder for version 2 binary dictionary. @@ -100,7 +101,7 @@ public class Ver2DictEncoder implements DictEncoder { Collections.sort(codePointOccurrenceArray, new Comparator<Entry<Integer, Integer>>() { @Override public int compare(final Entry<Integer, Integer> a, final Entry<Integer, Integer> b) { - if (a.getValue() != b.getValue()) { + if (!Objects.equals(a.getValue(), b.getValue())) { return b.getValue().compareTo(a.getValue()); } return b.getKey().compareTo(a.getKey()); |