Skip to content

Commit

Permalink
Partial revert of "upgraded usage of BinaryMessenger (#4451)" (#4453)
Browse files Browse the repository at this point in the history 
This reverts commit 203e7ae.

The work to accomodate the breaking change is no longer necessary.
  • Loading branch information
@gaaclarke
gaaclarke authored Oct 27, 2021
1 parent 418bef0 commit 2942e56
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 87 deletions.
28 changes: 5 additions & 23 deletions ...ent/android/src/test/java/io/flutter/plugins/androidintent/MethodCallHandlerImplTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,7 @@ public void startListening_registersChannel() {
methodCallHandler.startListening(messenger);

verify(messenger, times(1))
// FLUTTER_STABLE_CONDITIONAL_IF_NOT_STABLE
.setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class), eq(null));
// FLUTTER_STABLE_CONDITIONAL_ELSE
// .setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class));
// FLUTTER_STABLE_CONDITIONAL_ENDIF
.setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class));
}

@Test
Expand All @@ -71,15 +67,9 @@ public void startListening_unregistersExistingChannel() {
methodCallHandler.startListening(secondMessenger);

// Unregisters the first and then registers the second.
// FLUTTER_STABLE_CONDITIONAL_IF_NOT_STABLE
verify(firstMessenger, times(1)).setMessageHandler(CHANNEL_NAME, null, null);
verify(firstMessenger, times(1)).setMessageHandler(CHANNEL_NAME, null);
verify(secondMessenger, times(1))
.setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class), eq(null));
// FLUTTER_STABLE_CONDITIONAL_ELSE
// verify(firstMessenger, times(1)).setMessageHandler(CHANNEL_NAME, null);
// verify(secondMessenger, times(1))
// .setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class));
// FLUTTER_STABLE_CONDITIONAL_ENDIF
.setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class));
}

@Test
Expand All @@ -89,11 +79,7 @@ public void stopListening_unregistersExistingChannel() {

methodCallHandler.stopListening();

// FLUTTER_STABLE_CONDITIONAL_IF_NOT_STABLE
verify(messenger, times(1)).setMessageHandler(CHANNEL_NAME, null, null);
// FLUTTER_STABLE_CONDITIONAL_ELSE
// verify(messenger, times(1)).setMessageHandler(CHANNEL_NAME, null);
// FLUTTER_STABLE_CONDITIONAL_ENDIF
verify(messenger, times(1)).setMessageHandler(CHANNEL_NAME, null);
}

@Test
Expand All @@ -102,11 +88,7 @@ public void stopListening_doesNothingWhenUnset() {

methodCallHandler.stopListening();

// FLUTTER_STABLE_CONDITIONAL_IF_NOT_STABLE
verify(messenger, never()).setMessageHandler(CHANNEL_NAME, null, null);
// FLUTTER_STABLE_CONDITIONAL_ELSE
// verify(messenger, never()).setMessageHandler(CHANNEL_NAME, null);
// FLUTTER_STABLE_CONDITIONAL_ENDIF
verify(messenger, never()).setMessageHandler(CHANNEL_NAME, null);
}

