mockito: stop using deprecated analyzer APIs.

Also remove some unused elements. PiperOrigin-RevId: 673016124
dart-lang · Sep 10, 2024 · a3f92ef · a3f92ef
1 parent eb4d1da
commit a3f92ef
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 18 deletions.
diff --git a/lib/src/builder.dart b/lib/src/builder.dart
@@ -329,8 +329,8 @@ class _TypeVisitor extends RecursiveElementVisitor<void> {
       if (!alreadyVisitedElement) {
         type.element.typeParameters.forEach(visitTypeParameterElement);
 
-        final toStringMethod =
-            type.element.lookUpMethod('toString', type.element.library);
+        final toStringMethod = type.element.augmented
+            .lookUpMethod(name: 'toString', library: type.element.library);
         if (toStringMethod != null && toStringMethod.parameters.isNotEmpty) {
           // In a Fake class which implements a class which overrides `toString`
           // with additional (optional) parameters, we must also override
@@ -594,9 +594,7 @@ class _MockTargetGatherer {
     var type = _determineDartType(typeToMock, entryLib.typeProvider);
     final mockTypeArguments = mockType?.typeArguments;
     if (mockTypeArguments != null) {
-      final typeName =
-          type.alias?.element.getDisplayString(withNullability: false) ??
-              'type $type';
+      final typeName = type.alias?.element.getDisplayString() ?? 'type $type';
       final typeArguments = type.alias?.typeArguments ?? type.typeArguments;
       // Check explicit type arguments for unknown types that were
       // turned into `dynamic` by the analyzer.
@@ -1849,7 +1847,7 @@ class _MockClassInfo {
       // TODO(srawlins): It seems like this might be revivable, but Angular
       // does not revive Types; we should investigate this if users request it.
       final type = object.toTypeValue()!;
-      final typeStr = type.getDisplayString(withNullability: false);
+      final typeStr = type.getDisplayString();
       throw _ReviveException('default value is a Type: $typeStr.');
     } else {
       // If [constant] is not null, a literal, or a type, then it must be an
@@ -2176,10 +2174,7 @@ class _MockClassInfo {
             {for (final f in type.namedFields) f.name: _typeReference(f.type)})
         ..isNullable = forceNullable || typeSystem.isNullable(type));
     } else {
-      return referImported(
-        type.getDisplayString(withNullability: false),
-        _typeImport(type.element),
-      );
+      return referImported(type.getDisplayString(), _typeImport(type.element));
     }
   }
 

diff --git a/test/builder/custom_mocks_test.dart b/test/builder/custom_mocks_test.dart
@@ -81,11 +81,6 @@ void main() {}
 '''
 };
 
-const _constructorWithThrowOnMissingStub = '''
-MockFoo() {
-    _i1.throwOnMissingStub(this);
-  }''';
-
 void main() {
   late InMemoryAssetWriter writer;
 
@@ -1755,9 +1750,6 @@ void main() {
   });
 }
 
-TypeMatcher<List<int>> _containsAllOf(a, [b]) => decodedMatches(
-    b == null ? allOf(contains(a)) : allOf(contains(a), contains(b)));
-
 /// Expect that [testBuilder], given [assets], throws an
 /// [InvalidMockitoAnnotationException] with a message containing [message].
 void _expectBuilderThrows({