refactor(mocktail): resolve analysis warnings (#96)

felangel · Dec 20, 2021 · eee9d4b · eee9d4b
1 parent 461be1f
commit eee9d4b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/packages/mocktail/lib/src/_invocation_matcher.dart b/packages/mocktail/lib/src/_invocation_matcher.dart
@@ -45,10 +45,8 @@ class InvocationMatcher {
     for (final roleKey in roleInvocation.namedArguments.keys) {
       final dynamic roleArg = roleInvocation.namedArguments[roleKey];
       final dynamic actArg = invocation.namedArguments[roleKey];
-      if (roleArg is ArgMatcher) {
-        if (roleArg is ArgMatcher && roleArg._capture) {
-          _capturedArgs.add(actArg);
-        }
+      if (roleArg is ArgMatcher && roleArg._capture) {
+        _capturedArgs.add(actArg);
       }
     }
   }

diff --git a/packages/mocktail/lib/src/mocktail.dart b/packages/mocktail/lib/src/mocktail.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 
 import 'package:collection/collection.dart';
-import 'package:matcher/matcher.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:test/test.dart';
 
@@ -397,12 +396,10 @@ List<VerificationResult> Function<T>(
   _verificationInProgress = true;
   return <T>(List<T Function()> _) {
     for (final invocation in _) {
-      if (invocation is Function) {
-        try {
-          invocation();
-        } catch (_) {
-          if (_ is! TypeError) rethrow;
-        }
+      try {
+        invocation();
+      } catch (_) {
+        if (_ is! TypeError) rethrow;
       }
     }
 

diff --git a/packages/mocktail/test/mockito_compat/invocation_matcher_test.dart b/packages/mocktail/test/mockito_compat/invocation_matcher_test.dart
@@ -1,4 +1,3 @@
-import 'package:mocktail/mocktail.dart';
 import 'package:mocktail/src/mocktail.dart';
 import 'package:test/test.dart';
 

diff --git a/packages/mocktail/test/mocktail_test.dart b/packages/mocktail/test/mocktail_test.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 
 import 'package:meta/meta.dart';
-import 'package:mocktail/mocktail.dart';
 import 'package:mocktail/src/mocktail.dart';
 import 'package:test/test.dart';