am 0ae6607e: Merge "Added 2 new methods to InputConnection" into gingerbread
Merge commit '0ae6607e500d9f911bf398ab5e40a577051c7110' into gingerbread-plus-aosp
* commit '0ae6607e500d9f911bf398ab5e40a577051c7110':
Added 2 new methods to InputConnection
diff --git a/tests/tests/view/src/android/view/inputmethod/cts/InputConnectionWrapperTest.java b/tests/tests/view/src/android/view/inputmethod/cts/InputConnectionWrapperTest.java
index 896e99f..bdee05a 100644
--- a/tests/tests/view/src/android/view/inputmethod/cts/InputConnectionWrapperTest.java
+++ b/tests/tests/view/src/android/view/inputmethod/cts/InputConnectionWrapperTest.java
@@ -97,6 +97,11 @@
args = {int.class, int.class}
),
@TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "getSelectedText",
+ args = {int.class}
+ ),
+ @TestTargetNew(
level = TestLevel.COMPLETE,
method = "getCursorCapsMode",
args = {int.class}
@@ -127,6 +132,11 @@
args = {CharSequence.class, int.class}
),
@TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "setComposingRegion",
+ args = {int.class, int.class}
+ ),
+ @TestTargetNew(
level = TestLevel.COMPLETE,
method = "sendKeyEvent",
args = {KeyEvent.class}
@@ -184,6 +194,10 @@
assertTrue(inputConnection.isSetComposingTextCalled);
wrapper.setSelection(0, 10);
assertTrue(inputConnection.isSetSelectionCalled);
+ wrapper.getSelectedText(0);
+ assertTrue(inputConnection.isGetSelectedTextCalled);
+ wrapper.setComposingRegion(0, 3);
+ assertTrue(inputConnection.isSetComposingRegionCalled);
}
private class MockInputConnection implements InputConnection {
@@ -198,12 +212,14 @@
public boolean isGetExtractedTextCalled;
public boolean isGetTextAfterCursorCalled;
public boolean isGetTextBeforeCursorCalled;
+ public boolean isGetSelectedTextCalled;
public boolean isPerformContextMenuActionCalled;
public boolean isPerformEditorActionCalled;
public boolean isPerformPrivateCommandCalled;
public boolean isReportFullscreenModeCalled;
public boolean isSendKeyEventCalled;
public boolean isSetComposingTextCalled;
+ public boolean isSetComposingRegionCalled;
public boolean isSetSelectionCalled;
public boolean beginBatchEdit() {
@@ -261,6 +277,11 @@
return null;
}
+ public CharSequence getSelectedText(int flags) {
+ isGetSelectedTextCalled = true;
+ return null;
+ }
+
public boolean performContextMenuAction(int id) {
isPerformContextMenuActionCalled = true;
return false;
@@ -291,6 +312,11 @@
return false;
}
+ public boolean setComposingRegion(int start, int end) {
+ isSetComposingRegionCalled = true;
+ return false;
+ }
+
public boolean setSelection(int start, int end) {
isSetSelectionCalled = true;
return false;