Delete best-effort keycode guessing.

content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.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.app.Activity;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
@@ skipping 374 matching lines @@
         setComposingRegion(0, 4);
         waitAndVerifyStatesAndCalls(4, "hllo ", 1, 1, 0, 4);
 
         finishComposingText();
         waitAndVerifyStatesAndCalls(5, "hllo ", 1, 1, -1, -1);
 
         commitText("\n", 1);
         waitAndVerifyStatesAndCalls(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(-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
     @Feature({"TextInput", "Main"})
     http://crbug.com/445499
     */
     @DisabledTest

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

Nit. Not disabled any more?

[aelias_OOO_until_Jul13, 2015/10/09 20:42:10]

Done.

-    public void testKeyCodesWhileComposingText() throws Throwable {
+    public void testSwipingText() throws Throwable {
         focusElement("textarea");
 
         // The calls below are a reflection of what the stock Google Keyboard (Android 4.4) sends
-        // when the noted key is touched on screen.  Exercise care when altering to make sure
-        // that the test reflects reality.  If this test breaks, it's possible that code has
-        // changed and different calls need to be made instead.
-        // H
-        expectUpdateStateCall();
-        setComposingText("h", 1);
-        assertEquals(KeyEvent.KEYCODE_H, mImeAdapter.mLastSyntheticKeyCode);

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

Can we separate this as testDeleteSurroundingText (except the last synthetic
keycode part)? We're missing such a test.

[aelias_OOO_until_Jul13, 2015/10/09 20:42:10]

Done, I brought back the relevant parts as "testDeleteText".

-        assertUpdateStateCall(1000);
-        assertEquals("h", mConnection.getTextBeforeCursor(9, 0));
-
-        // O
-        expectUpdateStateCall();
-        setComposingText("ho", 1);
-        assertEquals(KeyEvent.KEYCODE_O, mImeAdapter.mLastSyntheticKeyCode);
-        assertUpdateStateCall(1000);
-        assertEquals("ho", mConnection.getTextBeforeCursor(9, 0));
-
-        // DEL
-        expectUpdateStateCall();
-        setComposingText("h", 1);
-        assertEquals(KeyEvent.KEYCODE_DEL, mImeAdapter.mLastSyntheticKeyCode);
-        assertUpdateStateCall(1000);
-        setComposingRegion(0, 1); // DEL calls cancelComposition() then restarts
-        setComposingText("h", 1);
-        assertEquals("h", mConnection.getTextBeforeCursor(9, 0));
-
-        // I
-        setComposingText("hi", 1);
-        assertEquals(KeyEvent.KEYCODE_I, mImeAdapter.mLastSyntheticKeyCode);
-        assertEquals("hi", mConnection.getTextBeforeCursor(9, 0));
-
-        // SPACE
-        commitText("hi", 1);
-        assertEquals(-1, mImeAdapter.mLastSyntheticKeyCode);
-        commitText(" ", 1);
-        assertEquals(KeyEvent.KEYCODE_SPACE, mImeAdapter.mLastSyntheticKeyCode);
-        assertEquals("hi ", mConnection.getTextBeforeCursor(9, 0));
-
-        // DEL
-        deleteSurroundingText(1, 0);
-        assertEquals(KeyEvent.KEYCODE_DEL, mImeAdapter.mLastSyntheticKeyCode);
-        setComposingRegion(0, 2);
-        assertEquals("hi", mConnection.getTextBeforeCursor(9, 0));
-
-        // DEL
-        setComposingText("h", 1);
-        assertEquals(KeyEvent.KEYCODE_DEL, mImeAdapter.mLastSyntheticKeyCode);
-        assertEquals("h", mConnection.getTextBeforeCursor(9, 0));
-
-        // DEL
-        commitText("", 1);
-        assertEquals(KeyEvent.KEYCODE_DEL, mImeAdapter.mLastSyntheticKeyCode);
-        assertEquals("", mConnection.getTextBeforeCursor(9, 0));
-
-        // DEL (on empty input)
-        deleteSurroundingText(1, 0); // DEL on empty still sends 1,0
-        assertEquals(KeyEvent.KEYCODE_DEL, mImeAdapter.mLastSyntheticKeyCode);
-        assertEquals("", mConnection.getTextBeforeCursor(9, 0));
-    }
-
-    /*
-    @SmallTest
-    @Feature({"TextInput", "Main"})
-    http://crbug.com/445499
-    */
-    @DisabledTest
-    public void testKeyCodesWhileSwipingText() throws Throwable {
-        focusElement("textarea");
-
-        // The calls below are a reflection of what the stock Google Keyboard (Android 4.4) sends
         // when the word is swiped on the soft keyboard.  Exercise care when altering to make sure
         // that the test reflects reality.  If this test breaks, it's possible that code has
         // changed and different calls need to be made instead.
         // "three"
         expectUpdateStateCall();
         setComposingText("three", 1);
-        assertEquals(KeyEvent.KEYCODE_UNKNOWN, mImeAdapter.mLastSyntheticKeyCode);
         assertUpdateStateCall(1000);
         assertEquals("three", mConnection.getTextBeforeCursor(99, 0));
 
         // "word"
         commitText("three", 1);
         commitText(" ", 1);
         expectUpdateStateCall();
-        setComposingText("word", 1);
-        assertEquals(KeyEvent.KEYCODE_UNKNOWN, mImeAdapter.mLastSyntheticKeyCode);
         assertUpdateStateCall(1000);
         assertEquals("three word", mConnection.getTextBeforeCursor(99, 0));
 
         // "test"
         commitText("word", 1);
         commitText(" ", 1);
         expectUpdateStateCall();
         setComposingText("test", 1);
-        assertEquals(KeyEvent.KEYCODE_UNKNOWN, mImeAdapter.mLastSyntheticKeyCode);
         assertUpdateStateCall(1000);
         assertEquals("three word test", mConnection.getTextBeforeCursor(99, 0));
     }
 
     @SmallTest
     @Feature({"TextInput", "Main"})
     public void testDeleteMultiCharacterCodepoint() throws Throwable {
         // This smiley is a multi character codepoint.
         final String smiley = "\uD83D\uDE0A";
 
@@ skipping 14 matching lines @@
     }
 
     @SmallTest
     @Feature({"TextInput", "Main"})
     public void testBackspaceKeycode() throws Throwable {
         focusElement("textarea");
 
         // H
         expectUpdateStateCall();
         commitText("h", 1);
-        assertEquals(KeyEvent.KEYCODE_H, mImeAdapter.mLastSyntheticKeyCode);
         assertEquals("h", mConnection.getTextBeforeCursor(9, 0));
         assertUpdateStateCall(1000);
         assertEquals("h", mConnection.getTextBeforeCursor(9, 0));
 
         // O
         expectUpdateStateCall();
         commitText("o", 1);
-        assertEquals(KeyEvent.KEYCODE_O, mImeAdapter.mLastSyntheticKeyCode);
         assertEquals("ho", mConnection.getTextBeforeCursor(9, 0));
         assertUpdateStateCall(1000);
         assertEquals("ho", mConnection.getTextBeforeCursor(9, 0));
 
         // DEL, sent via dispatchKeyEvent like it is in Android WebView or a physical keyboard.
         dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL));
         dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DEL));
 
         // DEL
         expectUpdateStateCall();
         assertEquals("h", mConnection.getTextBeforeCursor(9, 0));
         assertUpdateStateCall(1000);
         assertEquals("h", mConnection.getTextBeforeCursor(9, 0));
     }
 
     @SmallTest
     @Feature({"TextInput", "Main"})
     public void testRepeatBackspaceKeycode() throws Throwable {
         focusElement("textarea");
 
         // H
         expectUpdateStateCall();
         commitText("h", 1);
-        assertEquals(KeyEvent.KEYCODE_H, mImeAdapter.mLastSyntheticKeyCode);
         assertEquals("h", mConnection.getTextBeforeCursor(9, 0));
         assertUpdateStateCall(1000);
         assertEquals("h", mConnection.getTextBeforeCursor(9, 0));
 
         // O
         expectUpdateStateCall();
         commitText("o", 1);
-        assertEquals(KeyEvent.KEYCODE_O, mImeAdapter.mLastSyntheticKeyCode);
         assertEquals("ho", mConnection.getTextBeforeCursor(9, 0));
         assertUpdateStateCall(1000);
         assertEquals("ho", mConnection.getTextBeforeCursor(9, 0));
 
         // Multiple keydowns should each delete one character (this is for physical keyboard
         // key-repeat).
         dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL));
         dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL));
         dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DEL));
 
         // DEL
         expectUpdateStateCall();
         assertEquals("", mConnection.getTextBeforeCursor(9, 0));
         assertUpdateStateCall(1000);
         assertEquals("", mConnection.getTextBeforeCursor(9, 0));
     }
 
     @SmallTest
     @Feature({"TextInput", "Main"})
