Refactor tests. Same logic, different calls.

flutter · Oct 8, 2022 · 033f9df · 033f9df
1 parent bdcc158
commit 033f9df
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/shell/platform/embedder/fixtures/main.dart b/shell/platform/embedder/fixtures/main.dart
@@ -264,7 +264,9 @@ void a11y_main() async {
       label: 'Archive',
       hint: 'archive message',
     );
-  PlatformDispatcher.instance.updateSemantics(builder.build());
+
+  PlatformDispatcher.instance.views.first.updateSemantics(builder.build());
+
   signalNativeTest();
 
   // Await semantics action from embedder.

diff --git a/testing/scenario_app/lib/src/locale_initialization.dart b/testing/scenario_app/lib/src/locale_initialization.dart
@@ -43,8 +43,8 @@ class LocaleInitialization extends Scenario {
     // On the first frame, pretend that it drew a text field. Send the
     // corresponding semantics tree comprised of 1 node with the locale data
     // as the label.
-    window.updateSemantics((SemanticsUpdateBuilder()
-      ..updateNode(
+    final SemanticsUpdateBuilder semanticsUpdateBuilder =
+      SemanticsUpdateBuilder()..updateNode(
         id: 0,
         // SemanticsFlag.isTextField.
         flags: 16,
@@ -79,8 +79,11 @@ class LocaleInitialization extends Scenario {
         childrenInTraversalOrder: Int32List(0),
         childrenInHitTestOrder: Int32List(0),
         additionalActions: Int32List(0),
-      )).build()
-    );
+      );
+
+    final SemanticsUpdate semanticsUpdate = semanticsUpdateBuilder.build();
+
+    dispatcher.views.first.updateSemantics(semanticsUpdate);
   }
 
   /// Handle taps.
@@ -98,8 +101,8 @@ class LocaleInitialization extends Scenario {
       // Expand for other test cases.
     }
 
-    window.updateSemantics((SemanticsUpdateBuilder()
-      ..updateNode(
+    final SemanticsUpdateBuilder semanticsUpdateBuilder =
+      SemanticsUpdateBuilder()..updateNode(
         id: 0,
         // SemanticsFlag.isTextField.
         flags: 16,
@@ -134,8 +137,14 @@ class LocaleInitialization extends Scenario {
         childrenInTraversalOrder: Int32List(0),
         childrenInHitTestOrder: Int32List(0),
         additionalActions: Int32List(0),
-      )).build()
-    );
+      );
+
+    final SemanticsUpdate semanticsUpdate = semanticsUpdateBuilder.build();
+
+    for (final FlutterView view in dispatcher.views) {
+      view.updateSemantics(semanticsUpdate);
+    }
+
     _tapCount++;
   }
 }