diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-02-26 16:16:57 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-02-26 16:16:57 -0800 |
| commit | 2b12faa69bef5091ceb10f5f4418a6f6ea9b8ca8 (patch) | |
| tree | 5683719c1a4cc2074e95626c04a1d9f9433870ea | |
| parent | 7b4b16186d94222b884eed23d34ec9793a574220 (diff) | |
| parent | 16cbc30ae5c4b3249ff1551c7f5c2e20bd4cd299 (diff) | |
| download | latinime-2b12faa69bef5091ceb10f5f4418a6f6ea9b8ca8.tar.gz latinime-2b12faa69bef5091ceb10f5f4418a6f6ea9b8ca8.tar.xz latinime-2b12faa69bef5091ceb10f5f4418a6f6ea9b8ca8.zip | |
am 16cbc30a: am e621ea5f: Merge "Fix failed unit test due to resource string change" into jb-mr2-dev
* commit '16cbc30ae5c4b3249ff1551c7f5c2e20bd4cd299':
Fix failed unit test due to resource string change
| -rw-r--r-- | tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java | 6 |
1 files changed, 3 insertions, 3 deletions
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; } |