upgraded usage of BinaryMessenger

Author: gaaclarke

packages/android_intent/android/src/test/java/io/flutter/plugins/androidintent/MethodCallHandlerImplTest.java

@@ -55,7 +55,7 @@ public void startListening_registersChannel() {
     methodCallHandler.startListening(messenger);
 
     verify(messenger, times(1))
-        .setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class));
+        .setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class), eq(null));
   }
 
   @Test
@@ -67,9 +67,9 @@ public void startListening_unregistersExistingChannel() {
     methodCallHandler.startListening(secondMessenger);
 
     // Unregisters the first and then registers the second.
-    verify(firstMessenger, times(1)).setMessageHandler(CHANNEL_NAME, null);
+    verify(firstMessenger, times(1)).setMessageHandler(CHANNEL_NAME, null, null);
     verify(secondMessenger, times(1))
-        .setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class));
+        .setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class), eq(null));
   }
 
   @Test
@@ -79,7 +79,7 @@ public void stopListening_unregistersExistingChannel() {
 
     methodCallHandler.stopListening();
 
-    verify(messenger, times(1)).setMessageHandler(CHANNEL_NAME, null);
+    verify(messenger, times(1)).setMessageHandler(CHANNEL_NAME, null, null);
   }
 
   @Test
@@ -88,7 +88,7 @@ public void stopListening_doesNothingWhenUnset() {
 
     methodCallHandler.stopListening();
 
-    verify(messenger, never()).setMessageHandler(CHANNEL_NAME, null);
+    verify(messenger, never()).setMessageHandler(CHANNEL_NAME, null, null);
   }
 
   @Test

packages/camera/camera/android/src/test/java/io/flutter/plugins/camera/DartMessengerTest.java

@@ -12,6 +12,7 @@
 
 import android.os.Handler;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import io.flutter.embedding.engine.systemchannels.PlatformChannel;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.MethodCall;
@@ -31,6 +32,11 @@ public class DartMessengerTest {
   private static class FakeBinaryMessenger implements BinaryMessenger {
     private final List<ByteBuffer> sentMessages = new ArrayList<>();
 
+    @Override
+    TaskQueue makeBackgroundTaskQueue() {
+      return null;
+    }
+
     @Override
     public void send(@NonNull String channel, ByteBuffer message) {
       sentMessages.add(message);
@@ -42,7 +48,8 @@ public void send(@NonNull String channel, ByteBuffer message, BinaryReply callba
     }
 
     @Override
-    public void setMessageHandler(@NonNull String channel, BinaryMessageHandler handler) {}
+    public void setMessageHandler(
+        @NonNull String channel, BinaryMessageHandler handler, @Nullable TaskQueue taskQueue) {}
 
     List<ByteBuffer> getMessages() {
       return new ArrayList<>(sentMessages);

packages/quick_actions/quick_actions/android/src/test/java/io/flutter/plugins/quickactions/QuickActionsTest.java

@@ -33,6 +33,11 @@ public class QuickActionsTest {
   private static class TestBinaryMessenger implements BinaryMessenger {
     public MethodCall lastMethodCall;
 
+    @Override
+    TaskQueue makeBackgroundTaskQueue() {
+      return null;
+    }
+
     @Override
     public void send(@NonNull String channel, @Nullable ByteBuffer message) {
       send(channel, message, null);
@@ -50,7 +55,10 @@ public void send(
     }
 
     @Override
-    public void setMessageHandler(@NonNull String channel, @Nullable BinaryMessageHandler handler) {
+    public void setMessageHandler(
+        @NonNull String channel,
+        @Nullable BinaryMessageHandler handler,
+        @Nullable TaskQueue taskQueue) {
       // Do nothing.
     }
   }

packages/url_launcher/url_launcher/android/src/test/java/io/flutter/plugins/urllauncher/MethodCallHandlerImplTest.java

@@ -44,7 +44,7 @@ public void startListening_registersChannel() {
     methodCallHandler.startListening(messenger);
 
     verify(messenger, times(1))
-        .setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class));
+        .setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class), eq(null));
   }
 
   @Test
@@ -56,9 +56,9 @@ public void startListening_unregistersExistingChannel() {
     methodCallHandler.startListening(secondMessenger);
 
     // Unregisters the first and then registers the second.
-    verify(firstMessenger, times(1)).setMessageHandler(CHANNEL_NAME, null);
+    verify(firstMessenger, times(1)).setMessageHandler(CHANNEL_NAME, null, null);
     verify(secondMessenger, times(1))
-        .setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class));
+        .setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class), eq(null));
   }
 
   @Test
@@ -68,7 +68,7 @@ public void stopListening_unregistersExistingChannel() {
 
     methodCallHandler.stopListening();
 
-    verify(messenger, times(1)).setMessageHandler(CHANNEL_NAME, null);
+    verify(messenger, times(1)).setMessageHandler(CHANNEL_NAME, null, null);
   }
 
   @Test
@@ -77,7 +77,7 @@ public void stopListening_doesNothingWhenUnset() {
 
     methodCallHandler.stopListening();
 
-    verify(messenger, never()).setMessageHandler(CHANNEL_NAME, null);
+    verify(messenger, never()).setMessageHandler(CHANNEL_NAME, null, null);
   }
 
   @Test