diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-08-15 19:42:51 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-08-15 19:42:51 -0700 |
| commit | 806354bfa21368f17d3b25573c98a8dce3aa62a7 (patch) | |
| tree | ef5f473c1f6fdd7a7dca243969bb1b2bce6b9cf0 | |
| parent | 9bc2beaf7e31e289436e09b6416eb2906429ec52 (diff) | |
| parent | a440aa391c54b7d0d35a64aa4418ca1811518fa2 (diff) | |
| download | latinime-806354bfa21368f17d3b25573c98a8dce3aa62a7.tar.gz latinime-806354bfa21368f17d3b25573c98a8dce3aa62a7.tar.xz latinime-806354bfa21368f17d3b25573c98a8dce3aa62a7.zip | |
am a440aa39: Merge "Fix SubtypeLocaleUtilsTests"
* commit 'a440aa391c54b7d0d35a64aa4418ca1811518fa2':
Fix SubtypeLocaleUtilsTests
| -rw-r--r-- | tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java b/tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java index baebda2ed..856b2dbda 100644 --- a/tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java +++ b/tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java @@ -214,7 +214,7 @@ public class SubtypeLocaleUtilsTests extends AndroidTestCase { SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(FR_CA)); assertEquals("de ", "Allemand", SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(DE)); - assertEquals("zz ", "Alphabet (QWERTY)", + assertEquals("zz ", "Alphabet latin (QWERTY)", SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(ZZ)); return null; } @@ -236,7 +236,7 @@ public class SubtypeLocaleUtilsTests extends AndroidTestCase { SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(EN_UK_DVORAK)); assertEquals("es_US colemak","Espagnol (États-Unis) (Colemak)", SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(ES_US_COLEMAK)); - assertEquals("zz pc", "Alphabet (PC)", + assertEquals("zz pc", "Alphabet latin (PC)", SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(ZZ_PC)); return null; } |