From 0d6ce46528c43b3060b14cc3096adb03f55e6f76 Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Sat, 8 Nov 2014 18:50:59 -0800 Subject: Move logic to determine spacebar text to LanguageOnSpacebarHelper Change-Id: Ib9dbbb4bd4e35c15fd752c364d3012e8a7da2410 --- .../keyboard/internal/LanguageOnSpacebarHelperTests.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'tests/src') diff --git a/tests/src/com/android/inputmethod/keyboard/internal/LanguageOnSpacebarHelperTests.java b/tests/src/com/android/inputmethod/keyboard/internal/LanguageOnSpacebarHelperTests.java index e8788d122..6bb255b01 100644 --- a/tests/src/com/android/inputmethod/keyboard/internal/LanguageOnSpacebarHelperTests.java +++ b/tests/src/com/android/inputmethod/keyboard/internal/LanguageOnSpacebarHelperTests.java @@ -89,19 +89,15 @@ public class LanguageOnSpacebarHelperTests extends AndroidTestCase { for (final RichInputMethodSubtype subtype : subtypes) { enabledSubtypes.add(subtype.getRawSubtype()); } - mLanguageOnSpacebarHelper.updateEnabledSubtypes(enabledSubtypes); + mLanguageOnSpacebarHelper.onUpdateEnabledSubtypes(enabledSubtypes); } private void assertFormatType(final RichInputMethodSubtype subtype, final boolean implicitlyEnabledSubtype, final Locale systemLocale, final int expectedFormat) { - final Locale newLocale = subtype.getLocales()[0]; - final boolean sameLocale = systemLocale.equals(newLocale); - final boolean sameLanguage = systemLocale.getLanguage().equals(newLocale.getLanguage()); - mLanguageOnSpacebarHelper.updateIsSystemLanguageSameAsInputLanguage( - sameLocale || (sameLanguage && implicitlyEnabledSubtype)); - assertEquals(newLocale + " implicitly=" + implicitlyEnabledSubtype + " in " + systemLocale, - expectedFormat, + mLanguageOnSpacebarHelper.onSubtypeChanged(subtype, implicitlyEnabledSubtype, systemLocale); + assertEquals(subtype.getLocales()[0] + " implicitly=" + implicitlyEnabledSubtype + + " in " + systemLocale, expectedFormat, mLanguageOnSpacebarHelper.getLanguageOnSpacebarFormatType(subtype)); } -- cgit v1.2.3-83-g751a