diff options
| author |   Jatin Matani <jatinm@google.com> | 2015-07-11 01:08:28 -0700 |
|---|---|---|
| committer | Jatin Matani <jatinm@google.com> | 2015-07-11 01:08:28 -0700 |
| commit | 5abefbb8d6e2a4bfe824d9c2d8904600d41f9387 (patch) | |
| tree | 1c344e3a6deefc5bf4fd3fcc7a504f7b1491c5f8 /tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java | |
| parent | 1791ce07522f938a349eedeb22223449abe6c380 (diff) | |
| parent | 9cd60fe1bb67cec755c1cee6d541272e64129072 (diff) | |
| download | latinime-5abefbb8d6e2a4bfe824d9c2d8904600d41f9387.tar.gz latinime-5abefbb8d6e2a4bfe824d9c2d8904600d41f9387.tar.xz latinime-5abefbb8d6e2a4bfe824d9c2d8904600d41f9387.zip | |
resolved conflicts for merge of 9cd60fe1 to mnc-dev-plus-aosp
Change-Id: I1aad861d711170ab3dab0019d8e4ff02f058c423
Diffstat (limited to 'tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java')
| -rw-r--r-- | tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java b/tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java index 08779b9d3..128f9f7db 100644 --- a/tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java +++ b/tests/src/com/android/inputmethod/latin/RichInputConnectionAndTextRangeTests.java @@ -379,74 +379,74 @@ public class RichInputConnectionAndTextRangeTests extends AndroidTestCase { ims.setInputConnection(new MockConnection("users", 5)); ic.resetCachesUponCursorMoveAndReturnSuccess(ims.cursorPos(), ims.cursorPos(), true); - assertTrue(ic.isCursorTouchingWord(sap)); + assertTrue(ic.isCursorTouchingWord(sap, true /* checkTextAfter */)); ims.setInputConnection(new MockConnection("users'", 5)); ic.resetCachesUponCursorMoveAndReturnSuccess(ims.cursorPos(), ims.cursorPos(), true); - assertTrue(ic.isCursorTouchingWord(sap)); + assertTrue(ic.isCursorTouchingWord(sap, true)); ims.setInputConnection(new MockConnection("users'", 6)); ic.resetCachesUponCursorMoveAndReturnSuccess(ims.cursorPos(), ims.cursorPos(), true); - assertTrue(ic.isCursorTouchingWord(sap)); + assertTrue(ic.isCursorTouchingWord(sap, true)); ims.setInputConnection(new MockConnection("'users'", 6)); ic.resetCachesUponCursorMoveAndReturnSuccess(ims.cursorPos(), ims.cursorPos(), true); - assertTrue(ic.isCursorTouchingWord(sap)); + assertTrue(ic.isCursorTouchingWord(sap, true)); ims.setInputConnection(new MockConnection("'users'", 7)); ic.resetCachesUponCursorMoveAndReturnSuccess(ims.cursorPos(), ims.cursorPos(), true); - assertTrue(ic.isCursorTouchingWord(sap)); + assertTrue(ic.isCursorTouchingWord(sap, true)); ims.setInputConnection(new MockConnection("users '", 6)); ic.resetCachesUponCursorMoveAndReturnSuccess(ims.cursorPos(), ims.cursorPos(), true); - assertFalse(ic.isCursorTouchingWord(sap)); + assertFalse(ic.isCursorTouchingWord(sap, true)); ims.setInputConnection(new MockConnection("users '", 7)); ic.resetCachesUponCursorMoveAndReturnSuccess(ims.cursorPos(), ims.cursorPos(), true); - assertFalse(ic.isCursorTouchingWord(sap)); + assertFalse(ic.isCursorTouchingWord(sap, true)); ims.setInputConnection(new MockConnection("re-", 3)); ic.resetCachesUponCursorMoveAndReturnSuccess(ims.cursorPos(), ims.cursorPos(), true); - assertTrue(ic.isCursorTouchingWord(sap)); + assertTrue(ic.isCursorTouchingWord(sap, true)); ims.setInputConnection(new MockConnection("re--", 4)); ic.resetCachesUponCursorMoveAndReturnSuccess(ims.cursorPos(), ims.cursorPos(), true); - assertFalse(ic.isCursorTouchingWord(sap)); + assertFalse(ic.isCursorTouchingWord(sap, true)); ims.setInputConnection(new MockConnection("-", 1)); ic.resetCachesUponCursorMoveAndReturnSuccess(ims.cursorPos(), ims.cursorPos(), true); - assertFalse(ic.isCursorTouchingWord(sap)); + assertFalse(ic.isCursorTouchingWord(sap, true)); ims.setInputConnection(new MockConnection("--", 2)); ic.resetCachesUponCursorMoveAndReturnSuccess(ims.cursorPos(), ims.cursorPos(), true); - assertFalse(ic.isCursorTouchingWord(sap)); + assertFalse(ic.isCursorTouchingWord(sap, true)); ims.setInputConnection(new MockConnection(" -", 2)); ic.resetCachesUponCursorMoveAndReturnSuccess(ims.cursorPos(), ims.cursorPos(), true); - assertFalse(ic.isCursorTouchingWord(sap)); + assertFalse(ic.isCursorTouchingWord(sap, true)); ims.setInputConnection(new MockConnection(" --", 3)); ic.resetCachesUponCursorMoveAndReturnSuccess(ims.cursorPos(), ims.cursorPos(), true); - assertFalse(ic.isCursorTouchingWord(sap)); + assertFalse(ic.isCursorTouchingWord(sap, true)); ims.setInputConnection(new MockConnection(" users '", 1)); ic.resetCachesUponCursorMoveAndReturnSuccess(ims.cursorPos(), ims.cursorPos(), true); - assertTrue(ic.isCursorTouchingWord(sap)); + assertTrue(ic.isCursorTouchingWord(sap, true)); ims.setInputConnection(new MockConnection(" users '", 3)); ic.resetCachesUponCursorMoveAndReturnSuccess(ims.cursorPos(), ims.cursorPos(), true); - assertTrue(ic.isCursorTouchingWord(sap)); + assertTrue(ic.isCursorTouchingWord(sap, true)); ims.setInputConnection(new MockConnection(" users '", 7)); ic.resetCachesUponCursorMoveAndReturnSuccess(ims.cursorPos(), ims.cursorPos(), true); - assertFalse(ic.isCursorTouchingWord(sap)); + assertFalse(ic.isCursorTouchingWord(sap, true)); ims.setInputConnection(new MockConnection(" users are", 7)); ic.resetCachesUponCursorMoveAndReturnSuccess(ims.cursorPos(), ims.cursorPos(), true); - assertTrue(ic.isCursorTouchingWord(sap)); + assertTrue(ic.isCursorTouchingWord(sap, true)); ims.setInputConnection(new MockConnection(" users 'are", 7)); ic.resetCachesUponCursorMoveAndReturnSuccess(ims.cursorPos(), ims.cursorPos(), true); - assertFalse(ic.isCursorTouchingWord(sap)); + assertFalse(ic.isCursorTouchingWord(sap, true)); } } |