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

am 954ba244: Merge "Fix SpacingAndPunctuationsTests due to I2219224840" 

* commit '954ba2445ffdbf6cca58ea0da4b4580d905dcd59':
  Fix SpacingAndPunctuationsTests due to I2219224840
main
Tadashi G. Takaoka 2014-02-14 01:38:48 -08:00 committed by Android Git Automerger
parent 0d25c11b6f 954ba2445f
commit 9908c7c463
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
tests/src/com/android/inputmethod/latin/settings/SpacingAndPunctuationsTests.java
View File

@ -373,37 +373,53 @@ public class SpacingAndPunctuationsTests extends AndroidTestCase {
assertTrue(SWISS_GERMAN.mUsesGermanRules); assertTrue(SWISS_GERMAN.mUsesGermanRules);
} }
private static final String[] PUNCTUATION_LABELS = { private static final String[] PUNCTUATION_LABELS_LTR = {
"!", "?", ",", ":", ";", "\"", "(", ")", "'", "-", "/", "@", "_" "!", "?", ",", ":", ";", "\"", "(", ")", "'", "-", "/", "@", "_"
}; };
private static final String[] PUNCTUATION_WORDS_LTR = PUNCTUATION_LABELS; private static final String[] PUNCTUATION_WORDS_LTR = PUNCTUATION_LABELS_LTR;
private static final String[] PUNCTUATION_WORDS_RTL = { private static final String[] PUNCTUATION_WORDS_HEBREW = {
"!", "?", ",", ":", ";", "\"", ")", "(", "'", "-", "/", "@", "_" "!", "?", ",", ":", ";", "\"", ")", "(", "'", "-", "/", "@", "_"
}; };
// U+061F: "؟" ARABIC QUESTION MARK
// U+060C: "،" ARABIC COMMA
// U+061B: "؛" ARABIC SEMICOLON
private static final String[] PUNCTUATION_LABELS_ARABIC_PERSIAN = {
"!", "\u061F", "\u060C", ":", "\u061B", "\"", "(", ")", "'", "-", "/", "@", "_"
};
private static final String[] PUNCTUATION_WORDS_ARABIC_PERSIAN = {
"!", "\u061F", "\u060C", ":", "\u061B", "\"", ")", "(", "'", "-", "/", "@", "_"
};
private static void testingStandardPunctuationSuggestions(final SpacingAndPunctuations sp, private static void testingStandardPunctuationSuggestions(final SpacingAndPunctuations sp,
final String[] punctuationWords) { final String[] punctuationLabels, final String[] punctuationWords) {
final SuggestedWords suggestedWords = sp.mSuggestPuncList; final SuggestedWords suggestedWords = sp.mSuggestPuncList;
assertFalse("typedWordValid", suggestedWords.mTypedWordValid); assertFalse("typedWordValid", suggestedWords.mTypedWordValid);
assertFalse("willAutoCorrect", suggestedWords.mWillAutoCorrect); assertFalse("willAutoCorrect", suggestedWords.mWillAutoCorrect);
assertTrue("isPunctuationSuggestions", suggestedWords.isPunctuationSuggestions()); assertTrue("isPunctuationSuggestions", suggestedWords.isPunctuationSuggestions());
assertFalse("isObsoleteSuggestions", suggestedWords.mIsObsoleteSuggestions); assertFalse("isObsoleteSuggestions", suggestedWords.mIsObsoleteSuggestions);
assertFalse("isPrediction", suggestedWords.mIsPrediction); assertFalse("isPrediction", suggestedWords.mIsPrediction);
assertEquals("size", PUNCTUATION_LABELS.length, suggestedWords.size()); assertEquals("size", punctuationLabels.length, suggestedWords.size());
for (int index = 0; index < suggestedWords.size(); index++) { for (int index = 0; index < suggestedWords.size(); index++) {
assertEquals("punctuation label at " + index, assertEquals("punctuation label at " + index,
PUNCTUATION_LABELS[index], suggestedWords.getLabel(index)); punctuationLabels[index], suggestedWords.getLabel(index));
assertEquals("punctuation word at " + index, assertEquals("punctuation word at " + index,
punctuationWords[index], suggestedWords.getWord(index)); punctuationWords[index], suggestedWords.getWord(index));
} }
} }
// TODO: Add tests for tablet as well
public void testPunctuationSuggestions() { public void testPunctuationSuggestions() {
testingStandardPunctuationSuggestions(ENGLISH, PUNCTUATION_WORDS_LTR); testingStandardPunctuationSuggestions(ENGLISH,
testingStandardPunctuationSuggestions(FRENCH, PUNCTUATION_WORDS_LTR); PUNCTUATION_LABELS_LTR, PUNCTUATION_WORDS_LTR);
testingStandardPunctuationSuggestions(GERMAN, PUNCTUATION_WORDS_LTR); testingStandardPunctuationSuggestions(FRENCH,
testingStandardPunctuationSuggestions(ARABIC, PUNCTUATION_WORDS_RTL); PUNCTUATION_LABELS_LTR, PUNCTUATION_WORDS_LTR);
testingStandardPunctuationSuggestions(PERSIAN, PUNCTUATION_WORDS_RTL); testingStandardPunctuationSuggestions(GERMAN,
testingStandardPunctuationSuggestions(HEBREW, PUNCTUATION_WORDS_RTL); PUNCTUATION_LABELS_LTR, PUNCTUATION_WORDS_LTR);
testingStandardPunctuationSuggestions(ARABIC,
PUNCTUATION_LABELS_ARABIC_PERSIAN, PUNCTUATION_WORDS_ARABIC_PERSIAN);
testingStandardPunctuationSuggestions(PERSIAN,
PUNCTUATION_LABELS_ARABIC_PERSIAN, PUNCTUATION_WORDS_ARABIC_PERSIAN);
testingStandardPunctuationSuggestions(HEBREW,
PUNCTUATION_LABELS_LTR, PUNCTUATION_WORDS_HEBREW);
} }
} }