Upgrade to mockito v5

build.yaml

@@ -17,11 +17,10 @@ builders:
 targets:
   $default:
     builders:
-      # mockito's builder is expensive and is not needed until this package is
-      # migrated to null-safety. At that point, it should be scoped only to
-      # relevant files.
       mockito:mockBuilder:
-        enabled: false
+        generate_for:
+          include:
+            - "test/mockito.dart"
       over_react|_over_react_local_builder:
         enabled: true
         generate_for:

pubspec.yaml

@@ -36,7 +36,7 @@ dev_dependencies:
   dependency_validator: '>=2.0.0 <4.0.0'
   glob: '>=1.2.0<3.0.0'
   io: '>=0.3.2+1 <2.0.0'
-  mockito: ^4.1.1
+  mockito: '>=4.1.4 <6.0.0'
   react_testing_library: ^2.1.0
   over_react_test: ^2.10.2
   pedantic: ^1.8.0

test/mockito.dart

@@ -0,0 +1,25 @@
+import 'package:logging/logging.dart';
+import 'package:mockito/annotations.dart';
+
+@GenerateMocks([], customMocks: [
+  MockSpec<Logger>(returnNullOnMissingStub: true),
+  MockSpec<List>(fallbackGenerators: {
+    #[]: listIndexOperatorShim,
+    #removeAt: listRemoveAtShim,
+    #removeLast: listRemoveLastShim,
+  }, returnNullOnMissingStub: true),
+  MockSpec<Map>(fallbackGenerators: {
+    #update: mapUpdateShim,
+    #putIfAbsent: mapPutIfAbsentShim,
+  }, returnNullOnMissingStub: true)
+])
+void main() {}
+
+dynamic listIndexOperatorShim(int index) => 1;
+dynamic listRemoveAtShim(int index) => 1;
+dynamic listRemoveLastShim() => 1;
+
+String mapUpdateShim<K, V>(K key, V Function(V value) update,
+        {V Function() ifAbsent}) =>
+    'value';
+String mapPutIfAbsentShim<K, V>(K key, V Function() ifAbsent) => 'value';

test/mockito.mocks.dart

@@ -0,0 +1,29 @@
+// Mocks generated by Mockito 5.0.15 from annotations
+// in over_react/test/mockito.dart.
+// Do not manually edit this file.
+
+import 'package:logging/src/logger.dart' as _i2;
+import 'package:mockito/mockito.dart' as _i1;
+
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+
+/// A class which mocks [Logger].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockLogger extends _i1.Mock implements _i2.Logger {}
+
+/// A class which mocks [List].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockList<E> extends _i1.Mock implements List<E> {}
+
+/// A class which mocks [Map].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockMap<K, V> extends _i1.Mock implements Map<K, V> {}

test/over_react/shared/map_proxy_tests.dart

@@ -18,6 +18,8 @@ library over_react_tests.shared.map_proxy_tests;
 import 'package:mockito/mockito.dart';
 import 'package:test/test.dart';
 
+import '../../mockito.mocks.dart';
+
 void mapProxyTests(Map Function(Map proxiedMap) mapProxyFactory) {
   group('proxies the Map member:', () {
     Map proxy;
@@ -173,5 +175,3 @@ void mapProxyTests(Map Function(Map proxiedMap) mapProxyFactory) {
     });
   });
 }
-
-class MockMap extends Mock implements Map {}

test/over_react_redux/value_mutation_checker_test.dart

@@ -12,12 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import 'package:mockito/mockito.dart';
 import 'package:over_react/over_react.dart';
 import 'package:over_react/src/over_react_redux/value_mutation_checker.dart';
 import 'package:react/react.dart' as react;
 import 'package:test/test.dart';
 
+import '../mockito.mocks.dart';
+
 // ignore_for_file: invalid_use_of_protected_member
 main() {
   group('Value Mutation Checker:', () {
@@ -150,5 +151,3 @@ void sharedHashTests(InstanceHasher Function() getHasher) {
     });
   });
 }
-
-class MockList extends Mock implements List {}

test/vm_tests/builder/codegen_test.dart

@@ -24,6 +24,7 @@ import 'package:over_react/src/builder/codegen.dart';
 import 'package:source_span/source_span.dart';
 import 'package:test/test.dart';
 
+import '../../mockito.mocks.dart';
 import './util.dart';
 
 main() {

test/vm_tests/builder/declaration_parsing_test.dart

@@ -28,6 +28,7 @@ import 'package:over_react/src/component_declaration/annotations.dart' as annota
 import 'package:source_span/source_span.dart';
 import 'package:test/test.dart';
 
+import '../../mockito.mocks.dart';
 import './util.dart';
 import 'parsing/parsing_helpers.dart';
 

test/vm_tests/builder/parsing/error_collection.dart

@@ -20,7 +20,7 @@ import 'package:over_react/src/builder/parsing.dart';
 import 'package:source_span/source_span.dart';
 import 'package:test/test.dart';
 
-import '../util.dart';
+import '../../../mockito.mocks.dart';
 
 main() {
   group('error collection -', () {

test/vm_tests/builder/util.dart

@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import 'package:logging/logging.dart';
-import 'package:mockito/mockito.dart';
 import 'package:test/test.dart';
 
 const String factorySrc                  = '\n@Factory()\nUiFactory<FooProps> Foo = _\$Foo;\n';
@@ -585,9 +583,6 @@ class OverReactSrc {
   }
 }
 
-class MockLogger extends Mock implements Logger {}
-
-
 Iterable<T> expectLengthAndAllOfType<T>(Iterable<Object> items, int count) {
   expect(items, List.generate(count, (i) => isA<T>()));
   return items.cast<T>();