Index: content/public/android/javatests/src/org/chromium/content/browser/input/AdapterInputConnectionTest.java |
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/input/AdapterInputConnectionTest.java b/content/public/android/javatests/src/org/chromium/content/browser/input/AdapterInputConnectionTest.java |
index 75f5617e8315fa263257cb5288db50ff681fcd2f..242e00c8432965d019a14caadb329079babd2696 100644 |
--- a/content/public/android/javatests/src/org/chromium/content/browser/input/AdapterInputConnectionTest.java |
+++ b/content/public/android/javatests/src/org/chromium/content/browser/input/AdapterInputConnectionTest.java |
@@ -11,7 +11,6 @@ import android.test.suitebuilder.annotation.MediumTest; |
import android.test.suitebuilder.annotation.SmallTest; |
import android.text.Editable; |
import android.text.Selection; |
-import android.view.KeyEvent; |
import android.view.View; |
import android.view.inputmethod.BaseInputConnection; |
import android.view.inputmethod.EditorInfo; |
@@ -109,26 +108,19 @@ public class AdapterInputConnectionTest extends ContentShellTestBase { |
public void testDeleteSurroundingText() throws Throwable { |
Changwan Ryu
2015/10/09 12:34:28
Probably we should remove this test now. IMO this
aelias_OOO_until_Jul13
2015/10/09 20:42:10
Done.
|
// Tests back deletion of a single character with empty input. |
mConnection.deleteSurroundingText(1, 0); |
- assertEquals(0, mImeAdapter.getDeleteSurroundingTextCallCount()); |
- Integer[] keyEvents = mImeAdapter.getKeyEvents(); |
- assertEquals(1, keyEvents.length); |
- assertEquals(KeyEvent.KEYCODE_DEL, keyEvents[0].intValue()); |
+ assertEquals(1, mImeAdapter.getDeleteSurroundingTextCallCount()); |
// Tests forward deletion of a single character with non-empty input. |
mEditable.replace(0, mEditable.length(), " hello"); |
Selection.setSelection(mEditable, 0, 0); |
mConnection.deleteSurroundingText(0, 1); |
- assertEquals(0, mImeAdapter.getDeleteSurroundingTextCallCount()); |
- keyEvents = mImeAdapter.getKeyEvents(); |
- assertEquals(2, keyEvents.length); |
- assertEquals(KeyEvent.KEYCODE_FORWARD_DEL, keyEvents[1].intValue()); |
+ assertEquals(2, mImeAdapter.getDeleteSurroundingTextCallCount()); |
// Tests back deletion of multiple characters with non-empty input. |
mEditable.replace(0, mEditable.length(), "hello "); |
Selection.setSelection(mEditable, mEditable.length(), mEditable.length()); |
mConnection.deleteSurroundingText(2, 0); |
- assertEquals(1, mImeAdapter.getDeleteSurroundingTextCallCount()); |
- assertEquals(2, mImeAdapter.getKeyEvents().length); |
+ assertEquals(3, mImeAdapter.getDeleteSurroundingTextCallCount()); |
} |
@MediumTest |
@@ -162,7 +154,7 @@ public class AdapterInputConnectionTest extends ContentShellTestBase { |
} |
@Override |
- public void sendKeyEventWithKeyCode(int keyCode, int flags) { |
+ public void sendSyntheticKeyPress(int keyCode, int flags) { |
mKeyEventQueue.add(keyCode); |
} |