| Index: pkg/analyzer/test/generated/static_type_analyzer_test.dart
|
| diff --git a/pkg/analyzer/test/generated/static_type_analyzer_test.dart b/pkg/analyzer/test/generated/static_type_analyzer_test.dart
|
| index 11557ce39d746cec9717d77a5dda7996ea3f149b..ae59f48789e0cfae0eb6f16ff72a0c118a391ac8 100644
|
| --- a/pkg/analyzer/test/generated/static_type_analyzer_test.dart
|
| +++ b/pkg/analyzer/test/generated/static_type_analyzer_test.dart
|
| @@ -18,7 +18,7 @@ import 'package:analyzer/src/generated/engine.dart';
|
| import 'package:analyzer/src/generated/resolver.dart';
|
| import 'package:analyzer/src/generated/source.dart';
|
| import 'package:analyzer/src/generated/static_type_analyzer.dart';
|
| -import 'package:analyzer/src/generated/testing/ast_factory.dart';
|
| +import 'package:analyzer/src/generated/testing/ast_test_factory.dart';
|
| import 'package:analyzer/src/generated/testing/element_factory.dart';
|
| import 'package:analyzer/src/generated/testing/test_type_provider.dart';
|
| import 'package:analyzer/src/generated/testing/token_factory.dart';
|
| @@ -354,7 +354,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
|
|
| void test_visitAdjacentStrings() {
|
| // "a" "b"
|
| - Expression node = AstFactory
|
| + Expression node = AstTestFactory
|
| .adjacentStrings([_resolvedString("a"), _resolvedString("b")]);
|
| expect(_analyze(node), same(_typeProvider.stringType));
|
| _listener.assertNoErrors();
|
| @@ -366,8 +366,8 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| ClassElement superclass = ElementFactory.classElement2("A");
|
| InterfaceType superclassType = superclass.type;
|
| ClassElement subclass = ElementFactory.classElement("B", superclassType);
|
| - Expression node = AstFactory.asExpression(
|
| - AstFactory.thisExpression(), AstFactory.typeName(subclass));
|
| + Expression node = AstTestFactory.asExpression(
|
| + AstTestFactory.thisExpression(), AstTestFactory.typeName(subclass));
|
| expect(_analyze3(node, superclassType), same(subclass.type));
|
| _listener.assertNoErrors();
|
| }
|
| @@ -377,7 +377,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| InterfaceType numType = _typeProvider.numType;
|
| InterfaceType intType = _typeProvider.intType;
|
| SimpleIdentifier identifier = _resolvedVariable(intType, "i");
|
| - AssignmentExpression node = AstFactory.assignmentExpression(
|
| + AssignmentExpression node = AstTestFactory.assignmentExpression(
|
| identifier, operator, _resolvedInteger(1));
|
| MethodElement plusMethod = getMethod(numType, "+");
|
| node.staticElement = plusMethod;
|
| @@ -396,7 +396,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| validate(TokenType operator) {
|
| InterfaceType boolType = _typeProvider.boolType;
|
| SimpleIdentifier identifier = _resolvedVariable(boolType, "b");
|
| - AssignmentExpression node = AstFactory.assignmentExpression(
|
| + AssignmentExpression node = AstTestFactory.assignmentExpression(
|
| identifier, operator, _resolvedBool(true));
|
| expect(_analyze(node), same(boolType));
|
| _listener.assertNoErrors();
|
| @@ -412,7 +412,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| InterfaceType intType = _typeProvider.intType;
|
| InterfaceType doubleType = _typeProvider.doubleType;
|
| SimpleIdentifier identifier = _resolvedVariable(intType, "i");
|
| - AssignmentExpression node = AstFactory.assignmentExpression(
|
| + AssignmentExpression node = AstTestFactory.assignmentExpression(
|
| identifier, operator, _resolvedDouble(1.0));
|
| MethodElement plusMethod = getMethod(numType, "+");
|
| node.staticElement = plusMethod;
|
| @@ -428,7 +428,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
|
|
| void test_visitAssignmentExpression_compoundIfNull_differentTypes() {
|
| // double d; d ??= 0
|
| - Expression node = AstFactory.assignmentExpression(
|
| + Expression node = AstTestFactory.assignmentExpression(
|
| _resolvedVariable(_typeProvider.doubleType, 'd'),
|
| TokenType.QUESTION_QUESTION_EQ,
|
| _resolvedInteger(0));
|
| @@ -438,7 +438,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
|
|
| void test_visitAssignmentExpression_compoundIfNull_sameTypes() {
|
| // int i; i ??= 0
|
| - Expression node = AstFactory.assignmentExpression(
|
| + Expression node = AstTestFactory.assignmentExpression(
|
| _resolvedVariable(_typeProvider.intType, 'i'),
|
| TokenType.QUESTION_QUESTION_EQ,
|
| _resolvedInteger(0));
|
| @@ -449,7 +449,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| void test_visitAssignmentExpression_simple() {
|
| // i = 0
|
| InterfaceType intType = _typeProvider.intType;
|
| - Expression node = AstFactory.assignmentExpression(
|
| + Expression node = AstTestFactory.assignmentExpression(
|
| _resolvedVariable(intType, "i"), TokenType.EQ, _resolvedInteger(0));
|
| expect(_analyze(node), same(intType));
|
| _listener.assertNoErrors();
|
| @@ -462,8 +462,8 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| _typeProvider.futureType.instantiate(<DartType>[intType]);
|
| InterfaceType futureFutureIntType =
|
| _typeProvider.futureType.instantiate(<DartType>[futureIntType]);
|
| - Expression node =
|
| - AstFactory.awaitExpression(_resolvedVariable(futureFutureIntType, 'e'));
|
| + Expression node = AstTestFactory
|
| + .awaitExpression(_resolvedVariable(futureFutureIntType, 'e'));
|
| expect(_analyze(node), same(intType));
|
| _listener.assertNoErrors();
|
| }
|
| @@ -474,14 +474,14 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| InterfaceType futureIntType =
|
| _typeProvider.futureType.instantiate(<DartType>[intType]);
|
| Expression node =
|
| - AstFactory.awaitExpression(_resolvedVariable(futureIntType, 'e'));
|
| + AstTestFactory.awaitExpression(_resolvedVariable(futureIntType, 'e'));
|
| expect(_analyze(node), same(intType));
|
| _listener.assertNoErrors();
|
| }
|
|
|
| void test_visitBinaryExpression_equals() {
|
| // 2 == 3
|
| - Expression node = AstFactory.binaryExpression(
|
| + Expression node = AstTestFactory.binaryExpression(
|
| _resolvedInteger(2), TokenType.EQ_EQ, _resolvedInteger(3));
|
| expect(_analyze(node), same(_typeProvider.boolType));
|
| _listener.assertNoErrors();
|
| @@ -489,7 +489,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
|
|
| void test_visitBinaryExpression_ifNull() {
|
| // 1 ?? 1.5
|
| - Expression node = AstFactory.binaryExpression(
|
| + Expression node = AstTestFactory.binaryExpression(
|
| _resolvedInteger(1), TokenType.QUESTION_QUESTION, _resolvedDouble(1.5));
|
| expect(_analyze(node), same(_typeProvider.numType));
|
| _listener.assertNoErrors();
|
| @@ -497,27 +497,27 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
|
|
| void test_visitBinaryExpression_logicalAnd() {
|
| // false && true
|
| - Expression node = AstFactory.binaryExpression(
|
| - AstFactory.booleanLiteral(false),
|
| + Expression node = AstTestFactory.binaryExpression(
|
| + AstTestFactory.booleanLiteral(false),
|
| TokenType.AMPERSAND_AMPERSAND,
|
| - AstFactory.booleanLiteral(true));
|
| + AstTestFactory.booleanLiteral(true));
|
| expect(_analyze(node), same(_typeProvider.boolType));
|
| _listener.assertNoErrors();
|
| }
|
|
|
| void test_visitBinaryExpression_logicalOr() {
|
| // false || true
|
| - Expression node = AstFactory.binaryExpression(
|
| - AstFactory.booleanLiteral(false),
|
| + Expression node = AstTestFactory.binaryExpression(
|
| + AstTestFactory.booleanLiteral(false),
|
| TokenType.BAR_BAR,
|
| - AstFactory.booleanLiteral(true));
|
| + AstTestFactory.booleanLiteral(true));
|
| expect(_analyze(node), same(_typeProvider.boolType));
|
| _listener.assertNoErrors();
|
| }
|
|
|
| void test_visitBinaryExpression_minusID_propagated() {
|
| // a - b
|
| - BinaryExpression node = AstFactory.binaryExpression(
|
| + BinaryExpression node = AstTestFactory.binaryExpression(
|
| _propagatedVariable(_typeProvider.intType, 'a'),
|
| TokenType.MINUS,
|
| _propagatedVariable(_typeProvider.doubleType, 'b'));
|
| @@ -529,7 +529,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
|
|
| void test_visitBinaryExpression_notEquals() {
|
| // 2 != 3
|
| - Expression node = AstFactory.binaryExpression(
|
| + Expression node = AstTestFactory.binaryExpression(
|
| _resolvedInteger(2), TokenType.BANG_EQ, _resolvedInteger(3));
|
| expect(_analyze(node), same(_typeProvider.boolType));
|
| _listener.assertNoErrors();
|
| @@ -537,7 +537,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
|
|
| void test_visitBinaryExpression_plusID() {
|
| // 1 + 2.0
|
| - BinaryExpression node = AstFactory.binaryExpression(
|
| + BinaryExpression node = AstTestFactory.binaryExpression(
|
| _resolvedInteger(1), TokenType.PLUS, _resolvedDouble(2.0));
|
| node.staticElement = getMethod(_typeProvider.numType, "+");
|
| expect(_analyze(node), same(_typeProvider.doubleType));
|
| @@ -546,7 +546,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
|
|
| void test_visitBinaryExpression_plusII() {
|
| // 1 + 2
|
| - BinaryExpression node = AstFactory.binaryExpression(
|
| + BinaryExpression node = AstTestFactory.binaryExpression(
|
| _resolvedInteger(1), TokenType.PLUS, _resolvedInteger(2));
|
| node.staticElement = getMethod(_typeProvider.numType, "+");
|
| expect(_analyze(node), same(_typeProvider.intType));
|
| @@ -555,7 +555,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
|
|
| void test_visitBinaryExpression_plusII_propagated() {
|
| // a + b
|
| - BinaryExpression node = AstFactory.binaryExpression(
|
| + BinaryExpression node = AstTestFactory.binaryExpression(
|
| _propagatedVariable(_typeProvider.intType, 'a'),
|
| TokenType.PLUS,
|
| _propagatedVariable(_typeProvider.intType, 'b'));
|
| @@ -567,7 +567,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
|
|
| void test_visitBinaryExpression_slash() {
|
| // 2 / 2
|
| - BinaryExpression node = AstFactory.binaryExpression(
|
| + BinaryExpression node = AstTestFactory.binaryExpression(
|
| _resolvedInteger(2), TokenType.SLASH, _resolvedInteger(2));
|
| node.staticElement = getMethod(_typeProvider.numType, "/");
|
| expect(_analyze(node), same(_typeProvider.doubleType));
|
| @@ -584,9 +584,9 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| MethodElement operator =
|
| ElementFactory.methodElement("*", typeA, [_typeProvider.doubleType]);
|
| classA.methods = <MethodElement>[operator];
|
| - BinaryExpression node = AstFactory.binaryExpression(
|
| - AstFactory.asExpression(
|
| - AstFactory.identifier3("a"), AstFactory.typeName(classA)),
|
| + BinaryExpression node = AstTestFactory.binaryExpression(
|
| + AstTestFactory.asExpression(
|
| + AstTestFactory.identifier3("a"), AstTestFactory.typeName(classA)),
|
| TokenType.PLUS,
|
| _resolvedDouble(2.0));
|
| node.staticElement = operator;
|
| @@ -596,7 +596,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
|
|
| void test_visitBinaryExpression_starID() {
|
| // 1 * 2.0
|
| - BinaryExpression node = AstFactory.binaryExpression(
|
| + BinaryExpression node = AstTestFactory.binaryExpression(
|
| _resolvedInteger(1), TokenType.PLUS, _resolvedDouble(2.0));
|
| node.staticElement = getMethod(_typeProvider.numType, "*");
|
| expect(_analyze(node), same(_typeProvider.doubleType));
|
| @@ -605,30 +605,30 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
|
|
| void test_visitBooleanLiteral_false() {
|
| // false
|
| - Expression node = AstFactory.booleanLiteral(false);
|
| + Expression node = AstTestFactory.booleanLiteral(false);
|
| expect(_analyze(node), same(_typeProvider.boolType));
|
| _listener.assertNoErrors();
|
| }
|
|
|
| void test_visitBooleanLiteral_true() {
|
| // true
|
| - Expression node = AstFactory.booleanLiteral(true);
|
| + Expression node = AstTestFactory.booleanLiteral(true);
|
| expect(_analyze(node), same(_typeProvider.boolType));
|
| _listener.assertNoErrors();
|
| }
|
|
|
| void test_visitCascadeExpression() {
|
| // a..length
|
| - Expression node = AstFactory.cascadeExpression(
|
| - _resolvedString("a"), [AstFactory.propertyAccess2(null, "length")]);
|
| + Expression node = AstTestFactory.cascadeExpression(
|
| + _resolvedString("a"), [AstTestFactory.propertyAccess2(null, "length")]);
|
| expect(_analyze(node), same(_typeProvider.stringType));
|
| _listener.assertNoErrors();
|
| }
|
|
|
| void test_visitConditionalExpression_differentTypes() {
|
| // true ? 1.0 : 0
|
| - Expression node = AstFactory.conditionalExpression(
|
| - AstFactory.booleanLiteral(true),
|
| + Expression node = AstTestFactory.conditionalExpression(
|
| + AstTestFactory.booleanLiteral(true),
|
| _resolvedDouble(1.0),
|
| _resolvedInteger(0));
|
| expect(_analyze(node), same(_typeProvider.numType));
|
| @@ -637,8 +637,8 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
|
|
| void test_visitConditionalExpression_sameTypes() {
|
| // true ? 1 : 0
|
| - Expression node = AstFactory.conditionalExpression(
|
| - AstFactory.booleanLiteral(true),
|
| + Expression node = AstTestFactory.conditionalExpression(
|
| + AstTestFactory.booleanLiteral(true),
|
| _resolvedInteger(1),
|
| _resolvedInteger(0));
|
| expect(_analyze(node), same(_typeProvider.intType));
|
| @@ -647,17 +647,17 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
|
|
| void test_visitDoubleLiteral() {
|
| // 4.33
|
| - Expression node = AstFactory.doubleLiteral(4.33);
|
| + Expression node = AstTestFactory.doubleLiteral(4.33);
|
| expect(_analyze(node), same(_typeProvider.doubleType));
|
| _listener.assertNoErrors();
|
| }
|
|
|
| void test_visitFunctionExpression_async_block() {
|
| // () async {}
|
| - BlockFunctionBody body = AstFactory.blockFunctionBody2();
|
| + BlockFunctionBody body = AstTestFactory.blockFunctionBody2();
|
| body.keyword = TokenFactory.tokenFromString('async');
|
| - FunctionExpression node =
|
| - _resolvedFunctionExpression(AstFactory.formalParameterList([]), body);
|
| + FunctionExpression node = _resolvedFunctionExpression(
|
| + AstTestFactory.formalParameterList([]), body);
|
| DartType resultType = _analyze(node);
|
| _assertFunctionType(
|
| _typeProvider.futureDynamicType, null, null, null, resultType);
|
| @@ -670,10 +670,11 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| InterfaceType futureIntType =
|
| _typeProvider.futureType.instantiate(<DartType>[intType]);
|
| Expression expression = _resolvedVariable(intType, 'e');
|
| - ExpressionFunctionBody body = AstFactory.expressionFunctionBody(expression);
|
| + ExpressionFunctionBody body =
|
| + AstTestFactory.expressionFunctionBody(expression);
|
| body.keyword = TokenFactory.tokenFromString('async');
|
| - FunctionExpression node =
|
| - _resolvedFunctionExpression(AstFactory.formalParameterList([]), body);
|
| + FunctionExpression node = _resolvedFunctionExpression(
|
| + AstTestFactory.formalParameterList([]), body);
|
| DartType resultType = _analyze(node);
|
| _assertFunctionType(futureIntType, null, null, null, resultType);
|
| _listener.assertNoErrors();
|
| @@ -685,10 +686,11 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| InterfaceType futureIntType =
|
| _typeProvider.futureType.instantiate(<DartType>[intType]);
|
| Expression expression = _resolvedVariable(futureIntType, 'e');
|
| - ExpressionFunctionBody body = AstFactory.expressionFunctionBody(expression);
|
| + ExpressionFunctionBody body =
|
| + AstTestFactory.expressionFunctionBody(expression);
|
| body.keyword = TokenFactory.tokenFromString('async');
|
| - FunctionExpression node =
|
| - _resolvedFunctionExpression(AstFactory.formalParameterList([]), body);
|
| + FunctionExpression node = _resolvedFunctionExpression(
|
| + AstTestFactory.formalParameterList([]), body);
|
| DartType resultType = _analyze(node);
|
| _assertFunctionType(futureIntType, null, null, null, resultType);
|
| _listener.assertNoErrors();
|
| @@ -702,10 +704,11 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| InterfaceType futureFutureIntType =
|
| _typeProvider.futureType.instantiate(<DartType>[futureIntType]);
|
| Expression expression = _resolvedVariable(futureFutureIntType, 'e');
|
| - ExpressionFunctionBody body = AstFactory.expressionFunctionBody(expression);
|
| + ExpressionFunctionBody body =
|
| + AstTestFactory.expressionFunctionBody(expression);
|
| body.keyword = TokenFactory.tokenFromString('async');
|
| - FunctionExpression node =
|
| - _resolvedFunctionExpression(AstFactory.formalParameterList([]), body);
|
| + FunctionExpression node = _resolvedFunctionExpression(
|
| + AstTestFactory.formalParameterList([]), body);
|
| DartType resultType = _analyze(node);
|
| _assertFunctionType(futureIntType, null, null, null, resultType);
|
| _listener.assertNoErrors();
|
| @@ -713,11 +716,11 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
|
|
| void test_visitFunctionExpression_generator_async() {
|
| // () async* {}
|
| - BlockFunctionBody body = AstFactory.blockFunctionBody2();
|
| + BlockFunctionBody body = AstTestFactory.blockFunctionBody2();
|
| body.keyword = TokenFactory.tokenFromString('async');
|
| body.star = TokenFactory.tokenFromType(TokenType.STAR);
|
| - FunctionExpression node =
|
| - _resolvedFunctionExpression(AstFactory.formalParameterList([]), body);
|
| + FunctionExpression node = _resolvedFunctionExpression(
|
| + AstTestFactory.formalParameterList([]), body);
|
| DartType resultType = _analyze(node);
|
| _assertFunctionType(
|
| _typeProvider.streamDynamicType, null, null, null, resultType);
|
| @@ -726,11 +729,11 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
|
|
| void test_visitFunctionExpression_generator_sync() {
|
| // () sync* {}
|
| - BlockFunctionBody body = AstFactory.blockFunctionBody2();
|
| + BlockFunctionBody body = AstTestFactory.blockFunctionBody2();
|
| body.keyword = TokenFactory.tokenFromString('sync');
|
| body.star = TokenFactory.tokenFromType(TokenType.STAR);
|
| - FunctionExpression node =
|
| - _resolvedFunctionExpression(AstFactory.formalParameterList([]), body);
|
| + FunctionExpression node = _resolvedFunctionExpression(
|
| + AstTestFactory.formalParameterList([]), body);
|
| DartType resultType = _analyze(node);
|
| _assertFunctionType(
|
| _typeProvider.iterableDynamicType, null, null, null, resultType);
|
| @@ -740,15 +743,15 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| void test_visitFunctionExpression_named_block() {
|
| // ({p1 : 0, p2 : 0}) {}
|
| DartType dynamicType = _typeProvider.dynamicType;
|
| - FormalParameter p1 = AstFactory.namedFormalParameter(
|
| - AstFactory.simpleFormalParameter3("p1"), _resolvedInteger(0));
|
| + FormalParameter p1 = AstTestFactory.namedFormalParameter(
|
| + AstTestFactory.simpleFormalParameter3("p1"), _resolvedInteger(0));
|
| _setType(p1, dynamicType);
|
| - FormalParameter p2 = AstFactory.namedFormalParameter(
|
| - AstFactory.simpleFormalParameter3("p2"), _resolvedInteger(0));
|
| + FormalParameter p2 = AstTestFactory.namedFormalParameter(
|
| + AstTestFactory.simpleFormalParameter3("p2"), _resolvedInteger(0));
|
| _setType(p2, dynamicType);
|
| FunctionExpression node = _resolvedFunctionExpression(
|
| - AstFactory.formalParameterList([p1, p2]),
|
| - AstFactory.blockFunctionBody2());
|
| + AstTestFactory.formalParameterList([p1, p2]),
|
| + AstTestFactory.blockFunctionBody2());
|
| _analyze5(p1);
|
| _analyze5(p2);
|
| DartType resultType = _analyze(node);
|
| @@ -763,12 +766,12 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| void test_visitFunctionExpression_named_expression() {
|
| // ({p : 0}) -> 0;
|
| DartType dynamicType = _typeProvider.dynamicType;
|
| - FormalParameter p = AstFactory.namedFormalParameter(
|
| - AstFactory.simpleFormalParameter3("p"), _resolvedInteger(0));
|
| + FormalParameter p = AstTestFactory.namedFormalParameter(
|
| + AstTestFactory.simpleFormalParameter3("p"), _resolvedInteger(0));
|
| _setType(p, dynamicType);
|
| FunctionExpression node = _resolvedFunctionExpression(
|
| - AstFactory.formalParameterList([p]),
|
| - AstFactory.expressionFunctionBody(_resolvedInteger(0)));
|
| + AstTestFactory.formalParameterList([p]),
|
| + AstTestFactory.expressionFunctionBody(_resolvedInteger(0)));
|
| _analyze5(p);
|
| DartType resultType = _analyze(node);
|
| Map<String, DartType> expectedNamedTypes = new HashMap<String, DartType>();
|
| @@ -781,13 +784,13 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| void test_visitFunctionExpression_normal_block() {
|
| // (p1, p2) {}
|
| DartType dynamicType = _typeProvider.dynamicType;
|
| - FormalParameter p1 = AstFactory.simpleFormalParameter3("p1");
|
| + FormalParameter p1 = AstTestFactory.simpleFormalParameter3("p1");
|
| _setType(p1, dynamicType);
|
| - FormalParameter p2 = AstFactory.simpleFormalParameter3("p2");
|
| + FormalParameter p2 = AstTestFactory.simpleFormalParameter3("p2");
|
| _setType(p2, dynamicType);
|
| FunctionExpression node = _resolvedFunctionExpression(
|
| - AstFactory.formalParameterList([p1, p2]),
|
| - AstFactory.blockFunctionBody2());
|
| + AstTestFactory.formalParameterList([p1, p2]),
|
| + AstTestFactory.blockFunctionBody2());
|
| _analyze5(p1);
|
| _analyze5(p2);
|
| DartType resultType = _analyze(node);
|
| @@ -799,11 +802,11 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| void test_visitFunctionExpression_normal_expression() {
|
| // (p1, p2) -> 0
|
| DartType dynamicType = _typeProvider.dynamicType;
|
| - FormalParameter p = AstFactory.simpleFormalParameter3("p");
|
| + FormalParameter p = AstTestFactory.simpleFormalParameter3("p");
|
| _setType(p, dynamicType);
|
| FunctionExpression node = _resolvedFunctionExpression(
|
| - AstFactory.formalParameterList([p]),
|
| - AstFactory.expressionFunctionBody(_resolvedInteger(0)));
|
| + AstTestFactory.formalParameterList([p]),
|
| + AstTestFactory.expressionFunctionBody(_resolvedInteger(0)));
|
| _analyze5(p);
|
| DartType resultType = _analyze(node);
|
| _assertFunctionType(
|
| @@ -814,14 +817,14 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| void test_visitFunctionExpression_normalAndNamed_block() {
|
| // (p1, {p2 : 0}) {}
|
| DartType dynamicType = _typeProvider.dynamicType;
|
| - FormalParameter p1 = AstFactory.simpleFormalParameter3("p1");
|
| + FormalParameter p1 = AstTestFactory.simpleFormalParameter3("p1");
|
| _setType(p1, dynamicType);
|
| - FormalParameter p2 = AstFactory.namedFormalParameter(
|
| - AstFactory.simpleFormalParameter3("p2"), _resolvedInteger(0));
|
| + FormalParameter p2 = AstTestFactory.namedFormalParameter(
|
| + AstTestFactory.simpleFormalParameter3("p2"), _resolvedInteger(0));
|
| _setType(p2, dynamicType);
|
| FunctionExpression node = _resolvedFunctionExpression(
|
| - AstFactory.formalParameterList([p1, p2]),
|
| - AstFactory.blockFunctionBody2());
|
| + AstTestFactory.formalParameterList([p1, p2]),
|
| + AstTestFactory.blockFunctionBody2());
|
| _analyze5(p2);
|
| DartType resultType = _analyze(node);
|
| Map<String, DartType> expectedNamedTypes = new HashMap<String, DartType>();
|
| @@ -834,14 +837,14 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| void test_visitFunctionExpression_normalAndNamed_expression() {
|
| // (p1, {p2 : 0}) -> 0
|
| DartType dynamicType = _typeProvider.dynamicType;
|
| - FormalParameter p1 = AstFactory.simpleFormalParameter3("p1");
|
| + FormalParameter p1 = AstTestFactory.simpleFormalParameter3("p1");
|
| _setType(p1, dynamicType);
|
| - FormalParameter p2 = AstFactory.namedFormalParameter(
|
| - AstFactory.simpleFormalParameter3("p2"), _resolvedInteger(0));
|
| + FormalParameter p2 = AstTestFactory.namedFormalParameter(
|
| + AstTestFactory.simpleFormalParameter3("p2"), _resolvedInteger(0));
|
| _setType(p2, dynamicType);
|
| FunctionExpression node = _resolvedFunctionExpression(
|
| - AstFactory.formalParameterList([p1, p2]),
|
| - AstFactory.expressionFunctionBody(_resolvedInteger(0)));
|
| + AstTestFactory.formalParameterList([p1, p2]),
|
| + AstTestFactory.expressionFunctionBody(_resolvedInteger(0)));
|
| _analyze5(p2);
|
| DartType resultType = _analyze(node);
|
| Map<String, DartType> expectedNamedTypes = new HashMap<String, DartType>();
|
| @@ -854,14 +857,14 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| void test_visitFunctionExpression_normalAndPositional_block() {
|
| // (p1, [p2 = 0]) {}
|
| DartType dynamicType = _typeProvider.dynamicType;
|
| - FormalParameter p1 = AstFactory.simpleFormalParameter3("p1");
|
| + FormalParameter p1 = AstTestFactory.simpleFormalParameter3("p1");
|
| _setType(p1, dynamicType);
|
| - FormalParameter p2 = AstFactory.positionalFormalParameter(
|
| - AstFactory.simpleFormalParameter3("p2"), _resolvedInteger(0));
|
| + FormalParameter p2 = AstTestFactory.positionalFormalParameter(
|
| + AstTestFactory.simpleFormalParameter3("p2"), _resolvedInteger(0));
|
| _setType(p2, dynamicType);
|
| FunctionExpression node = _resolvedFunctionExpression(
|
| - AstFactory.formalParameterList([p1, p2]),
|
| - AstFactory.blockFunctionBody2());
|
| + AstTestFactory.formalParameterList([p1, p2]),
|
| + AstTestFactory.blockFunctionBody2());
|
| _analyze5(p1);
|
| _analyze5(p2);
|
| DartType resultType = _analyze(node);
|
| @@ -873,14 +876,14 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| void test_visitFunctionExpression_normalAndPositional_expression() {
|
| // (p1, [p2 = 0]) -> 0
|
| DartType dynamicType = _typeProvider.dynamicType;
|
| - FormalParameter p1 = AstFactory.simpleFormalParameter3("p1");
|
| + FormalParameter p1 = AstTestFactory.simpleFormalParameter3("p1");
|
| _setType(p1, dynamicType);
|
| - FormalParameter p2 = AstFactory.positionalFormalParameter(
|
| - AstFactory.simpleFormalParameter3("p2"), _resolvedInteger(0));
|
| + FormalParameter p2 = AstTestFactory.positionalFormalParameter(
|
| + AstTestFactory.simpleFormalParameter3("p2"), _resolvedInteger(0));
|
| _setType(p2, dynamicType);
|
| FunctionExpression node = _resolvedFunctionExpression(
|
| - AstFactory.formalParameterList([p1, p2]),
|
| - AstFactory.expressionFunctionBody(_resolvedInteger(0)));
|
| + AstTestFactory.formalParameterList([p1, p2]),
|
| + AstTestFactory.expressionFunctionBody(_resolvedInteger(0)));
|
| _analyze5(p1);
|
| _analyze5(p2);
|
| DartType resultType = _analyze(node);
|
| @@ -892,15 +895,15 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| void test_visitFunctionExpression_positional_block() {
|
| // ([p1 = 0, p2 = 0]) {}
|
| DartType dynamicType = _typeProvider.dynamicType;
|
| - FormalParameter p1 = AstFactory.positionalFormalParameter(
|
| - AstFactory.simpleFormalParameter3("p1"), _resolvedInteger(0));
|
| + FormalParameter p1 = AstTestFactory.positionalFormalParameter(
|
| + AstTestFactory.simpleFormalParameter3("p1"), _resolvedInteger(0));
|
| _setType(p1, dynamicType);
|
| - FormalParameter p2 = AstFactory.positionalFormalParameter(
|
| - AstFactory.simpleFormalParameter3("p2"), _resolvedInteger(0));
|
| + FormalParameter p2 = AstTestFactory.positionalFormalParameter(
|
| + AstTestFactory.simpleFormalParameter3("p2"), _resolvedInteger(0));
|
| _setType(p2, dynamicType);
|
| FunctionExpression node = _resolvedFunctionExpression(
|
| - AstFactory.formalParameterList([p1, p2]),
|
| - AstFactory.blockFunctionBody2());
|
| + AstTestFactory.formalParameterList([p1, p2]),
|
| + AstTestFactory.blockFunctionBody2());
|
| _analyze5(p1);
|
| _analyze5(p2);
|
| DartType resultType = _analyze(node);
|
| @@ -912,12 +915,12 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| void test_visitFunctionExpression_positional_expression() {
|
| // ([p1 = 0, p2 = 0]) -> 0
|
| DartType dynamicType = _typeProvider.dynamicType;
|
| - FormalParameter p = AstFactory.positionalFormalParameter(
|
| - AstFactory.simpleFormalParameter3("p"), _resolvedInteger(0));
|
| + FormalParameter p = AstTestFactory.positionalFormalParameter(
|
| + AstTestFactory.simpleFormalParameter3("p"), _resolvedInteger(0));
|
| _setType(p, dynamicType);
|
| FunctionExpression node = _resolvedFunctionExpression(
|
| - AstFactory.formalParameterList([p]),
|
| - AstFactory.expressionFunctionBody(_resolvedInteger(0)));
|
| + AstTestFactory.formalParameterList([p]),
|
| + AstTestFactory.expressionFunctionBody(_resolvedInteger(0)));
|
| _analyze5(p);
|
| DartType resultType = _analyze(node);
|
| _assertFunctionType(
|
| @@ -931,7 +934,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| InterfaceType listType = _typeProvider.listType;
|
| SimpleIdentifier identifier = _resolvedVariable(listType, "a");
|
| IndexExpression node =
|
| - AstFactory.indexExpression(identifier, _resolvedInteger(2));
|
| + AstTestFactory.indexExpression(identifier, _resolvedInteger(2));
|
| MethodElement indexMethod = listType.element.methods[0];
|
| node.staticElement = indexMethod;
|
| expect(_analyze(node), same(listType.typeArguments[0]));
|
| @@ -944,10 +947,11 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| InterfaceType listType = _typeProvider.listType;
|
| SimpleIdentifier identifier = _resolvedVariable(listType, "a");
|
| IndexExpression node =
|
| - AstFactory.indexExpression(identifier, _resolvedInteger(2));
|
| + AstTestFactory.indexExpression(identifier, _resolvedInteger(2));
|
| MethodElement indexMethod = listType.element.methods[1];
|
| node.staticElement = indexMethod;
|
| - AstFactory.assignmentExpression(node, TokenType.EQ, AstFactory.integer(0));
|
| + AstTestFactory.assignmentExpression(
|
| + node, TokenType.EQ, AstTestFactory.integer(0));
|
| expect(_analyze(node), same(listType.typeArguments[0]));
|
| _listener.assertNoErrors();
|
| }
|
| @@ -960,12 +964,12 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| // (int) -> E
|
| MethodElement methodElement = getMethod(listType, "[]");
|
| // "list" has type List<int>
|
| - SimpleIdentifier identifier = AstFactory.identifier3("list");
|
| + SimpleIdentifier identifier = AstTestFactory.identifier3("list");
|
| InterfaceType listOfIntType = listType.instantiate(<DartType>[intType]);
|
| identifier.staticType = listOfIntType;
|
| // list[0] has MethodElement element (int) -> E
|
| IndexExpression indexExpression =
|
| - AstFactory.indexExpression(identifier, AstFactory.integer(0));
|
| + AstTestFactory.indexExpression(identifier, AstTestFactory.integer(0));
|
| MethodElement indexMethod = MethodMember.from(methodElement, listOfIntType);
|
| indexExpression.staticElement = indexMethod;
|
| // analyze and assert result of the index expression
|
| @@ -981,17 +985,17 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| // (int, E) -> void
|
| MethodElement methodElement = getMethod(listType, "[]=");
|
| // "list" has type List<int>
|
| - SimpleIdentifier identifier = AstFactory.identifier3("list");
|
| + SimpleIdentifier identifier = AstTestFactory.identifier3("list");
|
| InterfaceType listOfIntType = listType.instantiate(<DartType>[intType]);
|
| identifier.staticType = listOfIntType;
|
| // list[0] has MethodElement element (int) -> E
|
| IndexExpression indexExpression =
|
| - AstFactory.indexExpression(identifier, AstFactory.integer(0));
|
| + AstTestFactory.indexExpression(identifier, AstTestFactory.integer(0));
|
| MethodElement indexMethod = MethodMember.from(methodElement, listOfIntType);
|
| indexExpression.staticElement = indexMethod;
|
| // list[0] should be in a setter context
|
| - AstFactory.assignmentExpression(
|
| - indexExpression, TokenType.EQ, AstFactory.integer(0));
|
| + AstTestFactory.assignmentExpression(
|
| + indexExpression, TokenType.EQ, AstTestFactory.integer(0));
|
| // analyze and assert result of the index expression
|
| expect(_analyze(indexExpression), same(intType));
|
| _listener.assertNoErrors();
|
| @@ -1004,10 +1008,11 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| ConstructorElementImpl constructor =
|
| ElementFactory.constructorElement2(classElement, constructorName);
|
| classElement.constructors = <ConstructorElement>[constructor];
|
| - InstanceCreationExpression node = AstFactory.instanceCreationExpression2(
|
| - null,
|
| - AstFactory.typeName(classElement),
|
| - [AstFactory.identifier3(constructorName)]);
|
| + InstanceCreationExpression node = AstTestFactory
|
| + .instanceCreationExpression2(
|
| + null,
|
| + AstTestFactory.typeName(classElement),
|
| + [AstTestFactory.identifier3(constructorName)]);
|
| node.staticElement = constructor;
|
| expect(_analyze(node), same(classElement.type));
|
| _listener.assertNoErrors();
|
| @@ -1021,10 +1026,10 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| ElementFactory.constructorElement2(elementC, null);
|
| elementC.constructors = <ConstructorElement>[constructor];
|
| TypeName typeName =
|
| - AstFactory.typeName(elementC, [AstFactory.typeName(elementI)]);
|
| + AstTestFactory.typeName(elementC, [AstTestFactory.typeName(elementI)]);
|
| typeName.type = elementC.type.instantiate(<DartType>[elementI.type]);
|
| InstanceCreationExpression node =
|
| - AstFactory.instanceCreationExpression2(null, typeName);
|
| + AstTestFactory.instanceCreationExpression2(null, typeName);
|
| node.staticElement = constructor;
|
| InterfaceType interfaceType = _analyze(node) as InterfaceType;
|
| List<DartType> typeArgs = interfaceType.typeArguments;
|
| @@ -1039,8 +1044,9 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| ConstructorElementImpl constructor =
|
| ElementFactory.constructorElement2(classElement, null);
|
| classElement.constructors = <ConstructorElement>[constructor];
|
| - InstanceCreationExpression node = AstFactory.instanceCreationExpression2(
|
| - null, AstFactory.typeName(classElement));
|
| + InstanceCreationExpression node =
|
| + AstTestFactory.instanceCreationExpression2(
|
| + null, AstTestFactory.typeName(classElement));
|
| node.staticElement = constructor;
|
| expect(_analyze(node), same(classElement.type));
|
| _listener.assertNoErrors();
|
| @@ -1055,23 +1061,23 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
|
|
| void test_visitIsExpression_negated() {
|
| // a is! String
|
| - Expression node = AstFactory.isExpression(
|
| - _resolvedString("a"), true, AstFactory.typeName4("String"));
|
| + Expression node = AstTestFactory.isExpression(
|
| + _resolvedString("a"), true, AstTestFactory.typeName4("String"));
|
| expect(_analyze(node), same(_typeProvider.boolType));
|
| _listener.assertNoErrors();
|
| }
|
|
|
| void test_visitIsExpression_notNegated() {
|
| // a is String
|
| - Expression node = AstFactory.isExpression(
|
| - _resolvedString("a"), false, AstFactory.typeName4("String"));
|
| + Expression node = AstTestFactory.isExpression(
|
| + _resolvedString("a"), false, AstTestFactory.typeName4("String"));
|
| expect(_analyze(node), same(_typeProvider.boolType));
|
| _listener.assertNoErrors();
|
| }
|
|
|
| void test_visitListLiteral_empty() {
|
| // []
|
| - Expression node = AstFactory.listLiteral();
|
| + Expression node = AstTestFactory.listLiteral();
|
| DartType resultType = _analyze(node);
|
| _assertType2(
|
| _typeProvider.listType
|
| @@ -1082,7 +1088,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
|
|
| void test_visitListLiteral_nonEmpty() {
|
| // [0]
|
| - Expression node = AstFactory.listLiteral([_resolvedInteger(0)]);
|
| + Expression node = AstTestFactory.listLiteral([_resolvedInteger(0)]);
|
| DartType resultType = _analyze(node);
|
| _assertType2(
|
| _typeProvider.listType
|
| @@ -1094,8 +1100,8 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| void test_visitListLiteral_unresolved() {
|
| _analyzer = _createAnalyzer(strongMode: true);
|
| // [a] // where 'a' is not resolved
|
| - Identifier identifier = AstFactory.identifier3('a');
|
| - Expression node = AstFactory.listLiteral([identifier]);
|
| + Identifier identifier = AstTestFactory.identifier3('a');
|
| + Expression node = AstTestFactory.listLiteral([identifier]);
|
| DartType resultType = _analyze(node);
|
| _assertType2(
|
| _typeProvider.listType
|
| @@ -1107,8 +1113,8 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| void test_visitListLiteral_unresolved_multiple() {
|
| _analyzer = _createAnalyzer(strongMode: true);
|
| // [0, a, 1] // where 'a' is not resolved
|
| - Identifier identifier = AstFactory.identifier3('a');
|
| - Expression node = AstFactory
|
| + Identifier identifier = AstTestFactory.identifier3('a');
|
| + Expression node = AstTestFactory
|
| .listLiteral([_resolvedInteger(0), identifier, _resolvedInteger(1)]);
|
| DartType resultType = _analyze(node);
|
| _assertType2(
|
| @@ -1119,7 +1125,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
|
|
| void test_visitMapLiteral_empty() {
|
| // {}
|
| - Expression node = AstFactory.mapLiteral2();
|
| + Expression node = AstTestFactory.mapLiteral2();
|
| DartType resultType = _analyze(node);
|
| _assertType2(
|
| _typeProvider.mapType.instantiate(
|
| @@ -1130,8 +1136,8 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
|
|
| void test_visitMapLiteral_nonEmpty() {
|
| // {"k" : 0}
|
| - Expression node = AstFactory
|
| - .mapLiteral2([AstFactory.mapLiteralEntry("k", _resolvedInteger(0))]);
|
| + Expression node = AstTestFactory.mapLiteral2(
|
| + [AstTestFactory.mapLiteralEntry("k", _resolvedInteger(0))]);
|
| DartType resultType = _analyze(node);
|
| _assertType2(
|
| _typeProvider.mapType.instantiate(
|
| @@ -1142,35 +1148,37 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
|
|
| void test_visitMethodInvocation_then() {
|
| // then()
|
| - Expression node = AstFactory.methodInvocation(null, "then");
|
| + Expression node = AstTestFactory.methodInvocation(null, "then");
|
| _analyze(node);
|
| _listener.assertNoErrors();
|
| }
|
|
|
| void test_visitNamedExpression() {
|
| // n: a
|
| - Expression node = AstFactory.namedExpression2("n", _resolvedString("a"));
|
| + Expression node =
|
| + AstTestFactory.namedExpression2("n", _resolvedString("a"));
|
| expect(_analyze(node), same(_typeProvider.stringType));
|
| _listener.assertNoErrors();
|
| }
|
|
|
| void test_visitNullLiteral() {
|
| // null
|
| - Expression node = AstFactory.nullLiteral();
|
| + Expression node = AstTestFactory.nullLiteral();
|
| expect(_analyze(node), same(_typeProvider.bottomType));
|
| _listener.assertNoErrors();
|
| }
|
|
|
| void test_visitParenthesizedExpression() {
|
| // (0)
|
| - Expression node = AstFactory.parenthesizedExpression(_resolvedInteger(0));
|
| + Expression node =
|
| + AstTestFactory.parenthesizedExpression(_resolvedInteger(0));
|
| expect(_analyze(node), same(_typeProvider.intType));
|
| _listener.assertNoErrors();
|
| }
|
|
|
| void test_visitPostfixExpression_minusMinus() {
|
| // 0--
|
| - PostfixExpression node = AstFactory.postfixExpression(
|
| + PostfixExpression node = AstTestFactory.postfixExpression(
|
| _resolvedInteger(0), TokenType.MINUS_MINUS);
|
| expect(_analyze(node), same(_typeProvider.intType));
|
| _listener.assertNoErrors();
|
| @@ -1178,8 +1186,8 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
|
|
| void test_visitPostfixExpression_plusPlus() {
|
| // 0++
|
| - PostfixExpression node =
|
| - AstFactory.postfixExpression(_resolvedInteger(0), TokenType.PLUS_PLUS);
|
| + PostfixExpression node = AstTestFactory.postfixExpression(
|
| + _resolvedInteger(0), TokenType.PLUS_PLUS);
|
| expect(_analyze(node), same(_typeProvider.intType));
|
| _listener.assertNoErrors();
|
| }
|
| @@ -1188,7 +1196,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| DartType boolType = _typeProvider.boolType;
|
| PropertyAccessorElementImpl getter =
|
| ElementFactory.getterElement("b", false, boolType);
|
| - PrefixedIdentifier node = AstFactory.identifier5("a", "b");
|
| + PrefixedIdentifier node = AstTestFactory.identifier5("a", "b");
|
| node.identifier.staticElement = getter;
|
| expect(_analyze(node), same(boolType));
|
| _listener.assertNoErrors();
|
| @@ -1199,7 +1207,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| FieldElementImpl field =
|
| ElementFactory.fieldElement("b", false, false, false, boolType);
|
| PropertyAccessorElement setter = field.setter;
|
| - PrefixedIdentifier node = AstFactory.identifier5("a", "b");
|
| + PrefixedIdentifier node = AstTestFactory.identifier5("a", "b");
|
| node.identifier.staticElement = setter;
|
| expect(_analyze(node), same(boolType));
|
| _listener.assertNoErrors();
|
| @@ -1208,7 +1216,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| void test_visitPrefixedIdentifier_variable() {
|
| VariableElementImpl variable = ElementFactory.localVariableElement2("b");
|
| variable.type = _typeProvider.boolType;
|
| - PrefixedIdentifier node = AstFactory.identifier5("a", "b");
|
| + PrefixedIdentifier node = AstTestFactory.identifier5("a", "b");
|
| node.identifier.staticElement = variable;
|
| expect(_analyze(node), same(_typeProvider.boolType));
|
| _listener.assertNoErrors();
|
| @@ -1217,7 +1225,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| void test_visitPrefixExpression_bang() {
|
| // !0
|
| PrefixExpression node =
|
| - AstFactory.prefixExpression(TokenType.BANG, _resolvedInteger(0));
|
| + AstTestFactory.prefixExpression(TokenType.BANG, _resolvedInteger(0));
|
| expect(_analyze(node), same(_typeProvider.boolType));
|
| _listener.assertNoErrors();
|
| }
|
| @@ -1225,7 +1233,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| void test_visitPrefixExpression_minus() {
|
| // -0
|
| PrefixExpression node =
|
| - AstFactory.prefixExpression(TokenType.MINUS, _resolvedInteger(0));
|
| + AstTestFactory.prefixExpression(TokenType.MINUS, _resolvedInteger(0));
|
| MethodElement minusMethod = getMethod(_typeProvider.numType, "-");
|
| node.staticElement = minusMethod;
|
| expect(_analyze(node), same(_typeProvider.numType));
|
| @@ -1234,8 +1242,8 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
|
|
| void test_visitPrefixExpression_minusMinus() {
|
| // --0
|
| - PrefixExpression node =
|
| - AstFactory.prefixExpression(TokenType.MINUS_MINUS, _resolvedInteger(0));
|
| + PrefixExpression node = AstTestFactory.prefixExpression(
|
| + TokenType.MINUS_MINUS, _resolvedInteger(0));
|
| MethodElement minusMethod = getMethod(_typeProvider.numType, "-");
|
| node.staticElement = minusMethod;
|
| expect(_analyze(node), same(_typeProvider.intType));
|
| @@ -1244,16 +1252,16 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
|
|
| void test_visitPrefixExpression_not() {
|
| // !true
|
| - Expression node = AstFactory.prefixExpression(
|
| - TokenType.BANG, AstFactory.booleanLiteral(true));
|
| + Expression node = AstTestFactory.prefixExpression(
|
| + TokenType.BANG, AstTestFactory.booleanLiteral(true));
|
| expect(_analyze(node), same(_typeProvider.boolType));
|
| _listener.assertNoErrors();
|
| }
|
|
|
| void test_visitPrefixExpression_plusPlus() {
|
| // ++0
|
| - PrefixExpression node =
|
| - AstFactory.prefixExpression(TokenType.PLUS_PLUS, _resolvedInteger(0));
|
| + PrefixExpression node = AstTestFactory.prefixExpression(
|
| + TokenType.PLUS_PLUS, _resolvedInteger(0));
|
| MethodElement plusMethod = getMethod(_typeProvider.numType, "+");
|
| node.staticElement = plusMethod;
|
| expect(_analyze(node), same(_typeProvider.intType));
|
| @@ -1263,7 +1271,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| void test_visitPrefixExpression_tilde() {
|
| // ~0
|
| PrefixExpression node =
|
| - AstFactory.prefixExpression(TokenType.TILDE, _resolvedInteger(0));
|
| + AstTestFactory.prefixExpression(TokenType.TILDE, _resolvedInteger(0));
|
| MethodElement tildeMethod = getMethod(_typeProvider.intType, "~");
|
| node.staticElement = tildeMethod;
|
| expect(_analyze(node), same(_typeProvider.intType));
|
| @@ -1275,7 +1283,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| PropertyAccessorElementImpl getter =
|
| ElementFactory.getterElement("b", false, boolType);
|
| PropertyAccess node =
|
| - AstFactory.propertyAccess2(AstFactory.identifier3("a"), "b");
|
| + AstTestFactory.propertyAccess2(AstTestFactory.identifier3("a"), "b");
|
| node.propertyName.propagatedElement = getter;
|
| expect(_analyze2(node, false), same(boolType));
|
| _listener.assertNoErrors();
|
| @@ -1287,7 +1295,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| ElementFactory.fieldElement("b", false, false, false, boolType);
|
| PropertyAccessorElement setter = field.setter;
|
| PropertyAccess node =
|
| - AstFactory.propertyAccess2(AstFactory.identifier3("a"), "b");
|
| + AstTestFactory.propertyAccess2(AstTestFactory.identifier3("a"), "b");
|
| node.propertyName.propagatedElement = setter;
|
| expect(_analyze2(node, false), same(boolType));
|
| _listener.assertNoErrors();
|
| @@ -1298,7 +1306,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| PropertyAccessorElementImpl getter =
|
| ElementFactory.getterElement("b", false, boolType);
|
| PropertyAccess node =
|
| - AstFactory.propertyAccess2(AstFactory.identifier3("a"), "b");
|
| + AstTestFactory.propertyAccess2(AstTestFactory.identifier3("a"), "b");
|
| node.propertyName.staticElement = getter;
|
| expect(_analyze(node), same(boolType));
|
| _listener.assertNoErrors();
|
| @@ -1310,7 +1318,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| ElementFactory.fieldElement("b", false, false, false, boolType);
|
| PropertyAccessorElement setter = field.setter;
|
| PropertyAccess node =
|
| - AstFactory.propertyAccess2(AstFactory.identifier3("a"), "b");
|
| + AstTestFactory.propertyAccess2(AstTestFactory.identifier3("a"), "b");
|
| node.propertyName.staticElement = setter;
|
| expect(_analyze(node), same(boolType));
|
| _listener.assertNoErrors();
|
| @@ -1318,7 +1326,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
|
|
| void test_visitSimpleIdentifier_dynamic() {
|
| // "dynamic"
|
| - SimpleIdentifier identifier = AstFactory.identifier3('dynamic');
|
| + SimpleIdentifier identifier = AstTestFactory.identifier3('dynamic');
|
| DynamicElementImpl element = DynamicElementImpl.instance;
|
| identifier.staticElement = element;
|
| identifier.staticType = _typeProvider.typeType;
|
| @@ -1335,10 +1343,10 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
|
|
| void test_visitStringInterpolation() {
|
| // "a${'b'}c"
|
| - Expression node = AstFactory.string([
|
| - AstFactory.interpolationString("a", "a"),
|
| - AstFactory.interpolationExpression(_resolvedString("b")),
|
| - AstFactory.interpolationString("c", "c")
|
| + Expression node = AstTestFactory.string([
|
| + AstTestFactory.interpolationString("a", "a"),
|
| + AstTestFactory.interpolationExpression(_resolvedString("b")),
|
| + AstTestFactory.interpolationString("c", "c")
|
| ]);
|
| expect(_analyze(node), same(_typeProvider.stringType));
|
| _listener.assertNoErrors();
|
| @@ -1348,13 +1356,13 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| // super
|
| InterfaceType superType = ElementFactory.classElement2("A").type;
|
| InterfaceType thisType = ElementFactory.classElement("B", superType).type;
|
| - Expression node = AstFactory.superExpression();
|
| + Expression node = AstTestFactory.superExpression();
|
| expect(_analyze3(node, thisType), same(thisType));
|
| _listener.assertNoErrors();
|
| }
|
|
|
| void test_visitSymbolLiteral() {
|
| - expect(_analyze(AstFactory.symbolLiteral(["a"])),
|
| + expect(_analyze(AstTestFactory.symbolLiteral(["a"])),
|
| same(_typeProvider.symbolType));
|
| }
|
|
|
| @@ -1363,21 +1371,21 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| InterfaceType thisType = ElementFactory
|
| .classElement("B", ElementFactory.classElement2("A").type)
|
| .type;
|
| - Expression node = AstFactory.thisExpression();
|
| + Expression node = AstTestFactory.thisExpression();
|
| expect(_analyze3(node, thisType), same(thisType));
|
| _listener.assertNoErrors();
|
| }
|
|
|
| void test_visitThrowExpression_withoutValue() {
|
| // throw
|
| - Expression node = AstFactory.throwExpression();
|
| + Expression node = AstTestFactory.throwExpression();
|
| expect(_analyze(node), same(_typeProvider.bottomType));
|
| _listener.assertNoErrors();
|
| }
|
|
|
| void test_visitThrowExpression_withValue() {
|
| // throw 0
|
| - Expression node = AstFactory.throwExpression2(_resolvedInteger(0));
|
| + Expression node = AstTestFactory.throwExpression2(_resolvedInteger(0));
|
| expect(_analyze(node), same(_typeProvider.bottomType));
|
| _listener.assertNoErrors();
|
| }
|
| @@ -1562,7 +1570,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| */
|
| SimpleIdentifier _propagatedVariable(
|
| InterfaceType type, String variableName) {
|
| - SimpleIdentifier identifier = AstFactory.identifier3(variableName);
|
| + SimpleIdentifier identifier = AstTestFactory.identifier3(variableName);
|
| VariableElementImpl element =
|
| ElementFactory.localVariableElement(identifier);
|
| element.type = type;
|
| @@ -1577,7 +1585,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| * the correct type.
|
| */
|
| BooleanLiteral _resolvedBool(bool value) {
|
| - BooleanLiteral literal = AstFactory.booleanLiteral(value);
|
| + BooleanLiteral literal = AstTestFactory.booleanLiteral(value);
|
| literal.staticType = _typeProvider.intType;
|
| return literal;
|
| }
|
| @@ -1589,7 +1597,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| * @return an integer literal that has been resolved to the correct type
|
| */
|
| DoubleLiteral _resolvedDouble(double value) {
|
| - DoubleLiteral literal = AstFactory.doubleLiteral(value);
|
| + DoubleLiteral literal = AstTestFactory.doubleLiteral(value);
|
| literal.staticType = _typeProvider.doubleType;
|
| return literal;
|
| }
|
| @@ -1615,7 +1623,8 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| parameter.identifier.staticElement = element;
|
| parameterElements.add(element);
|
| }
|
| - FunctionExpression node = AstFactory.functionExpression2(parameters, body);
|
| + FunctionExpression node =
|
| + AstTestFactory.functionExpression2(parameters, body);
|
| FunctionElementImpl element = new FunctionElementImpl.forNode(null);
|
| element.parameters = parameterElements;
|
| element.type = new FunctionTypeImpl(element);
|
| @@ -1630,7 +1639,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| * @return an integer literal that has been resolved to the correct type
|
| */
|
| IntegerLiteral _resolvedInteger(int value) {
|
| - IntegerLiteral literal = AstFactory.integer(value);
|
| + IntegerLiteral literal = AstTestFactory.integer(value);
|
| literal.staticType = _typeProvider.intType;
|
| return literal;
|
| }
|
| @@ -1642,7 +1651,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| * @return a string literal that has been resolved to the correct type
|
| */
|
| SimpleStringLiteral _resolvedString(String value) {
|
| - SimpleStringLiteral string = AstFactory.string2(value);
|
| + SimpleStringLiteral string = AstTestFactory.string2(value);
|
| string.staticType = _typeProvider.stringType;
|
| return string;
|
| }
|
| @@ -1655,7 +1664,7 @@ class StaticTypeAnalyzerTest extends EngineTestCase {
|
| * @return a simple identifier that has been resolved to a variable element with the given type
|
| */
|
| SimpleIdentifier _resolvedVariable(InterfaceType type, String variableName) {
|
| - SimpleIdentifier identifier = AstFactory.identifier3(variableName);
|
| + SimpleIdentifier identifier = AstTestFactory.identifier3(variableName);
|
| VariableElementImpl element =
|
| ElementFactory.localVariableElement(identifier);
|
| element.type = type;
|
|
|