@Test
Expand Down
21 changes: 1 addition & 20 deletions ...ages/camera/camera/android/src/test/java/io/flutter/plugins/camera/DartMessengerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

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;
Expand All @@ -32,15 +31,6 @@ public class DartMessengerTest {
private static class FakeBinaryMessenger implements BinaryMessenger {
private final List<ByteBuffer> sentMessages = new ArrayList<>();

// TODO(aaclarke): Remove when https://github.com/flutter/engine/pull/29147 is on stable.
// FLUTTER_STABLE_CONDITIONAL_IF_NOT_STABLE
@Override
public BinaryMessenger.TaskQueue makeBackgroundTaskQueue() {
return null;
}
// FLUTTER_STABLE_CONDITIONAL_ELSE
// FLUTTER_STABLE_CONDITIONAL_ENDIF

@Override
public void send(@NonNull String channel, ByteBuffer message) {
sentMessages.add(message);
Expand All @@ -51,17 +41,8 @@ public void send(@NonNull String channel, ByteBuffer message, BinaryReply callba
send(channel, message);
}

// TODO(aaclarke): Remove when https://github.com/flutter/engine/pull/29147 is on stable.
// FLUTTER_STABLE_CONDITIONAL_IF_NOT_STABLE
@Override
public void setMessageHandler(
@NonNull String channel,
BinaryMessageHandler handler,
@Nullable BinaryMessenger.TaskQueue taskQueue) {}
// FLUTTER_STABLE_CONDITIONAL_ELSE
// @Override
// public void setMessageHandler(@NonNull String channel, BinaryMessageHandler handler) {}
// FLUTTER_STABLE_CONDITIONAL_ENDIF
public void setMessageHandler(@NonNull String channel, BinaryMessageHandler handler) {}

List<ByteBuffer> getMessages() {
return new ArrayList<>(sentMessages);
Expand Down
22 changes: 1 addition & 21 deletions ...quick_actions/android/src/test/java/io/flutter/plugins/quickactions/QuickActionsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,6 @@ public class QuickActionsTest {
private static class TestBinaryMessenger implements BinaryMessenger {
public MethodCall lastMethodCall;

// TODO(aaclarke): Remove when https://github.com/flutter/engine/pull/29147 is on stable.
// FLUTTER_STABLE_CONDITIONAL_IF_NOT_STABLE
@Override
public BinaryMessenger.TaskQueue makeBackgroundTaskQueue() {
return null;
}
// FLUTTER_STABLE_CONDITIONAL_ELSE
// FLUTTER_STABLE_CONDITIONAL_ENDIF

@Override
public void send(@NonNull String channel, @Nullable ByteBuffer message) {
send(channel, message, null);
Expand All @@ -58,21 +49,10 @@ public void send(
}
}

// TODO(aaclarke): Remove when https://github.com/flutter/engine/pull/29147 is on stable.
// FLUTTER_STABLE_CONDITIONAL_IF_NOT_STABLE
@Override
public void setMessageHandler(
@NonNull String channel,
@Nullable BinaryMessageHandler handler,
@Nullable BinaryMessenger.TaskQueue taskQueue) {
public void setMessageHandler(@NonNull String channel, @Nullable BinaryMessageHandler handler) {
// Do nothing.
}
// FLUTTER_STABLE_CONDITIONAL_ELSE
// @Override
// public void setMessageHandler(
// @NonNull String channel,
// @Nullable BinaryMessageHandler handler) {}
// FLUTTER_STABLE_CONDITIONAL_ENDIF
}

static final int SUPPORTED_BUILD = 25;
Expand Down
28 changes: 5 additions & 23 deletions ...ncher/android/src/test/java/io/flutter/plugins/urllauncher/MethodCallHandlerImplTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,7 @@ public void startListening_registersChannel() {
methodCallHandler.startListening(messenger);

verify(messenger, times(1))
// FLUTTER_STABLE_CONDITIONAL_IF_NOT_STABLE
.setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class), eq(null));
// FLUTTER_STABLE_CONDITIONAL_ELSE
// .setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class));
// FLUTTER_STABLE_CONDITIONAL_ENDIF
.setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class));
}

@Test
Expand All @@ -60,15 +56,9 @@ public void startListening_unregistersExistingChannel() {
methodCallHandler.startListening(secondMessenger);

// Unregisters the first and then registers the second.
// FLUTTER_STABLE_CONDITIONAL_IF_NOT_STABLE
verify(firstMessenger, times(1)).setMessageHandler(CHANNEL_NAME, null, null);
verify(firstMessenger, times(1)).setMessageHandler(CHANNEL_NAME, null);
verify(secondMessenger, times(1))
.setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class), eq(null));
// FLUTTER_STABLE_CONDITIONAL_ELSE
// verify(firstMessenger, times(1)).setMessageHandler(CHANNEL_NAME, null);
// verify(secondMessenger, times(1))
// .setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class));
// FLUTTER_STABLE_CONDITIONAL_ENDIF
.setMessageHandler(eq(CHANNEL_NAME), any(BinaryMessageHandler.class));
}

@Test
Expand All @@ -78,11 +68,7 @@ public void stopListening_unregistersExistingChannel() {

methodCallHandler.stopListening();

// FLUTTER_STABLE_CONDITIONAL_IF_NOT_STABLE
verify(messenger, times(1)).setMessageHandler(CHANNEL_NAME, null, null);
// FLUTTER_STABLE_CONDITIONAL_ELSE
// verify(messenger, times(1)).setMessageHandler(CHANNEL_NAME, null);
// FLUTTER_STABLE_CONDITIONAL_ENDIF
verify(messenger, times(1)).setMessageHandler(CHANNEL_NAME, null);
}

@Test
Expand All @@ -91,11 +77,7 @@ public void stopListening_doesNothingWhenUnset() {

methodCallHandler.stopListening();

// FLUTTER_STABLE_CONDITIONAL_IF_NOT_STABLE
verify(messenger, never()).setMessageHandler(CHANNEL_NAME, null, null);
// FLUTTER_STABLE_CONDITIONAL_ELSE
// verify(messenger, never()).setMessageHandler(CHANNEL_NAME, null);
// FLUTTER_STABLE_CONDITIONAL_ENDIF
verify(messenger, never()).setMessageHandler(CHANNEL_NAME, null);
}

@Test
Expand Down

0 comments on commit 2942e56

Please sign in to comment.