Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(580)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/public/android/javatests/src/org/chromium/content/browser/ImeTest.java

Issue 12093068: Adding missing UpdateTextInputState calls after each ime event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Another attempt to fix testKeyboardDismissedAfterClickingGo Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/android/java/src/org/chromium/content/browser/ImeAdapter.java ('k') | content/renderer/render_view_impl.cc » ('j') | content/renderer/render_widget.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/android/javatests/src/org/chromium/content/browser/ImeTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ImeTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ImeTest.java
index 2b0cf2764bbed0e6d030795053fc55213121d275..68584e0ae00c4a9ad0f156c3c558fc18c88c6dac 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/ImeTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/ImeTest.java
@@ -5,9 +5,14 @@
package org.chromium.content.browser;
import android.test.suitebuilder.annotation.MediumTest;
+import android.test.suitebuilder.annotation.SmallTest;
+import android.view.View;
import android.view.inputmethod.EditorInfo;
import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.UrlUtils;
+import org.chromium.content.browser.ImeAdapter.AdapterInputConnection;
+import org.chromium.content.browser.ImeAdapter.AdapterInputConnectionFactory;
import org.chromium.content.browser.test.util.Criteria;
import org.chromium.content.browser.test.util.CriteriaHelper;
import org.chromium.content.browser.test.util.DOMUtils;
@@ -17,10 +22,11 @@ import org.chromium.content_shell.ContentShellTestBase;
public class ImeTest extends ContentShellTestBase {
- private static final String DATA_URL =
- "data:text/html;utf-8,<html><body>" +
+ private static final String DATA_URL = UrlUtils.encodeHtmlDataUri(
+ "<html><body>" +
+ "<form action=\"about:blank\">" +
"<input id=\"input_text\" type=\"text\" />" +
- "</body></html>";
+ "</form></body></html>");
@MediumTest
@Feature({"TextInput", "Main"})
@@ -28,20 +34,114 @@ public class ImeTest extends ContentShellTestBase {
launchContentShellWithUrl(DATA_URL);
assertTrue("Page failed to load", waitForActiveShellToBeDoneLoading());
+ getContentViewCore().setAdapterInputConnectionFactory(
+ new TestAdapterInputConnectionFactory());
+
+ final ContentView view = getActivity().getActiveContentView();
+ final TestCallbackHelperContainer viewClient =
+ new TestCallbackHelperContainer(view);
+ DOMUtils.clickNode(this, view, viewClient, "input_text");
+ assertWaitForKeyboardStatus(true);
+
+ TestAdapterInputConnection connection =
+ (TestAdapterInputConnection) getAdapterInputConnection();
+ ImeAdapter adapter = getImeAdapter();
+
+ assertWaitForSetEditableCallback(1, connection);
+ assertEquals("", connection.mText);
+ assertEquals(0, connection.mSelectionStart);
+ assertEquals(0, connection.mSelectionEnd);
+ assertEquals(-1, connection.mCompositionStart);
+ assertEquals(-1, connection.mCompositionEnd);
+
+ adapter.checkCompositionQueueAndCallNative("hello", 1, false);
+ assertWaitForSetEditableCallback(2, connection);
+ assertEquals("hello", connection.mText);
+ assertEquals(5, connection.mSelectionStart);
+ assertEquals(5, connection.mSelectionEnd);
+ assertEquals(0, connection.mCompositionStart);
+ assertEquals(5, connection.mCompositionEnd);
+
+ performGo(getAdapterInputConnection(), viewClient);
+
+ assertWaitForSetEditableCallback(3, connection);
+ assertEquals("", connection.mText);
+ assertEquals(0, connection.mSelectionStart);
+ assertEquals(0, connection.mSelectionEnd);
+ assertEquals(-1, connection.mCompositionStart);
+ assertEquals(-1, connection.mCompositionEnd);
+ assertWaitForKeyboardStatus(true);
+ }
+
+ @SmallTest
+ @Feature({"TextInput", "Main"})
+ public void testGetTextUpdatesAfterEnteringText() throws Throwable {
+ launchContentShellWithUrl(DATA_URL);
+ assertTrue("Page failed to load", waitForActiveShellToBeDoneLoading());
+
+ getContentViewCore().setAdapterInputConnectionFactory(
+ new TestAdapterInputConnectionFactory());
+
final ContentView view = getActivity().getActiveContentView();
final TestCallbackHelperContainer viewClient =
new TestCallbackHelperContainer(view);
DOMUtils.clickNode(this, view, viewClient, "input_text");
assertWaitForKeyboardStatus(true);
- getAdapterInputConnection().setComposingText("hello", 5);
- getAdapterInputConnection().performEditorAction(EditorInfo.IME_ACTION_GO);
+ TestAdapterInputConnection connection =
+ (TestAdapterInputConnection) getAdapterInputConnection();
+ ImeAdapter adapter = getImeAdapter();
- // Since hiding the keyboard is an asynchronous task, it might take an arbitrary amount
- // of time. settleDownUI will wait for one second and hopefully allowing the keyboard to
- // get to it's final state.
- UiUtils.settleDownUI(getInstrumentation());
- assertWaitForKeyboardStatus(false);
+ assertWaitForSetEditableCallback(1, connection);
+ assertEquals("", connection.mText);
+ assertEquals(0, connection.mSelectionStart);
+ assertEquals(0, connection.mSelectionEnd);
+ assertEquals(-1, connection.mCompositionStart);
+ assertEquals(-1, connection.mCompositionEnd);
+
+ adapter.checkCompositionQueueAndCallNative("h", 1, false);
+ assertWaitForSetEditableCallback(2, connection);
+ assertEquals("h", connection.mText);
+ assertEquals(1, connection.mSelectionStart);
+ assertEquals(1, connection.mSelectionEnd);
+ assertEquals(0, connection.mCompositionStart);
+ assertEquals(1, connection.mCompositionEnd);
+
+ adapter.checkCompositionQueueAndCallNative("he", 1, false);
+ assertWaitForSetEditableCallback(3, connection);
+ assertEquals("he", connection.mText);
+ assertEquals(2, connection.mSelectionStart);
+ assertEquals(2, connection.mSelectionEnd);
+ assertEquals(0, connection.mCompositionStart);
+ assertEquals(2, connection.mCompositionEnd);
+
+ adapter.checkCompositionQueueAndCallNative("hel", 1, false);
+ assertWaitForSetEditableCallback(4, connection);
+ assertEquals("hel", connection.mText);
+ assertEquals(3, connection.mSelectionStart);
+ assertEquals(3, connection.mSelectionEnd);
+ assertEquals(0, connection.mCompositionStart);
+ assertEquals(3, connection.mCompositionEnd);
+
+ adapter.checkCompositionQueueAndCallNative("hel", 1, true);
+ assertWaitForSetEditableCallback(5, connection);
+ assertEquals("hel", connection.mText);
+ assertEquals(3, connection.mSelectionStart);
+ assertEquals(3, connection.mSelectionEnd);
+ assertEquals(-1, connection.mCompositionStart);
+ assertEquals(-1, connection.mCompositionEnd);
+ }
+
+ private void performGo(final AdapterInputConnection inputConnection,
+ TestCallbackHelperContainer testCallbackHelperContainer) throws Throwable {
+ handleBlockingCallbackAction(
+ testCallbackHelperContainer.getOnPageFinishedHelper(),
+ new Runnable() {
+ @Override
+ public void run() {
+ inputConnection.performEditorAction(EditorInfo.IME_ACTION_GO);
+ }
+ });
}
private void assertWaitForKeyboardStatus(final boolean show) throws Throwable {
@@ -53,6 +153,16 @@ public class ImeTest extends ContentShellTestBase {
}));
}
+ private void assertWaitForSetEditableCallback(final int callbackNumber,
+ final TestAdapterInputConnection connection) throws Throwable {
+ assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
+ @Override
+ public boolean isSatisfied() {
+ return callbackNumber == connection.mSetEditableTextCallCounter;
+ }
+ }));
+ }
+
private ImeAdapter getImeAdapter() {
return getContentViewCore().getImeAdapterForTest();
}
@@ -60,4 +170,38 @@ public class ImeTest extends ContentShellTestBase {
private ImeAdapter.AdapterInputConnection getAdapterInputConnection() {
return getContentViewCore().getInputConnectionForTest();
}
+
+ private static class TestAdapterInputConnectionFactory extends
+ ImeAdapter.AdapterInputConnectionFactory {
+ @Override
+ public AdapterInputConnection get(View view, ImeAdapter imeAdapter,
+ EditorInfo outAttrs) {
+ return new TestAdapterInputConnection(view, imeAdapter, outAttrs);
+ }
+ }
+
+ private static class TestAdapterInputConnection extends ImeAdapter.AdapterInputConnection {
+ private int mSetEditableTextCallCounter;
+ private String mText;
+ private int mSelectionStart;
+ private int mSelectionEnd;
+ private int mCompositionStart;
+ private int mCompositionEnd;
+
+ public TestAdapterInputConnection(View view, ImeAdapter imeAdapter, EditorInfo outAttrs) {
+ super(view, imeAdapter, outAttrs);
+ mSetEditableTextCallCounter = 0;
+ }
+
+ @Override
+ public void setEditableText(String text, int selectionStart, int selectionEnd,
+ int compositionStart, int compositionEnd) {
+ mText = text;
+ mSelectionStart = selectionStart;
+ mSelectionEnd = selectionEnd;
+ mCompositionStart = compositionStart;
+ mCompositionEnd = compositionEnd;
+ mSetEditableTextCallCounter++;
+ }
+ }
}
« no previous file with comments | « content/public/android/java/src/org/chromium/content/browser/ImeAdapter.java ('k') | content/renderer/render_view_impl.cc » ('j') | content/renderer/render_widget.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698