-    public void testKeyCodesWhileTypingText() throws Throwable {
-        focusElement("textarea");
-
-        // The calls below are a reflection of what the Hacker's Keyboard sends when the noted
-        // key is touched on screen.  Exercise care when altering to make sure that the test
-        // reflects reality.
-        // H
-        expectUpdateStateCall();
-        commitText("h", 1);
-        assertEquals(KeyEvent.KEYCODE_H, mImeAdapter.mLastSyntheticKeyCode);
-        assertEquals("h", mConnection.getTextBeforeCursor(9, 0));
-        assertUpdateStateCall(1000);
-        assertEquals("h", mConnection.getTextBeforeCursor(9, 0));
-
-        // O
-        expectUpdateStateCall();
-        commitText("o", 1);
-        assertEquals(KeyEvent.KEYCODE_O, mImeAdapter.mLastSyntheticKeyCode);
-        assertEquals("ho", mConnection.getTextBeforeCursor(9, 0));
-        assertUpdateStateCall(1000);
-        assertEquals("ho", mConnection.getTextBeforeCursor(9, 0));
-
-        // DEL
-        expectUpdateStateCall();
-        deleteSurroundingText(1, 0);
-        assertEquals(KeyEvent.KEYCODE_DEL, mImeAdapter.mLastSyntheticKeyCode);
-        assertEquals("h", mConnection.getTextBeforeCursor(9, 0));
-        assertUpdateStateCall(1000);
-        assertEquals("h", mConnection.getTextBeforeCursor(9, 0));
-
-        // I
-        expectUpdateStateCall();
-        commitText("i", 1);
-        assertEquals(KeyEvent.KEYCODE_I, mImeAdapter.mLastSyntheticKeyCode);
-        assertEquals("hi", mConnection.getTextBeforeCursor(9, 0));
-        assertUpdateStateCall(1000);
-        assertEquals("hi", mConnection.getTextBeforeCursor(9, 0));
-
-        // SPACE
-        expectUpdateStateCall();
-        commitText(" ", 1);
-        assertEquals(KeyEvent.KEYCODE_SPACE, mImeAdapter.mLastSyntheticKeyCode);
-        assertEquals("hi ", mConnection.getTextBeforeCursor(9, 0));
-        assertUpdateStateCall(1000);
-        assertEquals("hi ", mConnection.getTextBeforeCursor(9, 0));
-
-        // DEL
-        expectUpdateStateCall();
-        deleteSurroundingText(1, 0);
-        assertEquals(KeyEvent.KEYCODE_DEL, mImeAdapter.mLastSyntheticKeyCode);
-        assertEquals("hi", mConnection.getTextBeforeCursor(9, 0));
-        assertUpdateStateCall(1000);
-        assertEquals("hi", mConnection.getTextBeforeCursor(9, 0));
-
-        // DEL
-        expectUpdateStateCall();
-        deleteSurroundingText(1, 0);
-        assertEquals(KeyEvent.KEYCODE_DEL, mImeAdapter.mLastSyntheticKeyCode);
-        assertEquals("h", mConnection.getTextBeforeCursor(9, 0));
-        assertUpdateStateCall(1000);
-        assertEquals("h", mConnection.getTextBeforeCursor(9, 0));
-
-        // DEL
-        expectUpdateStateCall();
-        deleteSurroundingText(1, 0);
-        assertEquals(KeyEvent.KEYCODE_DEL, mImeAdapter.mLastSyntheticKeyCode);
-        assertEquals("", mConnection.getTextBeforeCursor(9, 0));
-        assertUpdateStateCall(1000);
-        assertEquals("", mConnection.getTextBeforeCursor(9, 0));
-
-        // DEL (on empty input)
-        deleteSurroundingText(1, 0); // DEL on empty still sends 1,0
-        assertEquals(KeyEvent.KEYCODE_DEL, mImeAdapter.mLastSyntheticKeyCode);
-        assertEquals("", mConnection.getTextBeforeCursor(9, 0));
-    }
-
-    @SmallTest
-    @Feature({"TextInput", "Main"})
     public void testPhysicalKeyboard() throws Throwable {
         focusElement("textarea");
         // Type 'a' using a physical keyboard.
         dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_A));
         dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_A));
         waitAndVerifyStatesAndCalls(1, "a", 1, 1, -1, -1);
 
         // Type 'enter' key.
         dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER));
         dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_ENTER));
