aboutsummaryrefslogtreecommitdiffstats
path: root/tests/src
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-01-23 19:07:26 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-23 19:07:26 -0800
commit341044034ca83e0448b78c16fc8b459d23de0e18 (patch)
tree5c3319c4887e9291dd3e6b9d0a9ab13638d12ba5 /tests/src
parent9bbb214eddfaabd5d08b5771ee5ab3c5bf788114 (diff)
parentb6e128cc05fa0b4b1f79b6c7eb4d67f44833c7f4 (diff)
downloadlatinime-341044034ca83e0448b78c16fc8b459d23de0e18.tar.gz
latinime-341044034ca83e0448b78c16fc8b459d23de0e18.tar.xz
latinime-341044034ca83e0448b78c16fc8b459d23de0e18.zip
am b6e128cc: Merge "[IL69.1] Move a static method to a utility class."
* commit 'b6e128cc05fa0b4b1f79b6c7eb4d67f44833c7f4': [IL69.1] Move a static method to a utility class.
Diffstat (limited to 'tests/src')
-rw-r--r--tests/src/com/android/inputmethod/latin/WordComposerTests.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/src/com/android/inputmethod/latin/WordComposerTests.java b/tests/src/com/android/inputmethod/latin/WordComposerTests.java
index 2fe331bc3..62eb63ccd 100644
--- a/tests/src/com/android/inputmethod/latin/WordComposerTests.java
+++ b/tests/src/com/android/inputmethod/latin/WordComposerTests.java
@@ -19,6 +19,7 @@ package com.android.inputmethod.latin;
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.SmallTest;
+import com.android.inputmethod.keyboard.Keyboard;
import com.android.inputmethod.latin.utils.StringUtils;
/**
@@ -37,7 +38,7 @@ public class WordComposerTests extends AndroidTestCase {
final String STR_WITHIN_BMP = "abcdef";
final int[] CODEPOINTS_WITHIN_BMP = StringUtils.toCodePointArray(STR_WITHIN_BMP);
final int[] COORDINATES_WITHIN_BMP =
- LatinIME.getCoordinatesForKeyboard(CODEPOINTS_WITHIN_BMP, null);
+ Keyboard.getCoordinatesWithoutKeyboard(CODEPOINTS_WITHIN_BMP);
final String PREVWORD = "prevword";
wc.setComposingWord(CODEPOINTS_WITHIN_BMP, COORDINATES_WITHIN_BMP, PREVWORD);
assertEquals(wc.size(),
@@ -69,8 +70,8 @@ public class WordComposerTests extends AndroidTestCase {
final String STR_WITH_SUPPLEMENTARY_CHAR = "abcde\uD861\uDED7fgh";
final int[] CODEPOINTS_WITH_SUPPLEMENTARY_CHAR =
StringUtils.toCodePointArray(STR_WITH_SUPPLEMENTARY_CHAR);
- final int[] COORDINATES_WITH_SUPPLEMENTARY_CHAR = LatinIME.getCoordinatesForKeyboard(
- CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, null);
+ final int[] COORDINATES_WITH_SUPPLEMENTARY_CHAR = Keyboard.getCoordinatesWithoutKeyboard(
+ CODEPOINTS_WITH_SUPPLEMENTARY_CHAR);
wc.setComposingWord(CODEPOINTS_WITH_SUPPLEMENTARY_CHAR, COORDINATES_WITH_SUPPLEMENTARY_CHAR,
null /* previousWord */);
assertEquals(wc.size(), CODEPOINTS_WITH_SUPPLEMENTARY_CHAR.length);