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

Remove all remaining use of mock engine #57215

Closed
wants to merge 4 commits into from
Closed

Remove all remaining use of mock engine #57215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
15fad12
Migrate FlBinaryMessenger using embedder API instead of mock engine.
robert-ancell Dec 13, 2024
60dfc89
Remove all remaining use of mock engine
robert-ancell Dec 16, 2024
0ac799a
Merge branch 'main' into linux-remove-mock-engine
robert-ancell Dec 16, 2024
4534eda
Merge branch 'main' into linux-remove-mock-engine
cbracken Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions shell/platform/linux/fl_accessible_node_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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");
Expand All @@ -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);
Expand All @@ -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(
Expand All @@ -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);

Expand Down Expand Up @@ -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(
Expand Down
89 changes: 72 additions & 17 deletions shell/platform/linux/fl_accessible_text_field_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -143,7 +144,13 @@ TEST(FlAccessibleTextFieldTest, PerformAction) {
g_autoptr(GPtrArray) action_datas = g_ptr_array_new_with_free_func(
reinterpret_cast<GDestroyNotify>(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,
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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,
Expand All @@ -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);
Expand All @@ -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),
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
Loading
Loading