From 98b51c3a0a97d05c94915d91051ddc3309813aa6 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Thu, 18 Jul 2024 18:56:42 +1200 Subject: [PATCH] Don't leak binary messenger in tests --- .../linux/fl_basic_message_channel_test.cc | 10 ++++---- .../linux/fl_binary_messenger_test.cc | 20 ++++++++-------- shell/platform/linux/fl_event_channel_test.cc | 16 ++++++------- .../platform/linux/fl_method_channel_test.cc | 24 +++++++++---------- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/shell/platform/linux/fl_basic_message_channel_test.cc b/shell/platform/linux/fl_basic_message_channel_test.cc index 5a8eb635af4b5..4cdcca136759f 100644 --- a/shell/platform/linux/fl_basic_message_channel_test.cc +++ b/shell/platform/linux/fl_basic_message_channel_test.cc @@ -51,7 +51,7 @@ TEST(FlBasicMessageChannelTest, SendMessageWithoutResponse) { return kSuccess; })); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); g_autoptr(FlStandardMessageCodec) codec = fl_standard_message_codec_new(); g_autoptr(FlBasicMessageChannel) channel = fl_basic_message_channel_new(messenger, "test", FL_MESSAGE_CODEC(codec)); @@ -84,7 +84,7 @@ TEST(FlBasicMessageChannelTest, SendMessageWithResponse) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); g_autoptr(FlStandardMessageCodec) codec = fl_standard_message_codec_new(); g_autoptr(FlBasicMessageChannel) channel = fl_basic_message_channel_new( messenger, "test/echo", FL_MESSAGE_CODEC(codec)); @@ -114,7 +114,7 @@ TEST(FlBasicMessageChannelTest, SendFailure) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); g_autoptr(FlStandardMessageCodec) codec = fl_standard_message_codec_new(); g_autoptr(FlBasicMessageChannel) channel = fl_basic_message_channel_new( messenger, "test/failure", FL_MESSAGE_CODEC(codec)); @@ -162,7 +162,7 @@ TEST(FlBasicMessageChannelTest, ReceiveMessage) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); // Listen for messages from the engine. g_autoptr(FlStandardMessageCodec) codec = fl_standard_message_codec_new(); @@ -212,7 +212,7 @@ TEST(FlBasicMessageChannelTest, SendNullMessageWithResponse) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); g_autoptr(FlStandardMessageCodec) codec = fl_standard_message_codec_new(); g_autoptr(FlBasicMessageChannel) channel = fl_basic_message_channel_new( messenger, "test/echo", FL_MESSAGE_CODEC(codec)); diff --git a/shell/platform/linux/fl_binary_messenger_test.cc b/shell/platform/linux/fl_binary_messenger_test.cc index 85cbed4de90ba..133f6e4b57c20 100644 --- a/shell/platform/linux/fl_binary_messenger_test.cc +++ b/shell/platform/linux/fl_binary_messenger_test.cc @@ -235,7 +235,7 @@ TEST(FlBinaryMessengerTest, FakeMessengerReceive) { // Checks sending nullptr for a message works. TEST(FlBinaryMessengerTest, SendNullptrMessage) { g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); fl_binary_messenger_send_on_channel(messenger, "test/echo", nullptr, nullptr, nullptr, nullptr); } @@ -243,7 +243,7 @@ TEST(FlBinaryMessengerTest, SendNullptrMessage) { // Checks sending a zero length message works. TEST(FlBinaryMessengerTest, SendEmptyMessage) { g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); g_autoptr(GBytes) message = g_bytes_new(nullptr, 0); fl_binary_messenger_send_on_channel(messenger, "test/echo", message, nullptr, nullptr, nullptr); @@ -272,7 +272,7 @@ TEST(FlBinaryMessengerTest, SendMessage) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); const char* text = "Hello World!"; g_autoptr(GBytes) message = g_bytes_new(text, strlen(text)); fl_binary_messenger_send_on_channel(messenger, "test/echo", message, nullptr, @@ -302,7 +302,7 @@ TEST(FlBinaryMessengerTest, NullptrResponse) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); const char* text = "Hello World!"; g_autoptr(GBytes) message = g_bytes_new(text, strlen(text)); fl_binary_messenger_send_on_channel(messenger, "test/nullptr-response", @@ -331,7 +331,7 @@ TEST(FlBinaryMessengerTest, SendFailure) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); fl_binary_messenger_send_on_channel(messenger, "test/failure", nullptr, nullptr, failure_response_cb, loop); @@ -384,7 +384,7 @@ TEST(FlBinaryMessengerTest, ReceiveMessage) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); // Listen for messages from the engine. fl_binary_messenger_set_message_handler_on_channel( @@ -448,7 +448,7 @@ TEST(FlBinaryMessengerTest, ResizeChannel) { EXPECT_TRUE(fl_engine_start(engine, &error)); EXPECT_EQ(error, nullptr); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); fl_binary_messenger_resize_channel(messenger, "flutter/test", 3); EXPECT_TRUE(called); @@ -494,7 +494,7 @@ TEST(FlBinaryMessengerTest, WarnsOnOverflowChannel) { EXPECT_TRUE(fl_engine_start(engine, &error)); EXPECT_EQ(error, nullptr); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); fl_binary_messenger_set_warns_on_channel_overflow(messenger, "flutter/test", false); @@ -511,7 +511,7 @@ static gboolean quit_main_loop_cb(gpointer user_data) { TEST(FlBinaryMessengerTest, ControlChannelErrorResponse) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); g_autoptr(GError) error = nullptr; EXPECT_TRUE(fl_engine_start(engine, &error)); @@ -608,7 +608,7 @@ TEST(FlBinaryMessengerTest, RespondOnBackgroundThread) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); // Listen for messages from the engine. fl_binary_messenger_set_message_handler_on_channel( diff --git a/shell/platform/linux/fl_event_channel_test.cc b/shell/platform/linux/fl_event_channel_test.cc index 7515c34353f6f..7d338816208fc 100644 --- a/shell/platform/linux/fl_event_channel_test.cc +++ b/shell/platform/linux/fl_event_channel_test.cc @@ -82,7 +82,7 @@ TEST(FlEventChannelTest, Listen) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); FlEventChannel* channel = fl_event_channel_new( messenger, "test/standard-event", FL_METHOD_CODEC(codec)); @@ -141,7 +141,7 @@ TEST(FlEventChannelTest, ListenException) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); FlEventChannel* channel = fl_event_channel_new( messenger, "test/standard-event", FL_METHOD_CODEC(codec)); @@ -177,7 +177,7 @@ TEST(FlEventChannelTest, Cancel) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); FlEventChannel* channel = fl_event_channel_new( messenger, "test/standard-event", FL_METHOD_CODEC(codec)); @@ -245,7 +245,7 @@ TEST(FlEventChannelTest, CancelException) { data.count = 0; g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); FlEventChannel* channel = fl_event_channel_new( messenger, "test/standard-event", FL_METHOD_CODEC(codec)); @@ -294,7 +294,7 @@ TEST(FlEventChannelTest, Args) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); FlEventChannel* channel = fl_event_channel_new( messenger, "test/standard-event", FL_METHOD_CODEC(codec)); @@ -370,7 +370,7 @@ TEST(FlEventChannelTest, Test) { data.count = 0; g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); FlEventChannel* channel = fl_event_channel_new( messenger, "test/standard-event", FL_METHOD_CODEC(codec)); @@ -401,7 +401,7 @@ TEST(FlEventChannelTest, ReuseChannel) { // Register an event channel. g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); FlEventChannel* channel1 = fl_event_channel_new( messenger, "test/standard-event", FL_METHOD_CODEC(codec)); @@ -437,7 +437,7 @@ TEST(FlEventChannelTest, ReplaceChannel) { // Register an event channel. g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); FlEventChannel* channel1 = fl_event_channel_new( messenger, "test/standard-event", FL_METHOD_CODEC(codec)); diff --git a/shell/platform/linux/fl_method_channel_test.cc b/shell/platform/linux/fl_method_channel_test.cc index bcbaead6fb59a..7aa0c6572cd0f 100644 --- a/shell/platform/linux/fl_method_channel_test.cc +++ b/shell/platform/linux/fl_method_channel_test.cc @@ -40,7 +40,7 @@ TEST(FlMethodChannelTest, InvokeMethod) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); g_autoptr(FlMethodChannel) channel = fl_method_channel_new( messenger, "test/standard-method", FL_METHOD_CODEC(codec)); @@ -77,7 +77,7 @@ TEST(FlMethodChannelTest, InvokeMethodNullptrArgsMessage) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); g_autoptr(FlMethodChannel) channel = fl_method_channel_new( messenger, "test/standard-method", FL_METHOD_CODEC(codec)); @@ -121,7 +121,7 @@ TEST(FlMethodChannelTest, InvokeMethodError) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); g_autoptr(FlMethodChannel) channel = fl_method_channel_new( messenger, "test/standard-method", FL_METHOD_CODEC(codec)); @@ -158,7 +158,7 @@ TEST(FlMethodChannelTest, InvokeMethodNotImplemented) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); g_autoptr(FlMethodChannel) channel = fl_method_channel_new( messenger, "test/standard-method", FL_METHOD_CODEC(codec)); @@ -189,7 +189,7 @@ TEST(FlMethodChannelTest, InvokeMethodFailure) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); g_autoptr(FlMethodChannel) channel = fl_method_channel_new(messenger, "test/failure", FL_METHOD_CODEC(codec)); @@ -250,7 +250,7 @@ TEST(FlMethodChannelTest, ReceiveMethodCallRespondSuccess) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); g_autoptr(FlMethodChannel) channel = fl_method_channel_new( messenger, "test/standard-method", FL_METHOD_CODEC(codec)); @@ -330,7 +330,7 @@ TEST(FlMethodChannelTest, ReceiveMethodCallRespondError) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); g_autoptr(FlMethodChannel) channel = fl_method_channel_new( messenger, "test/standard-method", FL_METHOD_CODEC(codec)); @@ -398,7 +398,7 @@ TEST(FlMethodChannelTest, ReceiveMethodCallRespondNotImplemented) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); g_autoptr(FlMethodChannel) channel = fl_method_channel_new( messenger, "test/standard-method", FL_METHOD_CODEC(codec)); @@ -543,7 +543,7 @@ TEST(FlMethodChannelTest, ReceiveMethodCallRespondSuccessError) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); g_autoptr(TestMethodCodec) codec = test_method_codec_new(); g_autoptr(FlMethodChannel) channel = fl_method_channel_new( messenger, "test/standard-method", FL_METHOD_CODEC(codec)); @@ -585,7 +585,7 @@ TEST(FlMethodChannelTest, ReceiveMethodCallRespondErrorError) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); g_autoptr(TestMethodCodec) codec = test_method_codec_new(); g_autoptr(FlMethodChannel) channel = fl_method_channel_new( messenger, "test/standard-method", FL_METHOD_CODEC(codec)); @@ -639,7 +639,7 @@ TEST(FlMethodChannelTest, ReplaceADisposedMethodChannel) { // executed. g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); g_autoptr(FlValue) args = fl_value_new_list(); @@ -696,7 +696,7 @@ TEST(FlMethodChannelTest, DisposeAReplacedMethodChannel) { // executed. g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); g_autoptr(FlEngine) engine = make_mock_engine(); - FlBinaryMessenger* messenger = fl_binary_messenger_new(engine); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); g_autoptr(FlValue) args = fl_value_new_list();