nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix failing tests 

RichInputConnection#getWordRangeAtCursor may now returning
either a SpannableString or a String. We can't test that with
String#equals(), but TextUtils#equals() does the job for us.

Change-Id: I59ebe54207e92f4d90b49476b64f1e12fd4929cb
main
Jean Chalard 2013-04-12 23:08:33 +09:00
parent 2cd1136b8e
commit 128961ade0
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/src/com/android/inputmethod/latin/RichInputConnectionTests.java
View File

@ -19,6 +19,7 @@ package com.android.inputmethod.latin;
import android.inputmethodservice.InputMethodService; import android.inputmethodservice.InputMethodService;
import android.test.AndroidTestCase; import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.SmallTest; import android.test.suitebuilder.annotation.SmallTest;
import android.text.TextUtils;
import android.view.inputmethod.ExtractedText; import android.view.inputmethod.ExtractedText;
import android.view.inputmethod.ExtractedTextRequest; import android.view.inputmethod.ExtractedTextRequest;
import android.view.inputmethod.InputConnection; import android.view.inputmethod.InputConnection;
@ -141,11 +142,11 @@ public class RichInputConnectionTests extends AndroidTestCase {
ic.beginBatchEdit(); ic.beginBatchEdit();
// basic case // basic case
r = ic.getWordRangeAtCursor(" ", 0); r = ic.getWordRangeAtCursor(" ", 0);
assertEquals("word", r.mWord); assertTrue(TextUtils.equals("word", r.mWord));
// more than one word // more than one word
r = ic.getWordRangeAtCursor(" ", 1); r = ic.getWordRangeAtCursor(" ", 1);
assertEquals("word word", r.mWord); assertTrue(TextUtils.equals("word word", r.mWord));
ic.endBatchEdit(); ic.endBatchEdit();
// tab character instead of space // tab character instead of space
@ -153,28 +154,28 @@ public class RichInputConnectionTests extends AndroidTestCase {
ic.beginBatchEdit(); ic.beginBatchEdit();
r = ic.getWordRangeAtCursor("\t", 1); r = ic.getWordRangeAtCursor("\t", 1);
ic.endBatchEdit(); ic.endBatchEdit();
assertEquals("word\tword", r.mWord); assertTrue(TextUtils.equals("word\tword", r.mWord));
// only one word doesn't go too far // only one word doesn't go too far
mockInputMethodService.setInputConnection(new MockConnection("one\tword\two", "rd", et)); mockInputMethodService.setInputConnection(new MockConnection("one\tword\two", "rd", et));
ic.beginBatchEdit(); ic.beginBatchEdit();
r = ic.getWordRangeAtCursor("\t", 1); r = ic.getWordRangeAtCursor("\t", 1);
ic.endBatchEdit(); ic.endBatchEdit();
assertEquals("word\tword", r.mWord); assertTrue(TextUtils.equals("word\tword", r.mWord));
// tab or space // tab or space
mockInputMethodService.setInputConnection(new MockConnection("one word\two", "rd", et)); mockInputMethodService.setInputConnection(new MockConnection("one word\two", "rd", et));
ic.beginBatchEdit(); ic.beginBatchEdit();
r = ic.getWordRangeAtCursor(" \t", 1); r = ic.getWordRangeAtCursor(" \t", 1);
ic.endBatchEdit(); ic.endBatchEdit();
assertEquals("word\tword", r.mWord); assertTrue(TextUtils.equals("word\tword", r.mWord));
// tab or space multiword // tab or space multiword
mockInputMethodService.setInputConnection(new MockConnection("one word\two", "rd", et)); mockInputMethodService.setInputConnection(new MockConnection("one word\two", "rd", et));
ic.beginBatchEdit(); ic.beginBatchEdit();
r = ic.getWordRangeAtCursor(" \t", 2); r = ic.getWordRangeAtCursor(" \t", 2);
ic.endBatchEdit(); ic.endBatchEdit();
assertEquals("one word\tword", r.mWord); assertTrue(TextUtils.equals("one word\tword", r.mWord));
// splitting on supplementary character // splitting on supplementary character
final String supplementaryChar = "\uD840\uDC8A"; final String supplementaryChar = "\uD840\uDC8A";
@ -183,6 +184,6 @@ public class RichInputConnectionTests extends AndroidTestCase {
ic.beginBatchEdit(); ic.beginBatchEdit();
r = ic.getWordRangeAtCursor(supplementaryChar, 0); r = ic.getWordRangeAtCursor(supplementaryChar, 0);
ic.endBatchEdit(); ic.endBatchEdit();
assertEquals("word", r.mWord); assertTrue(TextUtils.equals("word", r.mWord));
} }
} }