aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorKeisuke Kuroyanagi <ksk@google.com>2014-10-03 19:53:23 +0900
committerKeisuke Kuroyanagi <ksk@google.com>2014-10-03 19:53:23 +0900
commit2522a4a477d366a1e69c07c0a5b7c8a0f43118f6 (patch)
tree9935603e8a51111f5fff8ab11cb2d9a23acad42f /tests
parent80861cde9d1597f770da667eca24d39889bfdb3a (diff)
downloadlatinime-2522a4a477d366a1e69c07c0a5b7c8a0f43118f6.tar.gz
latinime-2522a4a477d366a1e69c07c0a5b7c8a0f43118f6.tar.xz
latinime-2522a4a477d366a1e69c07c0a5b7c8a0f43118f6.zip
Fix: NPE in unit test.
Change-Id: I769b43f2afa1151d5c0d9c408018c3932be377dc
Diffstat (limited to 'tests')
-rw-r--r--tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java18
1 files changed, 10 insertions, 8 deletions
diff --git a/tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java b/tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java
index 9c7792cf2..b15987fd7 100644
--- a/tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java
+++ b/tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java
@@ -1237,15 +1237,17 @@ public class BinaryDictionaryTests extends AndroidTestCase {
wordSet.remove(word0);
final HashSet<String> bigramWord1s = bigrams.get(word0);
// TODO: Support ngram.
- for (final WeightedString bigramTarget : wordProperty.getBigrams()) {
- final String word1 = bigramTarget.mWord;
- assertTrue(bigramWord1s.contains(word1));
- final Pair<String, String> bigram = new Pair<>(word0, word1);
- if (canCheckBigramProbability(formatVersion)) {
- final int bigramProbability = bigramProbabilitiesToCheckLater.get(bigram);
- assertEquals(bigramProbability, bigramTarget.getProbability());
+ if (wordProperty.mHasNgrams) {
+ for (final WeightedString bigramTarget : wordProperty.getBigrams()) {
+ final String word1 = bigramTarget.mWord;
+ assertTrue(bigramWord1s.contains(word1));
+ final Pair<String, String> bigram = new Pair<>(word0, word1);
+ if (canCheckBigramProbability(formatVersion)) {
+ final int bigramProbability = bigramProbabilitiesToCheckLater.get(bigram);
+ assertEquals(bigramProbability, bigramTarget.getProbability());
+ }
+ bigramSet.remove(bigram);
}
- bigramSet.remove(bigram);
}
token = result.mNextToken;
} while (token != 0);