diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Android.mk | 2 | ||||
| -rw-r--r-- | tests/src/com/android/inputmethod/keyboard/internal/LanguageOnSpacebarHelperTests.java | 12 |
2 files changed, 5 insertions, 9 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index 7cdabf249..0b5449143 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -LOCAL_PATH:= $(call my-dir) +LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) # We only want this apk build for tests. 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)); } |