Delete best-effort keycode guessing.

content/public/android/javatests/src/org/chromium/content/browser/input/AdapterInputConnectionTest.java

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content.browser.input;
 
 import android.content.Context;
 import android.os.IBinder;
 import android.os.ResultReceiver;
 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;
 
 import org.chromium.base.test.util.Feature;
 import org.chromium.content.browser.input.AdapterInputConnection.ImeState;
 import org.chromium.content.browser.input.ImeAdapter.ImeAdapterDelegate;
 import org.chromium.content_shell_apk.ContentShellTestBase;
 
 import java.util.ArrayList;
@@ skipping 74 matching lines @@
         mConnection.endBatchEdit();
         mConnection.setComposingText("test", 1);
         assertEquals(0, mWrapper.getUpdateSelectionCallCount());
         mConnection.endBatchEdit();
         assertEquals(1, mWrapper.getUpdateSelectionCallCount());
         mWrapper.verifyUpdateSelectionCall(0, 4, 4, 0, 4);
     }
 
     @MediumTest
     @Feature({"TextInput", "Main"})
     public void testDeleteSurroundingText() throws Throwable {

[Changwan Ryu, 2015/10/09 12:34:28]

Probably we should remove this test now. IMO this doesn't test anything.

[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
     @Feature({"TextInput", "Main"})
     public void testNewConnectionFinishesComposingText() throws Throwable {
         mConnection.setComposingText("abc", 1);
         assertEquals(0, BaseInputConnection.getComposingSpanStart(mEditable));
         assertEquals(3, BaseInputConnection.getComposingSpanEnd(mEditable));
 
         mConnection = new AdapterInputConnection(
@@ skipping 13 matching lines @@
             super(wrapper, embedder);
         }
 
         @Override
         public boolean deleteSurroundingText(int beforeLength, int afterLength) {
             ++mDeleteSurroundingTextCounter;
             return true;
         }
 
         @Override
-        public void sendKeyEventWithKeyCode(int keyCode, int flags) {
+        public void sendSyntheticKeyPress(int keyCode, int flags) {
             mKeyEventQueue.add(keyCode);
         }
 
         @Override
         protected void finishComposingText() {
             ++mFinishComposingTextCounter;
             super.finishComposingText();
         }
 
         public int getDeleteSurroundingTextCallCount() {
@@ skipping 75 matching lines @@
 
     private static void assertCorrectState(String text, int selectionStart, int selectionEnd,
             int compositionStart, int compositionEnd, ImeState actual) {
         assertEquals("Text did not match", text, actual.text);
         assertEquals("Selection start did not match", selectionStart, actual.selectionStart);
         assertEquals("Selection end did not match", selectionEnd, actual.selectionEnd);
         assertEquals("Composition start did not match", compositionStart, actual.compositionStart);
         assertEquals("Composition end did not match", compositionEnd, actual.compositionEnd);
     }
 }