nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add test entry for BinaryDictionary class

Browse source 
Bug: 3414081
Change-Id: I1a3d60698795bf28c477086838e726d498fb6de0
This commit is contained in:
Tadashi G. Takaoka 2011-02-28 14:54:04 -08:00
parent 654db88d35
commit 6f4eba814a
1 changed files with 29 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
java/src/com/android/inputmethod/latin/BinaryDictionary.java
View file

@ -16,6 +16,7 @@
package com.android.inputmethod.latin; package com.android.inputmethod.latin;
import com.android.inputmethod.keyboard.Keyboard;
import com.android.inputmethod.keyboard.KeyboardSwitcher; import com.android.inputmethod.keyboard.KeyboardSwitcher;
import com.android.inputmethod.keyboard.ProximityInfo; import com.android.inputmethod.keyboard.ProximityInfo;
@ -93,8 +94,7 @@ public class BinaryDictionary extends Dictionary {
return sInstance; return sInstance;
} }
// For unit test /* package for test */ static BinaryDictionary initDictionary(File dictionary, long startOffset,
/* package */ static BinaryDictionary initDictionary(File dictionary, long startOffset,
long length, int dicTypeId) { long length, int dicTypeId) {
synchronized (sInstance) { synchronized (sInstance) {
sInstance.closeInternal(); sInstance.closeInternal();
@ -166,25 +166,7 @@ public class BinaryDictionary extends Dictionary {
@Override @Override
public void getWords(final WordComposer codes, final WordCallback callback) { public void getWords(final WordComposer codes, final WordCallback callback) {
if (mNativeDict == 0) return; final int count = getSuggestions(codes, mKeyboardSwitcher.getLatinKeyboard());
final int codesSize = codes.size();
// Won't deal with really long words.
if (codesSize > MAX_WORD_LENGTH - 1) return;
Arrays.fill(mInputCodes, WordComposer.NOT_A_CODE);
for (int i = 0; i < codesSize; i++) {
int[] alternatives = codes.getCodesAt(i);
System.arraycopy(alternatives, 0, mInputCodes, i * MAX_PROXIMITY_CHARS_SIZE,
Math.min(alternatives.length, MAX_PROXIMITY_CHARS_SIZE));
}
Arrays.fill(mOutputChars, (char) 0);
Arrays.fill(mFrequencies, 0);
int count = getSuggestionsNative(
mNativeDict, mKeyboardSwitcher.getLatinKeyboard().getProximityInfo(),
codes.getXCoordinates(), codes.getYCoordinates(), mInputCodes, codesSize,
mOutputChars, mFrequencies);
for (int j = 0; j < count; ++j) { for (int j = 0; j < count; ++j) {
if (mFrequencies[j] < 1) break; if (mFrequencies[j] < 1) break;
@ -200,6 +182,32 @@ public class BinaryDictionary extends Dictionary {
} }
} }
/* package for test */ boolean isValidDictionary() {
return mNativeDict != 0;
}
/* package for test */ int getSuggestions(final WordComposer codes, final Keyboard keyboard) {
if (!isValidDictionary()) return -1;
final int codesSize = codes.size();
// Won't deal with really long words.
if (codesSize > MAX_WORD_LENGTH - 1) return -1;
Arrays.fill(mInputCodes, WordComposer.NOT_A_CODE);
for (int i = 0; i < codesSize; i++) {
int[] alternatives = codes.getCodesAt(i);
System.arraycopy(alternatives, 0, mInputCodes, i * MAX_PROXIMITY_CHARS_SIZE,
Math.min(alternatives.length, MAX_PROXIMITY_CHARS_SIZE));
}
Arrays.fill(mOutputChars, (char) 0);
Arrays.fill(mFrequencies, 0);
return getSuggestionsNative(
mNativeDict, keyboard.getProximityInfo(),
codes.getXCoordinates(), codes.getYCoordinates(), mInputCodes, codesSize,
mOutputChars, mFrequencies);
}
@Override @Override
public boolean isValidWord(CharSequence word) { public boolean isValidWord(CharSequence word) {
if (word == null) return false; if (word == null) return false;