diff options
Diffstat (limited to 'tests')
4 files changed, 14 insertions, 9 deletions
diff --git a/tests/src/com/android/inputmethod/latin/SuggestHelper.java b/tests/src/com/android/inputmethod/latin/SuggestHelper.java index 43b8cf65f..a08933539 100644 --- a/tests/src/com/android/inputmethod/latin/SuggestHelper.java +++ b/tests/src/com/android/inputmethod/latin/SuggestHelper.java @@ -25,6 +25,7 @@ import com.android.inputmethod.keyboard.KeyboardId; import com.android.inputmethod.keyboard.LatinKeyboard; import java.io.File; +import java.util.Locale; public class SuggestHelper { protected final Suggest mSuggest; @@ -40,9 +41,10 @@ public class SuggestHelper { init(); } - protected SuggestHelper(Context context, File dictionaryPath, long startOffset, long length, - KeyboardId keyboardId) { - mSuggest = new Suggest(context, dictionaryPath, startOffset, length, null); + protected SuggestHelper(final Context context, final File dictionaryPath, + final long startOffset, final long length, final KeyboardId keyboardId, + final Locale locale) { + mSuggest = new Suggest(context, dictionaryPath, startOffset, length, null, locale); mKeyboard = new LatinKeyboard.Builder(context).load(keyboardId).build(); mKeyDetector = new KeyDetector(0); init(); diff --git a/tests/src/com/android/inputmethod/latin/SuggestTests.java b/tests/src/com/android/inputmethod/latin/SuggestTests.java index cf4558090..4080f34be 100644 --- a/tests/src/com/android/inputmethod/latin/SuggestTests.java +++ b/tests/src/com/android/inputmethod/latin/SuggestTests.java @@ -30,9 +30,10 @@ public class SuggestTests extends SuggestTestsBase { protected void setUp() throws Exception { super.setUp(); final AssetFileDescriptor dict = openTestRawResourceFd(R.raw.test); + final Locale locale = Locale.US; mHelper = new SuggestHelper( getContext(), mTestPackageFile, dict.getStartOffset(), dict.getLength(), - createKeyboardId(Locale.US, Configuration.ORIENTATION_PORTRAIT)); + createKeyboardId(locale, Configuration.ORIENTATION_PORTRAIT), locale); mHelper.setCorrectionMode(Suggest.CORRECTION_FULL_BIGRAM); } diff --git a/tests/src/com/android/inputmethod/latin/UserBigramSuggestHelper.java b/tests/src/com/android/inputmethod/latin/UserBigramSuggestHelper.java index 7efd5d05a..023e20a10 100644 --- a/tests/src/com/android/inputmethod/latin/UserBigramSuggestHelper.java +++ b/tests/src/com/android/inputmethod/latin/UserBigramSuggestHelper.java @@ -29,11 +29,12 @@ public class UserBigramSuggestHelper extends SuggestHelper { private final Context mContext; private UserBigramDictionary mUserBigram; - public UserBigramSuggestHelper(Context context, File dictionaryPath, long startOffset, - long length, int userBigramMax, int userBigramDelete, KeyboardId keyboardId) { - super(context, dictionaryPath, startOffset, length, keyboardId); + public UserBigramSuggestHelper(final Context context, final File dictionaryPath, + final long startOffset, final long length, final int userBigramMax, + final int userBigramDelete, final KeyboardId keyboardId, final Locale locale) { + super(context, dictionaryPath, startOffset, length, keyboardId, locale); mContext = context; - mUserBigram = new UserBigramDictionary(context, null, Locale.US.toString(), + mUserBigram = new UserBigramDictionary(context, null, locale.toString(), Suggest.DIC_USER); mUserBigram.setDatabaseMax(userBigramMax); mUserBigram.setDatabaseDelete(userBigramDelete); diff --git a/tests/src/com/android/inputmethod/latin/UserBigramSuggestTests.java b/tests/src/com/android/inputmethod/latin/UserBigramSuggestTests.java index 0b97e41fd..2bc0aabc0 100644 --- a/tests/src/com/android/inputmethod/latin/UserBigramSuggestTests.java +++ b/tests/src/com/android/inputmethod/latin/UserBigramSuggestTests.java @@ -33,10 +33,11 @@ public class UserBigramSuggestTests extends SuggestTestsBase { protected void setUp() throws Exception { super.setUp(); final AssetFileDescriptor dict = openTestRawResourceFd(R.raw.test); + final Locale locale = Locale.US; mHelper = new UserBigramSuggestHelper( getContext(), mTestPackageFile, dict.getStartOffset(), dict.getLength(), MAX_DATA, DELETE_DATA, - createKeyboardId(Locale.US, Configuration.ORIENTATION_PORTRAIT)); + createKeyboardId(locale, Configuration.ORIENTATION_PORTRAIT), locale); } /************************** Tests ************************/ |