Removes single window assumptions from `flutter_test` (#121549)

Removes single window assumptions from `flutter_test`

packages/flutter/lib/src/widgets/binding.dart

@@ -901,15 +901,13 @@ mixin WidgetsBinding on BindingBase, ServicesBinding, SchedulerBinding, GestureB
   /// Used by [runApp] to wrap the provided `rootWidget` in the default [View].
   ///
   /// The [View] determines into what [FlutterView] the app is rendered into.
-  /// For backwards-compatibility reasons, this method currently chooses
-  /// [window] (which is a [FlutterView]) as the rendering target. This will
-  /// change in a future version of Flutter.
+  /// This is currently [PlatformDispatcher.implicitView] from [platformDispatcher].
   ///
   /// The `rootWidget` widget provided to this method must not already be
   /// wrapped in a [View].
   Widget wrapWithDefaultView(Widget rootWidget) {
     return View(
-      view: window,
+      view: platformDispatcher.implicitView!,
       child: rootWidget,
     );
   }

packages/flutter/test/material/debug_test.dart

@@ -235,7 +235,7 @@ void main() {
       '     MediaQuery\n'
       '     _MediaQueryFromView\n'
       '     _ViewScope\n'
-      '     View-[GlobalObjectKey TestWindow#00000]\n'
+      '     View-[GlobalObjectKey TestFlutterView#00000]\n'
       '     [root]\n'
       '   Typically, the Scaffold widget is introduced by the MaterialApp\n'
       '   or WidgetsApp widget at the top of your application widget tree.\n'
@@ -376,7 +376,7 @@ void main() {
       '     MediaQuery\n'
       '     _MediaQueryFromView\n'
       '     _ViewScope\n'
-      '     View-[GlobalObjectKey TestWindow#00000]\n'
+      '     View-[GlobalObjectKey TestFlutterView#00000]\n'
       '     [root]\n'
       '   Typically, the ScaffoldMessenger widget is introduced by the\n'
       '   MaterialApp at the top of your application widget tree.\n'

packages/flutter/test/material/scaffold_test.dart

@@ -2454,7 +2454,7 @@ void main() {
       '     MediaQuery\n'
       '     _MediaQueryFromView\n'
       '     _ViewScope\n'
-      '     View-[GlobalObjectKey TestWindow#e6136]\n'
+      '     View-[GlobalObjectKey TestFlutterView#e6136]\n'
       '     [root]\n'
       '   Typically, the ScaffoldMessenger widget is introduced by the\n'
       '   MaterialApp at the top of your application widget tree.\n',

packages/flutter/test/widgets/custom_multi_child_layout_test.dart

@@ -374,7 +374,7 @@ void main() {
           '     creator: ConstrainedBox ← Container ← LayoutWithMissingId ←\n'
           '       CustomMultiChildLayout ← Center ← MediaQuery ←\n'
           '       _MediaQueryFromView ← _ViewScope ← View-[GlobalObjectKey\n'
-          '       TestWindow#00000] ← [root]\n'
+          '       TestFlutterView#00000] ← [root]\n'
           '     parentData: offset=Offset(0.0, 0.0); id=null\n'
           '     constraints: MISSING\n'
           '     size: MISSING\n'

packages/flutter/test/widgets/focus_manager_test.dart

@@ -1230,7 +1230,7 @@ void main() {
           ' │ primaryFocus: FocusNode#00000(Child 4 [PRIMARY FOCUS])\n'
           ' │ primaryFocusCreator: Container-[GlobalKey#00000] ← MediaQuery ←\n'
           ' │   _MediaQueryFromView ← _ViewScope ← View-[GlobalObjectKey\n'
-          ' │   TestWindow#00000] ← [root]\n'
+          ' │   TestFlutterView#00000] ← [root]\n'
           ' │\n'
           ' └─rootScope: FocusScopeNode#00000(Root Focus Scope [IN FOCUS PATH])\n'
           '   │ IN FOCUS PATH\n'

packages/flutter/test/widgets/slotted_render_object_widget_test.dart

@@ -223,7 +223,7 @@ void main() {
         '_RenderDiagonal#00000 relayoutBoundary=up1\n'
         ' │ creator: _Diagonal ← Align ← Directionality ← MediaQuery ←\n'
         ' │   _MediaQueryFromView ← _ViewScope ← View-[GlobalObjectKey\n'
-        ' │   TestWindow#00000] ← [root]\n'
+        ' │   TestFlutterView#00000] ← [root]\n'
         ' │ parentData: offset=Offset(0.0, 0.0) (can use size)\n'
         ' │ constraints: BoxConstraints(0.0<=w<=800.0, 0.0<=h<=600.0)\n'
         ' │ size: Size(190.0, 220.0)\n'
@@ -231,7 +231,7 @@ void main() {
         ' ├─topLeft: RenderConstrainedBox#00000 relayoutBoundary=up2\n'
         ' │   creator: SizedBox ← _Diagonal ← Align ← Directionality ←\n'
         ' │     MediaQuery ← _MediaQueryFromView ← _ViewScope ←\n'
-        ' │     View-[GlobalObjectKey TestWindow#00000] ← [root]\n'
+        ' │     View-[GlobalObjectKey TestFlutterView#00000] ← [root]\n'
         ' │   parentData: offset=Offset(0.0, 0.0) (can use size)\n'
         ' │   constraints: BoxConstraints(unconstrained)\n'
         ' │   size: Size(80.0, 100.0)\n'
@@ -240,7 +240,7 @@ void main() {
         ' └─bottomRight: RenderConstrainedBox#00000 relayoutBoundary=up2\n'
         '     creator: SizedBox ← _Diagonal ← Align ← Directionality ←\n'
         '       MediaQuery ← _MediaQueryFromView ← _ViewScope ←\n'
-        '       View-[GlobalObjectKey TestWindow#00000] ← [root]\n'
+        '       View-[GlobalObjectKey TestFlutterView#00000] ← [root]\n'
         '     parentData: offset=Offset(80.0, 100.0) (can use size)\n'
         '     constraints: BoxConstraints(unconstrained)\n'
         '     size: Size(110.0, 120.0)\n'

packages/flutter_test/lib/src/binding.dart

@@ -182,17 +182,18 @@ abstract class TestWidgetsFlutterBinding extends BindingBase
   ///
   /// This constructor overrides the [debugPrint] global hook to point to
   /// [debugPrintOverride], which can be overridden by subclasses.
-  TestWidgetsFlutterBinding() : _window = TestWindow(window: ui.window) {
+  TestWidgetsFlutterBinding() : platformDispatcher = TestPlatformDispatcher(
+    platformDispatcher: PlatformDispatcher.instance,
+  ) {
     debugPrint = debugPrintOverride;
     debugDisableShadows = disableShadows;
   }
 
   @override
-  TestWindow get window => _window;
-  final TestWindow _window;
+  late final TestWindow window;
 
   @override
-  TestPlatformDispatcher get platformDispatcher => _window.platformDispatcher;
+  final TestPlatformDispatcher platformDispatcher;
 
   @override
   TestRestorationManager get restorationManager {
@@ -346,6 +347,12 @@ abstract class TestWidgetsFlutterBinding extends BindingBase
 
   @override
   void initInstances() {
+    // This is intialized here because it's needed for the `super.initInstances`
+    // call. It can't be handled as a ctor initializer because it's dependent
+    // on `platformDispatcher`. It can't be handled in the ctor itself because
+    // the base class ctor is called first and calls `initInstances`.
+    window = TestWindow.fromPlatformDispatcher(platformDispatcher: platformDispatcher);
+
     super.initInstances();
     _instance = this;
     timeDilation = 1.0; // just in case the developer has artificially changed it for development

packages/flutter_test/lib/src/controller.dart

@@ -14,6 +14,7 @@ import 'event_simulation.dart';
 import 'finders.dart';
 import 'test_async_utils.dart';
 import 'test_pointer.dart';
+import 'window.dart';
 
 /// The default drag touch slop used to break up a large drag into multiple
 /// smaller moves.
@@ -234,6 +235,37 @@ abstract class WidgetController {
   /// A reference to the current instance of the binding.
   final WidgetsBinding binding;
 
+  /// The [TestPlatformDispatcher] that is being used in this test.
+  ///
+  /// This will be injected into the framework such that calls to
+  /// [WidgetsBinding.platformDispatcher] will use this. This allows
+  /// users to change platform specific properties for testing.
+  ///
+  /// See also:
+  ///
+  ///   * [TestFlutterView] which allows changing view specific properties
+  ///     for testing
+  ///   * [view] and [viewOf] which are used to find
+  ///     [TestFlutterView]s from the widget tree
+  TestPlatformDispatcher get platformDispatcher => binding.platformDispatcher as TestPlatformDispatcher;
+
+  /// The [TestFlutterView] provided by default when testing with
+  /// [WidgetTester.pumpWidget].
+  ///
+  /// If the test requires multiple views, it will need to use [viewOf] instead
+  /// to ensure that the view related to the widget being evaluated is the one
+  /// that gets updated.
+  ///
+  /// See also:
+  ///
+  ///   * [viewOf], which can find a [TestFlutterView] related to a given finder.
+  ///     This is how to modify view properties for testing when dealing with
+  ///     multiple views.
+  TestFlutterView get view {
+    assert(platformDispatcher.views.length == 1, 'When testing with multiple views, use `viewOf` instead.');
+    return platformDispatcher.views.single;
+  }
+
   /// Provides access to a [SemanticsController] for testing anything related to
   /// the [Semantics] tree.
   ///
@@ -257,6 +289,26 @@ abstract class WidgetController {
   // TODO(ianh): verify that the return values are of type T and throw
   // a good message otherwise, in all the generic methods below
 
+  /// Finds the [TestFlutterView] that is the closest ancestor of the widget
+  /// found by [finder].
+  ///
+  /// [TestFlutterView] can be used to modify view specific properties for testing.
+  ///
+  /// See also:
+  ///
+  ///   * [view] which returns the [TestFlutterView] used when only a single
+  ///     view is being used.
+  TestFlutterView viewOf(Finder finder) {
+    final View view = firstWidget<View>(
+      find.ancestor(
+        of: finder,
+        matching: find.byType(View),
+      )
+    );
+
+    return view.view as TestFlutterView;
+  }
+
   /// Checks if `finder` exists in the tree.
   bool any(Finder finder) {
     TestAsyncUtils.guardSync();

packages/flutter_test/test/controller_test.dart

@@ -711,6 +711,25 @@ void main() {
     });
   });
 
+  testWidgets('platformDispatcher exposes the platformDispatcher from binding', (WidgetTester tester) async {
+    expect(tester.platformDispatcher, tester.binding.platformDispatcher);
+  });
+
+  testWidgets('view exposes the implicitView from platformDispatcher', (WidgetTester tester) async {
+    expect(tester.view, tester.platformDispatcher.implicitView);
+  });
+
+  testWidgets('viewOf finds a view when the view is implicit', (WidgetTester tester) async {
+    await tester.pumpWidget(const MaterialApp(
+      home: Center(
+        child: Text('Test'),
+      )
+    ));
+
+    expect(() => tester.viewOf(find.text('Test')), isNot(throwsA(anything)));
+    expect(tester.viewOf(find.text('Test')), isA<TestFlutterView>());
+  });
+
   group('SemanticsController', () {
     group('find', () {
       testWidgets('throws when there are no semantics', (WidgetTester tester) async {

packages/flutter_test/test/platform_dispatcher_test.dart

@@ -7,15 +7,17 @@ import 'dart:ui' show AccessibilityFeatures, Brightness, Locale, PlatformDispatc
 import 'package:flutter/widgets.dart' show WidgetsBinding, WidgetsBindingObserver;
 import 'package:flutter_test/flutter_test.dart';
 
+import 'utils/fake_and_mock_utils.dart';
+
 void main() {
-  test('TestWindow can handle new methods without breaking', () {
+  test('TestPlatformDispatcher can handle new methods without breaking', () {
     final dynamic testPlatformDispatcher = TestPlatformDispatcher(platformDispatcher: PlatformDispatcher.instance);
     // ignore: avoid_dynamic_calls
     expect(testPlatformDispatcher.someNewProperty, null);
   });
 
-  testWidgets('TestWindow can fake locale', (WidgetTester tester) async {
-    verifyThatTestPlatformDispatcherCanFakeProperty<Locale>(
+  testWidgets('TestPlatformDispatcher can fake locale', (WidgetTester tester) async {
+    verifyPropertyFaked<Locale>(
       tester: tester,
       realValue: PlatformDispatcher.instance.locale,
       fakeValue: const Locale('fake_language_code'),
@@ -28,8 +30,8 @@ void main() {
     );
   });
 
-  testWidgets('TestWindow can fake locales', (WidgetTester tester) async {
-    verifyThatTestPlatformDispatcherCanFakeProperty<List<Locale>>(
+  testWidgets('TestPlatformDispatcher can fake locales', (WidgetTester tester) async {
+    verifyPropertyFaked<List<Locale>>(
       tester: tester,
       realValue: PlatformDispatcher.instance.locales,
       fakeValue: <Locale>[const Locale('fake_language_code')],
@@ -42,8 +44,8 @@ void main() {
     );
   });
 
-  testWidgets('TestWindow can fake text scale factor', (WidgetTester tester) async {
-    verifyThatTestPlatformDispatcherCanFakeProperty<double>(
+  testWidgets('TestPlatformDispatcher can fake text scale factor', (WidgetTester tester) async {
+    verifyPropertyFaked<double>(
       tester: tester,
       realValue: PlatformDispatcher.instance.textScaleFactor,
       fakeValue: 2.5,
@@ -56,8 +58,8 @@ void main() {
     );
   });
 
-  testWidgets('TestWindow can fake clock format', (WidgetTester tester) async {
-    verifyThatTestPlatformDispatcherCanFakeProperty<bool>(
+  testWidgets('TestPlatformDispatcher can fake clock format', (WidgetTester tester) async {
+    verifyPropertyFaked<bool>(
       tester: tester,
       realValue: PlatformDispatcher.instance.alwaysUse24HourFormat,
       fakeValue: !PlatformDispatcher.instance.alwaysUse24HourFormat,
@@ -70,8 +72,8 @@ void main() {
     );
   });
 
-  testWidgets('TestWindow can fake brieflyShowPassword', (WidgetTester tester) async {
-    verifyThatTestPlatformDispatcherCanFakeProperty<bool>(
+  testWidgets('TestPlatformDispatcher can fake brieflyShowPassword', (WidgetTester tester) async {
+    verifyPropertyFaked<bool>(
       tester: tester,
       realValue: PlatformDispatcher.instance.brieflyShowPassword,
       fakeValue: !PlatformDispatcher.instance.brieflyShowPassword,
@@ -82,8 +84,8 @@ void main() {
     );
   });
 
-  testWidgets('TestWindow can fake default route name', (WidgetTester tester) async {
-    verifyThatTestPlatformDispatcherCanFakeProperty<String>(
+  testWidgets('TestPlatformDispatcher can fake default route name', (WidgetTester tester) async {
+    verifyPropertyFaked<String>(
       tester: tester,
       realValue: PlatformDispatcher.instance.defaultRouteName,
       fakeValue: 'fake_route',
@@ -96,8 +98,8 @@ void main() {
     );
   });
 
-  testWidgets('TestWindow can fake accessibility features', (WidgetTester tester) async {
-    verifyThatTestPlatformDispatcherCanFakeProperty<AccessibilityFeatures>(
+  testWidgets('TestPlatformDispatcher can fake accessibility features', (WidgetTester tester) async {
+    verifyPropertyFaked<AccessibilityFeatures>(
       tester: tester,
       realValue: PlatformDispatcher.instance.accessibilityFeatures,
       fakeValue: const FakeAccessibilityFeatures(),
@@ -110,8 +112,8 @@ void main() {
     );
   });
 
-  testWidgets('TestWindow can fake platform brightness', (WidgetTester tester) async {
-    verifyThatTestPlatformDispatcherCanFakeProperty<Brightness>(
+  testWidgets('TestPlatformDispatcher can fake platform brightness', (WidgetTester tester) async {
+    verifyPropertyFaked<Brightness>(
       tester: tester,
       realValue: Brightness.light,
       fakeValue: Brightness.dark,
@@ -124,7 +126,7 @@ void main() {
     );
   });
 
-  testWidgets('TestWindow can clear out fake properties all at once', (WidgetTester tester) async {
+  testWidgets('TestPlatformDispatcher can clear out fake properties all at once', (WidgetTester tester) async {
     final Locale originalLocale = PlatformDispatcher.instance.locale;
     final double originalTextScaleFactor = PlatformDispatcher.instance.textScaleFactor;
     final TestPlatformDispatcher testPlatformDispatcher = retrieveTestBinding(tester).platformDispatcher;
@@ -141,7 +143,7 @@ void main() {
     expect(WidgetsBinding.instance.platformDispatcher.textScaleFactor, originalTextScaleFactor);
   });
 
-  testWidgets('TestWindow sends fake locales when WidgetsBindingObserver notifiers are called', (WidgetTester tester) async {
+  testWidgets('TestPlatformDispatcher sends fake locales when WidgetsBindingObserver notifiers are called', (WidgetTester tester) async {
     final List<Locale> defaultLocales = WidgetsBinding.instance.platformDispatcher.locales;
     final TestObserver observer = TestObserver();
     retrieveTestBinding(tester).addObserver(observer);
@@ -152,36 +154,8 @@ void main() {
   });
 }
 
-void verifyThatTestPlatformDispatcherCanFakeProperty<PlatformDispatcherPropertyType>({
-  required WidgetTester tester,
-  required PlatformDispatcherPropertyType? realValue,
-  required PlatformDispatcherPropertyType fakeValue,
-  required PlatformDispatcherPropertyType? Function() propertyRetriever,
-  required Function(TestWidgetsFlutterBinding, PlatformDispatcherPropertyType fakeValue) propertyFaker,
-}) {
-  PlatformDispatcherPropertyType? propertyBeforeFaking;
-  PlatformDispatcherPropertyType? propertyAfterFaking;
-
-  propertyBeforeFaking = propertyRetriever();
-
-  propertyFaker(retrieveTestBinding(tester), fakeValue);
-
-  propertyAfterFaking = propertyRetriever();
-
-  expect(propertyBeforeFaking, realValue);
-  expect(propertyAfterFaking, fakeValue);
-}
-
-TestWidgetsFlutterBinding retrieveTestBinding(WidgetTester tester) {
-  final WidgetsBinding binding = tester.binding;
-  assert(binding is TestWidgetsFlutterBinding);
-  final TestWidgetsFlutterBinding testBinding = binding as TestWidgetsFlutterBinding;
-  return testBinding;
-}
-
 class TestObserver with WidgetsBindingObserver {
   List<Locale>? locales;
-  Locale? locale;
 
   @override
   void didChangeLocales(List<Locale>? locales) {

packages/flutter_test/test/utils/fake_and_mock_utils.dart

+// Copyright 2014 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.
+
+import 'dart:ui';
+
+import 'package:flutter/widgets.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+TestWidgetsFlutterBinding retrieveTestBinding(WidgetTester tester) {
+  final WidgetsBinding binding = tester.binding;
+  assert(binding is TestWidgetsFlutterBinding);
+  final TestWidgetsFlutterBinding testBinding = binding as TestWidgetsFlutterBinding;
+  return testBinding;
+}
+
+void verifyPropertyFaked<TProperty>({
+  required WidgetTester tester,
+  required TProperty realValue,
+  required TProperty fakeValue,
+  required TProperty Function() propertyRetriever,
+  required Function(TestWidgetsFlutterBinding, TProperty fakeValue) propertyFaker,
+  Matcher Function(TProperty) matcher = equals,
+}) {
+  TProperty propertyBeforeFaking;
+  TProperty propertyAfterFaking;
+
+  propertyBeforeFaking = propertyRetriever();
+
+  propertyFaker(retrieveTestBinding(tester), fakeValue);
+
+  propertyAfterFaking = propertyRetriever();
+
+  expect(
+    realValue == fakeValue,
+    isFalse,
+    reason: 'Since the real value and fake value are equal, we cannot validate '
+      'that a property has been faked. Choose a different fake value to test.',
+  );
+  expect(propertyBeforeFaking, matcher(realValue));
+  expect(propertyAfterFaking, matcher(fakeValue));
+}
+
+void verifyPropertyReset<TProperty>({
+  required WidgetTester tester,
+  required TProperty fakeValue,
+  required TProperty Function() propertyRetriever,
+  required Function() propertyResetter,
+  required Function(TProperty fakeValue) propertyFaker,
+  Matcher Function(TProperty) matcher = equals,
+}) {
+  TProperty propertyBeforeFaking;
+  TProperty propertyAfterFaking;
+  TProperty propertyAfterReset;
+
+  propertyBeforeFaking = propertyRetriever();
+
+  propertyFaker(fakeValue);
+
+  propertyAfterFaking = propertyRetriever();
+
+  propertyResetter();
+
+  propertyAfterReset = propertyRetriever();
+
+  expect(propertyAfterFaking, matcher(fakeValue));
+  expect(propertyAfterReset, matcher(propertyBeforeFaking));
+}
+
+Matcher matchesViewPadding(ViewPadding expected) => _FakeViewPaddingMatcher(expected);
+
+class _FakeViewPaddingMatcher extends Matcher {
+  _FakeViewPaddingMatcher(this.expected);
+
+  final ViewPadding expected;
+
+  @override
+  Description describe(Description description) {
+    description.add('two ViewPadding instances match');
+    return description;
+  }
+
+  @override
+  Description describeMismatch(dynamic item, Description mismatchDescription, Map<dynamic, dynamic> matchState, bool verbose) {
+    assert(item is ViewPadding, 'Can only match against implementations of ViewPadding.');
+    final ViewPadding actual = item as ViewPadding;
+
+    if (actual.left != expected.left) {
+      mismatchDescription.add('actual.left (${actual.left}) did not match expected.left (${expected.left})');
+    }
+    if (actual.top != expected.top) {
+      mismatchDescription.add('actual.top (${actual.top}) did not match expected.top (${expected.top})');
+    }
+    if (actual.right != expected.right) {
+      mismatchDescription.add('actual.right (${actual.right}) did not match expected.right (${expected.right})');
+    }
+    if (actual.bottom != expected.bottom) {
+      mismatchDescription.add('actual.bottom (${actual.bottom}) did not match expected.bottom (${expected.bottom})');
+    }
+
+    return mismatchDescription;
+  }
+
+  @override
+  bool matches(dynamic item, Map<dynamic, dynamic> matchState) {
+    assert(item is ViewPadding, 'Can only match against implementations of ViewPadding.');
+    final ViewPadding actual = item as ViewPadding;
+
+    return actual.left == expected.left &&
+      actual.top == expected.top &&
+      actual.right == expected.right &&
+      actual.bottom == expected.bottom;
+  }
+}

packages/flutter_test/test/window_test.dart

@@ -3,13 +3,19 @@
 // found in the LICENSE file.
 
 import 'dart:ui' as ui show window;
-import 'dart:ui' show AccessibilityFeatures, Brightness, Locale, PlatformDispatcher, SemanticsUpdate, SingletonFlutterWindow, Size, ViewPadding;
+import 'dart:ui';
 
-import 'package:flutter/semantics.dart' show SemanticsUpdateBuilder;
 import 'package:flutter/widgets.dart' show WidgetsBinding, WidgetsBindingObserver;
 import 'package:flutter_test/flutter_test.dart';
 
+import 'utils/fake_and_mock_utils.dart';
+
 void main() {
+  tearDown(() {
+    final TestWindow window = WidgetsBinding.instance.window as TestWindow;
+    window.clearAllTestValues();
+  });
+
   test('TestWindow can handle new methods without breaking', () {
     final dynamic testWindow = TestWindow(window: ui.window);
     // ignore: avoid_dynamic_calls
@@ -17,7 +23,7 @@ void main() {
   });
 
   testWidgets('TestWindow can fake device pixel ratio', (WidgetTester tester) async {
-    verifyThatTestWindowCanFakeProperty<double>(
+    verifyPropertyFaked<double>(
       tester: tester,
       realValue: ui.window.devicePixelRatio,
       fakeValue: 2.5,
@@ -31,7 +37,7 @@ void main() {
   });
 
   testWidgets('TestWindow can fake physical size', (WidgetTester tester) async {
-    verifyThatTestWindowCanFakeProperty<Size>(
+    verifyPropertyFaked<Size>(
       tester: tester,
       realValue: ui.window.physicalSize,
       fakeValue: const Size(50, 50),
@@ -45,7 +51,7 @@ void main() {
   });
 
   testWidgets('TestWindow can fake view insets', (WidgetTester tester) async {
-    verifyThatTestWindowCanFakeProperty<ViewPadding>(
+    verifyPropertyFaked<ViewPadding>(
       tester: tester,
       realValue: ui.window.viewInsets,
       fakeValue: const FakeViewPadding(),
@@ -55,11 +61,12 @@ void main() {
       propertyFaker: (TestWidgetsFlutterBinding binding, ViewPadding fakeValue) {
         binding.window.viewInsetsTestValue = fakeValue;
       },
+      matcher: matchesViewPadding,
     );
   });
 
   testWidgets('TestWindow can fake padding', (WidgetTester tester) async {
-    verifyThatTestWindowCanFakeProperty<ViewPadding>(
+    verifyPropertyFaked<ViewPadding>(
       tester: tester,
       realValue: ui.window.padding,
       fakeValue: const FakeViewPadding(),
@@ -69,11 +76,12 @@ void main() {
       propertyFaker: (TestWidgetsFlutterBinding binding, ViewPadding fakeValue) {
         binding.window.paddingTestValue = fakeValue;
       },
+      matcher: matchesViewPadding
     );
   });
 
   testWidgets('TestWindow can fake locale', (WidgetTester tester) async {
-    verifyThatTestWindowCanFakeProperty<Locale>(
+    verifyPropertyFaked<Locale>(
       tester: tester,
       realValue: ui.window.locale,
       fakeValue: const Locale('fake_language_code'),
@@ -87,7 +95,7 @@ void main() {
   });
 
   testWidgets('TestWindow can fake locales', (WidgetTester tester) async {
-    verifyThatTestWindowCanFakeProperty<List<Locale>>(
+    verifyPropertyFaked<List<Locale>>(
       tester: tester,
       realValue: ui.window.locales,
       fakeValue: <Locale>[const Locale('fake_language_code')],
@@ -101,7 +109,7 @@ void main() {
   });
 
   testWidgets('TestWindow can fake text scale factor', (WidgetTester tester) async {
-    verifyThatTestWindowCanFakeProperty<double>(
+    verifyPropertyFaked<double>(
       tester: tester,
       realValue: ui.window.textScaleFactor,
       fakeValue: 2.5,
@@ -115,7 +123,7 @@ void main() {
   });
 
   testWidgets('TestWindow can fake clock format', (WidgetTester tester) async {
-    verifyThatTestWindowCanFakeProperty<bool>(
+    verifyPropertyFaked<bool>(
       tester: tester,
       realValue: ui.window.alwaysUse24HourFormat,
       fakeValue: !ui.window.alwaysUse24HourFormat,
@@ -129,7 +137,7 @@ void main() {
   });
 
   testWidgets('TestWindow can fake brieflyShowPassword', (WidgetTester tester) async {
-    verifyThatTestWindowCanFakeProperty<bool>(
+    verifyPropertyFaked<bool>(
       tester: tester,
       realValue: ui.window.brieflyShowPassword,
       fakeValue: !ui.window.brieflyShowPassword,
@@ -141,7 +149,7 @@ void main() {
   });
 
   testWidgets('TestWindow can fake default route name', (WidgetTester tester) async {
-    verifyThatTestWindowCanFakeProperty<String>(
+    verifyPropertyFaked<String>(
       tester: tester,
       realValue: ui.window.defaultRouteName,
       fakeValue: 'fake_route',
@@ -155,7 +163,7 @@ void main() {
   });
 
   testWidgets('TestWindow can fake accessibility features', (WidgetTester tester) async {
-    verifyThatTestWindowCanFakeProperty<AccessibilityFeatures>(
+    verifyPropertyFaked<AccessibilityFeatures>(
       tester: tester,
       realValue: ui.window.accessibilityFeatures,
       fakeValue: const FakeAccessibilityFeatures(),
@@ -169,7 +177,7 @@ void main() {
   });
 
   testWidgets('TestWindow can fake platform brightness', (WidgetTester tester) async {
-    verifyThatTestWindowCanFakeProperty<Brightness>(
+    verifyPropertyFaked<Brightness>(
       tester: tester,
       realValue: Brightness.light,
       fakeValue: Brightness.dark,
@@ -209,63 +217,27 @@ void main() {
     retrieveTestBinding(tester).window.localesTestValue = defaultLocales;
   });
 
-test('Window test', () {
-    final FakeSingletonWindow fakeWindow = FakeSingletonWindow();
-    final TestWindow testWindow = TestWindow(window: fakeWindow);
-    final SemanticsUpdate update = SemanticsUpdateBuilder().build();
-    testWindow.updateSemantics(update);
-    expect(fakeWindow.lastUpdate, update);
+  testWidgets('Updates to window also update tester.view', (WidgetTester tester) async {
+    tester.binding.window.devicePixelRatioTestValue = 7;
+    tester.binding.window.displayFeaturesTestValue = <DisplayFeature>[const DisplayFeature(bounds: Rect.fromLTWH(0, 0, 20, 300), type: DisplayFeatureType.unknown, state: DisplayFeatureState.unknown)];
+    tester.binding.window.paddingTestValue = const FakeViewPadding();
+    tester.binding.window.physicalSizeTestValue = const Size(505, 805);
+    tester.binding.window.systemGestureInsetsTestValue = const FakeViewPadding();
+    tester.binding.window.viewInsetsTestValue = const FakeViewPadding();
+    tester.binding.window.viewPaddingTestValue = const FakeViewPadding();
+    tester.binding.window.gestureSettingsTestValue = const GestureSettings(physicalTouchSlop: 4, physicalDoubleTapSlop: 5);
+
+    expect(tester.binding.window.devicePixelRatio, tester.view.devicePixelRatio);
+    expect(tester.binding.window.displayFeatures, tester.view.displayFeatures);
+    expect(tester.binding.window.padding, tester.view.padding);
+    expect(tester.binding.window.physicalSize, tester.view.physicalSize);
+    expect(tester.binding.window.systemGestureInsets, tester.view.systemGestureInsets);
+    expect(tester.binding.window.viewInsets, tester.view.viewInsets);
+    expect(tester.binding.window.viewPadding, tester.view.viewPadding);
+    expect(tester.binding.window.gestureSettings, tester.view.gestureSettings);
   });
 }
 
-void verifyThatTestWindowCanFakeProperty<WindowPropertyType>({
-  required WidgetTester tester,
-  required WindowPropertyType? realValue,
-  required WindowPropertyType fakeValue,
-  required WindowPropertyType? Function() propertyRetriever,
-  required Function(TestWidgetsFlutterBinding, WindowPropertyType fakeValue) propertyFaker,
-}) {
-  WindowPropertyType? propertyBeforeFaking;
-  WindowPropertyType? propertyAfterFaking;
-
-  propertyBeforeFaking = propertyRetriever();
-
-  propertyFaker(retrieveTestBinding(tester), fakeValue);
-
-  propertyAfterFaking = propertyRetriever();
-
-  expect(propertyBeforeFaking, realValue);
-  expect(propertyAfterFaking, fakeValue);
-}
-
-TestWidgetsFlutterBinding retrieveTestBinding(WidgetTester tester) {
-  final WidgetsBinding binding = tester.binding;
-  assert(binding is TestWidgetsFlutterBinding);
-  final TestWidgetsFlutterBinding testBinding = binding as TestWidgetsFlutterBinding;
-  return testBinding;
-}
-
-class FakeViewPadding implements ViewPadding {
-  const FakeViewPadding({
-    this.left = 0.0,
-    this.top = 0.0,
-    this.right = 0.0,
-    this.bottom = 0.0,
-  });
-
-  @override
-  final double left;
-
-  @override
-  final double top;
-
-  @override
-  final double right;
-
-  @override
-  final double bottom;
-}
-
 class TestObserver with WidgetsBindingObserver {
   List<Locale>? locales;
   Locale? locale;
@@ -275,15 +247,3 @@ class TestObserver with WidgetsBindingObserver {
     this.locales = locales;
   }
 }
-
-class FakeSingletonWindow extends Fake implements SingletonFlutterWindow {
-  SemanticsUpdate? lastUpdate;
-
-  @override
-  PlatformDispatcher get platformDispatcher => PlatformDispatcher.instance;
-
-  @override
-  void updateSemantics(SemanticsUpdate update) {
-    lastUpdate = update;
-  }
-}