am 228674f6: Merge "fix findWordInTree." into jb-mr1-dev

* commit '228674f6c7ce8891ca6b358db94da921712d9960':
  fix findWordInTree.
main
Jean Chalard 2012-08-16 18:56:45 -07:00 committed by Android Git Automerger
commit 7145ca7138
2 changed files with 7 additions and 0 deletions

View File

@ -532,6 +532,7 @@ public class FusionDictionary implements Iterable<Word> {
} while (null != node && index < s.length());
if (index < s.length()) return null;
if (!currentGroup.isTerminal()) return null;
if (DBG && !s.equals(checker.toString())) return null;
return currentGroup;
}

View File

@ -38,5 +38,11 @@ public class FusionDictionaryTests extends AndroidTestCase {
dict.add("aa", 10, null);
assertNull(FusionDictionary.findWordInTree(dict.mRoot, "aaa"));
assertNotNull(FusionDictionary.findWordInTree(dict.mRoot, "aa"));
dict.add("babcd", 10, null);
dict.add("bacde", 10, null);
assertNull(FusionDictionary.findWordInTree(dict.mRoot, "ba"));
assertNotNull(FusionDictionary.findWordInTree(dict.mRoot, "babcd"));
assertNotNull(FusionDictionary.findWordInTree(dict.mRoot, "bacde"));
}
}