add test

Author: gspencergoog

shell/platform/android/io/flutter/embedding/android/AndroidKeyProcessor.java

@@ -9,8 +9,8 @@
 import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import io.flutter.embedding.engine.systemchannels.KeyEventChannel;
 import io.flutter.Log;
+import io.flutter.embedding.engine.systemchannels.KeyEventChannel;
 import io.flutter.plugin.editing.TextInputPlugin;
 import java.util.ArrayDeque;
 import java.util.Deque;
@@ -94,7 +94,7 @@ public boolean onKeyEvent(@NonNull KeyEvent keyEvent) {
       // case the theory is wrong.
       return false;
     }
-    if (eventResponder.isPendingEvent(keyEvent)) {
+    if (isPendingEvent(keyEvent)) {
       // If the keyEvent is in the queue of pending events we've seen, and has
       // the same id, then we know that this is a re-dispatched keyEvent, and we
       // shouldn't respond to it, but we should remove it from tracking now.
@@ -124,7 +124,7 @@ public boolean onKeyEvent(@NonNull KeyEvent keyEvent) {
    * @return
    */
   public boolean isPendingEvent(@NonNull KeyEvent event) {
-    return eventResponder.isPendingEvent(event);
+    return eventResponder.findPendingEvent(event) != null;
   }
 
   /**
@@ -215,10 +215,6 @@ private KeyEvent findPendingEvent(KeyEvent event) {
       return null;
     }
 
-    private boolean isPendingEvent(KeyEvent event) {
-      return findPendingEvent(event) != null;
-    }
-
     /**
      * Called whenever the framework responds that a given key event was handled by the framework.
      *

shell/platform/android/test/io/flutter/embedding/android/AndroidKeyProcessorTest.java

@@ -74,6 +74,54 @@ public void destroyTest() {
         .setEventResponseHandler(isNull(KeyEventChannel.EventResponseHandler.class));
   }
 
+  public void removesPendingEventsWhenKeyDownHandled() {
+    FlutterEngine flutterEngine = mockFlutterEngine();
+    KeyEventChannel fakeKeyEventChannel = flutterEngine.getKeyEventChannel();
+    View fakeView = mock(View.class);
+    View fakeRootView = mock(View.class);
+    when(fakeView.getRootView())
+        .then(
+            new Answer<View>() {
+              @Override
+              public View answer(InvocationOnMock invocation) throws Throwable {
+                return fakeRootView;
+              }
+            });
+
+    ArgumentCaptor<KeyEventChannel.EventResponseHandler> handlerCaptor =
+        ArgumentCaptor.forClass(KeyEventChannel.EventResponseHandler.class);
+    verify(fakeKeyEventChannel).setEventResponseHandler(handlerCaptor.capture());
+    AndroidKeyProcessor processor =
+        new AndroidKeyProcessor(fakeView, fakeKeyEventChannel, mock(TextInputPlugin.class));
+    ArgumentCaptor<KeyEventChannel.FlutterKeyEvent> eventCaptor =
+        ArgumentCaptor.forClass(KeyEventChannel.FlutterKeyEvent.class);
+    FakeKeyEvent fakeKeyEvent = new FakeKeyEvent(KeyEvent.ACTION_DOWN, 65);
+
+    boolean result = processor.onKeyEvent(fakeKeyEvent);
+    assertEquals(true, processor.isPendingEvent(fakeKeyEvent));
+    assertEquals(true, result);
+
+    // Capture the FlutterKeyEvent so we can find out its event ID to use when
+    // faking our response.
+    verify(fakeKeyEventChannel, times(1)).keyDown(eventCaptor.capture());
+    boolean[] dispatchResult = {true};
+    when(fakeView.dispatchKeyEvent(any(KeyEvent.class)))
+        .then(
+            new Answer<Boolean>() {
+              @Override
+              public Boolean answer(InvocationOnMock invocation) throws Throwable {
+                KeyEvent event = (KeyEvent) invocation.getArguments()[0];
+                assertEquals(fakeKeyEvent, event);
+                dispatchResult[0] = processor.onKeyEvent(event);
+                return dispatchResult[0];
+              }
+            });
+
+    // Fake a response from the framework.
+    handlerCaptor.getValue().onKeyEventHandled(eventCaptor.getValue().event);
+    assertEquals(false, processor.isPendingEvent(fakeKeyEvent));
+  }
+
   public void synthesizesEventsWhenKeyDownNotHandled() {
     FlutterEngine flutterEngine = mockFlutterEngine();
     KeyEventChannel fakeKeyEventChannel = flutterEngine.getKeyEventChannel();
@@ -98,6 +146,7 @@ public View answer(InvocationOnMock invocation) throws Throwable {
     FakeKeyEvent fakeKeyEvent = new FakeKeyEvent(KeyEvent.ACTION_DOWN, 65);
 
     boolean result = processor.onKeyEvent(fakeKeyEvent);
+    assertEquals(true, processor.isPendingEvent(fakeKeyEvent));
     assertEquals(true, result);
 
     // Capture the FlutterKeyEvent so we can find out its event ID to use when
@@ -118,6 +167,7 @@ public Boolean answer(InvocationOnMock invocation) throws Throwable {
 
     // Fake a response from the framework.
     handlerCaptor.getValue().onKeyEventNotHandled(eventCaptor.getValue().event);
+    assertEquals(true, processor.isPendingEvent(fakeKeyEvent));
     verify(fakeView, times(1)).dispatchKeyEvent(fakeKeyEvent);
     assertEquals(false, dispatchResult[0]);
     verify(fakeKeyEventChannel, times(0)).keyUp(any(KeyEventChannel.FlutterKeyEvent.class));
@@ -148,6 +198,7 @@ public View answer(InvocationOnMock invocation) throws Throwable {
     FakeKeyEvent fakeKeyEvent = new FakeKeyEvent(KeyEvent.ACTION_UP, 65);
 
     boolean result = processor.onKeyEvent(fakeKeyEvent);
+    assertEquals(true, processor.isPendingEvent(fakeKeyEvent));
     assertEquals(true, result);
 
     // Capture the FlutterKeyEvent so we can find out its event ID to use when
@@ -168,6 +219,7 @@ public Boolean answer(InvocationOnMock invocation) throws Throwable {
 
     // Fake a response from the framework.
     handlerCaptor.getValue().onKeyEventNotHandled(eventCaptor.getValue().event);
+    assertEquals(true, processor.isPendingEvent(fakeKeyEvent));
     verify(fakeView, times(1)).dispatchKeyEvent(fakeKeyEvent);
     assertEquals(false, dispatchResult[0]);
     verify(fakeKeyEventChannel, times(0)).keyUp(any(KeyEventChannel.FlutterKeyEvent.class));