Fix Tests Dependent Upon ACTION_MULTIPLE Events
Bug 3097462
There is no support for injecting ACTION_MULTIPLE key events
in Gingerbread. Remove the tests that checked the onKeyMultiple
callback, since they cannot be triggered from tests with
instrumentation. Fix GridViewTest to use key down instead...it
did not support key up...
Change-Id: Ib5811d589c187dcef1c15cd181811e33ed14b303
diff --git a/tests/tests/app/src/android/app/cts/DialogTest.java b/tests/tests/app/src/android/app/cts/DialogTest.java
index 4d02896..9e651a5 100644
--- a/tests/tests/app/src/android/app/cts/DialogTest.java
+++ b/tests/tests/app/src/android/app/cts/DialogTest.java
@@ -518,25 +518,6 @@
assertTrue(d.onKeyDownReturn);
}
- @TestTargetNew(
- level = TestLevel.COMPLETE,
- method = "onKeyMultiple",
- args = {int.class, int.class, android.view.KeyEvent.class}
- )
- public void testOnKeyMultiple() {
- popDialog(DialogStubActivity.TEST_ONSTART_AND_ONSTOP);
- final TestDialog d = (TestDialog) mActivity.getDialog();
-
- // System call onTouchEvent
- assertNull(d.keyMultipleEvent);
- mInstrumentation.sendKeySync(
- new KeyEvent(KeyEvent.ACTION_MULTIPLE, KeyEvent.KEYCODE_UNKNOWN));
- assertTrue(d.isOnKeyMultipleCalled);
- assertFalse(d.onKeyMultipleReturn);
- assertEquals(KeyEvent.KEYCODE_UNKNOWN, d.keyMultipleEvent.getKeyCode());
- assertEquals(KeyEvent.ACTION_MULTIPLE, d.keyMultipleEvent.getAction());
- }
-
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
diff --git a/tests/tests/view/src/android/view/cts/ViewTest.java b/tests/tests/view/src/android/view/cts/ViewTest.java
index 3168312..2549574 100644
--- a/tests/tests/view/src/android/view/cts/ViewTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewTest.java
@@ -2711,25 +2711,6 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
- method = "onKeyMultiple",
- args = {int.class, int.class, android.view.KeyEvent.class}
- )
- public void testOnKeyMultiple() throws Throwable {
- final MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
- runTestOnUiThread(new Runnable() {
- public void run() {
- view.setFocusable(true);
- }
- });
-
- assertFalse(view.hasCalledOnKeyMultiple());
- KeyEvent keyEvent = new KeyEvent(KeyEvent.ACTION_MULTIPLE, KeyEvent.KEYCODE_ENTER);
- getInstrumentation().sendKeySync(keyEvent);
- assertTrue(view.hasCalledOnKeyMultiple());
- }
-
- @TestTargetNew(
- level = TestLevel.COMPLETE,
method = "dispatchKeyShortcutEvent",
args = {android.view.KeyEvent.class}
)
diff --git a/tests/tests/widget/src/android/widget/cts/GridViewTest.java b/tests/tests/widget/src/android/widget/cts/GridViewTest.java
index 65045d8..40684c9 100644
--- a/tests/tests/widget/src/android/widget/cts/GridViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/GridViewTest.java
@@ -215,11 +215,11 @@
mInstrumentation.waitForIdleSync();
assertEquals(0, mGridView.getSelectedItemPosition());
- KeyEvent event = new KeyEvent(KeyEvent.ACTION_MULTIPLE, KeyEvent.KEYCODE_DPAD_RIGHT);
+ KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_RIGHT);
mInstrumentation.sendKeySync(event);
assertEquals(1, mGridView.getSelectedItemPosition());
- event = new KeyEvent(KeyEvent.ACTION_MULTIPLE, KeyEvent.KEYCODE_DPAD_LEFT);
+ event = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_LEFT);
mInstrumentation.sendKeySync(event);
assertEquals(0, mGridView.getSelectedItemPosition());
@@ -535,7 +535,7 @@
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "attachLayoutAnimationParameters",
- args = {android.view.View.class, android.view.ViewGroup.LayoutParams.class, int.class,
+ args = {android.view.View.class, android.view.ViewGroup.LayoutParams.class, int.class,
int.class}
)
public void testAttachLayoutAnimationParameters() {
