aboutsummaryrefslogtreecommitdiffstats
path: root/tests/src
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2013-02-27 00:03:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-02-27 00:03:54 +0000
commite621ea5fdc4af0034c7c1d41e2d10aefc86e8aab (patch)
treed9cd5b2062d254de08d233565c762c726f483234 /tests/src
parent183fe8003163702a0ba9487d6fde2a7c025ab91a (diff)
parent67a54c4bbe4a6a097a4ceacfd67667000c70e595 (diff)
downloadlatinime-e621ea5fdc4af0034c7c1d41e2d10aefc86e8aab.tar.gz
latinime-e621ea5fdc4af0034c7c1d41e2d10aefc86e8aab.tar.xz
latinime-e621ea5fdc4af0034c7c1d41e2d10aefc86e8aab.zip
Merge "Fix failed unit test due to resource string change" into jb-mr2-dev
Diffstat (limited to 'tests/src')
-rw-r--r--tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java6
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;
}