@@ skipping 138 matching lines @@
     public void testDpadKeyCodesWhileSwipingText() throws Throwable {
         focusElement("textarea");
 
         // DPAD_CENTER should cause keyboard to appear
         expectUpdateStateCall();
         dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_CENTER));
         assertUpdateStateCall(1000);
     }
 
     @SmallTest
-    @Feature({"TextInput", "Main"})
-    public void testTransitionsWhileComposingText() throws Throwable {
-        focusElement("textarea"); // Default with autocomplete="on"
-
-        // H
-        // Since autocomplete="on" by default, COMPOSITION_KEY_CODE is emitted as key code
-        expectUpdateStateCall();
-        setComposingText("h", 1);
-        assertEquals(COMPOSITION_KEY_CODE, mImeAdapter.mLastSyntheticKeyCode);
-
-        // Simulate switch of input fields.
-        finishComposingText();
-
-        // H
-        expectUpdateStateCall();
-        setComposingText("h", 1);
-        assertEquals(COMPOSITION_KEY_CODE, mImeAdapter.mLastSyntheticKeyCode);
-    }
-
-    @SmallTest
-    @Feature({"TextInput", "Main"})
-    public void testTransitionsWhileEmittingKeyCode() throws Throwable {
-        focusElement("textarea2"); // Default with autocomplete="off"
-
-        // H
-        // Although autocomplete="off", we still emit COMPOSITION_KEY_CODE since synthesized
-        // keycodes are disabled.
-        expectUpdateStateCall();
-        setComposingText("h", 1);
-        assertEquals(COMPOSITION_KEY_CODE, mImeAdapter.mLastSyntheticKeyCode);
-
-        // Simulate switch of input fields.
-        finishComposingText();
-
-        // H
-        expectUpdateStateCall();
-        setComposingText("h", 1);
-        assertEquals(COMPOSITION_KEY_CODE, mImeAdapter.mLastSyntheticKeyCode);
-    }
-
-    @SmallTest
     @Feature({"TextInput"})
     public void testPastePopupShowAndHide() throws Throwable {
         commitText("hello", 1);
         waitAndVerifyStatesAndCalls(1, "hello", 5, 5, -1, -1);
 
         selectAll();
         waitAndVerifyStatesAndCalls(2, "hello", 0, 5, -1, -1);
 
         cut();
         waitAndVerifyStatesAndCalls(0, "", 0, 0, -1, -1);
@@ skipping 339 matching lines @@
         public void assertEqualState(String text, int selectionStart, int selectionEnd,
                 int compositionStart, int compositionEnd) {
             assertEquals("Text did not match", text, mText);
             assertEquals("Selection start did not match", selectionStart, mSelectionStart);
             assertEquals("Selection end did not match", selectionEnd, mSelectionEnd);
             assertEquals("Composition start did not match", compositionStart, mCompositionStart);
             assertEquals("Composition end did not match", compositionEnd, mCompositionEnd);
         }
     }
 }