diff options
Diffstat (limited to 'tests/src')
3 files changed, 34 insertions, 60 deletions
diff --git a/tests/src/com/android/inputmethod/keyboard/KeyboardThemeTests.java b/tests/src/com/android/inputmethod/keyboard/KeyboardThemeTests.java index 4f4f01c76..f9d98afa2 100644 --- a/tests/src/com/android/inputmethod/keyboard/KeyboardThemeTests.java +++ b/tests/src/com/android/inputmethod/keyboard/KeyboardThemeTests.java @@ -83,10 +83,14 @@ public class KeyboardThemeTests extends AndroidTestCase { * Test keyboard theme preference on the same platform version and the same keyboard version. */ - private void assertKeyboardThemePreference(final int sdkVersion, final int oldThemeId, + private void assertKeyboardThemePreference(final int sdkVersion, final int previousThemeId, final int expectedThemeId) { + // Clear preferences before testing. + setKeyboardThemePreference(KeyboardTheme.KLP_KEYBOARD_THEME_KEY, THEME_ID_NULL); + setKeyboardThemePreference(KeyboardTheme.LXX_KEYBOARD_THEME_KEY, THEME_ID_NULL); + // Set the preference of the sdkVersion to previousThemeId. final String prefKey = KeyboardTheme.getPreferenceKey(sdkVersion); - setKeyboardThemePreference(prefKey, oldThemeId); + setKeyboardThemePreference(prefKey, previousThemeId); assertKeyboardTheme(sdkVersion, expectedThemeId); } @@ -127,10 +131,10 @@ public class KeyboardThemeTests extends AndroidTestCase { * Test default keyboard theme based on the platform version. */ - private void assertDefaultKeyboardTheme(final int sdkVersion, final int oldThemeId, + private void assertDefaultKeyboardTheme(final int sdkVersion, final int previousThemeId, final int expectedThemeId) { final String oldPrefKey = KeyboardTheme.KLP_KEYBOARD_THEME_KEY; - setKeyboardThemePreference(oldPrefKey, oldThemeId); + setKeyboardThemePreference(oldPrefKey, previousThemeId); final KeyboardTheme defaultTheme = KeyboardTheme.getDefaultKeyboardTheme(mPrefs, sdkVersion); @@ -139,7 +143,7 @@ public class KeyboardThemeTests extends AndroidTestCase { assertEquals(expectedThemeId, defaultTheme.mThemeId); if (sdkVersion <= VERSION_CODES.KITKAT) { // Old preference must be retained if it is valid. Otherwise it must be pruned. - assertEquals(isValidKeyboardThemeId(oldThemeId), mPrefs.contains(oldPrefKey)); + assertEquals(isValidKeyboardThemeId(previousThemeId), mPrefs.contains(oldPrefKey)); return; } // Old preference must be removed. @@ -181,9 +185,9 @@ public class KeyboardThemeTests extends AndroidTestCase { * to the keyboard that supports LXX theme. */ - private void assertUpgradeKeyboardToLxxOn(final int sdkVersion, final int oldThemeId, + private void assertUpgradeKeyboardToLxxOn(final int sdkVersion, final int previousThemeId, final int expectedThemeId) { - setKeyboardThemePreference(KeyboardTheme.KLP_KEYBOARD_THEME_KEY, oldThemeId); + setKeyboardThemePreference(KeyboardTheme.KLP_KEYBOARD_THEME_KEY, previousThemeId); // Clean up new keyboard theme preference to simulate "upgrade to LXX keyboard". setKeyboardThemePreference(KeyboardTheme.LXX_KEYBOARD_THEME_KEY, THEME_ID_NULL); @@ -195,9 +199,9 @@ public class KeyboardThemeTests extends AndroidTestCase { // New preference must not exist. assertFalse(mPrefs.contains(KeyboardTheme.LXX_KEYBOARD_THEME_KEY)); // Old preference must be retained if it is valid. Otherwise it must be pruned. - assertEquals(isValidKeyboardThemeId(oldThemeId), + assertEquals(isValidKeyboardThemeId(previousThemeId), mPrefs.contains(KeyboardTheme.KLP_KEYBOARD_THEME_KEY)); - if (isValidKeyboardThemeId(oldThemeId)) { + if (isValidKeyboardThemeId(previousThemeId)) { // Old preference must have an expected value. assertEquals(mPrefs.getString(KeyboardTheme.KLP_KEYBOARD_THEME_KEY, null), Integer.toString(expectedThemeId)); @@ -247,7 +251,7 @@ public class KeyboardThemeTests extends AndroidTestCase { */ private void assertUpgradePlatformFromTo(final int oldSdkVersion, final int newSdkVersion, - final int oldThemeId, final int expectedThemeId) { + final int previousThemeId, final int expectedThemeId) { if (newSdkVersion < oldSdkVersion) { // No need to test. return; @@ -257,7 +261,7 @@ public class KeyboardThemeTests extends AndroidTestCase { setKeyboardThemePreference(KeyboardTheme.LXX_KEYBOARD_THEME_KEY, THEME_ID_NULL); final String oldPrefKey = KeyboardTheme.getPreferenceKey(oldSdkVersion); - setKeyboardThemePreference(oldPrefKey, oldThemeId); + setKeyboardThemePreference(oldPrefKey, previousThemeId); assertKeyboardTheme(newSdkVersion, expectedThemeId); } diff --git a/tests/src/com/android/inputmethod/latin/WordComposerTests.java b/tests/src/com/android/inputmethod/latin/WordComposerTests.java index 274555a03..c44544f3d 100644 --- a/tests/src/com/android/inputmethod/latin/WordComposerTests.java +++ b/tests/src/com/android/inputmethod/latin/WordComposerTests.java @@ -40,8 +40,7 @@ public class WordComposerTests extends AndroidTestCase { final int[] COORDINATES_WITHIN_BMP = CoordinateUtils.newCoordinateArray(CODEPOINTS_WITHIN_BMP.length, Constants.NOT_A_COORDINATE, Constants.NOT_A_COORDINATE); - final PrevWordsInfo PREV_WORDS_INFO = new PrevWordsInfo("prevword"); - wc.setComposingWord(CODEPOINTS_WITHIN_BMP, COORDINATES_WITHIN_BMP, PREV_WORDS_INFO); + wc.setComposingWord(CODEPOINTS_WITHIN_BMP, COORDINATES_WITHIN_BMP); assertEquals(wc.size(), STR_WITHIN_BMP.codePointCount(0, STR_WITHIN_BMP.length())); assertFalse(wc.isCursorFrontOrMiddleOfComposingWord()); wc.setCursorPositionWithinWord(2); @@ -56,15 +55,12 @@ public class WordComposerTests extends AndroidTestCase { // Move the cursor to after the 'f' assertTrue(wc.moveCursorByAndReturnIfInsideComposingWord(1)); assertFalse(wc.isCursorFrontOrMiddleOfComposingWord()); - // Check the previous word is still there - assertEquals(PREV_WORDS_INFO, wc.getPrevWordsInfoForSuggestion()); // Move the cursor past the end of the word assertFalse(wc.moveCursorByAndReturnIfInsideComposingWord(1)); assertFalse(wc.moveCursorByAndReturnIfInsideComposingWord(15)); // Do what LatinIME does when the cursor is moved outside of the word, // and check the behavior is correct. wc.reset(); - assertNull(wc.getPrevWordsInfoForSuggestion().mPrevWord); // \uD861\uDED7 is 𨛗, a character outside the BMP final String STR_WITH_SUPPLEMENTARY_CHAR = "abcde\uD861\uDED7fgh"; @@ -73,8 +69,8 @@ public class WordComposerTests extends AndroidTestCase { final int[] COORDINATES_WITH_SUPPLEMENTARY_CHAR = CoordinateUtils.newCoordinateArray(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR.length, Constants.NOT_A_COORDINATE, Constants.NOT_A_COORDINATE); - wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, COORDINATES_WITH_SUPPLEMENTARY_CHAR, - PrevWordsInfo.EMPTY_PREV_WORDS_INFO); + wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, + COORDINATES_WITH_SUPPLEMENTARY_CHAR); assertEquals(wc.size(), CODEPOINTS_WITH_SUPPLEMENTARY_CHAR.length); assertFalse(wc.isCursorFrontOrMiddleOfComposingWord()); wc.setCursorPositionWithinWord(3); @@ -83,55 +79,43 @@ public class WordComposerTests extends AndroidTestCase { assertTrue(wc.isCursorFrontOrMiddleOfComposingWord()); assertTrue(wc.moveCursorByAndReturnIfInsideComposingWord(1)); assertFalse(wc.isCursorFrontOrMiddleOfComposingWord()); - assertNull(wc.getPrevWordsInfoForSuggestion().mPrevWord); - final PrevWordsInfo PREV_WORDS_INFO_STR_WITHIN_BMP = new PrevWordsInfo(STR_WITHIN_BMP); - wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, COORDINATES_WITH_SUPPLEMENTARY_CHAR, - PREV_WORDS_INFO_STR_WITHIN_BMP); + wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, + COORDINATES_WITH_SUPPLEMENTARY_CHAR); wc.setCursorPositionWithinWord(3); assertTrue(wc.moveCursorByAndReturnIfInsideComposingWord(7)); - assertEquals(PREV_WORDS_INFO_STR_WITHIN_BMP, wc.getPrevWordsInfoForSuggestion()); - final PrevWordsInfo PREV_WORDS_INFO_STR_WITH_SUPPLEMENTARY_CHAR = - new PrevWordsInfo(STR_WITH_SUPPLEMENTARY_CHAR); - wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, COORDINATES_WITH_SUPPLEMENTARY_CHAR, - PREV_WORDS_INFO_STR_WITH_SUPPLEMENTARY_CHAR); + wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, + COORDINATES_WITH_SUPPLEMENTARY_CHAR); wc.setCursorPositionWithinWord(3); assertTrue(wc.moveCursorByAndReturnIfInsideComposingWord(7)); - assertEquals(PREV_WORDS_INFO_STR_WITH_SUPPLEMENTARY_CHAR, - wc.getPrevWordsInfoForSuggestion()); - wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, COORDINATES_WITH_SUPPLEMENTARY_CHAR, - PREV_WORDS_INFO_STR_WITHIN_BMP); + wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, + COORDINATES_WITH_SUPPLEMENTARY_CHAR); wc.setCursorPositionWithinWord(3); assertTrue(wc.moveCursorByAndReturnIfInsideComposingWord(-3)); assertFalse(wc.moveCursorByAndReturnIfInsideComposingWord(-1)); - assertEquals(PREV_WORDS_INFO_STR_WITHIN_BMP, wc.getPrevWordsInfoForSuggestion()); - final PrevWordsInfo PREV_WORDS_INFO_NULL = PrevWordsInfo.EMPTY_PREV_WORDS_INFO; - wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, COORDINATES_WITH_SUPPLEMENTARY_CHAR, - PREV_WORDS_INFO_NULL); + wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, + COORDINATES_WITH_SUPPLEMENTARY_CHAR); wc.setCursorPositionWithinWord(3); assertFalse(wc.moveCursorByAndReturnIfInsideComposingWord(-9)); - assertNull(wc.getPrevWordsInfoForSuggestion().mPrevWord); - wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, COORDINATES_WITH_SUPPLEMENTARY_CHAR, - PREV_WORDS_INFO_STR_WITH_SUPPLEMENTARY_CHAR); + wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, + COORDINATES_WITH_SUPPLEMENTARY_CHAR); assertTrue(wc.moveCursorByAndReturnIfInsideComposingWord(-10)); - assertEquals(PREV_WORDS_INFO_STR_WITH_SUPPLEMENTARY_CHAR, - wc.getPrevWordsInfoForSuggestion()); - wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, COORDINATES_WITH_SUPPLEMENTARY_CHAR, - PREV_WORDS_INFO_NULL); + wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, + COORDINATES_WITH_SUPPLEMENTARY_CHAR); assertFalse(wc.moveCursorByAndReturnIfInsideComposingWord(-11)); - wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, COORDINATES_WITH_SUPPLEMENTARY_CHAR, - PREV_WORDS_INFO_NULL); + wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, + COORDINATES_WITH_SUPPLEMENTARY_CHAR); assertTrue(wc.moveCursorByAndReturnIfInsideComposingWord(0)); - wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, COORDINATES_WITH_SUPPLEMENTARY_CHAR, - PREV_WORDS_INFO_NULL); + wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, + COORDINATES_WITH_SUPPLEMENTARY_CHAR); wc.setCursorPositionWithinWord(2); assertTrue(wc.moveCursorByAndReturnIfInsideComposingWord(0)); } diff --git a/tests/src/com/android/inputmethod/latin/utils/StringAndJsonUtilsTests.java b/tests/src/com/android/inputmethod/latin/utils/StringAndJsonUtilsTests.java index bdc608a00..cd9a98356 100644 --- a/tests/src/com/android/inputmethod/latin/utils/StringAndJsonUtilsTests.java +++ b/tests/src/com/android/inputmethod/latin/utils/StringAndJsonUtilsTests.java @@ -285,20 +285,6 @@ public class StringAndJsonUtilsTests extends AndroidTestCase { assertTrue(bytesStr.equals(bytesStr2)); } - public void testContainsOnlyWhitespace() { - assertTrue(StringUtils.containsOnlyWhitespace(" ")); - assertTrue(StringUtils.containsOnlyWhitespace("")); - assertTrue(StringUtils.containsOnlyWhitespace(" \n\t\t")); - // U+2002 : EN SPACE - // U+2003 : EM SPACE - // U+3000 : IDEOGRAPHIC SPACE (commonly "double-width space") - assertTrue(StringUtils.containsOnlyWhitespace("\u2002\u2003\u3000")); - assertFalse(StringUtils.containsOnlyWhitespace(" a ")); - assertFalse(StringUtils.containsOnlyWhitespace(". ")); - assertFalse(StringUtils.containsOnlyWhitespace(".")); - assertTrue(StringUtils.containsOnlyWhitespace("")); - } - public void testJsonUtils() { final Object[] objs = new Object[] { 1, "aaa", "bbb", 3 }; final List<Object> objArray = Arrays.asList(objs); |