am 82e87f4f: Merge "Fix: NPE in unit test."

* commit '82e87f4f7fee9e93ff908c1117698c2add460aec':
  Fix: NPE in unit test.

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);