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

Commit f0c0366

Browse files
caroqliucaroqliu
authored
Remove GFX and Scenic dependencies from Fuchsia integration tests (#44498)
This change removes GFX and Scenic dependencies from Fuchsia integration tests. Mainly, it: - swaps out `fuchsia.ui.scenic.Scenic/GetDisplayInfo` for `fuchsia.ui.display.singleton.Info/GetMetrics` - removes the no longer necessary `fuchsia.ui.scenic.Scenic` connections and component manifest declarations from tests - removes any extraneous build deps tests have on `fuchsia.ui.gfx`, `fuchsia.ui.policy`, and `scenic_cpp` Related bug: fxbug.dev/64206 ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide] and the [C++, Objective-C, Java style guides]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test-exempt. See [testing the engine] for instructions on writing and running engine tests. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I signed the [CLA]. - [x] All existing and new tests are passing.
1 parent 014c59f commit f0c0366

File tree

15 files changed

+36
-47
lines changed

15 files changed

+36
-47
lines changed

‎shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,11 @@ executable("flutter-embedder-test-bin") {
2929
"$fuchsia_sdk_root/fidl:fuchsia.ui.composition",
3030
"$fuchsia_sdk_root/fidl:fuchsia.ui.display.singleton",
3131
"$fuchsia_sdk_root/fidl:fuchsia.ui.observation.geometry",
32-
"$fuchsia_sdk_root/fidl:fuchsia.ui.scenic",
3332
"$fuchsia_sdk_root/fidl:fuchsia.ui.test.input",
3433
"$fuchsia_sdk_root/fidl:fuchsia.ui.test.scene",
3534
"$fuchsia_sdk_root/pkg:async",
3635
"$fuchsia_sdk_root/pkg:async-loop-testing",
3736
"$fuchsia_sdk_root/pkg:fidl_cpp",
38-
"$fuchsia_sdk_root/pkg:scenic_cpp",
3937
"$fuchsia_sdk_root/pkg:sys_component_cpp_testing",
4038
"$fuchsia_sdk_root/pkg:zx",
4139
"//flutter/fml",

‎shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,18 @@ executable("mouse-input-test-bin") {
3333
"$fuchsia_sdk_root/fidl:fuchsia.net.interfaces",
3434
"$fuchsia_sdk_root/fidl:fuchsia.tracing.provider",
3535
"$fuchsia_sdk_root/fidl:fuchsia.ui.app",
36+
"$fuchsia_sdk_root/fidl:fuchsia.ui.display.singleton",
3637
"$fuchsia_sdk_root/fidl:fuchsia.ui.input",
3738
"$fuchsia_sdk_root/fidl:fuchsia.ui.pointerinjector",
38-
"$fuchsia_sdk_root/fidl:fuchsia.ui.policy",
39-
"$fuchsia_sdk_root/fidl:fuchsia.ui.scenic",
4039
"$fuchsia_sdk_root/fidl:fuchsia.ui.test.input",
4140
"$fuchsia_sdk_root/fidl:fuchsia.ui.test.scene",
4241
"$fuchsia_sdk_root/fidl:fuchsia.web",
4342
"$fuchsia_sdk_root/pkg:async",
4443
"$fuchsia_sdk_root/pkg:async-loop-testing",
4544
"$fuchsia_sdk_root/pkg:fidl_cpp",
46-
"$fuchsia_sdk_root/pkg:scenic_cpp",
4745
"$fuchsia_sdk_root/pkg:sys_component_cpp_testing",
4846
"$fuchsia_sdk_root/pkg:zx",
4947
"mouse-input-view:package",
50-
"//build/fuchsia/fidl:fuchsia.ui.gfx",
5148
"//flutter/fml",
5249
"//flutter/shell/platform/fuchsia/flutter/tests/integration/utils:portable_ui_test",
5350
"//third_party/googletest:gtest",

‎shell/platform/fuchsia/flutter/tests/integration/mouse-input/meta/mouse-input-test.cml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
"fuchsia.tracing.provider.Registry",
3434
"fuchsia.ui.input.ImeService",
3535
"fuchsia.vulkan.loader.Loader",
36-
"fuchsia.ui.scenic.Scenic",
3736
"fuchsia.ui.composition.Allocator",
3837
"fuchsia.ui.composition.Flatland",
3938
"fuchsia.ui.test.input.MouseInputListener",

‎shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-test.cc‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#include <fuchsia/sys/cpp/fidl.h>
1616
#include <fuchsia/tracing/provider/cpp/fidl.h>
1717
#include <fuchsia/ui/app/cpp/fidl.h>
18+
#include <fuchsia/ui/display/singleton/cpp/fidl.h>
1819
#include <fuchsia/ui/input/cpp/fidl.h>
19-
#include <fuchsia/ui/scenic/cpp/fidl.h>
2020
#include <fuchsia/ui/test/input/cpp/fidl.h>
2121
#include <fuchsia/web/cpp/fidl.h>
2222
#include <lib/async/cpp/task.h>
@@ -170,14 +170,19 @@ class MouseInputTest : public PortableUITest,
170170
RegisterMouse();
171171

172172
// Get the display dimensions.
173-
FML_LOG(INFO) << "Waiting for scenic display info";
174-
scenic_ = realm_root()->component().Connect<fuchsia::ui::scenic::Scenic>();
175-
scenic_->GetDisplayInfo([this](fuchsia::ui::gfx::DisplayInfo display_info) {
176-
display_width_ = display_info.width_in_px;
177-
display_height_ = display_info.height_in_px;
178-
FML_LOG(INFO) << "Got display_width = " << display_width_
179-
<< " and display_height = " << display_height_;
180-
});
173+
FML_LOG(INFO)
174+
<< "Waiting for display info from fuchsia.ui.display.singleton.Info";
175+
fuchsia::ui::display::singleton::InfoPtr display_info =
176+
realm_root()
177+
->component()
178+
.Connect<fuchsia::ui::display::singleton::Info>();
179+
display_info->GetMetrics(
180+
[this](fuchsia::ui::display::singleton::Metrics metrics) {
181+
display_width_ = metrics.extent_in_px().width;
182+
display_height_ = metrics.extent_in_px().height;
183+
FML_LOG(INFO) << "Got display_width = " << display_width_
184+
<< " and display_height = " << display_height_;
185+
});
181186
RunLoopUntil(
182187
[this] { return display_width_ != 0 && display_height_ != 0; });
183188
}
@@ -284,7 +289,6 @@ class MouseInputTest : public PortableUITest,
284289

285290
MouseInputListenerServer* mouse_input_listener_;
286291

287-
fuchsia::ui::scenic::ScenicPtr scenic_;
288292
uint32_t display_width_ = 0;
289293
uint32_t display_height_ = 0;
290294
};

