Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Minor refactor
  • Loading branch information
lin-erik committed Oct 26, 2022
commit 4e9450327203c01b9e60c253283075549ab62745
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ executable("touch-input-test-bin") {
"touch-input-view:package",
"//build/fuchsia/fidl:fuchsia.ui.gfx",
"//flutter/fml",
"//flutter/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view:package",
"//flutter/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view:package",
"//flutter/shell/platform/fuchsia/flutter/tests/integration/utils:color",
"//flutter/shell/platform/fuchsia/flutter/tests/integration/utils:portable_ui_test",
"//flutter/shell/platform/fuchsia/flutter/tests/integration/utils:screenshot",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,11 @@ dart_library("lib") {
sources = [ "embedding-flutter-view.dart" ]

deps = [
"//flutter/shell/platform/fuchsia/dart:vector_math",
"//flutter/tools/fuchsia/dart:fuchsia_services",
"//flutter/tools/fuchsia/dart:zircon",
"//flutter/tools/fuchsia/fidl:fuchsia.ui.app",
"//flutter/tools/fuchsia/fidl:fuchsia.ui.scenic",
"//flutter/tools/fuchsia/fidl:fuchsia.ui.test.input",
"//flutter/tools/fuchsia/fidl:fuchsia.ui.test.input",
"//flutter/tools/fuchsia/fidl:fuchsia.ui.views",
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import 'package:fidl_fuchsia_ui_app/fidl_async.dart';
import 'package:fidl_fuchsia_ui_views/fidl_async.dart';
import 'package:fidl_fuchsia_ui_test_input/fidl_async.dart' as test_touch;
import 'package:fuchsia_services/services.dart';
import 'package:vector_math/vector_math_64.dart' as vector_math_64;
import 'package:zircon/zircon.dart';

void main(List<String> args) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Copyright 2013 The Flutter Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

name: touch-input-view

environment:
sdk: '>=2.18.0 <3.0.0'
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,8 @@ using RealmBuilder = component_testing::RealmBuilder;
constexpr zx::duration kTimeout = zx::min(1);
// Timeout for Scenic's |TakeScreenshot| FIDL call.
constexpr zx::duration kScreenshotTimeout = zx::sec(10);
constexpr fuchsia_test_utils::Color kChildBackgroundColor = {0xFF, 0x00, 0xFF,
0xFF}; // Pink

constexpr auto kTestUIStackUrl =
"fuchsia-pkg://fuchsia.com/gfx-root-presenter-test-ui-stack#meta/"
Expand Down Expand Up @@ -318,8 +320,6 @@ class FlutterEmbedTapTest : public FlutterTapTestBase {
bool WaitForEmbed() {
return RunLoopWithTimeoutOrUntil(
[this] {
constexpr fuchsia_test_utils::Color kChildBackgroundColor = {
0xFF, 0x00, 0xFF, 0xFF}; // Pink
fuchsia::ui::scenic::ScreenshotData screenshot_out;
scenic_->TakeScreenshot(
[this, &screenshot_out](
Expand Down
1 change: 1 addition & 0 deletions testing/fuchsia/test_suites.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,4 @@
- touch-input-test-0.far
- oot_flutter_jit_runner-0.far
- gen/flutter/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/touch-input-view/touch-input-view.far
- gen/flutter/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/embedding-flutter-view/embedding-flutter-view.far