aboutsummaryrefslogtreecommitdiffstats
path: root/tests/src
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2013-02-11 23:59:49 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-02-11 23:59:49 -0800
commitf6716e651f168bdae86a7ab5b438cb0039bd59b0 (patch)
tree7a6cb8b260af45b6afe73cb3393850ff1d294683 /tests/src
parentd16059f9185f2ab3fb5c987ab69649ca13685d46 (diff)
parent2c2942dd4bdea8581191866e2f06a0fa9dec18ed (diff)
downloadlatinime-f6716e651f168bdae86a7ab5b438cb0039bd59b0.tar.gz
latinime-f6716e651f168bdae86a7ab5b438cb0039bd59b0.tar.xz
latinime-f6716e651f168bdae86a7ab5b438cb0039bd59b0.zip
am 2c2942dd: Merge "Move parseCsvString to StringUtils"
# Via Android (Google) Code Review (1) and Tadashi G. Takaoka (1) * commit '2c2942dd4bdea8581191866e2f06a0fa9dec18ed': Move parseCsvString to StringUtils
Diffstat (limited to 'tests/src')
-rw-r--r--tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserCsvTests.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserCsvTests.java b/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserCsvTests.java
index cee62ca38..d58e1627f 100644
--- a/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserCsvTests.java
+++ b/tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserCsvTests.java
@@ -21,6 +21,7 @@ import android.test.InstrumentationTestCase;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.inputmethod.latin.CollectionUtils;
+import com.android.inputmethod.latin.StringUtils;
import java.lang.reflect.Field;
import java.util.ArrayList;
@@ -74,7 +75,8 @@ public class KeySpecParserCsvTests extends InstrumentationTestCase {
}
private void assertTextArray(String message, String value, String ... expectedArray) {
- final String[] actual = KeySpecParser.parseCsvString(value, mTextsSet);
+ final String resolvedActual = KeySpecParser.resolveTextReference(value, mTextsSet);
+ final String[] actual = StringUtils.parseCsvString(resolvedActual);
final String[] expected = (expectedArray.length == 0) ? null : expectedArray;
assertArrayEquals(message, expected, actual);
}