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

* commit '82e87f4f7fee9e93ff908c1117698c2add460aec':
  Fix: NPE in unit test.
This commit is contained in:
Keisuke Kuroyanagi 2014-10-03 11:03:37 +00:00 committed by Android Git Automerger
commit 829e3a6b00

View file

@ -1237,6 +1237,7 @@ public class BinaryDictionaryTests extends AndroidTestCase {
wordSet.remove(word0); wordSet.remove(word0);
final HashSet<String> bigramWord1s = bigrams.get(word0); final HashSet<String> bigramWord1s = bigrams.get(word0);
// TODO: Support ngram. // TODO: Support ngram.
if (wordProperty.mHasNgrams) {
for (final WeightedString bigramTarget : wordProperty.getBigrams()) { for (final WeightedString bigramTarget : wordProperty.getBigrams()) {
final String word1 = bigramTarget.mWord; final String word1 = bigramTarget.mWord;
assertTrue(bigramWord1s.contains(word1)); assertTrue(bigramWord1s.contains(word1));
@ -1247,6 +1248,7 @@ public class BinaryDictionaryTests extends AndroidTestCase {
} }
bigramSet.remove(bigram); bigramSet.remove(bigram);
} }
}
token = result.mNextToken; token = result.mNextToken;
} while (token != 0); } while (token != 0);
assertTrue(wordSet.isEmpty()); assertTrue(wordSet.isEmpty());