Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 5ed60f3

Browse files
robert-ancellrobert-ancell
authored
Don't leak binary messenger in tests (#53985)
Looks like the original code was just copied around. Should have no effect on the tests other than making it easier to detect other leaks.
1 parent ea1e53a commit 5ed60f3

File tree

4 files changed

+35
-35
lines changed

4 files changed

+35
-35
lines changed

‎shell/platform/linux/fl_basic_message_channel_test.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ TEST(FlBasicMessageChannelTest, SendMessageWithoutResponse) {
5151
return kSuccess;
5252
}));
5353

54-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
54+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
5555
g_autoptr(FlStandardMessageCodec) codec = fl_standard_message_codec_new();
5656
g_autoptr(FlBasicMessageChannel) channel =
5757
fl_basic_message_channel_new(messenger, "test", FL_MESSAGE_CODEC(codec));
@@ -84,7 +84,7 @@ TEST(FlBasicMessageChannelTest, SendMessageWithResponse) {
8484
g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
8585

8686
g_autoptr(FlEngine) engine = make_mock_engine();
87-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
87+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
8888
g_autoptr(FlStandardMessageCodec) codec = fl_standard_message_codec_new();
8989
g_autoptr(FlBasicMessageChannel) channel = fl_basic_message_channel_new(
9090
messenger, "test/echo", FL_MESSAGE_CODEC(codec));
@@ -114,7 +114,7 @@ TEST(FlBasicMessageChannelTest, SendFailure) {
114114
g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
115115

116116
g_autoptr(FlEngine) engine = make_mock_engine();
117-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
117+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
118118
g_autoptr(FlStandardMessageCodec) codec = fl_standard_message_codec_new();
119119
g_autoptr(FlBasicMessageChannel) channel = fl_basic_message_channel_new(
120120
messenger, "test/failure", FL_MESSAGE_CODEC(codec));
@@ -162,7 +162,7 @@ TEST(FlBasicMessageChannelTest, ReceiveMessage) {
162162
g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
163163

164164
g_autoptr(FlEngine) engine = make_mock_engine();
165-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
165+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
166166

167167
// Listen for messages from the engine.
168168
g_autoptr(FlStandardMessageCodec) codec = fl_standard_message_codec_new();
@@ -212,7 +212,7 @@ TEST(FlBasicMessageChannelTest, SendNullMessageWithResponse) {
212212
g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
213213

214214
g_autoptr(FlEngine) engine = make_mock_engine();
215-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
215+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
216216
g_autoptr(FlStandardMessageCodec) codec = fl_standard_message_codec_new();
217217
g_autoptr(FlBasicMessageChannel) channel = fl_basic_message_channel_new(
218218
messenger, "test/echo", FL_MESSAGE_CODEC(codec));

‎shell/platform/linux/fl_binary_messenger_test.cc‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -235,15 +235,15 @@ TEST(FlBinaryMessengerTest, FakeMessengerReceive) {
235235
// Checks sending nullptr for a message works.
236236
TEST(FlBinaryMessengerTest, SendNullptrMessage) {
237237
g_autoptr(FlEngine) engine = make_mock_engine();
238-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
238+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
239239
fl_binary_messenger_send_on_channel(messenger, "test/echo", nullptr, nullptr,
240240
nullptr, nullptr);
241241
}
242242

243243
// Checks sending a zero length message works.
244244
TEST(FlBinaryMessengerTest, SendEmptyMessage) {
245245
g_autoptr(FlEngine) engine = make_mock_engine();
246-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
246+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
247247
g_autoptr(GBytes) message = g_bytes_new(nullptr, 0);
248248
fl_binary_messenger_send_on_channel(messenger, "test/echo", message, nullptr,
249249
nullptr, nullptr);
@@ -272,7 +272,7 @@ TEST(FlBinaryMessengerTest, SendMessage) {
272272
g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
273273

274274
g_autoptr(FlEngine) engine = make_mock_engine();
275-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
275+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
276276
const char* text = "Hello World!";
277277
g_autoptr(GBytes) message = g_bytes_new(text, strlen(text));
278278
fl_binary_messenger_send_on_channel(messenger, "test/echo", message, nullptr,
@@ -302,7 +302,7 @@ TEST(FlBinaryMessengerTest, NullptrResponse) {
302302
g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
303303

304304
g_autoptr(FlEngine) engine = make_mock_engine();
305-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
305+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
306306
const char* text = "Hello World!";
307307
g_autoptr(GBytes) message = g_bytes_new(text, strlen(text));
308308
fl_binary_messenger_send_on_channel(messenger, "test/nullptr-response",
@@ -331,7 +331,7 @@ TEST(FlBinaryMessengerTest, SendFailure) {
331331
g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
332332

333333
g_autoptr(FlEngine) engine = make_mock_engine();
334-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
334+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
335335
fl_binary_messenger_send_on_channel(messenger, "test/failure", nullptr,
336336
nullptr, failure_response_cb, loop);
337337

@@ -384,7 +384,7 @@ TEST(FlBinaryMessengerTest, ReceiveMessage) {
384384
g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
385385

386386
g_autoptr(FlEngine) engine = make_mock_engine();
387-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
387+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
388388

389389
// Listen for messages from the engine.
390390
fl_binary_messenger_set_message_handler_on_channel(
@@ -448,7 +448,7 @@ TEST(FlBinaryMessengerTest, ResizeChannel) {
448448
EXPECT_TRUE(fl_engine_start(engine, &error));
449449
EXPECT_EQ(error, nullptr);
450450

451-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
451+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
452452
fl_binary_messenger_resize_channel(messenger, "flutter/test", 3);
453453

454454
EXPECT_TRUE(called);
@@ -494,7 +494,7 @@ TEST(FlBinaryMessengerTest, WarnsOnOverflowChannel) {
494494
EXPECT_TRUE(fl_engine_start(engine, &error));
495495
EXPECT_EQ(error, nullptr);
496496

497-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
497+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
498498
fl_binary_messenger_set_warns_on_channel_overflow(messenger, "flutter/test",
499499
false);
500500

@@ -511,7 +511,7 @@ static gboolean quit_main_loop_cb(gpointer user_data) {
511511
TEST(FlBinaryMessengerTest, ControlChannelErrorResponse) {
512512
g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
513513
g_autoptr(FlEngine) engine = make_mock_engine();
514-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
514+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
515515

516516
g_autoptr(GError) error = nullptr;
517517
EXPECT_TRUE(fl_engine_start(engine, &error));
@@ -608,7 +608,7 @@ TEST(FlBinaryMessengerTest, RespondOnBackgroundThread) {
608608
g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
609609

610610
g_autoptr(FlEngine) engine = make_mock_engine();
611-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
611+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
612612

613613
// Listen for messages from the engine.
614614
fl_binary_messenger_set_message_handler_on_channel(

‎shell/platform/linux/fl_event_channel_test.cc‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ TEST(FlEventChannelTest, Listen) {
8282
g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
8383

8484
g_autoptr(FlEngine) engine = make_mock_engine();
85-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
85+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
8686
g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
8787
FlEventChannel* channel = fl_event_channel_new(
8888
messenger, "test/standard-event", FL_METHOD_CODEC(codec));
@@ -141,7 +141,7 @@ TEST(FlEventChannelTest, ListenException) {
141141
g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
142142

143143
g_autoptr(FlEngine) engine = make_mock_engine();
144-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
144+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
145145
g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
146146
FlEventChannel* channel = fl_event_channel_new(
147147
messenger, "test/standard-event", FL_METHOD_CODEC(codec));
@@ -177,7 +177,7 @@ TEST(FlEventChannelTest, Cancel) {
177177
g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
178178

179179
g_autoptr(FlEngine) engine = make_mock_engine();
180-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
180+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
181181
g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
182182
FlEventChannel* channel = fl_event_channel_new(
183183
messenger, "test/standard-event", FL_METHOD_CODEC(codec));
@@ -245,7 +245,7 @@ TEST(FlEventChannelTest, CancelException) {
245245
data.count = 0;
246246

247247
g_autoptr(FlEngine) engine = make_mock_engine();
248-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
248+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
249249
g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
250250
FlEventChannel* channel = fl_event_channel_new(
251251
messenger, "test/standard-event", FL_METHOD_CODEC(codec));
@@ -294,7 +294,7 @@ TEST(FlEventChannelTest, Args) {
294294
g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
295295

296296
g_autoptr(FlEngine) engine = make_mock_engine();
297-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
297+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
298298
g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
299299
FlEventChannel* channel = fl_event_channel_new(
300300
messenger, "test/standard-event", FL_METHOD_CODEC(codec));
@@ -370,7 +370,7 @@ TEST(FlEventChannelTest, Test) {
370370
data.count = 0;
371371

372372
g_autoptr(FlEngine) engine = make_mock_engine();
373-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
373+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
374374
g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
375375
FlEventChannel* channel = fl_event_channel_new(
376376
messenger, "test/standard-event", FL_METHOD_CODEC(codec));
@@ -401,7 +401,7 @@ TEST(FlEventChannelTest, ReuseChannel) {
401401

402402
// Register an event channel.
403403
g_autoptr(FlEngine) engine = make_mock_engine();
404-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
404+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
405405
g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
406406
FlEventChannel* channel1 = fl_event_channel_new(
407407
messenger, "test/standard-event", FL_METHOD_CODEC(codec));
@@ -437,7 +437,7 @@ TEST(FlEventChannelTest, ReplaceChannel) {
437437

438438
// Register an event channel.
439439
g_autoptr(FlEngine) engine = make_mock_engine();
440-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
440+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
441441
g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
442442
FlEventChannel* channel1 = fl_event_channel_new(
443443
messenger, "test/standard-event", FL_METHOD_CODEC(codec));

‎shell/platform/linux/fl_method_channel_test.cc‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ TEST(FlMethodChannelTest, InvokeMethod) {
4040
g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
4141

4242
g_autoptr(FlEngine) engine = make_mock_engine();
43-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
43+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
4444
g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
4545
g_autoptr(FlMethodChannel) channel = fl_method_channel_new(
4646
messenger, "test/standard-method", FL_METHOD_CODEC(codec));
@@ -77,7 +77,7 @@ TEST(FlMethodChannelTest, InvokeMethodNullptrArgsMessage) {
7777
g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
7878

7979
g_autoptr(FlEngine) engine = make_mock_engine();
80-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
80+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
8181
g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
8282
g_autoptr(FlMethodChannel) channel = fl_method_channel_new(
8383
messenger, "test/standard-method", FL_METHOD_CODEC(codec));
@@ -121,7 +121,7 @@ TEST(FlMethodChannelTest, InvokeMethodError) {
121121
g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
122122

123123
g_autoptr(FlEngine) engine = make_mock_engine();
124-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
124+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
125125
g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
126126
g_autoptr(FlMethodChannel) channel = fl_method_channel_new(
127127
messenger, "test/standard-method", FL_METHOD_CODEC(codec));
@@ -158,7 +158,7 @@ TEST(FlMethodChannelTest, InvokeMethodNotImplemented) {
158158
g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
159159

160160
g_autoptr(FlEngine) engine = make_mock_engine();
161-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
161+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
162162
g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
163163
g_autoptr(FlMethodChannel) channel = fl_method_channel_new(
164164
messenger, "test/standard-method", FL_METHOD_CODEC(codec));
@@ -189,7 +189,7 @@ TEST(FlMethodChannelTest, InvokeMethodFailure) {
189189
g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
190190

191191
g_autoptr(FlEngine) engine = make_mock_engine();
192-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
192+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
193193
g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
194194
g_autoptr(FlMethodChannel) channel =
195195
fl_method_channel_new(messenger, "test/failure", FL_METHOD_CODEC(codec));
@@ -250,7 +250,7 @@ TEST(FlMethodChannelTest, ReceiveMethodCallRespondSuccess) {
250250
g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
251251

252252
g_autoptr(FlEngine) engine = make_mock_engine();
253-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
253+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
254254
g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
255255
g_autoptr(FlMethodChannel) channel = fl_method_channel_new(
256256
messenger, "test/standard-method", FL_METHOD_CODEC(codec));
@@ -330,7 +330,7 @@ TEST(FlMethodChannelTest, ReceiveMethodCallRespondError) {
330330
g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
331331

332332
g_autoptr(FlEngine) engine = make_mock_engine();
333-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
333+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
334334
g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
335335
g_autoptr(FlMethodChannel) channel = fl_method_channel_new(
336336
messenger, "test/standard-method", FL_METHOD_CODEC(codec));
@@ -398,7 +398,7 @@ TEST(FlMethodChannelTest, ReceiveMethodCallRespondNotImplemented) {
398398
g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
399399

400400
g_autoptr(FlEngine) engine = make_mock_engine();
401-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
401+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
402402
g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
403403
g_autoptr(FlMethodChannel) channel = fl_method_channel_new(
404404
messenger, "test/standard-method", FL_METHOD_CODEC(codec));
@@ -543,7 +543,7 @@ TEST(FlMethodChannelTest, ReceiveMethodCallRespondSuccessError) {
543543
g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
544544

545545
g_autoptr(FlEngine) engine = make_mock_engine();
546-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
546+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
547547
g_autoptr(TestMethodCodec) codec = test_method_codec_new();
548548
g_autoptr(FlMethodChannel) channel = fl_method_channel_new(
549549
messenger, "test/standard-method", FL_METHOD_CODEC(codec));
@@ -585,7 +585,7 @@ TEST(FlMethodChannelTest, ReceiveMethodCallRespondErrorError) {
585585
g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
586586

587587
g_autoptr(FlEngine) engine = make_mock_engine();
588-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
588+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
589589
g_autoptr(TestMethodCodec) codec = test_method_codec_new();
590590
g_autoptr(FlMethodChannel) channel = fl_method_channel_new(
591591
messenger, "test/standard-method", FL_METHOD_CODEC(codec));
@@ -639,7 +639,7 @@ TEST(FlMethodChannelTest, ReplaceADisposedMethodChannel) {
639639
// executed.
640640
g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
641641
g_autoptr(FlEngine) engine = make_mock_engine();
642-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
642+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
643643
g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
644644

645645
g_autoptr(FlValue) args = fl_value_new_list();
@@ -696,7 +696,7 @@ TEST(FlMethodChannelTest, DisposeAReplacedMethodChannel) {
696696
// executed.
697697
g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0);
698698
g_autoptr(FlEngine) engine = make_mock_engine();
699-
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
699+
g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine);
700700
g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
701701

702702
g_autoptr(FlValue) args = fl_value_new_list();

0 commit comments

Comments
 (0)