From caf7d6bd6ce5811ba005247574e93f5bae95c699 Mon Sep 17 00:00:00 2001 From: Caroline Liu Date: Tue, 8 Aug 2023 15:39:35 +0000 Subject: [PATCH 1/6] Remove GFX and Scenic dependencies from Fuchsia integration tests --- .../tests/integration/embedder/BUILD.gn | 2 -- .../tests/integration/mouse-input/BUILD.gn | 4 +--- .../mouse-input/meta/mouse-input-test.cml | 1 - .../mouse-input/mouse-input-test.cc | 24 +++++++++++-------- .../meta/mouse-input-view.cml | 1 - .../tests/integration/text-input/BUILD.gn | 4 +--- .../text-input/meta/text-input-test.cml | 1 - .../integration/text-input/text-input-test.cc | 23 +++++++++++------- .../tests/integration/touch-input/BUILD.gn | 3 --- .../meta/embedding-flutter-view.cml | 1 - .../touch-input/meta/touch-input-test.cml | 1 - .../integration/utils/portable_ui_test.cc | 1 - .../integration/utils/portable_ui_test.h | 2 -- 13 files changed, 30 insertions(+), 38 deletions(-) diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn index 392a271be85ec..b12e4b90ff4bf 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/BUILD.gn @@ -28,13 +28,11 @@ executable("flutter-embedder-test-bin") { "$fuchsia_sdk_root/fidl:fuchsia.ui.app", "$fuchsia_sdk_root/fidl:fuchsia.ui.composition", "$fuchsia_sdk_root/fidl:fuchsia.ui.observation.geometry", - "$fuchsia_sdk_root/fidl:fuchsia.ui.scenic", "$fuchsia_sdk_root/fidl:fuchsia.ui.test.input", "$fuchsia_sdk_root/fidl:fuchsia.ui.test.scene", "$fuchsia_sdk_root/pkg:async", "$fuchsia_sdk_root/pkg:async-loop-testing", "$fuchsia_sdk_root/pkg:fidl_cpp", - "$fuchsia_sdk_root/pkg:scenic_cpp", "$fuchsia_sdk_root/pkg:sys_component_cpp_testing", "$fuchsia_sdk_root/pkg:zx", "//flutter/fml", diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn index c26b44b7da874..63970f6d9786b 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn @@ -33,21 +33,19 @@ executable("mouse-input-test-bin") { "$fuchsia_sdk_root/fidl:fuchsia.net.interfaces", "$fuchsia_sdk_root/fidl:fuchsia.tracing.provider", "$fuchsia_sdk_root/fidl:fuchsia.ui.app", + "$fuchsia_sdk_root/fidl:fuchsia.ui.display.singleton", "$fuchsia_sdk_root/fidl:fuchsia.ui.input", "$fuchsia_sdk_root/fidl:fuchsia.ui.pointerinjector", "$fuchsia_sdk_root/fidl:fuchsia.ui.policy", - "$fuchsia_sdk_root/fidl:fuchsia.ui.scenic", "$fuchsia_sdk_root/fidl:fuchsia.ui.test.input", "$fuchsia_sdk_root/fidl:fuchsia.ui.test.scene", "$fuchsia_sdk_root/fidl:fuchsia.web", "$fuchsia_sdk_root/pkg:async", "$fuchsia_sdk_root/pkg:async-loop-testing", "$fuchsia_sdk_root/pkg:fidl_cpp", - "$fuchsia_sdk_root/pkg:scenic_cpp", "$fuchsia_sdk_root/pkg:sys_component_cpp_testing", "$fuchsia_sdk_root/pkg:zx", "mouse-input-view:package", - "//build/fuchsia/fidl:fuchsia.ui.gfx", "//flutter/fml", "//flutter/shell/platform/fuchsia/flutter/tests/integration/utils:portable_ui_test", "//third_party/googletest:gtest", diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/meta/mouse-input-test.cml b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/meta/mouse-input-test.cml index 0c4de88067b4d..b77da92ab9d91 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/meta/mouse-input-test.cml +++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/meta/mouse-input-test.cml @@ -33,7 +33,6 @@ "fuchsia.tracing.provider.Registry", "fuchsia.ui.input.ImeService", "fuchsia.vulkan.loader.Loader", - "fuchsia.ui.scenic.Scenic", "fuchsia.ui.composition.Allocator", "fuchsia.ui.composition.Flatland", "fuchsia.ui.test.input.MouseInputListener", diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-test.cc b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-test.cc index 170bd0c207e2a..3cd7942dcf8a7 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-test.cc +++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-test.cc @@ -15,8 +15,8 @@ #include #include #include +#include #include -#include #include #include #include @@ -170,14 +170,19 @@ class MouseInputTest : public PortableUITest, RegisterMouse(); // Get the display dimensions. - FML_LOG(INFO) << "Waiting for scenic display info"; - scenic_ = realm_root()->component().Connect(); - scenic_->GetDisplayInfo([this](fuchsia::ui::gfx::DisplayInfo display_info) { - display_width_ = display_info.width_in_px; - display_height_ = display_info.height_in_px; - FML_LOG(INFO) << "Got display_width = " << display_width_ - << " and display_height = " << display_height_; - }); + FML_LOG(INFO) + << "Waiting for display info from fuchsia.ui.display.singleton.Info"; + fuchsia::ui::display::singleton::InfoSyncPtr display_info = + realm_root() + ->component() + .Connect(); + display_info->GetMetrics( + [this](fuchsia::ui::display::singleton::Metrics metrics) { + display_width_ = metrics.extent_in_px().width; + display_height_ = metrics.extent_in_px().height; + FML_LOG(INFO) << "Got display_width = " << display_width_ + << " and display_height = " << display_height_; + }); RunLoopUntil( [this] { return display_width_ != 0 && display_height_ != 0; }); } @@ -284,7 +289,6 @@ class MouseInputTest : public PortableUITest, MouseInputListenerServer* mouse_input_listener_; - fuchsia::ui::scenic::ScenicPtr scenic_; uint32_t display_width_ = 0; uint32_t display_height_ = 0; }; diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/meta/mouse-input-view.cml b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/meta/mouse-input-view.cml index 38d23643e4664..fecafe2c6275d 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/meta/mouse-input-view.cml +++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/meta/mouse-input-view.cml @@ -26,7 +26,6 @@ protocol: [ "fuchsia.sysmem.Allocator", "fuchsia.tracing.provider.Registry", - "fuchsia.ui.scenic.Scenic", "fuchsia.ui.composition.Flatland", "fuchsia.ui.test.input.MouseInputListener", "fuchsia.vulkan.loader.Loader", diff --git a/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn index b45ea72458b6b..a7b29f4839f45 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn @@ -28,20 +28,18 @@ executable("text-input-test-bin") { "$fuchsia_sdk_root/fidl:fuchsia.kernel", "$fuchsia_sdk_root/fidl:fuchsia.tracing.provider", "$fuchsia_sdk_root/fidl:fuchsia.ui.app", + "$fuchsia_sdk_root/fidl:fuchsia.ui.display.singleton", "$fuchsia_sdk_root/fidl:fuchsia.ui.input", "$fuchsia_sdk_root/fidl:fuchsia.ui.pointerinjector", "$fuchsia_sdk_root/fidl:fuchsia.ui.policy", - "$fuchsia_sdk_root/fidl:fuchsia.ui.scenic", "$fuchsia_sdk_root/fidl:fuchsia.ui.test.input", "$fuchsia_sdk_root/fidl:fuchsia.ui.test.scene", "$fuchsia_sdk_root/pkg:async", "$fuchsia_sdk_root/pkg:async-loop-testing", "$fuchsia_sdk_root/pkg:fidl_cpp", - "$fuchsia_sdk_root/pkg:scenic_cpp", "$fuchsia_sdk_root/pkg:sys_component_cpp_testing", "$fuchsia_sdk_root/pkg:zx", "text-input-view:package", - "//build/fuchsia/fidl:fuchsia.ui.gfx", "//flutter/fml", "//flutter/shell/platform/fuchsia/flutter/tests/integration/utils:check_view", "//flutter/shell/platform/fuchsia/flutter/tests/integration/utils:color", diff --git a/shell/platform/fuchsia/flutter/tests/integration/text-input/meta/text-input-test.cml b/shell/platform/fuchsia/flutter/tests/integration/text-input/meta/text-input-test.cml index b86b0f54772b6..b957f14447ede 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/text-input/meta/text-input-test.cml +++ b/shell/platform/fuchsia/flutter/tests/integration/text-input/meta/text-input-test.cml @@ -32,7 +32,6 @@ "fuchsia.tracing.provider.Registry", "fuchsia.ui.input.ImeService", "fuchsia.vulkan.loader.Loader", - "fuchsia.ui.scenic.Scenic", "fuchsia.ui.test.input.KeyboardInputListener", "fuchsia.ui.input3.Keyboard", "fuchsia.intl.PropertyProvider", diff --git a/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-test.cc b/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-test.cc index d248cc03c7bf8..b79274b68dd23 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-test.cc +++ b/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-test.cc @@ -8,8 +8,8 @@ #include #include #include +#include #include -#include #include #include #include @@ -144,14 +144,19 @@ class TextInputTest : public PortableUITest, kTimeout); // Get the display dimensions. - FML_LOG(INFO) << "Waiting for scenic display info"; - scenic_ = realm_root()->component().Connect(); - scenic_->GetDisplayInfo([this](fuchsia::ui::gfx::DisplayInfo display_info) { - display_width_ = display_info.width_in_px; - display_height_ = display_info.height_in_px; - FML_LOG(INFO) << "Got display_width = " << display_width_ - << " and display_height = " << display_height_; - }); + FML_LOG(INFO) + << "Waiting for display info from fuchsia.ui.display.singleton.Info"; + fuchsia::ui::display::singleton::InfoSyncPtr display_info = + realm_root() + ->component() + .Connect(); + display_info->GetMetrics( + [this](fuchsia::ui::display::singleton::Metrics metrics) { + display_width_ = metrics.extent_in_px().width; + display_height_ = metrics.extent_in_px().height; + FML_LOG(INFO) << "Got display_width = " << display_width_ + << " and display_height = " << display_height_; + }); RunLoopUntil( [this] { return display_width_ != 0 && display_height_ != 0; }); diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn index 051fc40bbf33b..2fd5baa3451c1 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn @@ -36,19 +36,16 @@ executable("touch-input-test-bin") { "$fuchsia_sdk_root/fidl:fuchsia.ui.input", "$fuchsia_sdk_root/fidl:fuchsia.ui.pointerinjector", "$fuchsia_sdk_root/fidl:fuchsia.ui.policy", - "$fuchsia_sdk_root/fidl:fuchsia.ui.scenic", "$fuchsia_sdk_root/fidl:fuchsia.ui.test.input", "$fuchsia_sdk_root/fidl:fuchsia.ui.test.scene", "$fuchsia_sdk_root/fidl:fuchsia.web", "$fuchsia_sdk_root/pkg:async", "$fuchsia_sdk_root/pkg:async-loop-testing", "$fuchsia_sdk_root/pkg:fidl_cpp", - "$fuchsia_sdk_root/pkg:scenic_cpp", "$fuchsia_sdk_root/pkg:sys_component_cpp_testing", "$fuchsia_sdk_root/pkg:zx", "embedding-flutter-view:package", "touch-input-view:package", - "//build/fuchsia/fidl:fuchsia.ui.gfx", "//flutter/fml", "//flutter/shell/platform/fuchsia/flutter/tests/integration/utils:portable_ui_test", "//third_party/googletest:gtest", diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/meta/embedding-flutter-view.cml b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/meta/embedding-flutter-view.cml index f55ac3507b2c8..ead254908f279 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/meta/embedding-flutter-view.cml +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/meta/embedding-flutter-view.cml @@ -25,7 +25,6 @@ { protocol: [ "fuchsia.ui.app.ViewProvider", - "fuchsia.ui.scenic.Scenic", "fuchsia.ui.test.input.TouchInputListener", ] }, diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/meta/touch-input-test.cml b/shell/platform/fuchsia/flutter/tests/integration/touch-input/meta/touch-input-test.cml index 2e24ff66dff3d..21ccb8d075205 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/meta/touch-input-test.cml +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/meta/touch-input-test.cml @@ -33,7 +33,6 @@ "fuchsia.tracing.provider.Registry", "fuchsia.ui.input.ImeService", "fuchsia.vulkan.loader.Loader", - "fuchsia.ui.scenic.Scenic", "fuchsia.ui.test.input.TouchInputListener", "fuchsia.intl.PropertyProvider", "fuchsia.posix.socket.Provider", diff --git a/shell/platform/fuchsia/flutter/tests/integration/utils/portable_ui_test.cc b/shell/platform/fuchsia/flutter/tests/integration/utils/portable_ui_test.cc index 7c07590317b27..2502d2b45da76 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/utils/portable_ui_test.cc +++ b/shell/platform/fuchsia/flutter/tests/integration/utils/portable_ui_test.cc @@ -91,7 +91,6 @@ void PortableUITest::SetUpRealmBase() { realm_builder_.AddRoute(Route{ .capabilities = {Protocol{fuchsia::ui::composition::Allocator::Name_}, Protocol{fuchsia::ui::composition::Flatland::Name_}, - Protocol{fuchsia::ui::scenic::Scenic::Name_}, Protocol{fuchsia::ui::test::input::Registry::Name_}, Protocol{fuchsia::ui::test::scene::Controller::Name_}, Protocol{kPointerInjectorRegistryName}}, diff --git a/shell/platform/fuchsia/flutter/tests/integration/utils/portable_ui_test.h b/shell/platform/fuchsia/flutter/tests/integration/utils/portable_ui_test.h index 7440dc52aad58..d40c18aa63d2f 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/utils/portable_ui_test.h +++ b/shell/platform/fuchsia/flutter/tests/integration/utils/portable_ui_test.h @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include @@ -99,7 +98,6 @@ class PortableUITest : public ::loop_fixture::RealLoop { component_testing::RealmBuilder* realm_builder() { return &realm_builder_; } component_testing::RealmRoot* realm_root() { return realm_.get(); } - fuchsia::ui::scenic::ScenicPtr scenic_; uint32_t display_width_ = 0; uint32_t display_height_ = 0; From 5c0b01751da79d298fcf71b8e2961b1c9c9b5e10 Mon Sep 17 00:00:00 2001 From: Caroline Liu Date: Tue, 8 Aug 2023 16:16:19 +0000 Subject: [PATCH 2/6] Update build files --- .../flutter/tests/integration/touch-input/touch-input-test.cc | 1 - .../platform/fuchsia/flutter/tests/integration/utils/BUILD.gn | 3 +-- .../fuchsia/flutter/tests/integration/utils/portable_ui_test.h | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-test.cc b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-test.cc index c2f27251c9e66..452242e593540 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-test.cc +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-test.cc @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include diff --git a/shell/platform/fuchsia/flutter/tests/integration/utils/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/utils/BUILD.gn index f72e9ffcd676f..812703ec22781 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/utils/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/utils/BUILD.gn @@ -43,11 +43,10 @@ source_set("portable_ui_test") { ":check_view", "$fuchsia_sdk_root/fidl:fuchsia.logger", "$fuchsia_sdk_root/fidl:fuchsia.ui.app", + "$fuchsia_sdk_root/fidl:fuchsia.ui.composition", "$fuchsia_sdk_root/fidl:fuchsia.ui.display.singleton", "$fuchsia_sdk_root/fidl:fuchsia.ui.input", "$fuchsia_sdk_root/fidl:fuchsia.ui.observation.geometry", - "$fuchsia_sdk_root/fidl:fuchsia.ui.policy", - "$fuchsia_sdk_root/fidl:fuchsia.ui.scenic", "$fuchsia_sdk_root/fidl:fuchsia.ui.test.input", "$fuchsia_sdk_root/fidl:fuchsia.ui.test.scene", "$fuchsia_sdk_root/pkg:async-loop-testing", diff --git a/shell/platform/fuchsia/flutter/tests/integration/utils/portable_ui_test.h b/shell/platform/fuchsia/flutter/tests/integration/utils/portable_ui_test.h index ad2096b1f9062..74fca554861d9 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/utils/portable_ui_test.h +++ b/shell/platform/fuchsia/flutter/tests/integration/utils/portable_ui_test.h @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include From df28364d5fb884fb4b6349b9825dba0e0451f5c9 Mon Sep 17 00:00:00 2001 From: Caroline Liu Date: Tue, 8 Aug 2023 16:18:21 +0000 Subject: [PATCH 3/6] Remove fuchsia.ui.policy too --- .../fuchsia/flutter/tests/integration/mouse-input/BUILD.gn | 1 - .../fuchsia/flutter/tests/integration/text-input/BUILD.gn | 1 - .../fuchsia/flutter/tests/integration/touch-input/BUILD.gn | 1 - 3 files changed, 3 deletions(-) diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn index 63970f6d9786b..661d374f4ecf2 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/BUILD.gn @@ -36,7 +36,6 @@ executable("mouse-input-test-bin") { "$fuchsia_sdk_root/fidl:fuchsia.ui.display.singleton", "$fuchsia_sdk_root/fidl:fuchsia.ui.input", "$fuchsia_sdk_root/fidl:fuchsia.ui.pointerinjector", - "$fuchsia_sdk_root/fidl:fuchsia.ui.policy", "$fuchsia_sdk_root/fidl:fuchsia.ui.test.input", "$fuchsia_sdk_root/fidl:fuchsia.ui.test.scene", "$fuchsia_sdk_root/fidl:fuchsia.web", diff --git a/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn index 02b9198b472c8..41bcd16e90a80 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/text-input/BUILD.gn @@ -31,7 +31,6 @@ executable("text-input-test-bin") { "$fuchsia_sdk_root/fidl:fuchsia.ui.display.singleton", "$fuchsia_sdk_root/fidl:fuchsia.ui.input", "$fuchsia_sdk_root/fidl:fuchsia.ui.pointerinjector", - "$fuchsia_sdk_root/fidl:fuchsia.ui.policy", "$fuchsia_sdk_root/fidl:fuchsia.ui.test.input", "$fuchsia_sdk_root/fidl:fuchsia.ui.test.scene", "$fuchsia_sdk_root/pkg:async", diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn index 203d87374e224..40942926e41f0 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/BUILD.gn @@ -36,7 +36,6 @@ executable("touch-input-test-bin") { "$fuchsia_sdk_root/fidl:fuchsia.ui.display.singleton", "$fuchsia_sdk_root/fidl:fuchsia.ui.input", "$fuchsia_sdk_root/fidl:fuchsia.ui.pointerinjector", - "$fuchsia_sdk_root/fidl:fuchsia.ui.policy", "$fuchsia_sdk_root/fidl:fuchsia.ui.test.input", "$fuchsia_sdk_root/fidl:fuchsia.ui.test.scene", "$fuchsia_sdk_root/fidl:fuchsia.web", From 790bc09e3fc045a5d911f8d3a1f4bd9010af8951 Mon Sep 17 00:00:00 2001 From: Caroline Liu Date: Tue, 8 Aug 2023 16:30:27 +0000 Subject: [PATCH 4/6] Add fuchsia.ui.composition includes for portable_ui_test --- .../fuchsia/flutter/tests/integration/utils/portable_ui_test.h | 1 + 1 file changed, 1 insertion(+) diff --git a/shell/platform/fuchsia/flutter/tests/integration/utils/portable_ui_test.h b/shell/platform/fuchsia/flutter/tests/integration/utils/portable_ui_test.h index 74fca554861d9..363dba78c7e93 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/utils/portable_ui_test.h +++ b/shell/platform/fuchsia/flutter/tests/integration/utils/portable_ui_test.h @@ -7,6 +7,7 @@ #include #include +#include #include #include #include From 5c396e35b7a468673f1164905862051873834cc4 Mon Sep 17 00:00:00 2001 From: Caroline Liu Date: Tue, 8 Aug 2023 16:46:25 +0000 Subject: [PATCH 5/6] Update comments --- .../tests/integration/touch-input/touch-input-test.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-test.cc b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-test.cc index 452242e593540..913ce128b5876 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-test.cc +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-test.cc @@ -219,7 +219,8 @@ class FlutterTapTestBase : public PortableUITest, public ::testing::Test { // Get the display information using the // |fuchsia.ui.display.singleton.Info|. - FML_LOG(INFO) << "Waiting for scenic display info"; + FML_LOG(INFO) + << "Waiting for display info from fuchsia.ui.display.singleton.Info"; std::optional display_metrics_obtained; fuchsia::ui::display::singleton::InfoPtr display_info = realm_root() @@ -343,7 +344,8 @@ class FlutterEmbedTapTest : public FlutterTapTestBase { // Get the display information using the // |fuchsia.ui.display.singleton.Info|. - FML_LOG(INFO) << "Waiting for scenic display info"; + FML_LOG(INFO) + << "Waiting for display info from fuchsia.ui.display.singleton.Info"; std::optional display_metrics_obtained; fuchsia::ui::display::singleton::InfoPtr display_info = realm_root() From 736b79f38f4ff4ef632506fbe26279434444839f Mon Sep 17 00:00:00 2001 From: Caroline Liu Date: Tue, 8 Aug 2023 17:10:30 +0000 Subject: [PATCH 6/6] InfoPtr, not InfoSyncPtr --- .../flutter/tests/integration/mouse-input/mouse-input-test.cc | 2 +- .../flutter/tests/integration/text-input/text-input-test.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-test.cc b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-test.cc index 3cd7942dcf8a7..94f3909d05cb6 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-test.cc +++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-test.cc @@ -172,7 +172,7 @@ class MouseInputTest : public PortableUITest, // Get the display dimensions. FML_LOG(INFO) << "Waiting for display info from fuchsia.ui.display.singleton.Info"; - fuchsia::ui::display::singleton::InfoSyncPtr display_info = + fuchsia::ui::display::singleton::InfoPtr display_info = realm_root() ->component() .Connect(); diff --git a/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-test.cc b/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-test.cc index b79274b68dd23..95fdb3a307be0 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-test.cc +++ b/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-test.cc @@ -146,7 +146,7 @@ class TextInputTest : public PortableUITest, // Get the display dimensions. FML_LOG(INFO) << "Waiting for display info from fuchsia.ui.display.singleton.Info"; - fuchsia::ui::display::singleton::InfoSyncPtr display_info = + fuchsia::ui::display::singleton::InfoPtr display_info = realm_root() ->component() .Connect();