‎shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/meta/mouse-input-view.cml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
protocol: [
2727
"fuchsia.sysmem.Allocator",
2828
"fuchsia.tracing.provider.Registry",
29-
"fuchsia.ui.scenic.Scenic",
3029
"fuchsia.ui.composition.Flatland",
3130
"fuchsia.ui.test.input.MouseInputListener",
3231
"fuchsia.vulkan.loader.Loader",

‎shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,17 @@ executable("text-input-test-bin") {
2828
"$fuchsia_sdk_root/fidl:fuchsia.kernel",
2929
"$fuchsia_sdk_root/fidl:fuchsia.tracing.provider",
3030
"$fuchsia_sdk_root/fidl:fuchsia.ui.app",
31+
"$fuchsia_sdk_root/fidl:fuchsia.ui.display.singleton",
3132
"$fuchsia_sdk_root/fidl:fuchsia.ui.input",
3233
"$fuchsia_sdk_root/fidl:fuchsia.ui.pointerinjector",
33-
"$fuchsia_sdk_root/fidl:fuchsia.ui.policy",
34-
"$fuchsia_sdk_root/fidl:fuchsia.ui.scenic",
3534
"$fuchsia_sdk_root/fidl:fuchsia.ui.test.input",
3635
"$fuchsia_sdk_root/fidl:fuchsia.ui.test.scene",
3736
"$fuchsia_sdk_root/pkg:async",
3837
"$fuchsia_sdk_root/pkg:async-loop-testing",
3938
"$fuchsia_sdk_root/pkg:fidl_cpp",
40-
"$fuchsia_sdk_root/pkg:scenic_cpp",
4139
"$fuchsia_sdk_root/pkg:sys_component_cpp_testing",
4240
"$fuchsia_sdk_root/pkg:zx",
4341
"text-input-view:package",
44-
"//build/fuchsia/fidl:fuchsia.ui.gfx",
4542
"//flutter/fml",
4643
"//flutter/shell/platform/fuchsia/flutter/tests/integration/utils:check_view",
4744
"//flutter/shell/platform/fuchsia/flutter/tests/integration/utils:portable_ui_test",

‎shell/platform/fuchsia/flutter/tests/integration/text-input/meta/text-input-test.cml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
"fuchsia.tracing.provider.Registry",
3333
"fuchsia.ui.input.ImeService",
3434
"fuchsia.vulkan.loader.Loader",
35-
"fuchsia.ui.scenic.Scenic",
3635
"fuchsia.ui.test.input.KeyboardInputListener",
3736
"fuchsia.ui.input3.Keyboard",
3837
"fuchsia.intl.PropertyProvider",

‎shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-test.cc‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
#include <fuchsia/sysmem/cpp/fidl.h>
99
#include <fuchsia/tracing/provider/cpp/fidl.h>
1010
#include <fuchsia/ui/app/cpp/fidl.h>
11+
#include <fuchsia/ui/display/singleton/cpp/fidl.h>
1112
#include <fuchsia/ui/input/cpp/fidl.h>
12-
#include <fuchsia/ui/scenic/cpp/fidl.h>
1313
#include <fuchsia/ui/test/input/cpp/fidl.h>
1414
#include <fuchsia/ui/test/scene/cpp/fidl.h>
1515
#include <lib/async-loop/testing/cpp/real_loop.h>
@@ -144,14 +144,19 @@ class TextInputTest : public PortableUITest,
144144
kTimeout);
145145

146146
// Get the display dimensions.
147-
FML_LOG(INFO) << "Waiting for scenic display info";
148-
scenic_ = realm_root()->component().Connect<fuchsia::ui::scenic::Scenic>();
149-
scenic_->GetDisplayInfo([this](fuchsia::ui::gfx::DisplayInfo display_info) {
150-
display_width_ = display_info.width_in_px;
151-
display_height_ = display_info.height_in_px;
152-
FML_LOG(INFO) << "Got display_width = " << display_width_
153-
<< " and display_height = " << display_height_;
154-
});
147+
FML_LOG(INFO)
148+
<< "Waiting for display info from fuchsia.ui.display.singleton.Info";
149+
fuchsia::ui::display::singleton::InfoPtr display_info =
150+
realm_root()
151+
->component()
152+
.Connect<fuchsia::ui::display::singleton::Info>();
153+
display_info->GetMetrics(
154+
[this](fuchsia::ui::display::singleton::Metrics metrics) {
155+
display_width_ = metrics.extent_in_px().width;
156+
display_height_ = metrics.extent_in_px().height;
157+
FML_LOG(INFO) << "Got display_width = " << display_width_
158+
<< " and display_height = " << display_height_;
159+
});
155160
RunLoopUntil(
156161
[this] { return display_width_ != 0 && display_height_ != 0; });
157162

‎shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,16 @@ executable("touch-input-test-bin") {
3636
"$fuchsia_sdk_root/fidl:fuchsia.ui.display.singleton",
3737
"$fuchsia_sdk_root/fidl:fuchsia.ui.input",
3838
"$fuchsia_sdk_root/fidl:fuchsia.ui.pointerinjector",
39-
"$fuchsia_sdk_root/fidl:fuchsia.ui.policy",
40-
"$fuchsia_sdk_root/fidl:fuchsia.ui.scenic",
4139
"$fuchsia_sdk_root/fidl:fuchsia.ui.test.input",
4240
"$fuchsia_sdk_root/fidl:fuchsia.ui.test.scene",
4341
"$fuchsia_sdk_root/fidl:fuchsia.web",
4442
"$fuchsia_sdk_root/pkg:async",
4543
"$fuchsia_sdk_root/pkg:async-loop-testing",
4644
"$fuchsia_sdk_root/pkg:fidl_cpp",
47-
"$fuchsia_sdk_root/pkg:scenic_cpp",
4845
"$fuchsia_sdk_root/pkg:sys_component_cpp_testing",
4946
"$fuchsia_sdk_root/pkg:zx",
5047
"embedding-flutter-view:package",
5148
"touch-input-view:package",
52-
"//build/fuchsia/fidl:fuchsia.ui.gfx",
5349
"//flutter/fml",
5450
"//flutter/shell/platform/fuchsia/flutter/tests/integration/utils:portable_ui_test",
5551
"//third_party/googletest:gtest",

‎shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/meta/embedding-flutter-view.cml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
{
2626
protocol: [
2727
"fuchsia.ui.app.ViewProvider",
28-
"fuchsia.ui.scenic.Scenic",
2928
"fuchsia.ui.test.input.TouchInputListener",
3029
]
3130
},

0 commit comments

Comments
 (0)