mirror of
https://github.com/dart-lang/sdk
synced 2024-10-06 14:39:38 +00:00
Analyzer: prepare some generated/ tests for null safety
Change-Id: Ieca714d8b32b7b283a8dc30dd820df07d1e64655 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/170600 Reviewed-by: Konstantin Shcheglov <scheglov@google.com> Commit-Queue: Samuel Rawlins <srawlins@google.com>
This commit is contained in:
parent
e90967f29d
commit
466f2fd8a7
|
@ -392,7 +392,7 @@ class UriKindTest {
|
|||
}
|
||||
|
||||
class _SimpleDartSdkTest with ResourceProviderMixin {
|
||||
DartSdk sdk;
|
||||
/*late*/ DartSdk sdk;
|
||||
|
||||
void setUp() {
|
||||
newFile('/sdk/lib/_internal/sdk_library_metadata/lib/libraries.dart',
|
||||
|
|
|
@ -58,10 +58,10 @@ class A {
|
|||
SimpleIdentifier name2,
|
||||
SimpleIdentifier name3,
|
||||
Element annotationElement) {
|
||||
expect(name1, isNotNull);
|
||||
assert(name1 != null);
|
||||
assert(name2 != null);
|
||||
expect(name1.staticElement, isClassElement);
|
||||
expect(name1.staticElement.displayName, 'A');
|
||||
expect(name2, isNotNull);
|
||||
expect(name2.staticElement, isConstructorElement);
|
||||
expect(name2.staticElement.displayName, 'named');
|
||||
expect(name3, isNull);
|
||||
|
@ -87,13 +87,13 @@ class A {
|
|||
SimpleIdentifier name2,
|
||||
SimpleIdentifier name3,
|
||||
Element annotationElement) {
|
||||
expect(name1, isNotNull);
|
||||
assert(name1 != null);
|
||||
assert(name2 != null);
|
||||
assert(name3 != null);
|
||||
expect(name1.staticElement, isPrefixElement);
|
||||
expect(name1.staticElement.displayName, 'p');
|
||||
expect(name2, isNotNull);
|
||||
expect(name2.staticElement, isClassElement);
|
||||
expect(name2.staticElement.displayName, 'A');
|
||||
expect(name3, isNotNull);
|
||||
expect(name3.staticElement, isConstructorElement);
|
||||
expect(name3.staticElement.displayName, 'named');
|
||||
if (annotationElement is ConstructorElement) {
|
||||
|
@ -118,13 +118,13 @@ class A {
|
|||
SimpleIdentifier name2,
|
||||
SimpleIdentifier name3,
|
||||
Element annotationElement) {
|
||||
expect(name1, isNotNull);
|
||||
assert(name1 != null);
|
||||
assert(name2 != null);
|
||||
assert(name3 != null);
|
||||
expect(name1.staticElement, isPrefixElement);
|
||||
expect(name1.staticElement.displayName, 'p');
|
||||
expect(name2, isNotNull);
|
||||
expect(name2.staticElement, isClassElement);
|
||||
expect(name2.staticElement.displayName, 'A');
|
||||
expect(name3, isNotNull);
|
||||
expect(name3.staticElement, isPropertyAccessorElement);
|
||||
expect(name3.staticElement.displayName, 'V');
|
||||
if (annotationElement is PropertyAccessorElement) {
|
||||
|
@ -148,10 +148,10 @@ class A {
|
|||
SimpleIdentifier name2,
|
||||
SimpleIdentifier name3,
|
||||
Element annotationElement) {
|
||||
expect(name1, isNotNull);
|
||||
assert(name1 != null);
|
||||
assert(name2 != null);
|
||||
expect(name1.staticElement, isPrefixElement);
|
||||
expect(name1.staticElement.displayName, 'p');
|
||||
expect(name2, isNotNull);
|
||||
expect(name2.staticElement, isClassElement);
|
||||
expect(name2.staticElement.displayName, 'A');
|
||||
expect(name3, isNull);
|
||||
|
@ -176,10 +176,10 @@ class A {
|
|||
SimpleIdentifier name2,
|
||||
SimpleIdentifier name3,
|
||||
Element annotationElement) {
|
||||
expect(name1, isNotNull);
|
||||
assert(name1 != null);
|
||||
assert(name2 != null);
|
||||
expect(name1.staticElement, isClassElement);
|
||||
expect(name1.staticElement.displayName, 'A');
|
||||
expect(name2, isNotNull);
|
||||
expect(name2.staticElement, isPropertyAccessorElement);
|
||||
expect(name2.staticElement.displayName, 'V');
|
||||
expect(name3, isNull);
|
||||
|
@ -204,7 +204,7 @@ class A {
|
|||
SimpleIdentifier name2,
|
||||
SimpleIdentifier name3,
|
||||
Element annotationElement) {
|
||||
expect(name1, isNotNull);
|
||||
assert(name1 != null);
|
||||
expect(name1.staticElement, isClassElement);
|
||||
expect(name1.staticElement.displayName, 'A');
|
||||
expect(name2, isNull);
|
||||
|
@ -228,7 +228,7 @@ const V = 0;
|
|||
SimpleIdentifier name2,
|
||||
SimpleIdentifier name3,
|
||||
Element annotationElement) {
|
||||
expect(name1, isNotNull);
|
||||
assert(name1 != null);
|
||||
expect(name1.staticElement, isPropertyAccessorElement);
|
||||
expect(name1.staticElement.displayName, 'V');
|
||||
expect(name2, isNull);
|
||||
|
@ -252,10 +252,10 @@ const V = 0;
|
|||
SimpleIdentifier name2,
|
||||
SimpleIdentifier name3,
|
||||
Element annotationElement) {
|
||||
expect(name1, isNotNull);
|
||||
assert(name1 != null);
|
||||
assert(name2 != null);
|
||||
expect(name1.staticElement, isPrefixElement);
|
||||
expect(name1.staticElement.displayName, 'p');
|
||||
expect(name2, isNotNull);
|
||||
expect(name2.staticElement, isPropertyAccessorElement);
|
||||
expect(name2.staticElement.displayName, 'V');
|
||||
expect(name3, isNull);
|
||||
|
@ -299,19 +299,19 @@ class C {}
|
|||
@reflectiveTest
|
||||
class ElementResolverTest with ResourceProviderMixin, ElementsTypesMixin {
|
||||
/// The error listener to which errors will be reported.
|
||||
GatheringErrorListener _listener;
|
||||
/*late*/ GatheringErrorListener _listener;
|
||||
|
||||
/// The type provider used to access the types.
|
||||
TypeProvider _typeProvider;
|
||||
/*late*/ TypeProvider _typeProvider;
|
||||
|
||||
/// The library containing the code being resolved.
|
||||
LibraryElementImpl _definingLibrary;
|
||||
/*late*/ LibraryElementImpl _definingLibrary;
|
||||
|
||||
/// The resolver visitor that maintains the state for the resolver.
|
||||
ResolverVisitor _visitor;
|
||||
/*late*/ ResolverVisitor _visitor;
|
||||
|
||||
/// The resolver being used to resolve the test cases.
|
||||
ElementResolver _resolver;
|
||||
/*late*/ ElementResolver _resolver;
|
||||
|
||||
@override
|
||||
TypeProvider get typeProvider => _typeProvider;
|
||||
|
|
|
@ -151,7 +151,7 @@ mixin ElementsTypesMixin {
|
|||
|
||||
LibraryElementImpl get testLibrary => null;
|
||||
|
||||
TypeProvider get typeProvider;
|
||||
TypeProvider /*!*/ get typeProvider;
|
||||
|
||||
VoidTypeImpl get voidNone => VoidTypeImpl.instance;
|
||||
|
||||
|
|
|
@ -120,17 +120,17 @@ class ClassMemberParserTest_Fasta extends FastaParserTestCase
|
|||
CompilationUnitImpl unit = parseCompilationUnit(
|
||||
'class C { foo(int value) { x >>>= value; } }',
|
||||
featureSet: tripleShift);
|
||||
ClassDeclaration declaration = unit.declarations[0];
|
||||
MethodDeclaration method = declaration.members[0];
|
||||
BlockFunctionBody blockFunctionBody = method.body;
|
||||
var declaration = unit.declarations[0] as ClassDeclaration;
|
||||
var method = declaration.members[0] as MethodDeclaration;
|
||||
var blockFunctionBody = method.body as BlockFunctionBody;
|
||||
NodeList<Statement> statements = blockFunctionBody.block.statements;
|
||||
expect(statements, hasLength(1));
|
||||
ExpressionStatement statement = statements[0];
|
||||
AssignmentExpression assignment = statement.expression;
|
||||
SimpleIdentifier leftHandSide = assignment.leftHandSide;
|
||||
var statement = statements[0] as ExpressionStatement;
|
||||
var assignment = statement.expression as AssignmentExpression;
|
||||
var leftHandSide = assignment.leftHandSide as SimpleIdentifier;
|
||||
expect(leftHandSide.name, 'x');
|
||||
expect(assignment.operator.lexeme, '>>>=');
|
||||
SimpleIdentifier rightHandSide = assignment.rightHandSide;
|
||||
var rightHandSide = assignment.rightHandSide as SimpleIdentifier;
|
||||
expect(rightHandSide.name, 'value');
|
||||
}
|
||||
|
||||
|
@ -178,7 +178,7 @@ class ClassMemberParserTest_Fasta extends FastaParserTestCase
|
|||
expect(member, isNotNull);
|
||||
assertNoErrors();
|
||||
expect(member, isFieldDeclaration);
|
||||
FieldDeclaration field = member;
|
||||
var field = member as FieldDeclaration;
|
||||
expect(field.abstractKeyword, isNotNull);
|
||||
}
|
||||
|
||||
|
@ -190,7 +190,7 @@ class ClassMemberParserTest_Fasta extends FastaParserTestCase
|
|||
expectedError(ParserErrorCode.ABSTRACT_EXTERNAL_FIELD, 0, 8),
|
||||
]);
|
||||
expect(member, isFieldDeclaration);
|
||||
FieldDeclaration field = member;
|
||||
var field = member as FieldDeclaration;
|
||||
expect(field.abstractKeyword, isNotNull);
|
||||
expect(field.externalKeyword, isNotNull);
|
||||
}
|
||||
|
@ -203,7 +203,7 @@ class ClassMemberParserTest_Fasta extends FastaParserTestCase
|
|||
expectedError(ParserErrorCode.ABSTRACT_LATE_FIELD, 0, 8),
|
||||
]);
|
||||
expect(member, isFieldDeclaration);
|
||||
FieldDeclaration field = member;
|
||||
var field = member as FieldDeclaration;
|
||||
expect(field.abstractKeyword, isNotNull);
|
||||
}
|
||||
|
||||
|
@ -215,7 +215,7 @@ class ClassMemberParserTest_Fasta extends FastaParserTestCase
|
|||
expectedError(ParserErrorCode.ABSTRACT_LATE_FIELD, 0, 8),
|
||||
]);
|
||||
expect(member, isFieldDeclaration);
|
||||
FieldDeclaration field = member;
|
||||
var field = member as FieldDeclaration;
|
||||
expect(field.abstractKeyword, isNotNull);
|
||||
}
|
||||
|
||||
|
@ -227,7 +227,7 @@ class ClassMemberParserTest_Fasta extends FastaParserTestCase
|
|||
expectedError(ParserErrorCode.ABSTRACT_STATIC_FIELD, 0, 8),
|
||||
]);
|
||||
expect(member, isFieldDeclaration);
|
||||
FieldDeclaration field = member;
|
||||
var field = member as FieldDeclaration;
|
||||
expect(field.abstractKeyword, isNotNull);
|
||||
}
|
||||
|
||||
|
@ -239,7 +239,7 @@ class ClassMemberParserTest_Fasta extends FastaParserTestCase
|
|||
expectedError(ParserErrorCode.CONFLICTING_MODIFIERS, 6, 4),
|
||||
]);
|
||||
expect(member, isFieldDeclaration);
|
||||
FieldDeclaration field = member;
|
||||
var field = member as FieldDeclaration;
|
||||
expect(field.covariantKeyword, isNull);
|
||||
expect(field.documentationComment, isNull);
|
||||
expect(field.metadata, hasLength(0));
|
||||
|
@ -263,7 +263,7 @@ class ClassMemberParserTest_Fasta extends FastaParserTestCase
|
|||
expect(member, isNotNull);
|
||||
assertNoErrors();
|
||||
expect(member, isFieldDeclaration);
|
||||
FieldDeclaration field = member;
|
||||
var field = member as FieldDeclaration;
|
||||
expect(field.externalKeyword, isNotNull);
|
||||
}
|
||||
|
||||
|
@ -275,7 +275,7 @@ class ClassMemberParserTest_Fasta extends FastaParserTestCase
|
|||
expectedError(ParserErrorCode.ABSTRACT_EXTERNAL_FIELD, 9, 8),
|
||||
]);
|
||||
expect(member, isFieldDeclaration);
|
||||
FieldDeclaration field = member;
|
||||
var field = member as FieldDeclaration;
|
||||
expect(field.abstractKeyword, isNotNull);
|
||||
expect(field.externalKeyword, isNotNull);
|
||||
}
|
||||
|
@ -288,7 +288,7 @@ class ClassMemberParserTest_Fasta extends FastaParserTestCase
|
|||
expectedError(ParserErrorCode.EXTERNAL_LATE_FIELD, 0, 8),
|
||||
]);
|
||||
expect(member, isFieldDeclaration);
|
||||
FieldDeclaration field = member;
|
||||
var field = member as FieldDeclaration;
|
||||
expect(field.externalKeyword, isNotNull);
|
||||
}
|
||||
|
||||
|
@ -300,7 +300,7 @@ class ClassMemberParserTest_Fasta extends FastaParserTestCase
|
|||
expectedError(ParserErrorCode.EXTERNAL_LATE_FIELD, 0, 8),
|
||||
]);
|
||||
expect(member, isFieldDeclaration);
|
||||
FieldDeclaration field = member;
|
||||
var field = member as FieldDeclaration;
|
||||
expect(field.externalKeyword, isNotNull);
|
||||
}
|
||||
|
||||
|
@ -310,7 +310,7 @@ class ClassMemberParserTest_Fasta extends FastaParserTestCase
|
|||
expect(member, isNotNull);
|
||||
assertNoErrors();
|
||||
expect(member, isFieldDeclaration);
|
||||
FieldDeclaration field = member;
|
||||
var field = member as FieldDeclaration;
|
||||
expect(field.externalKeyword, isNotNull);
|
||||
}
|
||||
|
||||
|
@ -322,7 +322,7 @@ class ClassMemberParserTest_Fasta extends FastaParserTestCase
|
|||
]);
|
||||
expect(member, isNotNull);
|
||||
expect(member, isFieldDeclaration);
|
||||
FieldDeclaration field = member;
|
||||
var field = member as FieldDeclaration;
|
||||
expect(field.covariantKeyword, isNull);
|
||||
expect(field.documentationComment, isNull);
|
||||
expect(field.metadata, hasLength(0));
|
||||
|
@ -346,7 +346,7 @@ class ClassMemberParserTest_Fasta extends FastaParserTestCase
|
|||
expect(member, isNotNull);
|
||||
assertNoErrors();
|
||||
expect(member, isFieldDeclaration);
|
||||
FieldDeclaration field = member;
|
||||
var field = member as FieldDeclaration;
|
||||
expect(field.covariantKeyword, isNull);
|
||||
expect(field.documentationComment, isNull);
|
||||
expect(field.metadata, hasLength(0));
|
||||
|
@ -372,7 +372,7 @@ class ClassMemberParserTest_Fasta extends FastaParserTestCase
|
|||
expectedError(ParserErrorCode.CONFLICTING_MODIFIERS, 5, 5),
|
||||
]);
|
||||
expect(member, isFieldDeclaration);
|
||||
FieldDeclaration field = member;
|
||||
var field = member as FieldDeclaration;
|
||||
expect(field.covariantKeyword, isNull);
|
||||
expect(field.documentationComment, isNull);
|
||||
expect(field.metadata, hasLength(0));
|
||||
|
@ -396,7 +396,7 @@ class ClassMemberParserTest_Fasta extends FastaParserTestCase
|
|||
expect(member, isNotNull);
|
||||
assertNoErrors();
|
||||
expect(member, isFieldDeclaration);
|
||||
FieldDeclaration field = member;
|
||||
var field = member as FieldDeclaration;
|
||||
expect(field.covariantKeyword, isNull);
|
||||
expect(field.documentationComment, isNull);
|
||||
expect(field.metadata, hasLength(0));
|
||||
|
@ -419,7 +419,7 @@ class ClassMemberParserTest_Fasta extends FastaParserTestCase
|
|||
ClassMember member = parser.parseClassMember('C');
|
||||
expect(member, isNotNull);
|
||||
expect(member, isFieldDeclaration);
|
||||
FieldDeclaration field = member;
|
||||
var field = member as FieldDeclaration;
|
||||
expect(field.covariantKeyword, isNull);
|
||||
expect(field.documentationComment, isNull);
|
||||
expect(field.metadata, hasLength(0));
|
||||
|
@ -443,7 +443,7 @@ class ClassMemberParserTest_Fasta extends FastaParserTestCase
|
|||
expect(member, isNotNull);
|
||||
assertNoErrors();
|
||||
expect(member, isFieldDeclaration);
|
||||
FieldDeclaration field = member;
|
||||
var field = member as FieldDeclaration;
|
||||
expect(field.abstractKeyword, isNull);
|
||||
}
|
||||
|
||||
|
@ -453,7 +453,7 @@ class ClassMemberParserTest_Fasta extends FastaParserTestCase
|
|||
expect(member, isNotNull);
|
||||
assertNoErrors();
|
||||
expect(member, isFieldDeclaration);
|
||||
FieldDeclaration field = member;
|
||||
var field = member as FieldDeclaration;
|
||||
expect(field.externalKeyword, isNull);
|
||||
}
|
||||
|
||||
|
@ -465,7 +465,7 @@ class ClassMemberParserTest_Fasta extends FastaParserTestCase
|
|||
expectedError(ParserErrorCode.MODIFIER_OUT_OF_ORDER, 4, 4),
|
||||
]);
|
||||
expect(member, isFieldDeclaration);
|
||||
FieldDeclaration field = member;
|
||||
var field = member as FieldDeclaration;
|
||||
expect(field.covariantKeyword, isNull);
|
||||
expect(field.documentationComment, isNull);
|
||||
expect(field.metadata, hasLength(0));
|
||||
|
|
Loading…
Reference in a new issue