Skip to content

Commit d3dbd42

Browse files
authored
[web] Bootstrap tests without implicit view by default (flutter#48629)
- Follow up tests for flutter#48505 - Tests for navigation without an implicit view should work. - Package [this workaround](https://github.com/flutter/engine/blob/cd1a3b45d21e27b27ae711c561fb5a5f2679074f/lib/web_ui/test/engine/semantics/semantics_multi_view_test.dart#L29-L30) behind a nice, future-proof API. - Tests by default start with no implicit view. - Tests that need an implicit view have to explicitly indicate so (by using the `withImplicitView` param). Fixes flutter/flutter#138906
1 parent b7e4b6d commit d3dbd42

File tree

74 files changed

+146
-88
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+146
-88
lines changed

lib/web_ui/lib/ui_web/src/ui_web/testing.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ bool get debugEmulateFlutterTesterEnvironment =>
3131
set debugEmulateFlutterTesterEnvironment(bool value) {
3232
_debugEmulateFlutterTesterEnvironment = value;
3333
if (_debugEmulateFlutterTesterEnvironment) {
34-
ensureImplicitViewInitialized();
3534
const ui.Size logicalSize = ui.Size(800.0, 600.0);
36-
window.debugPhysicalSizeOverride = logicalSize * window.devicePixelRatio;
35+
final EngineFlutterWindow? implicitView = EnginePlatformDispatcher.instance.implicitView;
36+
implicitView?.debugPhysicalSizeOverride = logicalSize * implicitView.devicePixelRatio;
3737
}
3838
debugDisableFontFallbacks = value;
3939
}

lib/web_ui/test/canvaskit/backdrop_filter_golden_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const ui.Rect region = ui.Rect.fromLTRB(0, 0, 500, 500);
1717

1818
void testMain() {
1919
group('BackdropFilter', () {
20-
setUpCanvasKitTest();
20+
setUpCanvasKitTest(withImplicitView: true);
2121
EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(1.0);
2222

2323
test('blur renders to the edges', () async {

lib/web_ui/test/canvaskit/canvas_golden_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const ui.Rect kDefaultRegion = ui.Rect.fromLTRB(0, 0, 500, 250);
2121

2222
void testMain() {
2323
group('CkCanvas', () {
24-
setUpCanvasKitTest();
24+
setUpCanvasKitTest(withImplicitView: true);
2525

2626
setUp(() {
2727
renderer.fontCollection.debugResetFallbackFonts();

lib/web_ui/test/canvaskit/color_filter_golden_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const ui.Rect region = ui.Rect.fromLTRB(0, 0, 500, 250);
1717

1818
void testMain() {
1919
group('ColorFilter', () {
20-
setUpCanvasKitTest();
20+
setUpCanvasKitTest(withImplicitView: true);
2121

2222
test('ColorFilter.matrix applies a color filter', () async {
2323
final LayerSceneBuilder builder = LayerSceneBuilder();

lib/web_ui/test/canvaskit/common.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ export '../common/rendering.dart' show renderScene;
1919
const MethodCodec codec = StandardMethodCodec();
2020

2121
/// Common test setup for all CanvasKit unit-tests.
22-
void setUpCanvasKitTest() {
22+
void setUpCanvasKitTest({bool withImplicitView = false}) {
2323
setUpUnitTests(
24+
withImplicitView: withImplicitView,
2425
emulateTesterEnvironment: false,
2526
setUpTestViewDimensions: false,
2627
);

lib/web_ui/test/canvaskit/display_canvas_factory_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class DummyDisplayCanvas extends DisplayCanvas {
3030

3131
void testMain() {
3232
group('$DisplayCanvasFactory', () {
33-
setUpCanvasKitTest();
33+
setUpCanvasKitTest(withImplicitView: true);
3434

3535
test('getCanvas', () {
3636
final DisplayCanvasFactory<DisplayCanvas> factory =

lib/web_ui/test/canvaskit/embedded_views_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ void main() {
2525

2626
void testMain() {
2727
group('$HtmlViewEmbedder', () {
28-
setUpCanvasKitTest();
28+
setUpCanvasKitTest(withImplicitView: true);
2929

3030
setUp(() {
3131
EngineFlutterDisplay.instance.debugOverrideDevicePixelRatio(1);

lib/web_ui/test/canvaskit/filter_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void testMain() {
4949
return filters;
5050
}
5151

52-
setUpCanvasKitTest();
52+
setUpCanvasKitTest(withImplicitView: true);
5353

5454
group('ImageFilters', () {
5555
test('can be constructed', () {

lib/web_ui/test/canvaskit/flutter_tester_emulation_golden_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ void testMain() {
2020
ui_web.debugEmulateFlutterTesterEnvironment = true;
2121

2222
group('flutter_tester emulation', () {
23-
setUpCanvasKitTest();
23+
setUpCanvasKitTest(withImplicitView: true);
2424

2525
test('defaults to FlutterTest font family',
2626
() async {

lib/web_ui/test/canvaskit/frame_timings_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ void main() {
1414

1515
void testMain() {
1616
group('frame timings', () {
17-
setUpCanvasKitTest();
17+
setUpCanvasKitTest(withImplicitView: true);
1818

1919
test('collects frame timings', () async {
2020
await runFrameTimingsTest();

0 commit comments

Comments
 (0)