diff options
Diffstat (limited to 'tests/src')
| -rw-r--r-- | tests/src/com/android/inputmethod/latin/InputLogicTestsNonEnglish.java | 25 | ||||
| -rw-r--r-- | tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java | 6 |
2 files changed, 19 insertions, 12 deletions
diff --git a/tests/src/com/android/inputmethod/latin/InputLogicTestsNonEnglish.java b/tests/src/com/android/inputmethod/latin/InputLogicTestsNonEnglish.java index 005f8b279..333b60277 100644 --- a/tests/src/com/android/inputmethod/latin/InputLogicTestsNonEnglish.java +++ b/tests/src/com/android/inputmethod/latin/InputLogicTestsNonEnglish.java @@ -74,15 +74,22 @@ public class InputLogicTestsNonEnglish extends InputTestsBase { public void testWordThenSpaceDisplaysPredictions() { final String WORD_TO_TYPE = "beaujolais "; final String EXPECTED_RESULT = "nouveau"; - changeLanguage("fr"); - type(WORD_TO_TYPE); - sleep(DELAY_TO_WAIT_FOR_UNDERLINE); - runMessages(); - final SuggestionStripView suggestionStripView = - (SuggestionStripView)mInputView.findViewById(R.id.suggestion_strip_view); - final SuggestedWords suggestedWords = suggestionStripView.getSuggestions(); - assertEquals("type word then type space yields predictions for French", - EXPECTED_RESULT, suggestedWords.getWord(0)); + final boolean defaultNextWordPredictionOption = + mLatinIME.getResources().getBoolean(R.bool.config_default_next_word_prediction); + final boolean previousNextWordPredictionOption = + setBooleanPreference(NEXT_WORD_PREDICTION_OPTION, true, + defaultNextWordPredictionOption); + try { + changeLanguage("fr"); + type(WORD_TO_TYPE); + sleep(DELAY_TO_WAIT_FOR_UNDERLINE); + runMessages(); + assertEquals("type word then type space yields predictions for French", + EXPECTED_RESULT, mLatinIME.getFirstSuggestedWord()); + } finally { + setBooleanPreference(NEXT_WORD_PREDICTION_OPTION, previousNextWordPredictionOption, + defaultNextWordPredictionOption); + } } public void testAutoCorrectForGerman() { diff --git a/tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java b/tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java index 1e2036662..abfaf3062 100644 --- a/tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java +++ b/tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java @@ -189,7 +189,7 @@ public class SubtypeLocaleTests extends AndroidTestCase { SubtypeLocale.getSubtypeDisplayName(FR_CA)); assertEquals("de ", "Deutsch", SubtypeLocale.getSubtypeDisplayName(DE)); - assertEquals("zz ", "Pas de langue (QWERTY)", + assertEquals("zz ", "Aucune langue (QWERTY)", SubtypeLocale.getSubtypeDisplayName(ZZ)); return null; } @@ -301,7 +301,7 @@ public class SubtypeLocaleTests extends AndroidTestCase { // fr azerty F Français // fr_CA qwerty F Français (Canada) // de qwertz F Allemand - // zz qwerty F Pas de langue (QWERTY) + // zz qwerty F Aucune langue (QWERTY) // fr qwertz T Français (QWERTZ) // de qwerty T Allemand (QWERTY) // en_US azerty T Anglais (États-Unis) (AZERTY) exception @@ -325,7 +325,7 @@ public class SubtypeLocaleTests extends AndroidTestCase { SubtypeLocale.getSubtypeDisplayNameInSystemLocale(FR_CA)); assertEquals("de ", "Allemand", SubtypeLocale.getSubtypeDisplayNameInSystemLocale(DE)); - assertEquals("zz ", "Pas de langue (QWERTY)", + assertEquals("zz ", "Aucune langue (QWERTY)", SubtypeLocale.getSubtypeDisplayNameInSystemLocale(ZZ)); return null; } |