diff options
Diffstat (limited to 'tests/src')
5 files changed, 6 insertions, 24 deletions
diff --git a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java b/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java index 0246c49a1..88550802c 100644 --- a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java +++ b/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetTestsBase.java @@ -75,7 +75,7 @@ public abstract class KeyboardLayoutSetTestsBase extends AndroidTestCase { mRichImm = RichInputMethodManager.getInstance(); // Save and reset additional subtypes preference. - mSavedAdditionalSubtypes = mRichImm.getAdditionalSubtypes(context); + mSavedAdditionalSubtypes = mRichImm.getAdditionalSubtypes(); final InputMethodSubtype[] predefinedAdditionalSubtypes = AdditionalSubtypeUtils.createAdditionalSubtypesArray( AdditionalSubtypeUtils.createPrefSubtypes( @@ -155,7 +155,7 @@ public abstract class KeyboardLayoutSetTestsBase extends AndroidTestCase { final boolean languageSwitchKeyEnabled, final boolean splitLayoutEnabled) { final Context context = getContext(); final Resources res = context.getResources(); - final int keyboardWidth = ResourceUtils.getDefaultKeyboardWidth(res); + final int keyboardWidth = ResourceUtils.getKeyboardFrameWidth(res); final int keyboardHeight = ResourceUtils.getDefaultKeyboardHeight(res); final Builder builder = new Builder(context, editorInfo); builder.setKeyboardGeometry(keyboardWidth, keyboardHeight) diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/LayoutTestsBase.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/LayoutTestsBase.java index a8c4ac8fa..27519ee93 100644 --- a/tests/src/com/android/inputmethod/keyboard/layout/tests/LayoutTestsBase.java +++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/LayoutTestsBase.java @@ -120,31 +120,13 @@ abstract class LayoutTestsBase extends KeyboardLayoutSetTestsBase { // TODO: Add phone, phone symbols, number, number password layout tests. - public final void testAlphabet() { + public final void testLayouts() { doKeyboardTests(KeyboardId.ELEMENT_ALPHABET); - } - - public final void testAlphabetAutomaticShifted() { doKeyboardTests(KeyboardId.ELEMENT_ALPHABET_AUTOMATIC_SHIFTED); - } - - public final void testAlphabetManualShifted() { doKeyboardTests(KeyboardId.ELEMENT_ALPHABET_MANUAL_SHIFTED); - } - - public final void testAlphabetShiftLocked() { doKeyboardTests(KeyboardId.ELEMENT_ALPHABET_SHIFT_LOCKED); - } - - public final void testAlphabetShiftLockShifted() { doKeyboardTests(KeyboardId.ELEMENT_ALPHABET_SHIFT_LOCK_SHIFTED); - } - - public final void testSymbols() { doKeyboardTests(KeyboardId.ELEMENT_SYMBOLS); - } - - public final void testSymbolsShifted() { doKeyboardTests(KeyboardId.ELEMENT_SYMBOLS_SHIFTED); } diff --git a/tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java b/tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java index bcf016ae9..8614ccc0e 100644 --- a/tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java +++ b/tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java @@ -176,7 +176,7 @@ public class RichInputConnectionAndTextRangeTests extends AndroidTestCase { assertEquals(NgramContextUtils.getNgramContextFromNthPreviousWord( "abc def", mSpacingAndPunctuations, 1).getNthPrevWord(2), "abc"); assertTrue(NgramContextUtils.getNgramContextFromNthPreviousWord( - "abc def", mSpacingAndPunctuations, 2).isNthPrevWordBeginningOfSontence(2)); + "abc def", mSpacingAndPunctuations, 2).isNthPrevWordBeginningOfSentence(2)); // The following tests reflect the current behavior of the function // RichInputConnection#getNthPreviousWord. diff --git a/tests/src/com/android/inputmethod/latin/RichInputMethodSubtypeTests.java b/tests/src/com/android/inputmethod/latin/RichInputMethodSubtypeTests.java index aed7d6ad6..9c8e16511 100644 --- a/tests/src/com/android/inputmethod/latin/RichInputMethodSubtypeTests.java +++ b/tests/src/com/android/inputmethod/latin/RichInputMethodSubtypeTests.java @@ -76,7 +76,7 @@ public class RichInputMethodSubtypeTests extends AndroidTestCase { mRichImm = RichInputMethodManager.getInstance(); // Save and reset additional subtypes - mSavedAddtionalSubtypes = mRichImm.getAdditionalSubtypes(context); + mSavedAddtionalSubtypes = mRichImm.getAdditionalSubtypes(); final InputMethodSubtype[] predefinedAddtionalSubtypes = AdditionalSubtypeUtils.createAdditionalSubtypesArray( AdditionalSubtypeUtils.createPrefSubtypes( diff --git a/tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java b/tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java index dfa063c5e..111d5c56a 100644 --- a/tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java +++ b/tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java @@ -73,7 +73,7 @@ public class SubtypeLocaleUtilsTests extends AndroidTestCase { mRichImm = RichInputMethodManager.getInstance(); // Save and reset additional subtypes - mSavedAddtionalSubtypes = mRichImm.getAdditionalSubtypes(context); + mSavedAddtionalSubtypes = mRichImm.getAdditionalSubtypes(); final InputMethodSubtype[] predefinedAddtionalSubtypes = AdditionalSubtypeUtils.createAdditionalSubtypesArray( AdditionalSubtypeUtils.createPrefSubtypes( |