More places where Function() is too strict

dart-archive · Nov 22, 2023 · 1fa085a · 1fa085a
1 parent b362392
commit 1fa085a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/lib/src/core_matchers.dart b/lib/src/core_matchers.dart
@@ -148,12 +148,13 @@ class isInstanceOf<T> extends TypeMatcher<T> {
 /// a wrapper will have to be created.
 const Matcher returnsNormally = _ReturnsNormally();
 
-class _ReturnsNormally extends FeatureMatcher<Function()> {
+class _ReturnsNormally extends FeatureMatcher<Function> {
   const _ReturnsNormally();
 
   @override
-  bool typedMatches(Function() f, Map matchState) {
+  bool typedMatches(Function f, Map matchState) {
     try {
+      // ignore: avoid_dynamic_calls
       f();
       return true;
     } catch (e, s) {

diff --git a/test/core_matchers_test.dart b/test/core_matchers_test.dart
@@ -96,14 +96,15 @@ void main() {
 
   test('returnsNormally', () {
     shouldPass(doesNotThrow, returnsNormally);
+    shouldPass(doesNotThrowGeneric, returnsNormally);
     shouldFail(
         doesThrow,
         returnsNormally,
         matches(r'Expected: return normally'
             r'  Actual: <Closure.*>'
             r'   Which: threw StateError:<Bad state: X>'));
     shouldFail('not a function', returnsNormally,
-        contains('not an <Instance of \'() => dynamic\'>'));
+        contains('not an <Instance of \'Function\'>'));
   });
 
   test('hasLength', () {

diff --git a/test/test_utils.dart b/test/test_utils.dart
@@ -28,6 +28,7 @@ void shouldPass(Object? value, Matcher matcher) {
 }
 
 void doesNotThrow() {}
+void doesNotThrowGeneric<T>() {}
 void doesThrow() {
   throw StateError('X');
 }