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

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

Issue 2407303005: Let embedder provide select action mode (Closed)
Patch Set: fixing tests Created 4 years, 1 month 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
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 6a65a9b60018abdc52d62e1d3f5a2f6df9a7cef4..45e5878b9b6f82174abf997ca6e9aa27e52d9be0 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
@@ -31,6 +31,7 @@ import org.chromium.base.test.util.UrlUtils;
import org.chromium.base.test.util.parameter.Parameter;
import org.chromium.base.test.util.parameter.ParameterizedTest;
import org.chromium.content.browser.ContentViewCore;
+import org.chromium.content.browser.SelectionPopupController;
import org.chromium.content.browser.test.util.Criteria;
import org.chromium.content.browser.test.util.CriteriaHelper;
import org.chromium.content.browser.test.util.DOMUtils;
@@ -78,6 +79,7 @@ public class ImeTest extends ContentShellTestBase {
private ContentViewCore mContentViewCore;
private WebContents mWebContents;
+ private SelectionPopupController mSelectionPopupController;
private TestCallbackHelperContainer mCallbackContainer;
protected TestInputMethodManagerWrapper mInputMethodManagerWrapper;
@@ -86,6 +88,7 @@ public class ImeTest extends ContentShellTestBase {
super.setUp();
startActivityWithTestUrl(INPUT_FORM_HTML);
mContentViewCore = getContentViewCore();
+ mSelectionPopupController = mContentViewCore.getSelectionPopupControllerForTesting();
mWebContents = getWebContents();
mInputMethodManagerWrapper = new TestInputMethodManagerWrapper(mContentViewCore);
@@ -1290,7 +1293,7 @@ public class ImeTest extends ContentShellTestBase {
CriteriaHelper.pollUiThread(new Criteria() {
@Override
public boolean isSatisfied() {
- return mContentViewCore.isPastePopupShowing();
+ return mSelectionPopupController.isPastePopupShowing();
}
});
@@ -1298,10 +1301,10 @@ public class ImeTest extends ContentShellTestBase {
CriteriaHelper.pollUiThread(new Criteria() {
@Override
public boolean isSatisfied() {
- return !mContentViewCore.isPastePopupShowing();
+ return !mSelectionPopupController.isPastePopupShowing();
}
});
- assertFalse(mContentViewCore.hasInsertion());
+ assertFalse(mSelectionPopupController.isInsertion());
}
@SmallTest
@@ -1315,7 +1318,7 @@ public class ImeTest extends ContentShellTestBase {
setComposingText("h", 1);
assertWaitForSelectActionBarStatus(false);
- assertFalse(mContentViewCore.hasSelection());
+ assertFalse(mSelectionPopupController.hasSelection());
}
@SmallTest
@@ -1324,11 +1327,11 @@ public class ImeTest extends ContentShellTestBase {
public void testTextHandlesPreservedWithDpadNavigation() throws Throwable {
DOMUtils.longPressNode(this, mContentViewCore, "plain_text");
assertWaitForSelectActionBarStatus(true);
- assertTrue(mContentViewCore.hasSelection());
+ assertTrue(mSelectionPopupController.hasSelection());
dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_DOWN));
assertWaitForSelectActionBarStatus(true);
- assertTrue(mContentViewCore.hasSelection());
+ assertTrue(mSelectionPopupController.hasSelection());
}
@MediumTest

Powered by Google App Engine
This is Rietveld 408576698