From 15fad12becd3017e0e5b786ff6fd55f694b540f3 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Fri, 13 Dec 2024 16:29:40 +1300 Subject: [PATCH 1/2] Migrate FlBinaryMessenger using embedder API instead of mock engine. This allows us to remove most of the remaining mock engine code. --- shell/platform/linux/fl_binary_messenger.cc | 40 +- .../linux/fl_binary_messenger_private.h | 19 + .../linux/fl_binary_messenger_test.cc | 756 ++++++++---------- shell/platform/linux/testing/mock_engine.cc | 166 ---- 4 files changed, 362 insertions(+), 619 deletions(-) diff --git a/shell/platform/linux/fl_binary_messenger.cc b/shell/platform/linux/fl_binary_messenger.cc index 4453456ec1113..c0d6773e7b284 100644 --- a/shell/platform/linux/fl_binary_messenger.cc +++ b/shell/platform/linux/fl_binary_messenger.cc @@ -155,21 +155,9 @@ static gboolean fl_binary_messenger_platform_message_cb( GBytes* message, const FlutterPlatformMessageResponseHandle* response_handle, void* user_data) { - FlBinaryMessengerImpl* self = FL_BINARY_MESSENGER_IMPL(user_data); - - PlatformMessageHandler* handler = static_cast( - g_hash_table_lookup(self->platform_message_handlers, channel)); - if (handler == nullptr) { - return FALSE; - } - - g_autoptr(FlBinaryMessengerResponseHandleImpl) handle = - fl_binary_messenger_response_handle_impl_new(self, response_handle); - handler->message_handler(FL_BINARY_MESSENGER(self), channel, message, - FL_BINARY_MESSENGER_RESPONSE_HANDLE(handle), - handler->message_handler_data); - - return TRUE; + FlBinaryMessenger* self = FL_BINARY_MESSENGER(user_data); + return fl_binary_messenger_handle_message(self, channel, message, + response_handle); } static void fl_binary_messenger_impl_dispose(GObject* object) { @@ -487,6 +475,28 @@ G_MODULE_EXPORT void fl_binary_messenger_set_warns_on_channel_overflow( self, channel, warns); } +gboolean fl_binary_messenger_handle_message( + FlBinaryMessenger* messenger, + const gchar* channel, + GBytes* message, + const FlutterPlatformMessageResponseHandle* response_handle) { + FlBinaryMessengerImpl* self = FL_BINARY_MESSENGER_IMPL(messenger); + + PlatformMessageHandler* handler = static_cast( + g_hash_table_lookup(self->platform_message_handlers, channel)); + if (handler == nullptr) { + return FALSE; + } + + g_autoptr(FlBinaryMessengerResponseHandleImpl) handle = + fl_binary_messenger_response_handle_impl_new(self, response_handle); + handler->message_handler(FL_BINARY_MESSENGER(self), channel, message, + FL_BINARY_MESSENGER_RESPONSE_HANDLE(handle), + handler->message_handler_data); + + return TRUE; +} + void fl_binary_messenger_shutdown(FlBinaryMessenger* self) { g_return_if_fail(FL_IS_BINARY_MESSENGER(self)); diff --git a/shell/platform/linux/fl_binary_messenger_private.h b/shell/platform/linux/fl_binary_messenger_private.h index e444e8f94e31b..0925759972eaa 100644 --- a/shell/platform/linux/fl_binary_messenger_private.h +++ b/shell/platform/linux/fl_binary_messenger_private.h @@ -7,6 +7,7 @@ #include +#include "flutter/shell/platform/embedder/embedder.h" #include "flutter/shell/platform/linux/public/flutter_linux/fl_engine.h" G_BEGIN_DECLS @@ -22,6 +23,24 @@ G_BEGIN_DECLS */ FlBinaryMessenger* fl_binary_messenger_new(FlEngine* engine); +/** + * fl_binary_messenger_handle_message: + * @messenger: an #FlBinaryMessenger. + * @channel: channel message received on. + * @message: message data. + * @response_handle: handle to provide to + * fl_engine_send_platform_message_response(). + * + * Handles a message received from the engine. Available for testing purposes. + * + * Returns: %TRUE if the message is handled. + */ +gboolean fl_binary_messenger_handle_message( + FlBinaryMessenger* messenger, + const gchar* channel, + GBytes* message, + const FlutterPlatformMessageResponseHandle* response_handle); + /** * fl_binary_messenger_shutdown: * @messenger: an #FlBinaryMessenger. diff --git a/shell/platform/linux/fl_binary_messenger_test.cc b/shell/platform/linux/fl_binary_messenger_test.cc index 8f03eb514057c..49d75a0f0fbef 100644 --- a/shell/platform/linux/fl_binary_messenger_test.cc +++ b/shell/platform/linux/fl_binary_messenger_test.cc @@ -13,419 +13,367 @@ #include "flutter/shell/platform/linux/fl_binary_messenger_private.h" #include "flutter/shell/platform/linux/fl_engine_private.h" #include "flutter/shell/platform/linux/public/flutter_linux/fl_binary_messenger.h" -#include "flutter/shell/platform/linux/public/flutter_linux/fl_method_channel.h" #include "flutter/shell/platform/linux/public/flutter_linux/fl_standard_method_codec.h" -#include "flutter/shell/platform/linux/testing/fl_test.h" -#include "flutter/shell/platform/linux/testing/mock_renderer.h" -G_DECLARE_FINAL_TYPE(FlFakeBinaryMessengerResponseHandle, - fl_fake_binary_messenger_response_handle, - FL, - FAKE_BINARY_MESSENGER_RESPONSE_HANDLE, - FlBinaryMessengerResponseHandle) - -struct _FlFakeBinaryMessengerResponseHandle { - FlBinaryMessengerResponseHandle parent_instance; -}; - -G_DEFINE_TYPE(FlFakeBinaryMessengerResponseHandle, - fl_fake_binary_messenger_response_handle, - fl_binary_messenger_response_handle_get_type()); - -static void fl_fake_binary_messenger_response_handle_class_init( - FlFakeBinaryMessengerResponseHandleClass* klass) {} - -static void fl_fake_binary_messenger_response_handle_init( - FlFakeBinaryMessengerResponseHandle* self) {} - -FlFakeBinaryMessengerResponseHandle* -fl_fake_binary_messenger_response_handle_new() { - return FL_FAKE_BINARY_MESSENGER_RESPONSE_HANDLE( - g_object_new(fl_fake_binary_messenger_response_handle_get_type(), NULL)); -} - -G_DECLARE_FINAL_TYPE(FlFakeBinaryMessenger, - fl_fake_binary_messenger, - FL, - FAKE_BINARY_MESSENGER, - GObject) - -struct _FlFakeBinaryMessenger { - GObject parent_instance; - - GMainLoop* loop; - GAsyncReadyCallback send_callback; - gpointer send_callback_user_data; - FlBinaryMessengerMessageHandler message_handler; - gpointer message_handler_user_data; -}; +// Checks can send a message. +TEST(FlBinaryMessengerTest, Send) { + g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); -static void fl_fake_binary_messenger_iface_init( - FlBinaryMessengerInterface* iface); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); -G_DEFINE_TYPE_WITH_CODE( - FlFakeBinaryMessenger, - fl_fake_binary_messenger, - G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE(fl_binary_messenger_get_type(), - fl_fake_binary_messenger_iface_init)) + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); -static void fl_fake_binary_messenger_class_init( - FlFakeBinaryMessengerClass* klass) {} + FlutterDataCallback response_callback; + void* response_callback_user_data; + embedder_api->PlatformMessageCreateResponseHandle = MOCK_ENGINE_PROC( + PlatformMessageCreateResponseHandle, + ([&response_callback, &response_callback_user_data]( + auto engine, FlutterDataCallback data_callback, void* user_data, + FlutterPlatformMessageResponseHandle** response_out) { + response_callback = data_callback; + response_callback_user_data = user_data; + return kSuccess; + })); + embedder_api->SendPlatformMessage = MOCK_ENGINE_PROC( + SendPlatformMessage, + ([&response_callback, &response_callback_user_data]( + auto engine, const FlutterPlatformMessage* message) { + EXPECT_STREQ(message->channel, "test"); + g_autofree gchar* text = + g_strndup(reinterpret_cast(message->message), + message->message_size); + EXPECT_STREQ(text, "Marco!"); + + const gchar* response = "Polo!"; + response_callback(reinterpret_cast(response), + strlen(response), response_callback_user_data); -static gboolean send_message_cb(gpointer user_data) { - FlFakeBinaryMessenger* self = FL_FAKE_BINARY_MESSENGER(user_data); + return kSuccess; + })); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); const char* text = "Marco!"; g_autoptr(GBytes) message = g_bytes_new(text, strlen(text)); - self->message_handler(FL_BINARY_MESSENGER(self), "CHANNEL", message, - FL_BINARY_MESSENGER_RESPONSE_HANDLE( - fl_fake_binary_messenger_response_handle_new()), - self->message_handler_user_data); - - return FALSE; -} - -static void set_message_handler_on_channel( - FlBinaryMessenger* messenger, - const gchar* channel, - FlBinaryMessengerMessageHandler handler, - gpointer user_data, - GDestroyNotify destroy_notify) { - FlFakeBinaryMessenger* self = FL_FAKE_BINARY_MESSENGER(messenger); + fl_binary_messenger_send_on_channel( + messenger, "test", message, nullptr, + [](GObject* object, GAsyncResult* result, gpointer user_data) { + g_autoptr(GError) error = nullptr; + g_autoptr(GBytes) message = fl_binary_messenger_send_on_channel_finish( + FL_BINARY_MESSENGER(object), result, &error); + EXPECT_NE(message, nullptr); + EXPECT_EQ(error, nullptr); + + g_autofree gchar* text = g_strndup( + static_cast(g_bytes_get_data(message, nullptr)), + g_bytes_get_size(message)); + EXPECT_STREQ(text, "Polo!"); + + g_main_loop_quit(static_cast(user_data)); + }, + loop); - EXPECT_STREQ(channel, "CHANNEL"); - - // Send message. - self->message_handler = handler; - self->message_handler_user_data = user_data; - g_idle_add(send_message_cb, messenger); + g_main_loop_run(loop); } -static gboolean send_response(FlBinaryMessenger* messenger, - FlBinaryMessengerResponseHandle* response_handle, - GBytes* response, - GError** error) { - FlFakeBinaryMessenger* self = FL_FAKE_BINARY_MESSENGER(messenger); - - EXPECT_TRUE(FL_IS_FAKE_BINARY_MESSENGER_RESPONSE_HANDLE(response_handle)); - - g_autofree gchar* text = - g_strndup(static_cast(g_bytes_get_data(response, nullptr)), - g_bytes_get_size(response)); - EXPECT_STREQ(text, "Polo!"); +// Checks sending nullptr for a message works. +TEST(FlBinaryMessengerTest, SendNullptr) { + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); - g_main_loop_quit(self->loop); + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); - return TRUE; -} + bool called = false; + embedder_api->SendPlatformMessage = MOCK_ENGINE_PROC( + SendPlatformMessage, + ([&called](auto engine, const FlutterPlatformMessage* message) { + called = true; -static gboolean send_ready_cb(gpointer user_data) { - FlFakeBinaryMessenger* self = FL_FAKE_BINARY_MESSENGER(user_data); + EXPECT_STREQ(message->channel, "test"); + EXPECT_EQ(message->message_size, static_cast(0)); - self->send_callback(G_OBJECT(self), NULL, self->send_callback_user_data); + return kSuccess; + })); - return FALSE; + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); + fl_binary_messenger_send_on_channel(messenger, "test", nullptr, nullptr, + nullptr, nullptr); + EXPECT_TRUE(called); } -static void send_on_channel(FlBinaryMessenger* messenger, - const gchar* channel, - GBytes* message, - GCancellable* cancellable, - GAsyncReadyCallback callback, - gpointer user_data) { - FlFakeBinaryMessenger* self = FL_FAKE_BINARY_MESSENGER(messenger); - - EXPECT_STREQ(channel, "CHANNEL"); - g_autofree gchar* text = - g_strndup(static_cast(g_bytes_get_data(message, nullptr)), - g_bytes_get_size(message)); - EXPECT_STREQ(text, "Marco!"); - - // Send response. - self->send_callback = callback; - self->send_callback_user_data = user_data; - g_idle_add(send_ready_cb, messenger); -} +// Checks sending a zero length message works. +TEST(FlBinaryMessengerTest, SendEmpty) { + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); -static GBytes* send_on_channel_finish(FlBinaryMessenger* messenger, - GAsyncResult* result, - GError** error) { - const char* text = "Polo!"; - return g_bytes_new(text, strlen(text)); -} + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); -static void resize_channel(FlBinaryMessenger* messenger, - const gchar* channel, - int64_t new_size) { - // Fake implementation. Do nothing. -} + bool called = false; + embedder_api->SendPlatformMessage = MOCK_ENGINE_PROC( + SendPlatformMessage, + ([&called](auto engine, const FlutterPlatformMessage* message) { + called = true; -static void set_warns_on_channel_overflow(FlBinaryMessenger* messenger, - const gchar* channel, - bool warns) { - // Fake implementation. Do nothing. -} + EXPECT_STREQ(message->channel, "test"); + EXPECT_EQ(message->message_size, static_cast(0)); -static void fl_fake_binary_messenger_iface_init( - FlBinaryMessengerInterface* iface) { - iface->set_message_handler_on_channel = set_message_handler_on_channel; - iface->send_response = send_response; - iface->send_on_channel = send_on_channel; - iface->send_on_channel_finish = send_on_channel_finish; - iface->resize_channel = resize_channel; - iface->set_warns_on_channel_overflow = set_warns_on_channel_overflow; + return kSuccess; + })); + 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", message, nullptr, + nullptr, nullptr); + EXPECT_TRUE(called); } -static void fl_fake_binary_messenger_init(FlFakeBinaryMessenger* self) {} +// Checks the engine returning a nullptr message work. +TEST(FlBinaryMessengerTest, NullptrResponse) { + g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); -static FlBinaryMessenger* fl_fake_binary_messenger_new(GMainLoop* loop) { - FlFakeBinaryMessenger* self = FL_FAKE_BINARY_MESSENGER( - g_object_new(fl_fake_binary_messenger_get_type(), NULL)); - self->loop = loop; - return FL_BINARY_MESSENGER(self); -} + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); -// Called when the message response is received in the FakeMessengerSend test. -static void fake_response_cb(GObject* object, - GAsyncResult* result, - gpointer user_data) { g_autoptr(GError) error = nullptr; - g_autoptr(GBytes) message = fl_binary_messenger_send_on_channel_finish( - FL_BINARY_MESSENGER(object), result, &error); - EXPECT_NE(message, nullptr); + EXPECT_TRUE(fl_engine_start(engine, &error)); EXPECT_EQ(error, nullptr); - g_autofree gchar* text = - g_strndup(static_cast(g_bytes_get_data(message, nullptr)), - g_bytes_get_size(message)); - EXPECT_STREQ(text, "Polo!"); - - g_main_loop_quit(static_cast(user_data)); -} + FlutterDataCallback response_callback; + void* response_callback_user_data; + embedder_api->PlatformMessageCreateResponseHandle = MOCK_ENGINE_PROC( + PlatformMessageCreateResponseHandle, + ([&response_callback, &response_callback_user_data]( + auto engine, FlutterDataCallback data_callback, void* user_data, + FlutterPlatformMessageResponseHandle** response_out) { + response_callback = data_callback; + response_callback_user_data = user_data; + return kSuccess; + })); + embedder_api->SendPlatformMessage = MOCK_ENGINE_PROC( + SendPlatformMessage, + ([&response_callback, &response_callback_user_data]( + auto engine, const FlutterPlatformMessage* message) { + EXPECT_STREQ(message->channel, "test"); + g_autofree gchar* text = + g_strndup(reinterpret_cast(message->message), + message->message_size); + EXPECT_STREQ(text, "Hello World!"); -// Checks can make a fake messenger and send a message. -TEST(FlBinaryMessengerTest, FakeMessengerSend) { - g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); + response_callback(nullptr, 0, response_callback_user_data); - g_autoptr(FlBinaryMessenger) messenger = fl_fake_binary_messenger_new(loop); - EXPECT_TRUE(FL_IS_FAKE_BINARY_MESSENGER(messenger)); + return kSuccess; + })); - const char* text = "Marco!"; + 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, "CHANNEL", message, nullptr, - fake_response_cb, loop); - - // Blocks here until fake_response_cb is called. - g_main_loop_run(loop); -} - -// Called when a message is received in the FakeMessengerReceive test. -static void fake_message_cb(FlBinaryMessenger* messenger, - const gchar* channel, - GBytes* message, - FlBinaryMessengerResponseHandle* response_handle, - gpointer user_data) { - EXPECT_STREQ(channel, "CHANNEL"); - - EXPECT_NE(message, nullptr); - g_autofree gchar* text = - g_strndup(static_cast(g_bytes_get_data(message, nullptr)), - g_bytes_get_size(message)); - EXPECT_STREQ(text, "Marco!"); - - const char* response_text = "Polo!"; - g_autoptr(GBytes) response = - g_bytes_new(response_text, strlen(response_text)); - g_autoptr(GError) error = nullptr; - EXPECT_TRUE(fl_binary_messenger_send_response(messenger, response_handle, - response, &error)); - EXPECT_EQ(error, nullptr); -} + fl_binary_messenger_send_on_channel( + messenger, "test", message, nullptr, + [](GObject* object, GAsyncResult* result, gpointer user_data) { + g_autoptr(GError) error = nullptr; + g_autoptr(GBytes) message = fl_binary_messenger_send_on_channel_finish( + FL_BINARY_MESSENGER(object), result, &error); + EXPECT_NE(message, nullptr); + EXPECT_EQ(error, nullptr); -// Checks can make a fake messenger and receive a message. -TEST(FlBinaryMessengerTest, FakeMessengerReceive) { - g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); - - g_autoptr(FlBinaryMessenger) messenger = fl_fake_binary_messenger_new(loop); - EXPECT_TRUE(FL_IS_FAKE_BINARY_MESSENGER(messenger)); + EXPECT_EQ(g_bytes_get_size(message), static_cast(0)); - fl_binary_messenger_set_message_handler_on_channel( - messenger, "CHANNEL", fake_message_cb, nullptr, nullptr); + g_main_loop_quit(static_cast(user_data)); + }, + loop); - // Blocks here until response is received in fake messenger. g_main_loop_run(loop); } -// Checks sending nullptr for a message works. -TEST(FlBinaryMessengerTest, SendNullptrMessage) { - g_autoptr(FlEngine) engine = make_mock_engine(); - g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); - fl_binary_messenger_send_on_channel(messenger, "test/echo", nullptr, nullptr, - nullptr, nullptr); -} +// Checks the engine reporting a send failure is handled. +TEST(FlBinaryMessengerTest, SendFailure) { + g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); -// Checks sending a zero length message works. -TEST(FlBinaryMessengerTest, SendEmptyMessage) { - g_autoptr(FlEngine) engine = make_mock_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); -} + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); -// Called when the message response is received in the SendMessage test. -static void echo_response_cb(GObject* object, - GAsyncResult* result, - gpointer user_data) { g_autoptr(GError) error = nullptr; - g_autoptr(GBytes) message = fl_binary_messenger_send_on_channel_finish( - FL_BINARY_MESSENGER(object), result, &error); - EXPECT_NE(message, nullptr); + EXPECT_TRUE(fl_engine_start(engine, &error)); EXPECT_EQ(error, nullptr); - g_autofree gchar* text = - g_strndup(static_cast(g_bytes_get_data(message, nullptr)), - g_bytes_get_size(message)); - EXPECT_STREQ(text, "Hello World!"); - - g_main_loop_quit(static_cast(user_data)); -} - -// Checks sending a message works. -TEST(FlBinaryMessengerTest, SendMessage) { - g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); + embedder_api->SendPlatformMessage = + MOCK_ENGINE_PROC(SendPlatformMessage, + ([](auto engine, const FlutterPlatformMessage* message) { + EXPECT_STREQ(message->channel, "test"); + return kInternalInconsistency; + })); - g_autoptr(FlEngine) engine = make_mock_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, - echo_response_cb, loop); + fl_binary_messenger_send_on_channel( + messenger, "test", nullptr, nullptr, + [](GObject* object, GAsyncResult* result, gpointer user_data) { + g_autoptr(GError) error = nullptr; + g_autoptr(GBytes) message = fl_binary_messenger_send_on_channel_finish( + FL_BINARY_MESSENGER(object), result, &error); + EXPECT_EQ(message, nullptr); + EXPECT_NE(error, nullptr); + EXPECT_STREQ(error->message, "Failed to send platform messages"); + + g_main_loop_quit(static_cast(user_data)); + }, + loop); - // Blocks here until echo_response_cb is called. g_main_loop_run(loop); } -// Called when the message response is received in the NullptrResponse test. -static void nullptr_response_cb(GObject* object, - GAsyncResult* result, - gpointer user_data) { +// Checks can receive a message. +TEST(FlBinaryMessengerTest, Receive) { + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(GError) error = nullptr; - g_autoptr(GBytes) message = fl_binary_messenger_send_on_channel_finish( - FL_BINARY_MESSENGER(object), result, &error); - EXPECT_NE(message, nullptr); + EXPECT_TRUE(fl_engine_start(engine, &error)); EXPECT_EQ(error, nullptr); - EXPECT_EQ(g_bytes_get_size(message), static_cast(0)); + bool called = false; + embedder_api->SendPlatformMessageResponse = MOCK_ENGINE_PROC( + SendPlatformMessageResponse, + ([&called](auto engine, + const FlutterPlatformMessageResponseHandle* handle, + const uint8_t* data, size_t data_length) { + called = true; - g_main_loop_quit(static_cast(user_data)); -} + int fake_handle = *reinterpret_cast(handle); + EXPECT_EQ(fake_handle, 42); -// Checks the engine returning a nullptr message work. -TEST(FlBinaryMessengerTest, NullptrResponse) { - g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); + g_autofree gchar* text = + g_strndup(reinterpret_cast(data), data_length); + EXPECT_STREQ(text, "Polo!"); - g_autoptr(FlEngine) engine = make_mock_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", - message, nullptr, nullptr_response_cb, - loop); + return kSuccess; + })); - // Blocks here until nullptr_response_cb is called. - g_main_loop_run(loop); -} + FlBinaryMessenger* messenger = fl_engine_get_binary_messenger(engine); -// Called when the message response is received in the SendFailure test. -static void failure_response_cb(GObject* object, - GAsyncResult* result, - gpointer user_data) { - g_autoptr(GError) error = nullptr; - g_autoptr(GBytes) message = fl_binary_messenger_send_on_channel_finish( - FL_BINARY_MESSENGER(object), result, &error); - EXPECT_EQ(message, nullptr); - EXPECT_NE(error, nullptr); + // Listen for message. + fl_binary_messenger_set_message_handler_on_channel( + messenger, "test", + [](FlBinaryMessenger* messenger, const gchar* channel, GBytes* message, + FlBinaryMessengerResponseHandle* response_handle, gpointer user_data) { + g_autofree gchar* text = g_strndup( + static_cast(g_bytes_get_data(message, nullptr)), + g_bytes_get_size(message)); + EXPECT_STREQ(text, "Marco!"); + + const char* response_text = "Polo!"; + g_autoptr(GBytes) response = + g_bytes_new(response_text, strlen(response_text)); + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_binary_messenger_send_response( + messenger, response_handle, response, &error)); + EXPECT_EQ(error, nullptr); + }, + nullptr, nullptr); + + // Send message from engine. + const char* message_text = "Marco!"; + g_autoptr(GBytes) message = g_bytes_new(message_text, strlen(message_text)); + int fake_handle = 42; + fl_binary_messenger_handle_message( + messenger, "test", message, + reinterpret_cast( + &fake_handle)); - g_main_loop_quit(static_cast(user_data)); + EXPECT_TRUE(called); } -// Checks the engine reporting a send failure is handled. -TEST(FlBinaryMessengerTest, SendFailure) { +// Checks receieved messages can be responded to on a thread. +TEST(FlBinaryMessengerTest, ReceiveRespondThread) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); - g_autoptr(FlEngine) engine = make_mock_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); - - // Blocks here until failure_response_cb is called. - g_main_loop_run(loop); -} + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); -// Called when a message is received from the engine in the ReceiveMessage test. -static void message_cb(FlBinaryMessenger* messenger, - const gchar* channel, - GBytes* message, - FlBinaryMessengerResponseHandle* response_handle, - gpointer user_data) { - EXPECT_NE(message, nullptr); - g_autofree gchar* text = - g_strndup(static_cast(g_bytes_get_data(message, nullptr)), - g_bytes_get_size(message)); - EXPECT_STREQ(text, "Marco!"); - - const char* response_text = "Polo!"; - g_autoptr(GBytes) response = - g_bytes_new(response_text, strlen(response_text)); g_autoptr(GError) error = nullptr; - EXPECT_TRUE(fl_binary_messenger_send_response(messenger, response_handle, - response, &error)); + EXPECT_TRUE(fl_engine_start(engine, &error)); EXPECT_EQ(error, nullptr); -} -// Called when a the test engine notifies us what response we sent in the -// ReceiveMessage test. -static void response_cb(FlBinaryMessenger* messenger, - const gchar* channel, - GBytes* message, - FlBinaryMessengerResponseHandle* response_handle, - gpointer user_data) { - EXPECT_NE(message, nullptr); - g_autofree gchar* text = - g_strndup(static_cast(g_bytes_get_data(message, nullptr)), - g_bytes_get_size(message)); - EXPECT_STREQ(text, "Polo!"); - - fl_binary_messenger_send_response(messenger, response_handle, nullptr, - nullptr); - - g_main_loop_quit(static_cast(user_data)); -} + embedder_api->SendPlatformMessageResponse = MOCK_ENGINE_PROC( + SendPlatformMessageResponse, + ([&loop](auto engine, const FlutterPlatformMessageResponseHandle* handle, + const uint8_t* data, size_t data_length) { + int fake_handle = *reinterpret_cast(handle); + EXPECT_EQ(fake_handle, 42); -// Checks the shell able to receive and respond to messages from the engine. -TEST(FlBinaryMessengerTest, ReceiveMessage) { - g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); + g_autofree gchar* text = + g_strndup(reinterpret_cast(data), data_length); + EXPECT_STREQ(text, "Polo!"); - g_autoptr(FlEngine) engine = make_mock_engine(); - g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); + g_main_loop_quit(loop); - // Listen for messages from the engine. - fl_binary_messenger_set_message_handler_on_channel( - messenger, "test/messages", message_cb, nullptr, nullptr); + return kSuccess; + })); - // Listen for response from the engine. - fl_binary_messenger_set_message_handler_on_channel( - messenger, "test/responses", response_cb, loop, nullptr); + FlBinaryMessenger* messenger = fl_engine_get_binary_messenger(engine); - // Trigger the engine to send a message. - const char* text = "Marco!"; - g_autoptr(GBytes) message = g_bytes_new(text, strlen(text)); - fl_binary_messenger_send_on_channel(messenger, "test/send-message", message, - nullptr, nullptr, nullptr); + // Listen for message. + fl_binary_messenger_set_message_handler_on_channel( + messenger, "test", + [](FlBinaryMessenger* messenger, const gchar* channel, GBytes* message, + FlBinaryMessengerResponseHandle* response_handle, gpointer user_data) { + g_autofree gchar* text = g_strndup( + static_cast(g_bytes_get_data(message, nullptr)), + g_bytes_get_size(message)); + EXPECT_STREQ(text, "Marco!"); + + // Respond on a thread. + typedef struct { + FlBinaryMessenger* messenger; + FlBinaryMessengerResponseHandle* response_handle; + } ThreadData; + ThreadData* data = g_new0(ThreadData, 1); + data->messenger = + static_cast(g_object_ref(messenger)); + data->response_handle = static_cast( + g_object_ref(response_handle)); + g_autoptr(GThread) thread = g_thread_new( + nullptr, + [](gpointer user_data) { + g_autofree ThreadData* data = static_cast(user_data); + g_autoptr(FlBinaryMessenger) messenger = data->messenger; + g_autoptr(FlBinaryMessengerResponseHandle) response_handle = + data->response_handle; + + const char* response_text = "Polo!"; + g_autoptr(GBytes) response = + g_bytes_new(response_text, strlen(response_text)); + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_binary_messenger_send_response( + data->messenger, data->response_handle, response, &error)); + EXPECT_EQ(error, nullptr); + + return static_cast(nullptr); + }, + data); + }, + nullptr, nullptr); + + // Send message from engine. + const char* message_text = "Marco!"; + g_autoptr(GBytes) message = g_bytes_new(message_text, strlen(message_text)); + int fake_handle = 42; + fl_binary_messenger_handle_message( + messenger, "test", message, + reinterpret_cast( + &fake_handle)); - // Blocks here until response_cb is called. g_main_loop_run(loop); } @@ -434,7 +382,8 @@ TEST(FlBinaryMessengerTest, ReceiveMessage) { // Checks if the 'resize' command is sent and is well-formed. TEST(FlBinaryMessengerTest, ResizeChannel) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); bool called = false; @@ -481,7 +430,8 @@ TEST(FlBinaryMessengerTest, ResizeChannel) { // Checks if the 'overflow' command is sent and is well-formed. TEST(FlBinaryMessengerTest, WarnsOnOverflowChannel) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); bool called = false; @@ -526,26 +476,21 @@ TEST(FlBinaryMessengerTest, WarnsOnOverflowChannel) { EXPECT_TRUE(called); } -static gboolean quit_main_loop_cb(gpointer user_data) { - g_main_loop_quit(static_cast(user_data)); - return FALSE; -} - // Checks if error returned when invoking a command on the control channel // are handled. TEST(FlBinaryMessengerTest, ControlChannelErrorResponse) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); - g_autoptr(FlEngine) engine = make_mock_engine(); - g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); + + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); g_autoptr(GError) error = nullptr; EXPECT_TRUE(fl_engine_start(engine, &error)); EXPECT_EQ(error, nullptr); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); - + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); bool called = false; - FlutterEngineSendPlatformMessageFnPtr old_handler = embedder_api->SendPlatformMessage; embedder_api->SendPlatformMessage = MOCK_ENGINE_PROC( @@ -561,7 +506,12 @@ TEST(FlBinaryMessengerTest, ControlChannelErrorResponse) { // Register a callback to quit the main loop when binary messenger work // ends. - g_idle_add(quit_main_loop_cb, loop); + g_idle_add( + [](gpointer user_data) { + g_main_loop_quit(static_cast(user_data)); + return FALSE; + }, + loop); // Simulates an internal error. return kInvalidArguments; @@ -572,102 +522,32 @@ TEST(FlBinaryMessengerTest, ControlChannelErrorResponse) { EXPECT_TRUE(called); - // Blocks here until quit_main_loop_cb is called. g_main_loop_run(loop); } // NOLINTEND(clang-analyzer-core.StackAddressEscape) -struct RespondsOnBackgroundThreadInfo { - FlBinaryMessenger* messenger; - FlBinaryMessengerResponseHandle* response_handle; - GMainLoop* loop; -}; - -static gboolean cleanup_responds_on_background_thread_info(gpointer user_data) { - RespondsOnBackgroundThreadInfo* info = - static_cast(user_data); - GMainLoop* loop = info->loop; - - g_object_unref(info->messenger); - g_object_unref(info->response_handle); - free(info); - - g_main_loop_quit(static_cast(loop)); - - return G_SOURCE_REMOVE; -} - -static void* response_from_thread_main(void* user_data) { - RespondsOnBackgroundThreadInfo* info = - static_cast(user_data); - - fl_binary_messenger_send_response(info->messenger, info->response_handle, - nullptr, nullptr); - - g_idle_add(cleanup_responds_on_background_thread_info, info); - - return nullptr; -} - -static void response_from_thread_cb( - FlBinaryMessenger* messenger, - const gchar* channel, - GBytes* message, - FlBinaryMessengerResponseHandle* response_handle, - gpointer user_data) { - EXPECT_NE(message, nullptr); - pthread_t thread; - RespondsOnBackgroundThreadInfo* info = - static_cast( - malloc(sizeof(RespondsOnBackgroundThreadInfo))); - info->messenger = FL_BINARY_MESSENGER(g_object_ref(messenger)); - info->response_handle = - FL_BINARY_MESSENGER_RESPONSE_HANDLE(g_object_ref(response_handle)); - info->loop = static_cast(user_data); - EXPECT_EQ(0, - pthread_create(&thread, nullptr, &response_from_thread_main, info)); -} - -TEST(FlBinaryMessengerTest, RespondOnBackgroundThread) { - g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); - - g_autoptr(FlEngine) engine = make_mock_engine(); - g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); - - // Listen for messages from the engine. - fl_binary_messenger_set_message_handler_on_channel( - messenger, "test/messages", message_cb, nullptr, nullptr); - - // Listen for response from the engine. - fl_binary_messenger_set_message_handler_on_channel( - messenger, "test/responses", response_from_thread_cb, loop, nullptr); - - // Trigger the engine to send a message. - const char* text = "Marco!"; - g_autoptr(GBytes) message = g_bytes_new(text, strlen(text)); - fl_binary_messenger_send_on_channel(messenger, "test/send-message", message, - nullptr, nullptr, nullptr); - - // Blocks here until response_cb is called. - g_main_loop_run(loop); -} +TEST(FlBinaryMessengerTest, DeletingEngineClearsHandlers) { + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); -static void kill_handler_notify_cb(gpointer was_called) { - *static_cast(was_called) = TRUE; -} + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); -TEST(FlBinaryMessengerTest, DeletingEngineClearsHandlers) { - FlEngine* engine = make_mock_engine(); FlBinaryMessenger* messenger = fl_engine_get_binary_messenger(engine); - gboolean was_killed = FALSE; - // Listen for messages from the engine. - fl_binary_messenger_set_message_handler_on_channel(messenger, "test/messages", - message_cb, &was_killed, - kill_handler_notify_cb); + // Add handler to check the destroy_notify is called. + gboolean destroy_notify_called = FALSE; + fl_binary_messenger_set_message_handler_on_channel( + messenger, "test", + [](FlBinaryMessenger* messenger, const gchar* channel, GBytes* message, + FlBinaryMessengerResponseHandle* response_handle, + gpointer user_data) {}, + &destroy_notify_called, + [](gpointer user_data) { *static_cast(user_data) = TRUE; }); g_clear_object(&engine); - ASSERT_TRUE(was_killed); + ASSERT_TRUE(destroy_notify_called); } diff --git a/shell/platform/linux/testing/mock_engine.cc b/shell/platform/linux/testing/mock_engine.cc index 5db5d3704b397..b1806e8104653 100644 --- a/shell/platform/linux/testing/mock_engine.cc +++ b/shell/platform/linux/testing/mock_engine.cc @@ -96,56 +96,6 @@ struct _FlutterTaskRunner { namespace { -// Send a response from the engine. -static void send_response( - FLUTTER_API_SYMBOL(FlutterEngine) engine, - const std::string& channel, - const FlutterPlatformMessageResponseHandle* response_handle, - const uint8_t* message, - size_t message_size) { - if (response_handle == nullptr) { - return; - } - - FlutterTask task; - task.runner = new _FlutterTaskRunner(1234, channel, response_handle, message, - message_size); - task.task = task.runner->task; - engine->platform_post_task_callback(task, 0, engine->user_data); -} - -// Send a message from the engine. -static void send_message(FLUTTER_API_SYMBOL(FlutterEngine) engine, - const std::string& channel, - const uint8_t* message, - size_t message_size) { - FlutterTask task; - task.runner = - new _FlutterTaskRunner(1234, channel, nullptr, message, message_size); - task.task = task.runner->task; - engine->platform_post_task_callback(task, 0, engine->user_data); -} - -static void invoke_method(FLUTTER_API_SYMBOL(FlutterEngine) engine, - const std::string& channel, - const gchar* name, - FlValue* args) { - g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); - g_autoptr(GError) error = nullptr; - g_autoptr(GBytes) message = fl_method_codec_encode_method_call( - FL_METHOD_CODEC(codec), name, args, &error); - EXPECT_NE(message, nullptr); - EXPECT_EQ(error, nullptr); - - FlutterTask task; - task.runner = new _FlutterTaskRunner( - 1234, channel, nullptr, - static_cast(g_bytes_get_data(message, nullptr)), - g_bytes_get_size(message)); - task.task = task.runner->task; - engine->platform_post_task_callback(task, 0, engine->user_data); -} - FlutterEngineResult FlutterEngineCreateAOTData( const FlutterEngineAOTDataSource* source, FlutterEngineAOTData* data_out) { @@ -247,117 +197,6 @@ FlutterEngineResult FlutterEngineSendPlatformMessage( const FlutterPlatformMessage* message) { EXPECT_TRUE(engine->running); - if (strcmp(message->channel, "test/echo") == 0) { - // Responds with the same message received. - send_response(engine, message->channel, message->response_handle, - message->message, message->message_size); - } else if (strcmp(message->channel, "test/send-message") == 0) { - // Triggers the engine to send a message. - send_response(engine, message->channel, message->response_handle, nullptr, - 0); - send_message(engine, "test/messages", message->message, - message->message_size); - } else if (strcmp(message->channel, "test/standard-method") == 0) { - g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); - g_autoptr(GBytes) m = g_bytes_new(message->message, message->message_size); - g_autofree gchar* name = nullptr; - g_autoptr(FlValue) args = nullptr; - g_autoptr(GError) error = nullptr; - EXPECT_TRUE(fl_method_codec_decode_method_call(FL_METHOD_CODEC(codec), m, - &name, &args, &error)); - EXPECT_EQ(error, nullptr); - - g_autoptr(GBytes) response = nullptr; - if (strcmp(name, "Echo") == 0) { - // Returns args as a success result. - response = fl_method_codec_encode_success_envelope(FL_METHOD_CODEC(codec), - args, &error); - EXPECT_EQ(error, nullptr); - } else if (strcmp(name, "Error") == 0) { - // Returns an error result. - const gchar* code = nullptr; - const gchar* message = nullptr; - FlValue* details = nullptr; - if (fl_value_get_length(args) >= 2) { - FlValue* code_value = fl_value_get_list_value(args, 0); - EXPECT_EQ(fl_value_get_type(code_value), FL_VALUE_TYPE_STRING); - code = fl_value_get_string(code_value); - FlValue* message_value = fl_value_get_list_value(args, 1); - message = fl_value_get_type(message_value) == FL_VALUE_TYPE_STRING - ? fl_value_get_string(message_value) - : nullptr; - } - if (fl_value_get_length(args) >= 3) { - details = fl_value_get_list_value(args, 2); - } - response = fl_method_codec_encode_error_envelope( - FL_METHOD_CODEC(codec), code, message, details, &error); - EXPECT_EQ(error, nullptr); - } else if (strcmp(name, "InvokeMethod") == 0) { - // Gets the engine to call the shell. - if (fl_value_get_length(args) == 3) { - FlValue* channel_value = fl_value_get_list_value(args, 0); - EXPECT_EQ(fl_value_get_type(channel_value), FL_VALUE_TYPE_STRING); - const gchar* channel = fl_value_get_string(channel_value); - FlValue* name_value = fl_value_get_list_value(args, 1); - EXPECT_EQ(fl_value_get_type(name_value), FL_VALUE_TYPE_STRING); - const gchar* name = fl_value_get_string(name_value); - FlValue* method_args = fl_value_get_list_value(args, 2); - invoke_method(engine, channel, name, method_args); - } - response = fl_method_codec_encode_success_envelope(FL_METHOD_CODEC(codec), - nullptr, &error); - EXPECT_EQ(error, nullptr); - } else { - // Returns "not implemented". - response = g_bytes_new(nullptr, 0); - } - - send_response( - engine, message->channel, message->response_handle, - static_cast(g_bytes_get_data(response, nullptr)), - g_bytes_get_size(response)); - } else if (strcmp(message->channel, "test/nullptr-response") == 0) { - // Sends a null response. - send_response(engine, message->channel, message->response_handle, nullptr, - 0); - } else if (strcmp(message->channel, "test/failure") == 0) { - // Generates an internal error. - return kInternalInconsistency; - } else if (strcmp(message->channel, "test/key-event-handled") == 0 || - strcmp(message->channel, "test/key-event-not-handled") == 0) { - bool value = strcmp(message->channel, "test/key-event-handled") == 0; - g_autoptr(FlJsonMessageCodec) codec = fl_json_message_codec_new(); - g_autoptr(FlValue) handledValue = fl_value_new_map(); - fl_value_set_string_take(handledValue, "handled", fl_value_new_bool(value)); - g_autoptr(GBytes) response = fl_message_codec_encode_message( - FL_MESSAGE_CODEC(codec), handledValue, nullptr); - send_response( - engine, message->channel, message->response_handle, - static_cast(g_bytes_get_data(response, nullptr)), - g_bytes_get_size(response)); - } else if (strcmp(message->channel, "test/key-event-delayed") == 0) { - static std::unique_ptr - delayed_response_handle = nullptr; - g_autoptr(FlJsonMessageCodec) codec = fl_json_message_codec_new(); - g_autoptr(FlValue) handledValue = fl_value_new_map(); - fl_value_set_string_take(handledValue, "handled", fl_value_new_bool(true)); - g_autoptr(GBytes) response = fl_message_codec_encode_message( - FL_MESSAGE_CODEC(codec), handledValue, nullptr); - if (delayed_response_handle == nullptr) { - delayed_response_handle.reset(message->response_handle); - } else { - send_response( - engine, message->channel, message->response_handle, - static_cast(g_bytes_get_data(response, nullptr)), - g_bytes_get_size(response)); - send_response( - engine, message->channel, delayed_response_handle.release(), - static_cast(g_bytes_get_data(response, nullptr)), - g_bytes_get_size(response)); - } - } - return kSuccess; } @@ -401,11 +240,6 @@ FlutterEngineResult FlutterEngineSendPlatformMessageResponse( EXPECT_TRUE(engine->running); - // Send a message so the shell can check the responses received. - if (handle->channel != "test/responses") { - send_message(engine, "test/responses", data, data_length); - } - EXPECT_FALSE(handle->released); delete handle; From 60dfc8928d5fe824c35e1833248199cfbe25bc2f Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Mon, 16 Dec 2024 16:03:46 +1300 Subject: [PATCH 2/2] Remove all remaining use of mock engine --- .../platform/linux/fl_accessible_node_test.cc | 19 +- .../linux/fl_accessible_text_field_test.cc | 89 +++++-- .../linux/fl_binary_messenger_test.cc | 123 +++++---- shell/platform/linux/fl_engine.cc | 5 +- shell/platform/linux/fl_engine_test.cc | 222 ++++++++-------- shell/platform/linux/fl_framebuffer_test.cc | 2 - .../linux/fl_plugin_registrar_test.cc | 5 +- .../platform/linux/fl_pointer_manager_test.cc | 250 +++++++++++++++--- .../linux/fl_scrolling_manager_test.cc | 78 ++++-- .../linux/fl_settings_handler_test.cc | 22 +- .../linux/fl_texture_registrar_test.cc | 90 ++++++- shell/platform/linux/fl_touch_manager_test.cc | 36 ++- .../platform/linux/fl_view_accessible_test.cc | 7 +- shell/platform/linux/fl_view_test.cc | 12 +- shell/platform/linux/testing/fl_test.cc | 16 -- shell/platform/linux/testing/fl_test.h | 7 - shell/platform/linux/testing/mock_engine.cc | 172 +----------- 17 files changed, 660 insertions(+), 495 deletions(-) diff --git a/shell/platform/linux/fl_accessible_node_test.cc b/shell/platform/linux/fl_accessible_node_test.cc index c0f534ddd20c3..2b59f40f0dfd6 100644 --- a/shell/platform/linux/fl_accessible_node_test.cc +++ b/shell/platform/linux/fl_accessible_node_test.cc @@ -6,11 +6,11 @@ #include "gtest/gtest.h" #include "flutter/shell/platform/linux/fl_accessible_node.h" -#include "flutter/shell/platform/linux/testing/fl_test.h" // Checks can build a tree of nodes. TEST(FlAccessibleNodeTest, BuildTree) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); g_autoptr(FlAccessibleNode) root = fl_accessible_node_new(engine, 0); g_autoptr(FlAccessibleNode) child1 = fl_accessible_node_new(engine, 1); @@ -44,7 +44,8 @@ TEST(FlAccessibleNodeTest, BuildTree) { // Checks node name is exposed to ATK. TEST(FlAccessibleNodeTest, SetName) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); g_autoptr(FlAccessibleNode) node = fl_accessible_node_new(engine, 0); fl_accessible_node_set_name(node, "test"); @@ -53,7 +54,8 @@ TEST(FlAccessibleNodeTest, SetName) { // Checks node extents are exposed to ATK. TEST(FlAccessibleNodeTest, SetExtents) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); g_autoptr(FlAccessibleNode) node = fl_accessible_node_new(engine, 0); fl_accessible_node_set_extents(node, 1, 2, 3, 4); @@ -68,7 +70,8 @@ TEST(FlAccessibleNodeTest, SetExtents) { // Checks Flutter flags are mapped to appropriate ATK state. TEST(FlAccessibleNodeTest, SetFlags) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); g_autoptr(FlAccessibleNode) node = fl_accessible_node_new(engine, 0); fl_accessible_node_set_flags( @@ -87,7 +90,8 @@ TEST(FlAccessibleNodeTest, SetFlags) { // Checks Flutter flags are mapped to appropriate ATK roles. TEST(FlAccessibleNodeTest, GetRole) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); g_autoptr(FlAccessibleNode) node = fl_accessible_node_new(engine, 0); @@ -120,7 +124,8 @@ TEST(FlAccessibleNodeTest, GetRole) { // Checks Flutter actions are mapped to the appropriate ATK actions. TEST(FlAccessibleNodeTest, SetActions) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); g_autoptr(FlAccessibleNode) node = fl_accessible_node_new(engine, 0); fl_accessible_node_set_actions( diff --git a/shell/platform/linux/fl_accessible_text_field_test.cc b/shell/platform/linux/fl_accessible_text_field_test.cc index 396c4b0b7bf00..a13eddd2e023c 100644 --- a/shell/platform/linux/fl_accessible_text_field_test.cc +++ b/shell/platform/linux/fl_accessible_text_field_test.cc @@ -9,7 +9,6 @@ #include "flutter/shell/platform/linux/fl_accessible_text_field.h" #include "flutter/shell/platform/linux/fl_engine_private.h" #include "flutter/shell/platform/linux/public/flutter_linux/fl_standard_message_codec.h" -#include "flutter/shell/platform/linux/testing/fl_test.h" #include "flutter/shell/platform/linux/testing/mock_signal_handler.h" // MOCK_ENGINE_PROC is leaky by design @@ -25,7 +24,8 @@ static FlValue* decode_semantic_data(const uint8_t* data, size_t data_length) { // Tests that semantic node value updates from Flutter emit AtkText::text-insert // and AtkText::text-remove signals as expected. TEST(FlAccessibleTextFieldTest, SetValue) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); g_autoptr(FlAccessibleNode) node = fl_accessible_text_field_new(engine, 1); // "" -> "Flutter" @@ -81,7 +81,8 @@ TEST(FlAccessibleTextFieldTest, SetValue) { // AtkText::text-selection-changed and AtkText::text-caret-moved signals as // expected. TEST(FlAccessibleTextFieldTest, SetTextSelection) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); g_autoptr(FlAccessibleNode) node = fl_accessible_text_field_new(engine, 1); // [-1,-1] -> [2,3] @@ -143,7 +144,13 @@ TEST(FlAccessibleTextFieldTest, PerformAction) { g_autoptr(GPtrArray) action_datas = g_ptr_array_new_with_free_func( reinterpret_cast(fl_value_unref)); - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); + fl_engine_get_embedder_api(engine)->DispatchSemanticsAction = MOCK_ENGINE_PROC( DispatchSemanticsAction, @@ -176,7 +183,8 @@ TEST(FlAccessibleTextFieldTest, PerformAction) { // Tests AtkText::get_character_count. TEST(FlAccessibleTextFieldTest, GetCharacterCount) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); g_autoptr(FlAccessibleNode) node = fl_accessible_text_field_new(engine, 1); EXPECT_EQ(atk_text_get_character_count(ATK_TEXT(node)), 0); @@ -188,7 +196,8 @@ TEST(FlAccessibleTextFieldTest, GetCharacterCount) { // Tests AtkText::get_text. TEST(FlAccessibleTextFieldTest, GetText) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); g_autoptr(FlAccessibleNode) node = fl_accessible_text_field_new(engine, 1); g_autofree gchar* empty = atk_text_get_text(ATK_TEXT(node), 0, -1); @@ -208,7 +217,8 @@ TEST(FlAccessibleTextFieldTest, GetText) { // Tests AtkText::get_caret_offset. TEST(FlAccessibleTextFieldTest, GetCaretOffset) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); g_autoptr(FlAccessibleNode) node = fl_accessible_text_field_new(engine, 1); EXPECT_EQ(atk_text_get_caret_offset(ATK_TEXT(node)), -1); @@ -223,7 +233,13 @@ TEST(FlAccessibleTextFieldTest, SetCaretOffset) { int base = -1; int extent = -1; - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); + fl_engine_get_embedder_api(engine)->DispatchSemanticsAction = MOCK_ENGINE_PROC( DispatchSemanticsAction, @@ -247,7 +263,8 @@ TEST(FlAccessibleTextFieldTest, SetCaretOffset) { // Tests AtkText::get_n_selections. TEST(FlAccessibleTextFieldTest, GetNSelections) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); g_autoptr(FlAccessibleNode) node = fl_accessible_text_field_new(engine, 1); EXPECT_EQ(atk_text_get_n_selections(ATK_TEXT(node)), 0); @@ -259,7 +276,8 @@ TEST(FlAccessibleTextFieldTest, GetNSelections) { // Tests AtkText::get_selection. TEST(FlAccessibleTextFieldTest, GetSelection) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); g_autoptr(FlAccessibleNode) node = fl_accessible_text_field_new(engine, 1); EXPECT_EQ(atk_text_get_selection(ATK_TEXT(node), 0, nullptr, nullptr), @@ -296,7 +314,13 @@ TEST(FlAccessibleTextFieldTest, AddSelection) { int base = -1; int extent = -1; - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); + fl_engine_get_embedder_api(engine)->DispatchSemanticsAction = MOCK_ENGINE_PROC( DispatchSemanticsAction, @@ -330,7 +354,13 @@ TEST(FlAccessibleTextFieldTest, RemoveSelection) { int base = -1; int extent = -1; - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); + fl_engine_get_embedder_api(engine)->DispatchSemanticsAction = MOCK_ENGINE_PROC( DispatchSemanticsAction, @@ -370,7 +400,13 @@ TEST(FlAccessibleTextFieldTest, SetSelection) { int base = -1; int extent = -1; - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); + fl_engine_get_embedder_api(engine)->DispatchSemanticsAction = MOCK_ENGINE_PROC( DispatchSemanticsAction, @@ -405,7 +441,13 @@ TEST(FlAccessibleTextFieldTest, SetSelection) { TEST(FlAccessibleTextFieldTest, SetTextContents) { g_autofree gchar* text = nullptr; - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); + fl_engine_get_embedder_api(engine)->DispatchSemanticsAction = MOCK_ENGINE_PROC( DispatchSemanticsAction, @@ -430,7 +472,13 @@ TEST(FlAccessibleTextFieldTest, InsertDeleteText) { int base = -1; int extent = -1; - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); + fl_engine_get_embedder_api(engine)->DispatchSemanticsAction = MOCK_ENGINE_PROC( DispatchSemanticsAction, @@ -479,7 +527,13 @@ TEST(FlAccessibleTextFieldTest, CopyCutPasteText) { int extent = -1; FlutterSemanticsAction act = kFlutterSemanticsActionCustomAction; - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); + fl_engine_get_embedder_api(engine)->DispatchSemanticsAction = MOCK_ENGINE_PROC( DispatchSemanticsAction, @@ -522,7 +576,8 @@ TEST(FlAccessibleTextFieldTest, CopyCutPasteText) { } TEST(FlAccessibleTextFieldTest, TextBoundary) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); g_autoptr(FlAccessibleNode) node = fl_accessible_text_field_new(engine, 1); fl_accessible_node_set_value(node, diff --git a/shell/platform/linux/fl_binary_messenger_test.cc b/shell/platform/linux/fl_binary_messenger_test.cc index 49d75a0f0fbef..4d99e94e8c594 100644 --- a/shell/platform/linux/fl_binary_messenger_test.cc +++ b/shell/platform/linux/fl_binary_messenger_test.cc @@ -21,7 +21,6 @@ TEST(FlBinaryMessengerTest, Send) { g_autoptr(FlDartProject) project = fl_dart_project_new(); g_autoptr(FlEngine) engine = fl_engine_new(project); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); g_autoptr(GError) error = nullptr; EXPECT_TRUE(fl_engine_start(engine, &error)); @@ -29,16 +28,17 @@ TEST(FlBinaryMessengerTest, Send) { FlutterDataCallback response_callback; void* response_callback_user_data; - embedder_api->PlatformMessageCreateResponseHandle = MOCK_ENGINE_PROC( - PlatformMessageCreateResponseHandle, - ([&response_callback, &response_callback_user_data]( - auto engine, FlutterDataCallback data_callback, void* user_data, - FlutterPlatformMessageResponseHandle** response_out) { - response_callback = data_callback; - response_callback_user_data = user_data; - return kSuccess; - })); - embedder_api->SendPlatformMessage = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->PlatformMessageCreateResponseHandle = + MOCK_ENGINE_PROC( + PlatformMessageCreateResponseHandle, + ([&response_callback, &response_callback_user_data]( + auto engine, FlutterDataCallback data_callback, void* user_data, + FlutterPlatformMessageResponseHandle** response_out) { + response_callback = data_callback; + response_callback_user_data = user_data; + return kSuccess; + })); + fl_engine_get_embedder_api(engine)->SendPlatformMessage = MOCK_ENGINE_PROC( SendPlatformMessage, ([&response_callback, &response_callback_user_data]( auto engine, const FlutterPlatformMessage* message) { @@ -83,14 +83,13 @@ TEST(FlBinaryMessengerTest, Send) { TEST(FlBinaryMessengerTest, SendNullptr) { g_autoptr(FlDartProject) project = fl_dart_project_new(); g_autoptr(FlEngine) engine = fl_engine_new(project); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); g_autoptr(GError) error = nullptr; EXPECT_TRUE(fl_engine_start(engine, &error)); EXPECT_EQ(error, nullptr); bool called = false; - embedder_api->SendPlatformMessage = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->SendPlatformMessage = MOCK_ENGINE_PROC( SendPlatformMessage, ([&called](auto engine, const FlutterPlatformMessage* message) { called = true; @@ -111,14 +110,13 @@ TEST(FlBinaryMessengerTest, SendNullptr) { TEST(FlBinaryMessengerTest, SendEmpty) { g_autoptr(FlDartProject) project = fl_dart_project_new(); g_autoptr(FlEngine) engine = fl_engine_new(project); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); g_autoptr(GError) error = nullptr; EXPECT_TRUE(fl_engine_start(engine, &error)); EXPECT_EQ(error, nullptr); bool called = false; - embedder_api->SendPlatformMessage = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->SendPlatformMessage = MOCK_ENGINE_PROC( SendPlatformMessage, ([&called](auto engine, const FlutterPlatformMessage* message) { called = true; @@ -141,7 +139,6 @@ TEST(FlBinaryMessengerTest, NullptrResponse) { g_autoptr(FlDartProject) project = fl_dart_project_new(); g_autoptr(FlEngine) engine = fl_engine_new(project); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); g_autoptr(GError) error = nullptr; EXPECT_TRUE(fl_engine_start(engine, &error)); @@ -149,16 +146,17 @@ TEST(FlBinaryMessengerTest, NullptrResponse) { FlutterDataCallback response_callback; void* response_callback_user_data; - embedder_api->PlatformMessageCreateResponseHandle = MOCK_ENGINE_PROC( - PlatformMessageCreateResponseHandle, - ([&response_callback, &response_callback_user_data]( - auto engine, FlutterDataCallback data_callback, void* user_data, - FlutterPlatformMessageResponseHandle** response_out) { - response_callback = data_callback; - response_callback_user_data = user_data; - return kSuccess; - })); - embedder_api->SendPlatformMessage = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->PlatformMessageCreateResponseHandle = + MOCK_ENGINE_PROC( + PlatformMessageCreateResponseHandle, + ([&response_callback, &response_callback_user_data]( + auto engine, FlutterDataCallback data_callback, void* user_data, + FlutterPlatformMessageResponseHandle** response_out) { + response_callback = data_callback; + response_callback_user_data = user_data; + return kSuccess; + })); + fl_engine_get_embedder_api(engine)->SendPlatformMessage = MOCK_ENGINE_PROC( SendPlatformMessage, ([&response_callback, &response_callback_user_data]( auto engine, const FlutterPlatformMessage* message) { @@ -200,13 +198,12 @@ TEST(FlBinaryMessengerTest, SendFailure) { g_autoptr(FlDartProject) project = fl_dart_project_new(); g_autoptr(FlEngine) engine = fl_engine_new(project); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); g_autoptr(GError) error = nullptr; EXPECT_TRUE(fl_engine_start(engine, &error)); EXPECT_EQ(error, nullptr); - embedder_api->SendPlatformMessage = + fl_engine_get_embedder_api(engine)->SendPlatformMessage = MOCK_ENGINE_PROC(SendPlatformMessage, ([](auto engine, const FlutterPlatformMessage* message) { EXPECT_STREQ(message->channel, "test"); @@ -235,29 +232,29 @@ TEST(FlBinaryMessengerTest, SendFailure) { TEST(FlBinaryMessengerTest, Receive) { g_autoptr(FlDartProject) project = fl_dart_project_new(); g_autoptr(FlEngine) engine = fl_engine_new(project); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); g_autoptr(GError) error = nullptr; EXPECT_TRUE(fl_engine_start(engine, &error)); EXPECT_EQ(error, nullptr); bool called = false; - embedder_api->SendPlatformMessageResponse = MOCK_ENGINE_PROC( - SendPlatformMessageResponse, - ([&called](auto engine, - const FlutterPlatformMessageResponseHandle* handle, - const uint8_t* data, size_t data_length) { - called = true; + fl_engine_get_embedder_api(engine)->SendPlatformMessageResponse = + MOCK_ENGINE_PROC( + SendPlatformMessageResponse, + ([&called](auto engine, + const FlutterPlatformMessageResponseHandle* handle, + const uint8_t* data, size_t data_length) { + called = true; - int fake_handle = *reinterpret_cast(handle); - EXPECT_EQ(fake_handle, 42); + int fake_handle = *reinterpret_cast(handle); + EXPECT_EQ(fake_handle, 42); - g_autofree gchar* text = - g_strndup(reinterpret_cast(data), data_length); - EXPECT_STREQ(text, "Polo!"); + g_autofree gchar* text = + g_strndup(reinterpret_cast(data), data_length); + EXPECT_STREQ(text, "Polo!"); - return kSuccess; - })); + return kSuccess; + })); FlBinaryMessenger* messenger = fl_engine_get_binary_messenger(engine); @@ -299,27 +296,28 @@ TEST(FlBinaryMessengerTest, ReceiveRespondThread) { g_autoptr(FlDartProject) project = fl_dart_project_new(); g_autoptr(FlEngine) engine = fl_engine_new(project); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); g_autoptr(GError) error = nullptr; EXPECT_TRUE(fl_engine_start(engine, &error)); EXPECT_EQ(error, nullptr); - embedder_api->SendPlatformMessageResponse = MOCK_ENGINE_PROC( - SendPlatformMessageResponse, - ([&loop](auto engine, const FlutterPlatformMessageResponseHandle* handle, - const uint8_t* data, size_t data_length) { - int fake_handle = *reinterpret_cast(handle); - EXPECT_EQ(fake_handle, 42); + fl_engine_get_embedder_api(engine)->SendPlatformMessageResponse = + MOCK_ENGINE_PROC( + SendPlatformMessageResponse, + ([&loop](auto engine, + const FlutterPlatformMessageResponseHandle* handle, + const uint8_t* data, size_t data_length) { + int fake_handle = *reinterpret_cast(handle); + EXPECT_EQ(fake_handle, 42); - g_autofree gchar* text = - g_strndup(reinterpret_cast(data), data_length); - EXPECT_STREQ(text, "Polo!"); + g_autofree gchar* text = + g_strndup(reinterpret_cast(data), data_length); + EXPECT_STREQ(text, "Polo!"); - g_main_loop_quit(loop); + g_main_loop_quit(loop); - return kSuccess; - })); + return kSuccess; + })); FlBinaryMessenger* messenger = fl_engine_get_binary_messenger(engine); @@ -384,13 +382,12 @@ TEST(FlBinaryMessengerTest, ReceiveRespondThread) { TEST(FlBinaryMessengerTest, ResizeChannel) { g_autoptr(FlDartProject) project = fl_dart_project_new(); g_autoptr(FlEngine) engine = fl_engine_new(project); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); bool called = false; FlutterEngineSendPlatformMessageFnPtr old_handler = - embedder_api->SendPlatformMessage; - embedder_api->SendPlatformMessage = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->SendPlatformMessage; + fl_engine_get_embedder_api(engine)->SendPlatformMessage = MOCK_ENGINE_PROC( SendPlatformMessage, ([&called, old_handler](auto engine, const FlutterPlatformMessage* message) { @@ -432,13 +429,12 @@ TEST(FlBinaryMessengerTest, ResizeChannel) { TEST(FlBinaryMessengerTest, WarnsOnOverflowChannel) { g_autoptr(FlDartProject) project = fl_dart_project_new(); g_autoptr(FlEngine) engine = fl_engine_new(project); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); bool called = false; FlutterEngineSendPlatformMessageFnPtr old_handler = - embedder_api->SendPlatformMessage; - embedder_api->SendPlatformMessage = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->SendPlatformMessage; + fl_engine_get_embedder_api(engine)->SendPlatformMessage = MOCK_ENGINE_PROC( SendPlatformMessage, ([&called, old_handler](auto engine, const FlutterPlatformMessage* message) { @@ -483,7 +479,6 @@ TEST(FlBinaryMessengerTest, ControlChannelErrorResponse) { g_autoptr(FlDartProject) project = fl_dart_project_new(); g_autoptr(FlEngine) engine = fl_engine_new(project); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); g_autoptr(GError) error = nullptr; EXPECT_TRUE(fl_engine_start(engine, &error)); @@ -492,8 +487,8 @@ TEST(FlBinaryMessengerTest, ControlChannelErrorResponse) { g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); bool called = false; FlutterEngineSendPlatformMessageFnPtr old_handler = - embedder_api->SendPlatformMessage; - embedder_api->SendPlatformMessage = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->SendPlatformMessage; + fl_engine_get_embedder_api(engine)->SendPlatformMessage = MOCK_ENGINE_PROC( SendPlatformMessage, ([&called, old_handler, loop](auto engine, const FlutterPlatformMessage* message) { diff --git a/shell/platform/linux/fl_engine.cc b/shell/platform/linux/fl_engine.cc index eb3d678f67415..1523906fba84e 100644 --- a/shell/platform/linux/fl_engine.cc +++ b/shell/platform/linux/fl_engine.cc @@ -8,7 +8,6 @@ #include -#include "flutter/common/constants.h" #include "flutter/shell/platform/common/engine_switches.h" #include "flutter/shell/platform/embedder/embedder.h" #include "flutter/shell/platform/linux/fl_binary_messenger_private.h" @@ -493,7 +492,9 @@ static void fl_engine_init(FlEngine* self) { self->thread = g_thread_self(); self->embedder_api.struct_size = sizeof(FlutterEngineProcTable); - FlutterEngineGetProcAddresses(&self->embedder_api); + if (FlutterEngineGetProcAddresses(&self->embedder_api) != kSuccess) { + g_warning("Failed get get engine function pointers"); + } // Implicit view is 0, so start at 1. self->next_view_id = 1; diff --git a/shell/platform/linux/fl_engine_test.cc b/shell/platform/linux/fl_engine_test.cc index 083b64930138e..93787998eed7c 100644 --- a/shell/platform/linux/fl_engine_test.cc +++ b/shell/platform/linux/fl_engine_test.cc @@ -10,18 +10,21 @@ #include "flutter/shell/platform/linux/public/flutter_linux/fl_engine.h" #include "flutter/shell/platform/linux/public/flutter_linux/fl_json_message_codec.h" #include "flutter/shell/platform/linux/public/flutter_linux/fl_string_codec.h" -#include "flutter/shell/platform/linux/testing/fl_test.h" // MOCK_ENGINE_PROC is leaky by design // NOLINTBEGIN(clang-analyzer-core.StackAddressEscape) // Checks sending window metrics events works. TEST(FlEngineTest, WindowMetrics) { - g_autoptr(FlEngine) engine = make_mock_engine(); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); bool called = false; - embedder_api->SendWindowMetricsEvent = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->SendWindowMetricsEvent = MOCK_ENGINE_PROC( SendWindowMetricsEvent, ([&called](auto engine, const FlutterWindowMetricsEvent* event) { called = true; @@ -33,9 +36,6 @@ TEST(FlEngineTest, WindowMetrics) { return kSuccess; })); - g_autoptr(GError) error = nullptr; - EXPECT_TRUE(fl_engine_start(engine, &error)); - EXPECT_EQ(error, nullptr); fl_engine_send_window_metrics_event(engine, 1, 3840, 2160, 2.0); EXPECT_TRUE(called); @@ -43,11 +43,11 @@ TEST(FlEngineTest, WindowMetrics) { // Checks sending mouse pointer events works. TEST(FlEngineTest, MousePointer) { - g_autoptr(FlEngine) engine = make_mock_engine(); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); bool called = false; - embedder_api->SendPointerEvent = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->SendPointerEvent = MOCK_ENGINE_PROC( SendPointerEvent, ([&called](auto engine, const FlutterPointerEvent* events, size_t events_count) { @@ -80,11 +80,11 @@ TEST(FlEngineTest, MousePointer) { // Checks sending pan/zoom events works. TEST(FlEngineTest, PointerPanZoom) { - g_autoptr(FlEngine) engine = make_mock_engine(); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); bool called = false; - embedder_api->SendPointerEvent = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->SendPointerEvent = MOCK_ENGINE_PROC( SendPointerEvent, ([&called](auto engine, const FlutterPointerEvent* events, size_t events_count) { @@ -118,25 +118,26 @@ TEST(FlEngineTest, PointerPanZoom) { // Checks dispatching a semantics action works. TEST(FlEngineTest, DispatchSemanticsAction) { - g_autoptr(FlEngine) engine = make_mock_engine(); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); bool called = false; - embedder_api->DispatchSemanticsAction = MOCK_ENGINE_PROC( - DispatchSemanticsAction, - ([&called](auto engine, uint64_t id, FlutterSemanticsAction action, - const uint8_t* data, size_t data_length) { - EXPECT_EQ(id, static_cast(42)); - EXPECT_EQ(action, kFlutterSemanticsActionTap); - EXPECT_EQ(data_length, static_cast(4)); - EXPECT_EQ(data[0], 't'); - EXPECT_EQ(data[1], 'e'); - EXPECT_EQ(data[2], 's'); - EXPECT_EQ(data[3], 't'); - called = true; - - return kSuccess; - })); + fl_engine_get_embedder_api(engine)->DispatchSemanticsAction = + MOCK_ENGINE_PROC( + DispatchSemanticsAction, + ([&called](auto engine, uint64_t id, FlutterSemanticsAction action, + const uint8_t* data, size_t data_length) { + EXPECT_EQ(id, static_cast(42)); + EXPECT_EQ(action, kFlutterSemanticsActionTap); + EXPECT_EQ(data_length, static_cast(4)); + EXPECT_EQ(data[0], 't'); + EXPECT_EQ(data[1], 'e'); + EXPECT_EQ(data[2], 's'); + EXPECT_EQ(data[3], 't'); + called = true; + + return kSuccess; + })); g_autoptr(GError) error = nullptr; EXPECT_TRUE(fl_engine_start(engine, &error)); @@ -150,13 +151,13 @@ TEST(FlEngineTest, DispatchSemanticsAction) { // Checks sending platform messages works. TEST(FlEngineTest, PlatformMessage) { - g_autoptr(FlEngine) engine = make_mock_engine(); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); bool called = false; FlutterEngineSendPlatformMessageFnPtr old_handler = - embedder_api->SendPlatformMessage; - embedder_api->SendPlatformMessage = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->SendPlatformMessage; + fl_engine_get_embedder_api(engine)->SendPlatformMessage = MOCK_ENGINE_PROC( SendPlatformMessage, ([&called, old_handler](auto engine, const FlutterPlatformMessage* message) { @@ -187,28 +188,30 @@ TEST(FlEngineTest, PlatformMessage) { // Checks sending platform message responses works. TEST(FlEngineTest, PlatformMessageResponse) { - g_autoptr(FlEngine) engine = make_mock_engine(); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); bool called = false; - embedder_api->SendPlatformMessageResponse = MOCK_ENGINE_PROC( - SendPlatformMessageResponse, - ([&called](auto engine, - const FlutterPlatformMessageResponseHandle* handle, - const uint8_t* data, size_t data_length) { - called = true; - - EXPECT_EQ( - handle, - reinterpret_cast(42)); - EXPECT_EQ(data_length, static_cast(4)); - EXPECT_EQ(data[0], 't'); - EXPECT_EQ(data[1], 'e'); - EXPECT_EQ(data[2], 's'); - EXPECT_EQ(data[3], 't'); - - return kSuccess; - })); + fl_engine_get_embedder_api(engine)->SendPlatformMessageResponse = + MOCK_ENGINE_PROC( + SendPlatformMessageResponse, + ([&called](auto engine, + const FlutterPlatformMessageResponseHandle* handle, + const uint8_t* data, size_t data_length) { + called = true; + + EXPECT_EQ( + handle, + reinterpret_cast( + 42)); + EXPECT_EQ(data_length, static_cast(4)); + EXPECT_EQ(data[0], 't'); + EXPECT_EQ(data[1], 'e'); + EXPECT_EQ(data[2], 's'); + EXPECT_EQ(data[3], 't'); + + return kSuccess; + })); g_autoptr(GError) error = nullptr; EXPECT_TRUE(fl_engine_start(engine, &error)); @@ -224,11 +227,11 @@ TEST(FlEngineTest, PlatformMessageResponse) { // Checks settings handler sends settings on startup. TEST(FlEngineTest, SettingsHandler) { - g_autoptr(FlEngine) engine = make_mock_engine(); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); bool called = false; - embedder_api->SendPlatformMessage = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->SendPlatformMessage = MOCK_ENGINE_PROC( SendPlatformMessage, ([&called](auto engine, const FlutterPlatformMessage* message) { called = true; @@ -277,14 +280,14 @@ void on_pre_engine_restart_cb(FlEngine* engine, gpointer user_data) { // Checks restarting the engine invokes the correct callback. TEST(FlEngineTest, OnPreEngineRestart) { - g_autoptr(FlEngine) engine = make_mock_engine(); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); OnPreEngineRestartCallback callback; void* callback_user_data; bool called = false; - embedder_api->Initialize = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->Initialize = MOCK_ENGINE_PROC( Initialize, ([&callback, &callback_user_data, &called]( size_t version, const FlutterRendererConfig* config, const FlutterProjectArgs* args, void* user_data, @@ -295,6 +298,8 @@ TEST(FlEngineTest, OnPreEngineRestart) { return kSuccess; })); + fl_engine_get_embedder_api(engine)->RunInitialized = + MOCK_ENGINE_PROC(RunInitialized, ([](auto engine) { return kSuccess; })); g_autoptr(GError) error = nullptr; EXPECT_TRUE(fl_engine_start(engine, &error)); @@ -320,8 +325,6 @@ TEST(FlEngineTest, OnPreEngineRestart) { } TEST(FlEngineTest, DartEntrypointArgs) { - g_autoptr(FlDartProject) project = fl_dart_project_new(); - GPtrArray* args_array = g_ptr_array_new(); g_ptr_array_add(args_array, const_cast("arg_one")); g_ptr_array_add(args_array, const_cast("arg_two")); @@ -329,13 +332,12 @@ TEST(FlEngineTest, DartEntrypointArgs) { g_ptr_array_add(args_array, nullptr); gchar** args = reinterpret_cast(g_ptr_array_free(args_array, false)); + g_autoptr(FlDartProject) project = fl_dart_project_new(); fl_dart_project_set_dart_entrypoint_arguments(project, args); - - g_autoptr(FlEngine) engine = make_mock_engine_with_project(project); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(FlEngine) engine = fl_engine_new(project); bool called = false; - embedder_api->Initialize = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->Initialize = MOCK_ENGINE_PROC( Initialize, ([&called, &set_args = args]( size_t version, const FlutterRendererConfig* config, const FlutterProjectArgs* args, void* user_data, @@ -346,6 +348,8 @@ TEST(FlEngineTest, DartEntrypointArgs) { return kSuccess; })); + fl_engine_get_embedder_api(engine)->RunInitialized = + MOCK_ENGINE_PROC(RunInitialized, ([](auto engine) { return kSuccess; })); g_autoptr(GError) error = nullptr; EXPECT_TRUE(fl_engine_start(engine, &error)); @@ -359,11 +363,10 @@ TEST(FlEngineTest, Locales) { g_setenv("LANGUAGE", "de:en_US", TRUE); g_autoptr(FlDartProject) project = fl_dart_project_new(); - g_autoptr(FlEngine) engine = make_mock_engine_with_project(project); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(FlEngine) engine = fl_engine_new(project); bool called = false; - embedder_api->UpdateLocales = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->UpdateLocales = MOCK_ENGINE_PROC( UpdateLocales, ([&called](auto engine, const FlutterLocale** locales, size_t locales_count) { called = true; @@ -411,11 +414,10 @@ TEST(FlEngineTest, CLocale) { g_setenv("LANGUAGE", "C", TRUE); g_autoptr(FlDartProject) project = fl_dart_project_new(); - g_autoptr(FlEngine) engine = make_mock_engine_with_project(project); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(FlEngine) engine = fl_engine_new(project); bool called = false; - embedder_api->UpdateLocales = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->UpdateLocales = MOCK_ENGINE_PROC( UpdateLocales, ([&called](auto engine, const FlutterLocale** locales, size_t locales_count) { called = true; @@ -448,11 +450,10 @@ TEST(FlEngineTest, DuplicateLocale) { g_setenv("LANGUAGE", "en:en", TRUE); g_autoptr(FlDartProject) project = fl_dart_project_new(); - g_autoptr(FlEngine) engine = make_mock_engine_with_project(project); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(FlEngine) engine = fl_engine_new(project); bool called = false; - embedder_api->UpdateLocales = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->UpdateLocales = MOCK_ENGINE_PROC( UpdateLocales, ([&called](auto engine, const FlutterLocale** locales, size_t locales_count) { called = true; @@ -490,11 +491,10 @@ TEST(FlEngineTest, EmptyLocales) { g_setenv("LANGUAGE", "de:: :en_US", TRUE); g_autoptr(FlDartProject) project = fl_dart_project_new(); - g_autoptr(FlEngine) engine = make_mock_engine_with_project(project); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(FlEngine) engine = fl_engine_new(project); bool called = false; - embedder_api->UpdateLocales = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->UpdateLocales = MOCK_ENGINE_PROC( UpdateLocales, ([&called](auto engine, const FlutterLocale** locales, size_t locales_count) { called = true; @@ -551,11 +551,11 @@ static void add_view_cb(GObject* object, TEST(FlEngineTest, AddView) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); - g_autoptr(FlEngine) engine = make_mock_engine(); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); bool called = false; - embedder_api->AddView = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->AddView = MOCK_ENGINE_PROC( AddView, ([&called](auto engine, const FlutterAddViewInfo* info) { called = true; EXPECT_EQ(info->view_metrics->width, 123u); @@ -594,10 +594,10 @@ static void add_view_error_cb(GObject* object, TEST(FlEngineTest, AddViewError) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); - g_autoptr(FlEngine) engine = make_mock_engine(); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); - embedder_api->AddView = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->AddView = MOCK_ENGINE_PROC( AddView, ([](auto engine, const FlutterAddViewInfo* info) { FlutterAddViewResult result; result.struct_size = sizeof(FlutterAddViewResult); @@ -630,10 +630,10 @@ static void add_view_engine_error_cb(GObject* object, TEST(FlEngineTest, AddViewEngineError) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); - g_autoptr(FlEngine) engine = make_mock_engine(); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); - embedder_api->AddView = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->AddView = MOCK_ENGINE_PROC( AddView, ([](auto engine, const FlutterAddViewInfo* info) { return kInvalidArguments; })); @@ -660,11 +660,11 @@ static void remove_view_cb(GObject* object, TEST(FlEngineTest, RemoveView) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); - g_autoptr(FlEngine) engine = make_mock_engine(); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); bool called = false; - embedder_api->RemoveView = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->RemoveView = MOCK_ENGINE_PROC( RemoveView, ([&called](auto engine, const FlutterRemoveViewInfo* info) { called = true; EXPECT_EQ(info->view_id, 123); @@ -699,10 +699,10 @@ static void remove_view_error_cb(GObject* object, TEST(FlEngineTest, RemoveViewError) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); - g_autoptr(FlEngine) engine = make_mock_engine(); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); - embedder_api->RemoveView = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->RemoveView = MOCK_ENGINE_PROC( RemoveView, ([](auto engine, const FlutterRemoveViewInfo* info) { FlutterRemoveViewResult result; result.struct_size = sizeof(FlutterRemoveViewResult); @@ -733,10 +733,10 @@ static void remove_view_engine_error_cb(GObject* object, TEST(FlEngineTest, RemoveViewEngineError) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); - g_autoptr(FlEngine) engine = make_mock_engine(); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); - embedder_api->RemoveView = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->RemoveView = MOCK_ENGINE_PROC( RemoveView, ([](auto engine, const FlutterRemoveViewInfo* info) { return kInvalidArguments; })); @@ -751,11 +751,15 @@ TEST(FlEngineTest, RemoveViewEngineError) { TEST(FlEngineTest, SendKeyEvent) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); - g_autoptr(FlEngine) engine = make_mock_engine(); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); bool called; - embedder_api->SendKeyEvent = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->SendKeyEvent = MOCK_ENGINE_PROC( SendKeyEvent, ([&called](auto engine, const FlutterKeyEvent* event, FlutterKeyEventCallback callback, void* user_data) { @@ -798,11 +802,15 @@ TEST(FlEngineTest, SendKeyEvent) { TEST(FlEngineTest, SendKeyEventNotHandled) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); - g_autoptr(FlEngine) engine = make_mock_engine(); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); bool called; - embedder_api->SendKeyEvent = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->SendKeyEvent = MOCK_ENGINE_PROC( SendKeyEvent, ([&called](auto engine, const FlutterKeyEvent* event, FlutterKeyEventCallback callback, void* user_data) { @@ -839,11 +847,15 @@ TEST(FlEngineTest, SendKeyEventNotHandled) { TEST(FlEngineTest, SendKeyEventError) { g_autoptr(GMainLoop) loop = g_main_loop_new(nullptr, 0); - g_autoptr(FlEngine) engine = make_mock_engine(); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); bool called; - embedder_api->SendKeyEvent = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->SendKeyEvent = MOCK_ENGINE_PROC( SendKeyEvent, ([&called](auto engine, const FlutterKeyEvent* event, FlutterKeyEventCallback callback, void* user_data) { diff --git a/shell/platform/linux/fl_framebuffer_test.cc b/shell/platform/linux/fl_framebuffer_test.cc index de565c59ecf2d..44f2e78dc7e31 100644 --- a/shell/platform/linux/fl_framebuffer_test.cc +++ b/shell/platform/linux/fl_framebuffer_test.cc @@ -4,8 +4,6 @@ #include "gtest/gtest.h" -#include "flutter/common/constants.h" -#include "flutter/fml/logging.h" #include "flutter/shell/platform/linux/fl_framebuffer.h" #include "flutter/shell/platform/linux/testing/mock_epoxy.h" diff --git a/shell/platform/linux/fl_plugin_registrar_test.cc b/shell/platform/linux/fl_plugin_registrar_test.cc index 792e32473a3bf..e9b7772b9e852 100644 --- a/shell/platform/linux/fl_plugin_registrar_test.cc +++ b/shell/platform/linux/fl_plugin_registrar_test.cc @@ -10,12 +10,13 @@ #include "flutter/shell/platform/linux/fl_binary_messenger_private.h" #include "flutter/shell/platform/linux/fl_texture_registrar_private.h" #include "flutter/shell/platform/linux/public/flutter_linux/fl_plugin_registrar.h" -#include "flutter/shell/platform/linux/testing/fl_test.h" #include "flutter/shell/platform/linux/testing/mock_plugin_registrar.h" // Checks can make a mock registrar. TEST(FlPluginRegistrarTest, FlMockRegistrar) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + g_autoptr(FlBinaryMessenger) messenger = fl_binary_messenger_new(engine); g_autoptr(FlTextureRegistrar) texture_registrar = fl_texture_registrar_new(engine); diff --git a/shell/platform/linux/fl_pointer_manager_test.cc b/shell/platform/linux/fl_pointer_manager_test.cc index 503397e441acf..519b39ad14c5b 100644 --- a/shell/platform/linux/fl_pointer_manager_test.cc +++ b/shell/platform/linux/fl_pointer_manager_test.cc @@ -5,15 +5,19 @@ #include "flutter/shell/platform/linux/fl_pointer_manager.h" #include "flutter/shell/platform/embedder/test_utils/proc_table_replacement.h" #include "flutter/shell/platform/linux/fl_engine_private.h" -#include "flutter/shell/platform/linux/testing/fl_test.h" #include "gtest/gtest.h" -static void log_pointer_events( - FlEngine* engine, - std::vector& pointer_events) { - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); - embedder_api->SendPointerEvent = MOCK_ENGINE_PROC( +TEST(FlPointerManagerTest, EnterLeave) { + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); + + std::vector pointer_events; + fl_engine_get_embedder_api(engine)->SendPointerEvent = MOCK_ENGINE_PROC( SendPointerEvent, ([&pointer_events](auto engine, const FlutterPointerEvent* events, size_t events_count) { @@ -23,12 +27,6 @@ static void log_pointer_events( return kSuccess; })); -} - -TEST(FlPointerManagerTest, EnterLeave) { - g_autoptr(FlEngine) engine = make_mock_engine(); - std::vector pointer_events; - log_pointer_events(engine, pointer_events); g_autoptr(FlPointerManager) manager = fl_pointer_manager_new(42, engine); fl_pointer_manager_handle_enter(manager, 1234, kFlutterPointerDeviceKindMouse, @@ -54,9 +52,24 @@ TEST(FlPointerManagerTest, EnterLeave) { } TEST(FlPointerManagerTest, EnterEnter) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); + std::vector pointer_events; - log_pointer_events(engine, pointer_events); + fl_engine_get_embedder_api(engine)->SendPointerEvent = MOCK_ENGINE_PROC( + SendPointerEvent, + ([&pointer_events](auto engine, const FlutterPointerEvent* events, + size_t events_count) { + for (size_t i = 0; i < events_count; i++) { + pointer_events.push_back(events[i]); + } + + return kSuccess; + })); g_autoptr(FlPointerManager) manager = fl_pointer_manager_new(42, engine); fl_pointer_manager_handle_enter(manager, 1234, kFlutterPointerDeviceKindMouse, @@ -76,9 +89,24 @@ TEST(FlPointerManagerTest, EnterEnter) { } TEST(FlPointerManagerTest, EnterLeaveLeave) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); + std::vector pointer_events; - log_pointer_events(engine, pointer_events); + fl_engine_get_embedder_api(engine)->SendPointerEvent = MOCK_ENGINE_PROC( + SendPointerEvent, + ([&pointer_events](auto engine, const FlutterPointerEvent* events, + size_t events_count) { + for (size_t i = 0; i < events_count; i++) { + pointer_events.push_back(events[i]); + } + + return kSuccess; + })); g_autoptr(FlPointerManager) manager = fl_pointer_manager_new(42, engine); fl_pointer_manager_handle_enter(manager, 1234, kFlutterPointerDeviceKindMouse, @@ -107,9 +135,24 @@ TEST(FlPointerManagerTest, EnterLeaveLeave) { } TEST(FlPointerManagerTest, EnterButtonPress) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); + std::vector pointer_events; - log_pointer_events(engine, pointer_events); + fl_engine_get_embedder_api(engine)->SendPointerEvent = MOCK_ENGINE_PROC( + SendPointerEvent, + ([&pointer_events](auto engine, const FlutterPointerEvent* events, + size_t events_count) { + for (size_t i = 0; i < events_count; i++) { + pointer_events.push_back(events[i]); + } + + return kSuccess; + })); g_autoptr(FlPointerManager) manager = fl_pointer_manager_new(42, engine); fl_pointer_manager_handle_enter(manager, 1234, kFlutterPointerDeviceKindMouse, @@ -136,9 +179,24 @@ TEST(FlPointerManagerTest, EnterButtonPress) { } TEST(FlPointerManagerTest, NoEnterButtonPress) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); + std::vector pointer_events; - log_pointer_events(engine, pointer_events); + fl_engine_get_embedder_api(engine)->SendPointerEvent = MOCK_ENGINE_PROC( + SendPointerEvent, + ([&pointer_events](auto engine, const FlutterPointerEvent* events, + size_t events_count) { + for (size_t i = 0; i < events_count; i++) { + pointer_events.push_back(events[i]); + } + + return kSuccess; + })); g_autoptr(FlPointerManager) manager = fl_pointer_manager_new(42, engine); fl_pointer_manager_handle_button_press( @@ -164,9 +222,24 @@ TEST(FlPointerManagerTest, NoEnterButtonPress) { } TEST(FlPointerManagerTest, ButtonPressButtonRelease) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); + std::vector pointer_events; - log_pointer_events(engine, pointer_events); + fl_engine_get_embedder_api(engine)->SendPointerEvent = MOCK_ENGINE_PROC( + SendPointerEvent, + ([&pointer_events](auto engine, const FlutterPointerEvent* events, + size_t events_count) { + for (size_t i = 0; i < events_count; i++) { + pointer_events.push_back(events[i]); + } + + return kSuccess; + })); g_autoptr(FlPointerManager) manager = fl_pointer_manager_new(42, engine); fl_pointer_manager_handle_button_press( @@ -194,9 +267,24 @@ TEST(FlPointerManagerTest, ButtonPressButtonRelease) { } TEST(FlPointerManagerTest, ButtonPressButtonReleaseThreeButtons) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); + std::vector pointer_events; - log_pointer_events(engine, pointer_events); + fl_engine_get_embedder_api(engine)->SendPointerEvent = MOCK_ENGINE_PROC( + SendPointerEvent, + ([&pointer_events](auto engine, const FlutterPointerEvent* events, + size_t events_count) { + for (size_t i = 0; i < events_count; i++) { + pointer_events.push_back(events[i]); + } + + return kSuccess; + })); g_autoptr(FlPointerManager) manager = fl_pointer_manager_new(42, engine); // Press buttons 1-2-3, release 3-2-1 @@ -253,9 +341,24 @@ TEST(FlPointerManagerTest, ButtonPressButtonReleaseThreeButtons) { } TEST(FlPointerManagerTest, ButtonPressButtonPressButtonRelease) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); + std::vector pointer_events; - log_pointer_events(engine, pointer_events); + fl_engine_get_embedder_api(engine)->SendPointerEvent = MOCK_ENGINE_PROC( + SendPointerEvent, + ([&pointer_events](auto engine, const FlutterPointerEvent* events, + size_t events_count) { + for (size_t i = 0; i < events_count; i++) { + pointer_events.push_back(events[i]); + } + + return kSuccess; + })); g_autoptr(FlPointerManager) manager = fl_pointer_manager_new(42, engine); fl_pointer_manager_handle_button_press( @@ -287,9 +390,24 @@ TEST(FlPointerManagerTest, ButtonPressButtonPressButtonRelease) { } TEST(FlPointerManagerTest, ButtonPressButtonReleaseButtonRelease) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); + std::vector pointer_events; - log_pointer_events(engine, pointer_events); + fl_engine_get_embedder_api(engine)->SendPointerEvent = MOCK_ENGINE_PROC( + SendPointerEvent, + ([&pointer_events](auto engine, const FlutterPointerEvent* events, + size_t events_count) { + for (size_t i = 0; i < events_count; i++) { + pointer_events.push_back(events[i]); + } + + return kSuccess; + })); g_autoptr(FlPointerManager) manager = fl_pointer_manager_new(42, engine); fl_pointer_manager_handle_button_press( @@ -321,9 +439,24 @@ TEST(FlPointerManagerTest, ButtonPressButtonReleaseButtonRelease) { } TEST(FlPointerManagerTest, NoButtonPressButtonRelease) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); + std::vector pointer_events; - log_pointer_events(engine, pointer_events); + fl_engine_get_embedder_api(engine)->SendPointerEvent = MOCK_ENGINE_PROC( + SendPointerEvent, + ([&pointer_events](auto engine, const FlutterPointerEvent* events, + size_t events_count) { + for (size_t i = 0; i < events_count; i++) { + pointer_events.push_back(events[i]); + } + + return kSuccess; + })); g_autoptr(FlPointerManager) manager = fl_pointer_manager_new(42, engine); // Release without associated press, will be ignored @@ -335,9 +468,24 @@ TEST(FlPointerManagerTest, NoButtonPressButtonRelease) { } TEST(FlPointerManagerTest, Motion) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); + std::vector pointer_events; - log_pointer_events(engine, pointer_events); + fl_engine_get_embedder_api(engine)->SendPointerEvent = MOCK_ENGINE_PROC( + SendPointerEvent, + ([&pointer_events](auto engine, const FlutterPointerEvent* events, + size_t events_count) { + for (size_t i = 0; i < events_count; i++) { + pointer_events.push_back(events[i]); + } + + return kSuccess; + })); g_autoptr(FlPointerManager) manager = fl_pointer_manager_new(42, engine); fl_pointer_manager_handle_motion(manager, 1234, @@ -371,9 +519,24 @@ TEST(FlPointerManagerTest, Motion) { } TEST(FlPointerManagerTest, Drag) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); + std::vector pointer_events; - log_pointer_events(engine, pointer_events); + fl_engine_get_embedder_api(engine)->SendPointerEvent = MOCK_ENGINE_PROC( + SendPointerEvent, + ([&pointer_events](auto engine, const FlutterPointerEvent* events, + size_t events_count) { + for (size_t i = 0; i < events_count; i++) { + pointer_events.push_back(events[i]); + } + + return kSuccess; + })); g_autoptr(FlPointerManager) manager = fl_pointer_manager_new(42, engine); fl_pointer_manager_handle_motion(manager, 1234, @@ -420,9 +583,24 @@ TEST(FlPointerManagerTest, Drag) { } TEST(FlPointerManagerTest, DeviceKind) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); + std::vector pointer_events; - log_pointer_events(engine, pointer_events); + fl_engine_get_embedder_api(engine)->SendPointerEvent = MOCK_ENGINE_PROC( + SendPointerEvent, + ([&pointer_events](auto engine, const FlutterPointerEvent* events, + size_t events_count) { + for (size_t i = 0; i < events_count; i++) { + pointer_events.push_back(events[i]); + } + + return kSuccess; + })); g_autoptr(FlPointerManager) manager = fl_pointer_manager_new(42, engine); fl_pointer_manager_handle_enter(manager, 1234, diff --git a/shell/platform/linux/fl_scrolling_manager_test.cc b/shell/platform/linux/fl_scrolling_manager_test.cc index 05fe2adc31967..047df48cd9193 100644 --- a/shell/platform/linux/fl_scrolling_manager_test.cc +++ b/shell/platform/linux/fl_scrolling_manager_test.cc @@ -5,7 +5,6 @@ #include "flutter/shell/platform/linux/fl_scrolling_manager.h" #include "flutter/shell/platform/embedder/test_utils/proc_table_replacement.h" #include "flutter/shell/platform/linux/fl_engine_private.h" -#include "flutter/shell/platform/linux/testing/fl_test.h" #include #include @@ -30,10 +29,15 @@ GdkDevice* makeFakeDevice(GdkInputSource source) { } TEST(FlScrollingManagerTest, DiscreteDirectional) { - g_autoptr(FlEngine) engine = make_mock_engine(); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); + std::vector pointer_events; - embedder_api->SendPointerEvent = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->SendPointerEvent = MOCK_ENGINE_PROC( SendPointerEvent, ([&pointer_events](auto engine, const FlutterPointerEvent* events, size_t events_count) { @@ -96,10 +100,15 @@ TEST(FlScrollingManagerTest, DiscreteDirectional) { } TEST(FlScrollingManagerTest, DiscreteScrolling) { - g_autoptr(FlEngine) engine = make_mock_engine(); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); + std::vector pointer_events; - embedder_api->SendPointerEvent = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->SendPointerEvent = MOCK_ENGINE_PROC( SendPointerEvent, ([&pointer_events](auto engine, const FlutterPointerEvent* events, size_t events_count) { @@ -134,10 +143,15 @@ TEST(FlScrollingManagerTest, DiscreteScrolling) { } TEST(FlScrollingManagerTest, Panning) { - g_autoptr(FlEngine) engine = make_mock_engine(); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); + std::vector pointer_events; - embedder_api->SendPointerEvent = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->SendPointerEvent = MOCK_ENGINE_PROC( SendPointerEvent, ([&pointer_events](auto engine, const FlutterPointerEvent* events, size_t events_count) { @@ -198,10 +212,15 @@ TEST(FlScrollingManagerTest, Panning) { } TEST(FlScrollingManagerTest, Zooming) { - g_autoptr(FlEngine) engine = make_mock_engine(); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); + std::vector pointer_events; - embedder_api->SendPointerEvent = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->SendPointerEvent = MOCK_ENGINE_PROC( SendPointerEvent, ([&pointer_events](auto engine, const FlutterPointerEvent* events, size_t events_count) { @@ -240,10 +259,15 @@ TEST(FlScrollingManagerTest, Zooming) { } TEST(FlScrollingManagerTest, Rotating) { - g_autoptr(FlEngine) engine = make_mock_engine(); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); + std::vector pointer_events; - embedder_api->SendPointerEvent = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->SendPointerEvent = MOCK_ENGINE_PROC( SendPointerEvent, ([&pointer_events](auto engine, const FlutterPointerEvent* events, size_t events_count) { @@ -282,10 +306,15 @@ TEST(FlScrollingManagerTest, Rotating) { } TEST(FlScrollingManagerTest, SynchronizedZoomingAndRotating) { - g_autoptr(FlEngine) engine = make_mock_engine(); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); + std::vector pointer_events; - embedder_api->SendPointerEvent = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->SendPointerEvent = MOCK_ENGINE_PROC( SendPointerEvent, ([&pointer_events](auto engine, const FlutterPointerEvent* events, size_t events_count) { @@ -341,10 +370,15 @@ TEST(FlScrollingManagerTest, SynchronizedZoomingAndRotating) { // Make sure that zoom and rotate sequences which don't end at the same time // don't cause any problems. TEST(FlScrollingManagerTest, UnsynchronizedZoomingAndRotating) { - g_autoptr(FlEngine) engine = make_mock_engine(); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); + std::vector pointer_events; - embedder_api->SendPointerEvent = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->SendPointerEvent = MOCK_ENGINE_PROC( SendPointerEvent, ([&pointer_events](auto engine, const FlutterPointerEvent* events, size_t events_count) { diff --git a/shell/platform/linux/fl_settings_handler_test.cc b/shell/platform/linux/fl_settings_handler_test.cc index e8ebd34934100..b9221822801b8 100644 --- a/shell/platform/linux/fl_settings_handler_test.cc +++ b/shell/platform/linux/fl_settings_handler_test.cc @@ -8,7 +8,6 @@ #include "flutter/shell/platform/linux/fl_binary_messenger_private.h" #include "flutter/shell/platform/linux/fl_engine_private.h" #include "flutter/shell/platform/linux/testing/fl_mock_binary_messenger.h" -#include "flutter/shell/platform/linux/testing/fl_test.h" #include "flutter/shell/platform/linux/testing/mock_settings.h" #include "flutter/testing/testing.h" @@ -191,16 +190,21 @@ TEST(FlSettingsHandlerTest, TextScaleFactor) { // MOCK_ENGINE_PROC is leaky by design // NOLINTBEGIN(clang-analyzer-core.StackAddressEscape) TEST(FlSettingsHandlerTest, AccessibilityFeatures) { - g_autoptr(FlEngine) engine = make_mock_engine(); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); std::vector calls; - embedder_api->UpdateAccessibilityFeatures = MOCK_ENGINE_PROC( - UpdateAccessibilityFeatures, - ([&calls](auto engine, FlutterAccessibilityFeature features) { - calls.push_back(features); - return kSuccess; - })); + fl_engine_get_embedder_api(engine)->UpdateAccessibilityFeatures = + MOCK_ENGINE_PROC( + UpdateAccessibilityFeatures, + ([&calls](auto engine, FlutterAccessibilityFeature features) { + calls.push_back(features); + return kSuccess; + })); g_autoptr(FlSettingsHandler) handler = fl_settings_handler_new(engine); diff --git a/shell/platform/linux/fl_texture_registrar_test.cc b/shell/platform/linux/fl_texture_registrar_test.cc index 23e0b7f84c123..b1a5fe982b5ba 100644 --- a/shell/platform/linux/fl_texture_registrar_test.cc +++ b/shell/platform/linux/fl_texture_registrar_test.cc @@ -3,10 +3,11 @@ // found in the LICENSE file. #include "flutter/shell/platform/linux/public/flutter_linux/fl_texture_registrar.h" +#include "flutter/shell/platform/embedder/test_utils/proc_table_replacement.h" +#include "flutter/shell/platform/linux/fl_engine_private.h" #include "flutter/shell/platform/linux/fl_texture_registrar_private.h" #include "flutter/shell/platform/linux/public/flutter_linux/fl_pixel_buffer_texture.h" #include "flutter/shell/platform/linux/public/flutter_linux/fl_texture_gl.h" -#include "flutter/shell/platform/linux/testing/fl_test.h" #include "flutter/shell/platform/linux/testing/mock_texture_registrar.h" #include "gtest/gtest.h" @@ -95,35 +96,110 @@ TEST(FlTextureRegistrarTest, MockRegistrar) { // Test that registering a texture works. TEST(FlTextureRegistrarTest, RegisterTexture) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + bool register_called = false; + fl_engine_get_embedder_api(engine)->RegisterExternalTexture = + MOCK_ENGINE_PROC(RegisterExternalTexture, + ([®ister_called](auto engine, int64_t texture_id) { + register_called = true; + return kSuccess; + })); + bool unregister_called = false; + fl_engine_get_embedder_api(engine)->UnregisterExternalTexture = + MOCK_ENGINE_PROC(UnregisterExternalTexture, + ([&unregister_called](auto engine, int64_t texture_id) { + unregister_called = true; + return kSuccess; + })); + g_autoptr(FlTextureRegistrar) registrar = fl_texture_registrar_new(engine); g_autoptr(FlTexture) texture = FL_TEXTURE(fl_test_registrar_texture_new()); - EXPECT_FALSE(fl_texture_registrar_unregister_texture(registrar, texture)); + // EXPECT_FALSE(fl_texture_registrar_unregister_texture(registrar, texture)); + EXPECT_FALSE(register_called); EXPECT_TRUE(fl_texture_registrar_register_texture(registrar, texture)); + EXPECT_TRUE(register_called); + EXPECT_FALSE(unregister_called); EXPECT_TRUE(fl_texture_registrar_unregister_texture(registrar, texture)); + EXPECT_TRUE(unregister_called); } // Test that marking a texture frame available works. TEST(FlTextureRegistrarTest, MarkTextureFrameAvailable) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + bool register_called = false; + fl_engine_get_embedder_api(engine)->RegisterExternalTexture = + MOCK_ENGINE_PROC(RegisterExternalTexture, + ([®ister_called](auto engine, int64_t texture_id) { + register_called = true; + return kSuccess; + })); + fl_engine_get_embedder_api(engine)->UnregisterExternalTexture = + MOCK_ENGINE_PROC( + UnregisterExternalTexture, + ([](auto engine, int64_t texture_id) { return kSuccess; })); + fl_engine_get_embedder_api(engine)->MarkExternalTextureFrameAvailable = + MOCK_ENGINE_PROC(MarkExternalTextureFrameAvailable, + ([](auto engine, int64_t texture_id) { + g_printerr("!\n"); + return kSuccess; + })); + g_autoptr(FlTextureRegistrar) registrar = fl_texture_registrar_new(engine); g_autoptr(FlTexture) texture = FL_TEXTURE(fl_test_registrar_texture_new()); - EXPECT_FALSE( - fl_texture_registrar_mark_texture_frame_available(registrar, texture)); EXPECT_TRUE(fl_texture_registrar_register_texture(registrar, texture)); + EXPECT_TRUE(register_called); EXPECT_TRUE( fl_texture_registrar_mark_texture_frame_available(registrar, texture)); } +// Test handles error marking a texture frame available. +TEST(FlTextureRegistrarTest, MarkInvalidTextureFrameAvailable) { + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + fl_engine_get_embedder_api(engine)->RegisterExternalTexture = + MOCK_ENGINE_PROC( + RegisterExternalTexture, + ([](auto engine, int64_t texture_id) { return kSuccess; })); + fl_engine_get_embedder_api(engine)->UnregisterExternalTexture = + MOCK_ENGINE_PROC( + UnregisterExternalTexture, + ([](auto engine, int64_t texture_id) { return kSuccess; })); + fl_engine_get_embedder_api(engine)->MarkExternalTextureFrameAvailable = + MOCK_ENGINE_PROC(MarkExternalTextureFrameAvailable, + ([](auto engine, int64_t texture_id) { + return kInternalInconsistency; + })); + + g_autoptr(FlTextureRegistrar) registrar = fl_texture_registrar_new(engine); + g_autoptr(FlTexture) texture = FL_TEXTURE(fl_test_registrar_texture_new()); + + EXPECT_TRUE(fl_texture_registrar_register_texture(registrar, texture)); + EXPECT_FALSE( + fl_texture_registrar_mark_texture_frame_available(registrar, texture)); +} + // Test the textures can be accessed via multiple threads without // synchronization issues. // TODO(robert-ancell): Re-enable when no longer flaky // https://github.com/flutter/flutter/issues/138197 TEST(FlTextureRegistrarTest, DISABLED_RegistrarRegisterTextureInMultipleThreads) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + fl_engine_get_embedder_api(engine)->RegisterExternalTexture = + MOCK_ENGINE_PROC( + RegisterExternalTexture, + ([](auto engine, int64_t texture_id) { return kSuccess; })); + fl_engine_get_embedder_api(engine)->UnregisterExternalTexture = + MOCK_ENGINE_PROC( + UnregisterExternalTexture, + ([](auto engine, int64_t texture_id) { return kSuccess; })); + g_autoptr(FlTextureRegistrar) registrar = fl_texture_registrar_new(engine); pthread_t threads[kThreadCount]; int64_t ids[kThreadCount]; diff --git a/shell/platform/linux/fl_touch_manager_test.cc b/shell/platform/linux/fl_touch_manager_test.cc index 90d1d4621a92a..1b08bfbc22f0c 100644 --- a/shell/platform/linux/fl_touch_manager_test.cc +++ b/shell/platform/linux/fl_touch_manager_test.cc @@ -5,29 +5,12 @@ #include "flutter/shell/platform/linux/fl_touch_manager.h" #include "flutter/shell/platform/embedder/test_utils/proc_table_replacement.h" #include "flutter/shell/platform/linux/fl_engine_private.h" -#include "flutter/shell/platform/linux/testing/fl_test.h" #include #include #include "gtest/gtest.h" -static void log_pointer_events( - FlEngine* engine, - std::vector& pointer_events) { - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); - embedder_api->SendPointerEvent = MOCK_ENGINE_PROC( - SendPointerEvent, - ([&pointer_events](auto engine, const FlutterPointerEvent* events, - size_t events_count) { - for (size_t i = 0; i < events_count; i++) { - pointer_events.push_back(events[i]); - } - - return kSuccess; - })); -} - struct _FakeGdkDevice { GObject parent_instance; gchar* name; @@ -45,9 +28,24 @@ static GdkDevice* makeFakeDevice(GdkInputSource source) { } TEST(FlTouchManagerTest, TouchEvents) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); + + g_autoptr(GError) error = nullptr; + EXPECT_TRUE(fl_engine_start(engine, &error)); + EXPECT_EQ(error, nullptr); + std::vector pointer_events; - log_pointer_events(engine, pointer_events); + fl_engine_get_embedder_api(engine)->SendPointerEvent = MOCK_ENGINE_PROC( + SendPointerEvent, + ([&pointer_events](auto engine, const FlutterPointerEvent* events, + size_t events_count) { + for (size_t i = 0; i < events_count; i++) { + pointer_events.push_back(events[i]); + } + + return kSuccess; + })); g_autoptr(FlTouchManager) manager = fl_touch_manager_new(engine, 0); diff --git a/shell/platform/linux/fl_view_accessible_test.cc b/shell/platform/linux/fl_view_accessible_test.cc index 0b6d17ab49a21..533346aee80c9 100644 --- a/shell/platform/linux/fl_view_accessible_test.cc +++ b/shell/platform/linux/fl_view_accessible_test.cc @@ -7,11 +7,11 @@ #include "flutter/shell/platform/linux/fl_view_accessible.h" #include "flutter/shell/platform/linux/public/flutter_linux/fl_engine.h" -#include "flutter/shell/platform/linux/testing/fl_test.h" #include "flutter/shell/platform/linux/testing/mock_signal_handler.h" TEST(FlViewAccessibleTest, BuildTree) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); g_autoptr(FlViewAccessible) accessible = fl_view_accessible_new(engine); int32_t children[] = {111, 222}; @@ -47,7 +47,8 @@ TEST(FlViewAccessibleTest, BuildTree) { } TEST(FlViewAccessibleTest, AddRemoveChildren) { - g_autoptr(FlEngine) engine = make_mock_engine(); + g_autoptr(FlDartProject) project = fl_dart_project_new(); + g_autoptr(FlEngine) engine = fl_engine_new(project); g_autoptr(FlViewAccessible) accessible = fl_view_accessible_new(engine); FlutterSemanticsNode2 root_node = { diff --git a/shell/platform/linux/fl_view_test.cc b/shell/platform/linux/fl_view_test.cc index e6a51057c68c1..61e87a323f578 100644 --- a/shell/platform/linux/fl_view_test.cc +++ b/shell/platform/linux/fl_view_test.cc @@ -68,10 +68,9 @@ TEST(FlViewTest, SecondaryView) { FlView* implicit_view = fl_view_new(project); FlEngine* engine = fl_view_get_engine(implicit_view); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); FlutterViewId view_id = -1; - embedder_api->AddView = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->AddView = MOCK_ENGINE_PROC( AddView, ([&view_id](auto engine, const FlutterAddViewInfo* info) { view_id = info->view_id; FlutterAddViewResult result = { @@ -97,10 +96,9 @@ TEST(FlViewTest, SecondaryViewError) { FlView* implicit_view = fl_view_new(project); FlEngine* engine = fl_view_get_engine(implicit_view); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); FlutterViewId view_id = -1; - embedder_api->AddView = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->AddView = MOCK_ENGINE_PROC( AddView, ([&view_id](auto engine, const FlutterAddViewInfo* info) { view_id = info->view_id; return kInvalidArguments; @@ -121,10 +119,9 @@ TEST(FlViewTest, ViewDestroy) { FlView* implicit_view = fl_view_new(project); FlEngine* engine = fl_view_get_engine(implicit_view); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); g_autoptr(GPtrArray) removed_views = g_ptr_array_new(); - embedder_api->RemoveView = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->RemoveView = MOCK_ENGINE_PROC( RemoveView, ([removed_views](auto engine, const FlutterRemoveViewInfo* info) { g_ptr_array_add(removed_views, GINT_TO_POINTER(info->view_id)); @@ -157,9 +154,8 @@ TEST(FlViewTest, ViewDestroyError) { FlView* implicit_view = fl_view_new(project); FlEngine* engine = fl_view_get_engine(implicit_view); - FlutterEngineProcTable* embedder_api = fl_engine_get_embedder_api(engine); - embedder_api->RemoveView = MOCK_ENGINE_PROC( + fl_engine_get_embedder_api(engine)->RemoveView = MOCK_ENGINE_PROC( RemoveView, ([](auto engine, const FlutterRemoveViewInfo* info) { return kInvalidArguments; })); diff --git a/shell/platform/linux/testing/fl_test.cc b/shell/platform/linux/testing/fl_test.cc index 6d0888fa45ed1..3c0da2eb10afb 100644 --- a/shell/platform/linux/testing/fl_test.cc +++ b/shell/platform/linux/testing/fl_test.cc @@ -60,22 +60,6 @@ gchar* bytes_to_hex_string(GBytes* bytes) { return g_string_free(hex_string, FALSE); } -FlEngine* make_mock_engine() { - g_autoptr(FlDartProject) project = fl_dart_project_new(); - return make_mock_engine_with_project(project); -} - -FlEngine* make_mock_engine_with_project(FlDartProject* project) { - g_autoptr(FlMockRenderer) renderer = fl_mock_renderer_new(); - g_autoptr(FlEngine) engine = - fl_engine_new_with_renderer(project, FL_RENDERER(renderer)); - g_autoptr(GError) engine_error = nullptr; - EXPECT_TRUE(fl_engine_start(engine, &engine_error)); - EXPECT_EQ(engine_error, nullptr); - - return static_cast(g_object_ref(engine)); -} - void PrintTo(FlValue* v, std::ostream* os) { g_autofree gchar* s = fl_value_to_string(v); *os << s; diff --git a/shell/platform/linux/testing/fl_test.h b/shell/platform/linux/testing/fl_test.h index 51b4cb349a6e6..10925577fcc57 100644 --- a/shell/platform/linux/testing/fl_test.h +++ b/shell/platform/linux/testing/fl_test.h @@ -22,13 +22,6 @@ GBytes* hex_string_to_bytes(const gchar* hex_string); // Helper function to convert GBytes into a hexadecimal string (e.g. "01feab") gchar* bytes_to_hex_string(GBytes* bytes); -// Creates a mock engine that responds to platform messages. -FlEngine* make_mock_engine(); - -// Creates a mock engine using a specified FlDartProject that responds to -// platform messages. -FlEngine* make_mock_engine_with_project(FlDartProject* project); - // GTest printer for FlValue. void PrintTo(FlValue* v, std::ostream* os); diff --git a/shell/platform/linux/testing/mock_engine.cc b/shell/platform/linux/testing/mock_engine.cc index b1806e8104653..b48435a4e6764 100644 --- a/shell/platform/linux/testing/mock_engine.cc +++ b/shell/platform/linux/testing/mock_engine.cc @@ -20,78 +20,8 @@ #include "flutter/shell/platform/linux/public/flutter_linux/fl_standard_method_codec.h" #include "gtest/gtest.h" -const int32_t kFlutterSemanticsNodeIdBatchEnd = -1; -const int32_t kFlutterSemanticsCustomActionIdBatchEnd = -1; - -struct _FlutterEngineTexture { - bool has_new_frame; -}; - struct _FlutterEngine { - bool running = false; - FlutterPlatformMessageCallback platform_message_callback; - FlutterTaskRunnerPostTaskCallback platform_post_task_callback; - void* user_data; - std::unordered_map textures; - - _FlutterEngine(FlutterPlatformMessageCallback platform_message_callback, - FlutterTaskRunnerPostTaskCallback platform_post_task_callback, - void* user_data) - : platform_message_callback(platform_message_callback), - platform_post_task_callback(platform_post_task_callback), - user_data(user_data) {} -}; - -struct _FlutterPlatformMessageResponseHandle { - FlutterDataCallback data_callback; - void* user_data; - std::string channel; - bool released; - - // Constructor for a response handle generated by the engine. - explicit _FlutterPlatformMessageResponseHandle(std::string channel) - : data_callback(nullptr), - user_data(nullptr), - channel(std::move(channel)), - released(false) {} - - // Constructor for a response handle generated by the shell. - _FlutterPlatformMessageResponseHandle(FlutterDataCallback data_callback, - void* user_data) - : data_callback(data_callback), user_data(user_data), released(false) {} -}; - -struct _FlutterTaskRunner { - uint64_t task; - std::string channel; - const FlutterPlatformMessageResponseHandle* response_handle; - uint8_t* message; - size_t message_size; - - _FlutterTaskRunner( - uint64_t task, - const std::string& channel, - const FlutterPlatformMessageResponseHandle* response_handle, - const uint8_t* message, - size_t message_size) - : task(task), - channel(channel), - response_handle(response_handle), - message_size(message_size) { - if (message_size > 0) { - this->message = static_cast(malloc(message_size)); - memcpy(this->message, message, message_size); - } else { - this->message = nullptr; - } - } - ~_FlutterTaskRunner() { - if (response_handle != nullptr) { - EXPECT_TRUE(response_handle->released); - delete response_handle; - } - free(message); - } + _FlutterEngine() {} }; namespace { @@ -99,7 +29,6 @@ namespace { FlutterEngineResult FlutterEngineCreateAOTData( const FlutterEngineAOTDataSource* source, FlutterEngineAOTData* data_out) { - *data_out = nullptr; return kSuccess; } @@ -113,29 +42,12 @@ FlutterEngineResult FlutterEngineInitialize(size_t version, void* user_data, FLUTTER_API_SYMBOL(FlutterEngine) * engine_out) { - EXPECT_NE(config, nullptr); - - EXPECT_NE(args, nullptr); - EXPECT_NE(args->platform_message_callback, nullptr); - EXPECT_NE(args->custom_task_runners, nullptr); - EXPECT_NE(args->custom_task_runners->platform_task_runner, nullptr); - EXPECT_NE(args->custom_task_runners->platform_task_runner->post_task_callback, - nullptr); - - EXPECT_NE(user_data, nullptr); - - EXPECT_EQ(config->type, kOpenGL); - - *engine_out = new _FlutterEngine( - args->platform_message_callback, - args->custom_task_runners->platform_task_runner->post_task_callback, - user_data); + *engine_out = new _FlutterEngine(); return kSuccess; } FlutterEngineResult FlutterEngineRunInitialized( FLUTTER_API_SYMBOL(FlutterEngine) engine) { - engine->running = true; return kSuccess; } @@ -145,17 +57,7 @@ FlutterEngineResult FlutterEngineRun(size_t version, void* user_data, FLUTTER_API_SYMBOL(FlutterEngine) * engine_out) { - EXPECT_NE(config, nullptr); - EXPECT_NE(args, nullptr); - EXPECT_NE(user_data, nullptr); - EXPECT_NE(engine_out, nullptr); - - FlutterEngineResult result = - FlutterEngineInitialize(version, config, args, user_data, engine_out); - if (result != kSuccess) { - return result; - } - return FlutterEngineRunInitialized(*engine_out); + return kSuccess; } FlutterEngineResult FlutterEngineShutdown(FLUTTER_API_SYMBOL(FlutterEngine) @@ -172,7 +74,6 @@ FlutterEngineResult FlutterEngineDeinitialize(FLUTTER_API_SYMBOL(FlutterEngine) FlutterEngineResult FlutterEngineSendWindowMetricsEvent( FLUTTER_API_SYMBOL(FlutterEngine) engine, const FlutterWindowMetricsEvent* event) { - EXPECT_TRUE(engine->running); return kSuccess; } @@ -195,8 +96,6 @@ FLUTTER_EXPORT FlutterEngineResult FlutterEngineSendPlatformMessage( FLUTTER_API_SYMBOL(FlutterEngine) engine, const FlutterPlatformMessage* message) { - EXPECT_TRUE(engine->running); - return kSuccess; } @@ -205,28 +104,12 @@ FlutterEngineResult FlutterPlatformMessageCreateResponseHandle( FlutterDataCallback data_callback, void* user_data, FlutterPlatformMessageResponseHandle** response_out) { - EXPECT_TRUE(engine->running); - EXPECT_NE(data_callback, nullptr); - EXPECT_NE(user_data, nullptr); - - _FlutterPlatformMessageResponseHandle* handle = - new _FlutterPlatformMessageResponseHandle(data_callback, user_data); - - *response_out = handle; return kSuccess; } FlutterEngineResult FlutterPlatformMessageReleaseResponseHandle( FLUTTER_API_SYMBOL(FlutterEngine) engine, FlutterPlatformMessageResponseHandle* response) { - EXPECT_NE(engine, nullptr); - EXPECT_NE(response, nullptr); - - EXPECT_TRUE(engine->running); - - EXPECT_FALSE(response->released); - response->released = true; - return kSuccess; } @@ -235,48 +118,12 @@ FlutterEngineResult FlutterEngineSendPlatformMessageResponse( const FlutterPlatformMessageResponseHandle* handle, const uint8_t* data, size_t data_length) { - EXPECT_NE(engine, nullptr); - EXPECT_NE(handle, nullptr); - - EXPECT_TRUE(engine->running); - - EXPECT_FALSE(handle->released); - - delete handle; - return kSuccess; } FlutterEngineResult FlutterEngineRunTask(FLUTTER_API_SYMBOL(FlutterEngine) engine, const FlutterTask* task) { - EXPECT_NE(engine, nullptr); - EXPECT_NE(task, nullptr); - EXPECT_NE(task->runner, nullptr); - - FlutterTaskRunner runner = task->runner; - EXPECT_NE(runner, nullptr); - const FlutterPlatformMessageResponseHandle* response_handle = - runner->response_handle; - if (response_handle != nullptr) { - EXPECT_NE(response_handle->data_callback, nullptr); - response_handle->data_callback(runner->message, runner->message_size, - response_handle->user_data); - } else { - _FlutterPlatformMessageResponseHandle* handle = - new _FlutterPlatformMessageResponseHandle(runner->channel); - - FlutterPlatformMessage message; - message.struct_size = sizeof(FlutterPlatformMessage); - message.channel = runner->channel.c_str(); - message.message = runner->message; - message.message_size = runner->message_size; - message.response_handle = handle; - engine->platform_message_callback(&message, engine->user_data); - } - - delete runner; - return kSuccess; } @@ -315,31 +162,18 @@ FlutterEngineResult FlutterEngineDispatchSemanticsAction( FlutterEngineResult FlutterEngineRegisterExternalTexture( FLUTTER_API_SYMBOL(FlutterEngine) engine, int64_t texture_identifier) { - _FlutterEngineTexture texture; - texture.has_new_frame = false; - engine->textures[texture_identifier] = texture; return kSuccess; } FlutterEngineResult FlutterEngineMarkExternalTextureFrameAvailable( FLUTTER_API_SYMBOL(FlutterEngine) engine, int64_t texture_identifier) { - auto val = engine->textures.find(texture_identifier); - if (val == std::end(engine->textures)) { - return kInvalidArguments; - } - val->second.has_new_frame = true; return kSuccess; } FlutterEngineResult FlutterEngineUnregisterExternalTexture( FLUTTER_API_SYMBOL(FlutterEngine) engine, int64_t texture_identifier) { - auto val = engine->textures.find(texture_identifier); - if (val == std::end(engine->textures)) { - return kInvalidArguments; - } - engine->textures.erase(texture_identifier); return kSuccess; }