Revive Deleted ACTION_MULTIPLE_TESTS
Bug 3097462
Use dispatchKeyEvent as suggested instead of instrumentation.
Change-Id: Ib567da9cca281b516cb5cc97991d34b67250976f
diff --git a/tests/tests/app/src/android/app/cts/DialogTest.java b/tests/tests/app/src/android/app/cts/DialogTest.java
index 9e651a5..6a48358 100644
--- a/tests/tests/app/src/android/app/cts/DialogTest.java
+++ b/tests/tests/app/src/android/app/cts/DialogTest.java
@@ -518,6 +518,23 @@
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();
+
+ assertNull(d.keyMultipleEvent);
+ d.dispatchKeyEvent(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 ac0dbd6..e07e105 100644
--- a/tests/tests/view/src/android/view/cts/ViewTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewTest.java
@@ -2692,6 +2692,24 @@
@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());
+ view.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_MULTIPLE, KeyEvent.KEYCODE_ENTER));
+ assertTrue(view.hasCalledOnKeyMultiple());
+ }
+
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
method = "dispatchKeyShortcutEvent",
args = {android.view.KeyEvent.class}
)
