3333#include " flutter/testing/test_dart_native_resolver.h"
3434#include " gtest/gtest.h"
3535
36- // CREATE_NATIVE_ENTRY and MOCK_ENGINE_PROC are leaky by design
36+ // CREATE_FFI_LAMBDA and MOCK_ENGINE_PROC are leaky by design
3737// NOLINTBEGIN(clang-analyzer-core.StackAddressEscape)
3838
3939@interface FlutterEngine (Test)
@@ -153,12 +153,12 @@ @implementation MockableFlutterEngine
153153
154154 // Block until notified by the Dart test of the value of Platform.executable.
155155 BOOL signaled = NO ;
156- AddNativeCallback (" NotifyStringValue" , CREATE_NATIVE_ENTRY ([&](Dart_NativeArguments args ) {
157- const auto dart_string = tonic::DartConverter<std::string>:: FromDart (
158- Dart_GetNativeArgument (args, 0 ) );
159- EXPECT_EQ (executable_name, dart_string);
160- signaled = YES ;
161- }));
156+ AddFfiNativeCallback (" NotifyStringValue" , CREATE_FFI_LAMBDA ([&](Dart_Handle value ) {
157+ const auto dart_string =
158+ tonic::DartConverter<std::string>:: FromDart (value );
159+ EXPECT_EQ (executable_name, dart_string);
160+ signaled = YES ;
161+ }));
162162
163163 // Launch the test entrypoint.
164164 EXPECT_TRUE ([engine runWithEntrypoint: @" executableNameNotNull" ]);
@@ -216,8 +216,7 @@ @implementation MockableFlutterEngine
216216TEST_F (FlutterEngineTest, CanLogToStdout) {
217217 // Block until completion of print statement.
218218 BOOL signaled = NO ;
219- AddNativeCallback (" SignalNativeTest" ,
220- CREATE_NATIVE_ENTRY ([&](Dart_NativeArguments args) { signaled = YES ; }));
219+ AddFfiNativeCallback (" SignalNativeTest" , CREATE_FFI_LAMBDA ([&]() { signaled = YES ; }));
221220
222221 // Replace stdout stream buffer with our own.
223222 FlutterStringOutputWriter* writer = [[FlutterStringOutputWriter alloc ] init ];
@@ -242,16 +241,16 @@ @implementation MockableFlutterEngine
242241
243242 // Latch to ensure the entire layer tree has been generated and presented.
244243 BOOL signaled = NO ;
245- AddNativeCallback (" SignalNativeTest" , CREATE_NATIVE_ENTRY ([&](Dart_NativeArguments args ) {
246- CALayer * rootLayer = engine.viewController .flutterView .layer ;
247- EXPECT_TRUE (rootLayer.backgroundColor != nil );
248- if (rootLayer.backgroundColor != nil ) {
249- NSColor * actualBackgroundColor =
250- [NSColor colorWithCGColor: rootLayer.backgroundColor];
251- EXPECT_EQ (actualBackgroundColor, [NSColor blackColor ]);
252- }
253- signaled = YES ;
254- }));
244+ AddFfiNativeCallback (" SignalNativeTest" , CREATE_FFI_LAMBDA ([&]() {
245+ CALayer * rootLayer = engine.viewController .flutterView .layer ;
246+ EXPECT_TRUE (rootLayer.backgroundColor != nil );
247+ if (rootLayer.backgroundColor != nil ) {
248+ NSColor * actualBackgroundColor =
249+ [NSColor colorWithCGColor: rootLayer.backgroundColor];
250+ EXPECT_EQ (actualBackgroundColor, [NSColor blackColor ]);
251+ }
252+ signaled = YES ;
253+ }));
255254
256255 // Launch the test entrypoint.
257256 EXPECT_TRUE ([engine runWithEntrypoint: @" backgroundTest" ]);
@@ -273,16 +272,16 @@ @implementation MockableFlutterEngine
273272
274273 // Latch to ensure the entire layer tree has been generated and presented.
275274 BOOL signaled = NO ;
276- AddNativeCallback (" SignalNativeTest" , CREATE_NATIVE_ENTRY ([&](Dart_NativeArguments args ) {
277- CALayer * rootLayer = engine.viewController .flutterView .layer ;
278- EXPECT_TRUE (rootLayer.backgroundColor != nil );
279- if (rootLayer.backgroundColor != nil ) {
280- NSColor * actualBackgroundColor =
281- [NSColor colorWithCGColor: rootLayer.backgroundColor];
282- EXPECT_EQ (actualBackgroundColor, [NSColor whiteColor ]);
283- }
284- signaled = YES ;
285- }));
275+ AddFfiNativeCallback (" SignalNativeTest" , CREATE_FFI_LAMBDA ([&]() {
276+ CALayer * rootLayer = engine.viewController .flutterView .layer ;
277+ EXPECT_TRUE (rootLayer.backgroundColor != nil );
278+ if (rootLayer.backgroundColor != nil ) {
279+ NSColor * actualBackgroundColor =
280+ [NSColor colorWithCGColor: rootLayer.backgroundColor];
281+ EXPECT_EQ (actualBackgroundColor, [NSColor whiteColor ]);
282+ }
283+ signaled = YES ;
284+ }));
286285
287286 // Launch the test entrypoint.
288287 EXPECT_TRUE ([engine runWithEntrypoint: @" backgroundTest" ]);
@@ -512,8 +511,7 @@ @implementation MockableFlutterEngine
512511
513512TEST_F (FlutterEngineTest, NativeCallbacks) {
514513 BOOL latch_called = NO ;
515- AddNativeCallback (" SignalNativeTest" ,
516- CREATE_NATIVE_ENTRY ([&](Dart_NativeArguments args) { latch_called = YES ; }));
514+ AddFfiNativeCallback (" SignalNativeTest" , CREATE_FFI_LAMBDA ([&]() { latch_called = YES ; }));
517515
518516 FlutterEngine* engine = GetFlutterEngine ();
519517 EXPECT_TRUE ([engine runWithEntrypoint: @" nativeCallback" ]);
@@ -937,14 +935,13 @@ @implementation MockableFlutterEngine
937935
938936 BOOL signaled = NO ;
939937 std::optional<int64_t > engineId;
940- AddNativeCallback (" NotifyEngineId" , CREATE_NATIVE_ENTRY ([&](Dart_NativeArguments args) {
941- const auto argument = Dart_GetNativeArgument (args, 0 );
942- if (!Dart_IsNull (argument)) {
943- const auto id = tonic::DartConverter<int64_t >::FromDart (argument);
944- engineId = id ;
945- }
946- signaled = YES ;
947- }));
938+ AddFfiNativeCallback (" NotifyEngineId" , CREATE_FFI_LAMBDA ([&](Dart_Handle argument) {
939+ if (!Dart_IsNull (argument)) {
940+ const auto id = tonic::DartConverter<int64_t >::FromDart (argument);
941+ engineId = id ;
942+ }
943+ signaled = YES ;
944+ }));
948945
949946 EXPECT_TRUE ([engine runWithEntrypoint: @" testEngineId" ]);
950947 while (!signaled) {
0 commit comments