Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 228674f6 authored by Jean Chalard's avatar Jean Chalard Committed by Android (Google) Code Review
Browse files

Merge "fix findWordInTree." into jb-mr1-dev

parents 3083b4b7 0d35c159

java/src/com/android/inputmethod/latin/makedict/FusionDictionary.java

+1 −0
Original line number Diff line number Diff line
@@ -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;

    }

tests/src/com/android/inputmethod/latin/FusionDictionaryTests.java

+6 −0
Original line number Diff line number Diff line
@@ -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"));

    }

}