[cfe] Convert extension_test into expectation tests

With the Builder model refactoring this test made less and less sense on its own. Removing the test enables the removal for properties that don't fit well with the new Builder model. The existing tests have been converted to expectation tests to preserve test coverage.

Change-Id: I0234a110321187870ad969236f58aae634f614cd
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/418022
Commit-Queue: Johnni Winther <[email protected]>
Reviewed-by: Jens Johansen <[email protected]>

Author: johnniwinther

pkg/front_end/lib/src/fragment/class/declaration.dart

@@ -6,7 +6,6 @@ part of '../fragment.dart';
 
 abstract class ClassDeclaration {
   String get name;
-  List<MetadataBuilder>? get metadata;
   LookupScope get compilationUnitScope;
   LookupScope get bodyScope;
   Uri get fileUri;
@@ -34,10 +33,6 @@ class RegularClassDeclaration implements ClassDeclaration {
 
   RegularClassDeclaration(this._fragment);
 
-  @override
-  // Coverage-ignore(suite): Not run.
-  List<MetadataBuilder>? get metadata => _fragment.metadata;
-
   @override
   LookupScope get compilationUnitScope => _fragment.enclosingScope;
 
@@ -105,10 +100,6 @@ class EnumDeclaration implements ClassDeclaration {
 
   EnumDeclaration(this._fragment, this.supertype);
 
-  @override
-  // Coverage-ignore(suite): Not run.
-  List<MetadataBuilder>? get metadata => _fragment.metadata;
-
   @override
   LookupScope get compilationUnitScope => _fragment.enclosingScope;
 
@@ -173,10 +164,6 @@ class NamedMixinApplication implements ClassDeclaration {
 
   NamedMixinApplication(this._fragment, this.mixedInTypes);
 
-  @override
-  // Coverage-ignore(suite): Not run.
-  List<MetadataBuilder>? get metadata => _fragment.metadata;
-
   @override
   LookupScope get compilationUnitScope => _fragment.enclosingScope;
 
@@ -276,10 +263,6 @@ class AnonymousMixinApplication implements ClassDeclaration {
   // Coverage-ignore(suite): Not run.
   LookupScope get bodyScope => compilationUnitScope;
 
-  @override
-  // Coverage-ignore(suite): Not run.
-  List<MetadataBuilder>? get metadata => null;
-
   @override
   void buildOutlineExpressions(
       {required Annotatable annotatable,
@@ -299,10 +282,6 @@ class MixinDeclaration implements ClassDeclaration {
 
   MixinDeclaration(this._fragment);
 
-  @override
-  // Coverage-ignore(suite): Not run.
-  List<MetadataBuilder>? get metadata => _fragment.metadata;
-
   @override
   LookupScope get compilationUnitScope => _fragment.enclosingScope;
 

pkg/front_end/lib/src/fragment/constructor/declaration.dart

@@ -47,8 +47,6 @@ abstract class ConstructorDeclaration {
 
   OmittedTypeBuilder get returnType;
 
-  List<SourceNominalParameterBuilder>? get typeParameters;
-
   List<FormalParameterBuilder>? get formals;
 
   FunctionNode get function;
@@ -162,6 +160,8 @@ mixin ConstructorDeclarationMixin implements ConstructorDeclaration {
 
   abstract Token? _beginInitializers;
 
+  List<SourceNominalParameterBuilder>? get _typeParameters;
+
   @override
   FormalParameterBuilder? getFormal(Identifier identifier) {
     if (formals != null) {
@@ -615,7 +615,7 @@ mixin ConstructorDeclarationMixin implements ConstructorDeclaration {
   @override
   int computeDefaultTypes(ComputeDefaultTypeContext context,
       {required bool inErrorRecovery}) {
-    int count = context.computeDefaultTypesForVariables(typeParameters,
+    int count = context.computeDefaultTypesForVariables(_typeParameters,
         // Type parameters are inherited from the enclosing declaration, so if
         // it has issues, so do the constructors.
         inErrorRecovery: inErrorRecovery);
@@ -734,9 +734,9 @@ mixin RegularConstructorDeclarationMixin
     required ClassHierarchy classHierarchy,
     required LookupScope typeParameterScope,
   }) {
-    if (typeParameters != null) {
-      for (int i = 0; i < typeParameters!.length; i++) {
-        typeParameters![i].buildOutlineExpressions(
+    if (_typeParameters != null) {
+      for (int i = 0; i < _typeParameters!.length; i++) {
+        _typeParameters![i].buildOutlineExpressions(
             libraryBuilder, bodyBuilderContext, classHierarchy);
       }
     }
@@ -787,18 +787,19 @@ class RegularConstructorDeclaration
   final RegularConstructorEncoding _encoding;
 
   @override
-  final List<SourceNominalParameterBuilder>? typeParameters;
+  final List<SourceNominalParameterBuilder>? _typeParameters;
 
   @override
   Token? _beginInitializers;
 
   RegularConstructorDeclaration(this._fragment,
       {required List<FormalParameterBuilder>? syntheticFormals,
-      required this.typeParameters,
+      required List<SourceNominalParameterBuilder>? typeParameters,
       // TODO(johnniwinther): Create a separate [ConstructorDeclaration] for
       // enum constructors.
       required bool isEnumConstructor})
-      : _syntheticFormals = syntheticFormals,
+      : _typeParameters = typeParameters,
+        _syntheticFormals = syntheticFormals,
         _beginInitializers = _fragment.beginInitializers,
         _encoding = new RegularConstructorEncoding(
             isExternal: _fragment.modifiers.isExternal,
@@ -863,7 +864,7 @@ class RegularConstructorDeclaration
         formalsOffset: _fragment.formalsOffset,
         isConst: _fragment.modifiers.isConst,
         returnType: returnType,
-        typeParameters: typeParameters,
+        typeParameters: _typeParameters,
         formals: formals,
         delayedDefaultValueCloners: delayedDefaultValueCloners);
   }
@@ -943,7 +944,7 @@ class PrimaryConstructorDeclaration
   List<FormalParameterBuilder>? get formals => _fragment.formals;
 
   @override
-  List<SourceNominalParameterBuilder>? get typeParameters => null;
+  List<SourceNominalParameterBuilder>? get _typeParameters => null;
 
   @override
   bool get isConst => _fragment.modifiers.isConst;
@@ -988,7 +989,7 @@ class PrimaryConstructorDeclaration
         formalsOffset: _fragment.formalsOffset,
         isConst: _fragment.modifiers.isConst,
         returnType: returnType,
-        typeParameters: typeParameters,
+        typeParameters: _typeParameters,
         formals: formals,
         delayedDefaultValueCloners: delayedDefaultValueCloners);
   }
@@ -1073,7 +1074,7 @@ class DefaultEnumConstructorDeclaration
   List<MetadataBuilder>? get metadata => null;
 
   @override
-  List<SourceNominalParameterBuilder>? get typeParameters => null;
+  List<SourceNominalParameterBuilder>? get _typeParameters => null;
 
   @override
   bool get isConst => true;
@@ -1117,7 +1118,7 @@ class DefaultEnumConstructorDeclaration
         formalsOffset: fileOffset,
         isConst: true,
         returnType: returnType,
-        typeParameters: typeParameters,
+        typeParameters: _typeParameters,
         formals: formals,
         delayedDefaultValueCloners: delayedDefaultValueCloners);
   }
@@ -1215,9 +1216,9 @@ mixin ExtensionTypeConstructorDeclarationMixin
   @override
   Substitution computeFieldTypeSubstitution(
       DeclarationBuilder declarationBuilder) {
-    if (typeParameters != null) {
+    if (_typeParameters != null) {
       assert(
-          declarationBuilder.typeParameters!.length == typeParameters?.length);
+          declarationBuilder.typeParameters!.length == _typeParameters?.length);
       return Substitution.fromPairs(
           (declarationBuilder as SourceExtensionTypeDeclarationBuilder)
               .extensionTypeDeclaration
@@ -1268,9 +1269,9 @@ mixin ExtensionTypeConstructorDeclarationMixin
     required ClassHierarchy classHierarchy,
     required LookupScope typeParameterScope,
   }) {
-    if (typeParameters != null) {
-      for (int i = 0; i < typeParameters!.length; i++) {
-        typeParameters![i].buildOutlineExpressions(
+    if (_typeParameters != null) {
+      for (int i = 0; i < _typeParameters!.length; i++) {
+        _typeParameters![i].buildOutlineExpressions(
             libraryBuilder, bodyBuilderContext, classHierarchy);
       }
     }
@@ -1317,7 +1318,7 @@ class ExtensionTypeConstructorDeclaration
   final ConstructorFragment _fragment;
 
   @override
-  final List<SourceNominalParameterBuilder>? typeParameters;
+  final List<SourceNominalParameterBuilder>? _typeParameters;
 
   @override
   final ExtensionTypeConstructorEncoding _encoding;
@@ -1326,8 +1327,9 @@ class ExtensionTypeConstructorDeclaration
   Token? _beginInitializers;
 
   ExtensionTypeConstructorDeclaration(this._fragment,
-      {required this.typeParameters})
-      : _beginInitializers = _fragment.beginInitializers,
+      {required List<SourceNominalParameterBuilder>? typeParameters})
+      : _typeParameters = typeParameters,
+        _beginInitializers = _fragment.beginInitializers,
         _encoding = new ExtensionTypeConstructorEncoding(
             isExternal: _fragment.modifiers.isExternal) {
     _fragment.declaration = this;
@@ -1387,7 +1389,7 @@ class ExtensionTypeConstructorDeclaration
         formalsOffset: _fragment.formalsOffset,
         isConst: _fragment.modifiers.isConst,
         returnType: returnType,
-        typeParameters: typeParameters,
+        typeParameters: _typeParameters,
         formals: formals,
         delayedDefaultValueCloners: delayedDefaultValueCloners);
   }
@@ -1440,7 +1442,7 @@ class ExtensionTypePrimaryConstructorDeclaration
   final PrimaryConstructorFragment _fragment;
 
   @override
-  final List<SourceNominalParameterBuilder>? typeParameters;
+  final List<SourceNominalParameterBuilder>? _typeParameters;
 
   @override
   final ExtensionTypeConstructorEncoding _encoding;
@@ -1449,8 +1451,9 @@ class ExtensionTypePrimaryConstructorDeclaration
   Token? _beginInitializers;
 
   ExtensionTypePrimaryConstructorDeclaration(this._fragment,
-      {required this.typeParameters})
-      : _beginInitializers = _fragment.beginInitializers,
+      {required List<SourceNominalParameterBuilder>? typeParameters})
+      : _typeParameters = typeParameters,
+        _beginInitializers = _fragment.beginInitializers,
         _encoding = new ExtensionTypeConstructorEncoding(
             isExternal: _fragment.modifiers.isExternal) {
     _fragment.declaration = this;
@@ -1511,7 +1514,7 @@ class ExtensionTypePrimaryConstructorDeclaration
         formalsOffset: _fragment.formalsOffset,
         isConst: _fragment.modifiers.isConst,
         returnType: returnType,
-        typeParameters: typeParameters,
+        typeParameters: _typeParameters,
         formals: formals,
         delayedDefaultValueCloners: delayedDefaultValueCloners);
   }

pkg/front_end/lib/src/fragment/factory/declaration.dart

@@ -33,8 +33,6 @@ abstract class FactoryDeclaration {
 
   FunctionNode get function;
 
-  List<SourceNominalParameterBuilder>? get typeParameters;
-
   TypeBuilder get returnType;
 
   void createNode({
@@ -120,7 +118,6 @@ abstract class FactoryDeclaration {
 
 class FactoryDeclarationImpl implements FactoryDeclaration {
   final FactoryFragment _fragment;
-  @override
   final List<SourceNominalParameterBuilder>? typeParameters;
   @override
   final TypeBuilder returnType;

pkg/front_end/lib/src/fragment/getter/declaration.dart

@@ -54,8 +54,6 @@ abstract class GetterDeclaration {
 
   VariableDeclaration? get thisVariable;
 
-  List<NominalParameterBuilder>? get typeParametersForTesting;
-
   void becomeNative(SourceLoader loader);
 
   void buildOutlineExpressions(
@@ -152,11 +150,6 @@ class GetterDeclarationImpl implements GetterDeclaration {
   @override
   VariableDeclaration? get thisVariable => _encoding.thisVariable;
 
-  @override
-  // Coverage-ignore(suite): Not run.
-  List<NominalParameterBuilder>? get typeParametersForTesting =>
-      _encoding.clonedAndDeclaredTypeParameters;
-
   @override
   void becomeNative(SourceLoader loader) {
     _encoding.becomeNative(loader);

pkg/front_end/lib/src/fragment/method/declaration.dart

@@ -32,8 +32,6 @@ abstract class MethodDeclaration {
 
   List<FormalParameterBuilder>? get formals;
 
-  List<FormalParameterBuilder>? get formalsForTesting;
-
   FunctionNode get function;
 
   Procedure get invokeTarget;
@@ -50,8 +48,6 @@ abstract class MethodDeclaration {
 
   VariableDeclaration? get thisVariable;
 
-  List<NominalParameterBuilder>? get typeParametersForTesting;
-
   void becomeNative(SourceLoader loader);
 
   void buildOutlineExpressions(
@@ -112,11 +108,6 @@ class MethodDeclarationImpl implements MethodDeclaration {
   // TODO: implement formals
   List<FormalParameterBuilder>? get formals => _encoding.formals;
 
-  @override
-  // Coverage-ignore(suite): Not run.
-  List<FormalParameterBuilder>? get formalsForTesting =>
-      _encoding.formalsForTesting;
-
   @override
   FunctionNode get function => _encoding.function;
 
@@ -142,11 +133,6 @@ class MethodDeclarationImpl implements MethodDeclaration {
   @override
   VariableDeclaration? get thisVariable => _encoding.thisVariable;
 
-  @override
-  // Coverage-ignore(suite): Not run.
-  List<NominalParameterBuilder>? get typeParametersForTesting =>
-      _encoding.clonedAndDeclaredTypeParameters;
-
   @override
   void becomeNative(SourceLoader loader) {
     _encoding.becomeNative(loader);

pkg/front_end/lib/src/fragment/method/encoding.dart

@@ -30,7 +30,6 @@ import '../fragment.dart';
 sealed class MethodEncoding implements InferredTypeListener {
   List<SourceNominalParameterBuilder>? get clonedAndDeclaredTypeParameters;
   List<FormalParameterBuilder>? get formals;
-  List<FormalParameterBuilder>? get formalsForTesting;
   FunctionNode get function;
   Procedure get invokeTarget;
 
@@ -114,11 +113,6 @@ mixin _DirectMethodEncodingMixin implements MethodEncoding {
   @override
   List<FormalParameterBuilder>? get formals => _fragment.declaredFormals;
 
-  @override
-  // Coverage-ignore(suite): Not run.
-  List<FormalParameterBuilder>? get formalsForTesting =>
-      _fragment.declaredFormals;
-
   @override
   FunctionNode get function => _procedure!.function;
 
@@ -358,11 +352,6 @@ mixin _ExtensionInstanceMethodEncodingMixin implements MethodEncoding {
   List<FormalParameterBuilder>? get formals =>
       [_thisFormal, ...?_fragment.declaredFormals];
 
-  @override
-  // Coverage-ignore(suite): Not run.
-  List<FormalParameterBuilder>? get formalsForTesting =>
-      [_thisFormal, ...?_fragment.declaredFormals];
-
   @override
   FunctionNode get function => _procedure!.function;
 

pkg/front_end/lib/src/fragment/setter/declaration.dart

@@ -52,8 +52,6 @@ abstract class SetterDeclaration {
 
   VariableDeclaration? get thisVariable;
 
-  List<NominalParameterBuilder>? get typeParametersForTesting;
-
   Procedure get writeTarget;
 
   void becomeNative(SourceLoader loader);
@@ -150,11 +148,6 @@ class SetterDeclarationImpl implements SetterDeclaration {
   @override
   VariableDeclaration? get thisVariable => _encoding.thisVariable;
 
-  @override
-  // Coverage-ignore(suite): Not run.
-  List<NominalParameterBuilder>? get typeParametersForTesting =>
-      _encoding.clonedAndDeclaredTypeParameters;
-
   @override
   Procedure get writeTarget => _encoding.writeTarget;
 

pkg/front_end/lib/src/kernel/expression_generator.dart

@@ -3450,7 +3450,6 @@ class TypeUseGenerator extends AbstractReadOnlyAccessGenerator {
               offsetForToken(send.token), send.typeArguments, arguments,
               isTypeArgumentsInForest: send.isTypeArgumentsInForest);
     } else {
-      // Coverage-ignore-block(suite): Not run.
       // `SomeType?.toString` is the same as `SomeType.toString`, not
       // `(SomeType).toString`.
       return super.buildSelectorAccess(send, operatorOffset, isNullAware);