Fix tests

flutter · May 25, 2022 · 6a41416 · 6a41416
1 parent 2b39e74
commit 6a41416
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/packages/flutter/lib/src/gestures/binding.dart b/packages/flutter/lib/src/gestures/binding.dart
@@ -373,9 +373,12 @@ mixin GestureBinding on BindingBase implements HitTestable, HitTestDispatcher, H
         debugPrint('$event');
       return true;
     }());
-    assert(hitTestResult != null || event is PointerAddedEvent || event is PointerRemovedEvent);
-    assert(event.position != null);
-    dispatchEvent(event, hitTestResult);
+    if (hitTestResult != null ||
+        event is PointerAddedEvent ||
+        event is PointerRemovedEvent) {
+      assert(event.position != null);
+      dispatchEvent(event, hitTestResult);
+    }
   }
 
   /// Determine which [HitTestTarget] objects are located at a given position.

diff --git a/packages/flutter/test/material/debug_test.dart b/packages/flutter/test/material/debug_test.dart
@@ -186,6 +186,13 @@ void main() {
       '     Localizations\n'
       '     MediaQuery\n'
       '     _MediaQueryFromWindow\n'
+      '     _ShortcutRegistrarMarker\n'
+      '     _ShortcutsMarker\n'
+      '     Semantics\n'
+      '     _FocusMarker\n'
+      '     Focus\n'
+      '     Shortcuts\n'
+      '     ShortcutRegistrar\n'
       '     _FocusMarker\n'
       '     Focus\n'
       '     _FocusTraversalGroupMarker\n'

diff --git a/packages/flutter/test/widgets/focus_manager_test.dart b/packages/flutter/test/widgets/focus_manager_test.dart
@@ -1697,7 +1697,7 @@ void main() {
     final String messagesStr = messages.toString();
     expect(messagesStr.split('\n').length, equals(58));
     expect(messagesStr, contains(RegExp(r'   └─Child 1: FocusScopeNode#[a-f0-9]{5}\(parent1 \[PRIMARY FOCUS\]\)')));
-    expect(messagesStr, contains('FOCUS: Notifying 2 dirty nodes'));
+    expect(messagesStr, contains('FOCUS: Notified 2 dirty nodes'));
     expect(messagesStr, contains(RegExp(r'FOCUS: Scheduling update, current focus is null, next focus will be FocusScopeNode#.*parent1')));
   });
 }