Internal change

PiperOrigin-RevId: 550196851
dart-lang · Jul 22, 2023 · b421775 · b421775
1 parent afa20a8
commit b421775
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/lib/src/builder.dart b/lib/src/builder.dart
@@ -512,9 +512,9 @@ class _MockTargetGatherer {
 
   static Iterable<_MockTarget> _mockTargetsFromGenerateMocks(
       ElementAnnotation annotation, LibraryElement entryLib) {
-    final generateMocksValue = annotation.computeConstantValue()!;
-    final classesField = generateMocksValue.getField('classes')!;
-    if (classesField.isNull) {
+    final generateMocksValue = annotation.computeConstantValue();
+    final classesField = generateMocksValue?.getField('classes');
+    if (classesField == null || classesField.isNull) {
       throw InvalidMockitoAnnotationException(
           'The GenerateMocks "classes" argument is missing, includes an '
           'unknown type, or includes an extension');
@@ -548,7 +548,7 @@ class _MockTargetGatherer {
         fallbackGenerators: {},
       ));
     }
-    final customMocksField = generateMocksValue.getField('customMocks');
+    final customMocksField = generateMocksValue?.getField('customMocks');
     if (customMocksField != null && !customMocksField.isNull) {
       final customMocksAsts =
           _customMocksAst(annotation.annotationAst)?.elements ??

diff --git a/test/builder/auto_mocks_test.dart b/test/builder/auto_mocks_test.dart
@@ -30,11 +30,11 @@ class GenerateMocks {
   final List<Type> classes;
   final List<MockSpec> customMocks;
 
-  const GenerateMocks(this.classes, {this.customMocks = []});
+  const GenerateMocks(this.classes, {this.customMocks = const []});
 }
 
 class MockSpec<T> {
-  final Symbol mockName;
+  final Symbol? mockName;
 
   final bool returnNullOnMissingStub;
 
@@ -43,7 +43,7 @@ class MockSpec<T> {
   final Map<Symbol, Function> fallbackGenerators;
 
   const MockSpec({
-    Symbol as,
+    Symbol? as,
     this.returnNullOnMissingStub = false,
     this.unsupportedMembers = const {},
     this.fallbackGenerators = const {},

diff --git a/test/builder/custom_mocks_test.dart b/test/builder/custom_mocks_test.dart
@@ -39,7 +39,7 @@ class GenerateNiceMocks {
 }
 
 class MockSpec<T> {
-  final Symbol mockName;
+  final Symbol? mockName;
 
   final List<Type> mixins;