Fix keycode problems for modified keys.

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

Index: content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java b/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java
index db2abf86ee4fe044c4558596138af2ace2898236..dc002f90e29ee58971571346d635b198f6ae5787 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java
@@ -262,40 +262,51 @@ public class ImeTest extends ContentShellTestBase {
         waitAndVerifyEditableCallback(mConnection.mImeUpdateQueue, 6, "h\nllo ", 2, 2, -1, -1);
     }
 
+    private int getTypedKeycodeGuess(String before, String after) {
+        KeyEvent ev = ImeAdapter.getTypedKeyEventGuess(before, after);
+        if (ev == null) return -1;
+        return ev.getKeyCode();
+    }
+
     @SmallTest
     @Feature({"TextInput", "Main"})
-    public void testGuessedKeycodeFromTyping() throws Throwable {
-        assertEquals(0, ImeAdapter.getTypedKeycodeGuess(null, ""));
-        assertEquals(KeyEvent.KEYCODE_X, ImeAdapter.getTypedKeycodeGuess(null, "x"));
-        assertEquals(0, ImeAdapter.getTypedKeycodeGuess(null, "xyz"));
-
-        assertEquals(0, ImeAdapter.getTypedKeycodeGuess("abc", "abc"));
-        assertEquals(KeyEvent.KEYCODE_DEL, ImeAdapter.getTypedKeycodeGuess("abc", ""));
-
-        assertEquals(KeyEvent.KEYCODE_H, ImeAdapter.getTypedKeycodeGuess("", "h"));
-        assertEquals(KeyEvent.KEYCODE_DEL, ImeAdapter.getTypedKeycodeGuess("h", ""));
-        assertEquals(KeyEvent.KEYCODE_E, ImeAdapter.getTypedKeycodeGuess("h", "he"));
-        assertEquals(KeyEvent.KEYCODE_L, ImeAdapter.getTypedKeycodeGuess("he", "hel"));
-        assertEquals(KeyEvent.KEYCODE_O, ImeAdapter.getTypedKeycodeGuess("hel", "helo"));
-        assertEquals(KeyEvent.KEYCODE_DEL, ImeAdapter.getTypedKeycodeGuess("helo", "hel"));
-        assertEquals(KeyEvent.KEYCODE_L, ImeAdapter.getTypedKeycodeGuess("hel", "hell"));
-        assertEquals(KeyEvent.KEYCODE_L, ImeAdapter.getTypedKeycodeGuess("hell", "helll"));
-        assertEquals(KeyEvent.KEYCODE_DEL, ImeAdapter.getTypedKeycodeGuess("helll", "hell"));
-        assertEquals(KeyEvent.KEYCODE_O, ImeAdapter.getTypedKeycodeGuess("hell", "hello"));
-
-        assertEquals(KeyEvent.KEYCODE_X, ImeAdapter.getTypedKeycodeGuess("xxx", "xxxx"));
-        assertEquals(KeyEvent.KEYCODE_X, ImeAdapter.getTypedKeycodeGuess("xxx", "xxxxx"));
-        assertEquals(KeyEvent.KEYCODE_DEL, ImeAdapter.getTypedKeycodeGuess("xxx", "xx"));
-        assertEquals(KeyEvent.KEYCODE_DEL, ImeAdapter.getTypedKeycodeGuess("xxx", "x"));
-
-        assertEquals(KeyEvent.KEYCODE_Y, ImeAdapter.getTypedKeycodeGuess("xxx", "xxxy"));
-        assertEquals(KeyEvent.KEYCODE_Y, ImeAdapter.getTypedKeycodeGuess("xxx", "xxxxy"));
-        assertEquals(0, ImeAdapter.getTypedKeycodeGuess("xxx", "xy"));
-        assertEquals(0, ImeAdapter.getTypedKeycodeGuess("xxx", "y"));
-
-        assertEquals(0, ImeAdapter.getTypedKeycodeGuess("foo", "bar"));
-        assertEquals(0, ImeAdapter.getTypedKeycodeGuess("foo", "bars"));
-        assertEquals(0, ImeAdapter.getTypedKeycodeGuess("foo", "ba"));
+    public void testGuessedKeyCodeFromTyping() throws Throwable {
+        assertEquals(-1, getTypedKeycodeGuess(null, ""));
+        assertEquals(KeyEvent.KEYCODE_X, getTypedKeycodeGuess(null, "x"));
+        assertEquals(-1, getTypedKeycodeGuess(null, "xyz"));
+
+        assertEquals(-1, getTypedKeycodeGuess("abc", "abc"));
+        assertEquals(KeyEvent.KEYCODE_DEL, getTypedKeycodeGuess("abc", ""));
+
+        assertEquals(KeyEvent.KEYCODE_H, getTypedKeycodeGuess("", "h"));
+        assertEquals(KeyEvent.KEYCODE_DEL, getTypedKeycodeGuess("h", ""));
+        assertEquals(KeyEvent.KEYCODE_E, getTypedKeycodeGuess("h", "he"));
+        assertEquals(KeyEvent.KEYCODE_L, getTypedKeycodeGuess("he", "hel"));
+        assertEquals(KeyEvent.KEYCODE_O, getTypedKeycodeGuess("hel", "helo"));
+        assertEquals(KeyEvent.KEYCODE_DEL, getTypedKeycodeGuess("helo", "hel"));
+        assertEquals(KeyEvent.KEYCODE_L, getTypedKeycodeGuess("hel", "hell"));
+        assertEquals(KeyEvent.KEYCODE_L, getTypedKeycodeGuess("hell", "helll"));
+        assertEquals(KeyEvent.KEYCODE_DEL, getTypedKeycodeGuess("helll", "hell"));
+        assertEquals(KeyEvent.KEYCODE_O, getTypedKeycodeGuess("hell", "hello"));
+
+        assertEquals(KeyEvent.KEYCODE_X, getTypedKeycodeGuess("xxx", "xxxx"));
+        assertEquals(KeyEvent.KEYCODE_X, getTypedKeycodeGuess("xxx", "xxxxx"));
+        assertEquals(KeyEvent.KEYCODE_DEL, getTypedKeycodeGuess("xxx", "xx"));
+        assertEquals(KeyEvent.KEYCODE_DEL, getTypedKeycodeGuess("xxx", "x"));
+
+        assertEquals(KeyEvent.KEYCODE_Y, getTypedKeycodeGuess("xxx", "xxxy"));
+        assertEquals(KeyEvent.KEYCODE_Y, getTypedKeycodeGuess("xxx", "xxxxy"));
+        assertEquals(-1, getTypedKeycodeGuess("xxx", "xy"));
+        assertEquals(-1, getTypedKeycodeGuess("xxx", "y"));
+
+        assertEquals(-1, getTypedKeycodeGuess("foo", "bar"));
+        assertEquals(-1, getTypedKeycodeGuess("foo", "bars"));
+        assertEquals(-1, getTypedKeycodeGuess("foo", "ba"));
+
+        // Some characters also require modifiers so we have to check the full event.
+        KeyEvent ev = ImeAdapter.getTypedKeyEventGuess(null, "!");
+        assertEquals(KeyEvent.KEYCODE_1, ev.getKeyCode());
+        assertTrue(ev.isShiftPressed());
     }
 
     @SmallTest

[jdduke (slow), 2014/08/07 13:56:36]

Is there already test coverage for the following change in ImeAdapter.java?

if (keyCode > 0 && isCommit && mLastComposeText == null) {
        mLastSyntheticKeyCode = keyCode;
        return translateAndSendNativeEvents(keyEvent) &&
               translateAndSendNativeEvents(KeyEvent.changeAction(
                       keyEvent, KeyEvent.ACTION_UP));
}

[bcwhite, 2014/08/07 15:16:40]

Yes.  The "Hacker's Keyboard" test covers this use case and shows that it
continues to work.

@@ -315,7 +326,6 @@ public class ImeTest extends ContentShellTestBase {
         expectUpdateStateCall(mConnection);
         setComposingText(mConnection, "h", 1);
         assertEquals(KeyEvent.KEYCODE_H, mImeAdapter.mLastSyntheticKeyCode);
-        assertEquals("h", mConnection.getTextBeforeCursor(9, 0));
         assertUpdateStateCall(mConnection, 1000);
         assertEquals("h", mConnection.getTextBeforeCursor(9, 0));
 
@@ -323,7 +333,6 @@ public class ImeTest extends ContentShellTestBase {
         expectUpdateStateCall(mConnection);
         setComposingText(mConnection, "ho", 1);
         assertEquals(KeyEvent.KEYCODE_O, mImeAdapter.mLastSyntheticKeyCode);
-        assertEquals("ho", mConnection.getTextBeforeCursor(9, 0));
         assertUpdateStateCall(mConnection, 1000);
         assertEquals("ho", mConnection.getTextBeforeCursor(9, 0));
 
@@ -331,10 +340,10 @@ public class ImeTest extends ContentShellTestBase {
         expectUpdateStateCall(mConnection);
         setComposingText(mConnection, "h", 1);
         assertEquals(KeyEvent.KEYCODE_DEL, mImeAdapter.mLastSyntheticKeyCode);
-        assertEquals("h", mConnection.getTextBeforeCursor(9, 0));
         assertUpdateStateCall(mConnection, 1000);
-        assertEquals("h", mConnection.getTextBeforeCursor(9, 0));
         setComposingRegion(mConnection, 0, 1);  // DEL calls cancelComposition() then restarts
+        setComposingText(mConnection, "h", 1);
+        assertEquals("h", mConnection.getTextBeforeCursor(9, 0));
 
         // I
         setComposingText(mConnection, "hi", 1);
@@ -343,7 +352,7 @@ public class ImeTest extends ContentShellTestBase {
 
         // SPACE
         commitText(mConnection, "hi", 1);
-        assertEquals(0, mImeAdapter.mLastSyntheticKeyCode);
+        assertEquals(-1, mImeAdapter.mLastSyntheticKeyCode);
         commitText(mConnection, " ", 1);
         assertEquals(KeyEvent.KEYCODE_SPACE, mImeAdapter.mLastSyntheticKeyCode);
         assertEquals("hi ", mConnection.getTextBeforeCursor(9, 0));
@@ -365,7 +374,7 @@ public class ImeTest extends ContentShellTestBase {
         assertEquals("", mConnection.getTextBeforeCursor(9, 0));
 
         // DEL (on empty input)
-        deleteSurroundingText(mConnection, 1, 0);  // BS on empty still sends 1,0
+        deleteSurroundingText(mConnection, 1, 0);  // DEL on empty still sends 1,0
         assertEquals(KeyEvent.KEYCODE_DEL, mImeAdapter.mLastSyntheticKeyCode);
         assertEquals("", mConnection.getTextBeforeCursor(9, 0));
     }
@@ -447,7 +456,7 @@ public class ImeTest extends ContentShellTestBase {
         assertEquals("", mConnection.getTextBeforeCursor(9, 0));
 
         // DEL (on empty input)
-        deleteSurroundingText(mConnection, 1, 0);  // BS on empty still sends 1,0
+        deleteSurroundingText(mConnection, 1, 0);  // DEL on empty still sends 1,0
         assertEquals(KeyEvent.KEYCODE_DEL, mImeAdapter.mLastSyntheticKeyCode);
         assertEquals("", mConnection.getTextBeforeCursor(9, 0));
     }