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

am e621ea5f: Merge "Fix failed unit test due to resource string change" into jb-mr2-dev

Browse source 
* commit 'e621ea5fdc4af0034c7c1d41e2d10aefc86e8aab':
  Fix failed unit test due to resource string change
This commit is contained in:
Tadashi G. Takaoka 2013-02-27 00:15:25 +00:00 committed by Android Git Automerger
commit 16cbc30ae5
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java
View file

@ -189,7 +189,7 @@ public class SubtypeLocaleTests extends AndroidTestCase {
SubtypeLocale.getSubtypeDisplayName(FR_CA)); SubtypeLocale.getSubtypeDisplayName(FR_CA));
assertEquals("de ", "Deutsch", assertEquals("de ", "Deutsch",
SubtypeLocale.getSubtypeDisplayName(DE)); SubtypeLocale.getSubtypeDisplayName(DE));
assertEquals("zz ", "Pas de langue (QWERTY)", assertEquals("zz ", "Aucune langue (QWERTY)",
SubtypeLocale.getSubtypeDisplayName(ZZ)); SubtypeLocale.getSubtypeDisplayName(ZZ));
return null; return null;
} }
@ -301,7 +301,7 @@ public class SubtypeLocaleTests extends AndroidTestCase {
// fr azerty F Français // fr azerty F Français
// fr_CA qwerty F Français (Canada) // fr_CA qwerty F Français (Canada)
// de qwertz F Allemand // de qwertz F Allemand
// zz qwerty F Pas de langue (QWERTY) // zz qwerty F Aucune langue (QWERTY)
// fr qwertz T Français (QWERTZ) // fr qwertz T Français (QWERTZ)
// de qwerty T Allemand (QWERTY) // de qwerty T Allemand (QWERTY)
// en_US azerty T Anglais (États-Unis) (AZERTY) exception // en_US azerty T Anglais (États-Unis) (AZERTY) exception
@ -325,7 +325,7 @@ public class SubtypeLocaleTests extends AndroidTestCase {
SubtypeLocale.getSubtypeDisplayNameInSystemLocale(FR_CA)); SubtypeLocale.getSubtypeDisplayNameInSystemLocale(FR_CA));
assertEquals("de ", "Allemand", assertEquals("de ", "Allemand",
SubtypeLocale.getSubtypeDisplayNameInSystemLocale(DE)); SubtypeLocale.getSubtypeDisplayNameInSystemLocale(DE));
assertEquals("zz ", "Pas de langue (QWERTY)", assertEquals("zz ", "Aucune langue (QWERTY)",
SubtypeLocale.getSubtypeDisplayNameInSystemLocale(ZZ)); SubtypeLocale.getSubtypeDisplayNameInSystemLocale(ZZ));
return null; return null;
} }