Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e621ea5f authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

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

parents 183fe800 67a54c4b

tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java

+3 −3
Original line number Diff line number Diff line
@@ -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;

            }