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

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

Issue 191133003: In tests call ImeAdapter from UI thread only. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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
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 e68736a9a431e74414ccb03cb000dadd342711a5..da5bd3d3a5d03e1010bae3b80e7fbcdecfb449b8 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
@@ -121,7 +121,7 @@ public class ImeTest extends ContentShellTestBase {
setSelection(mConnection, 2, 5);
waitAndVerifyEditableCallback(mConnection.mImeUpdateQueue, 2, "hello", 2, 5, -1, -1);
- mImeAdapter.copy();
+ copy(mImeAdapter);
assertClipboardContents(getActivity(), "llo");
}
@@ -149,7 +149,7 @@ public class ImeTest extends ContentShellTestBase {
setSelection(mConnection, 1, 5);
waitAndVerifyEditableCallback(mConnection.mImeUpdateQueue, 2, "snarful", 1, 5, -1, -1);
- mImeAdapter.cut();
+ cut(mImeAdapter);
waitAndVerifyEditableCallback(mConnection.mImeUpdateQueue, 3, "sul", 1, 1, -1, -1);
assertClipboardContents(getActivity(), "narf");
@@ -168,18 +168,18 @@ public class ImeTest extends ContentShellTestBase {
}
});
- mImeAdapter.paste();
+ paste(mImeAdapter);
waitAndVerifyEditableCallback(mConnection.mImeUpdateQueue, 1, "blarg", 5, 5, -1, -1);
setSelection(mConnection, 3, 5);
waitAndVerifyEditableCallback(mConnection.mImeUpdateQueue, 2, "blarg", 3, 5, -1, -1);
- mImeAdapter.paste();
+ paste(mImeAdapter);
// Paste is a two step process when there is a non-zero selection.
waitAndVerifyEditableCallback(mConnection.mImeUpdateQueue, 3, "bla", 3, 3, -1, -1);
waitAndVerifyEditableCallback(mConnection.mImeUpdateQueue, 4, "blablarg", 8, 8, -1, -1);
- mImeAdapter.paste();
+ paste(mImeAdapter);
waitAndVerifyEditableCallback(
mConnection.mImeUpdateQueue, 5, "blablargblarg", 13, 13, -1, -1);
}
@@ -190,10 +190,10 @@ public class ImeTest extends ContentShellTestBase {
commitText(mConnection, "hello", 1);
waitAndVerifyEditableCallback(mConnection.mImeUpdateQueue, 1, "hello", 5, 5, -1, -1);
- mImeAdapter.selectAll();
+ selectAll(mImeAdapter);
waitAndVerifyEditableCallback(mConnection.mImeUpdateQueue, 2, "hello", 0, 5, -1, -1);
- mImeAdapter.unselect();
+ unselect(mImeAdapter);
waitAndVerifyEditableCallback(mConnection.mImeUpdateQueue, 3, "", 0, 0, -1, -1);
assertWaitForKeyboardStatus(false);
@@ -353,6 +353,51 @@ public class ImeTest extends ContentShellTestBase {
return getContentViewCore().getInputConnectionForTest();
}
+ private void copy(final ImeAdapter adapter) {
+ ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+ @Override
+ public void run() {
+ adapter.copy();
+ }
+ });
+ }
+
+ private void cut(final ImeAdapter adapter) {
+ ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+ @Override
+ public void run() {
+ adapter.cut();
+ }
+ });
+ }
+
+ private void paste(final ImeAdapter adapter) {
+ ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+ @Override
+ public void run() {
+ adapter.paste();
+ }
+ });
+ }
+
+ private void selectAll(final ImeAdapter adapter) {
+ ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+ @Override
+ public void run() {
+ adapter.selectAll();
+ }
+ });
+ }
+
+ private void unselect(final ImeAdapter adapter) {
+ ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+ @Override
+ public void run() {
+ adapter.unselect();
+ }
+ });
+ }
+
private void commitText(final AdapterInputConnection connection, final CharSequence text,
final int newCursorPosition) {
ThreadUtils.runOnUiThreadBlocking(new Runnable() {

Powered by Google App Engine
This is Rietveld 408576698