Revert "Transition analyzer and analysis_server to new astFactory; remove old AST factory methods."

pkg/analyzer/test/src/dart/ast/utilities_test.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library analyzer.test.src.dart.ast.utilities_test;
 
 import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/ast/standard_ast_factory.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/generated/java_core.dart';
 import 'package:analyzer/src/generated/java_engine.dart' show Predicate;
 import 'package:analyzer/src/generated/java_engine.dart';
 import 'package:analyzer/src/generated/testing/ast_test_factory.dart';
 import 'package:analyzer/src/generated/testing/element_factory.dart';
@@ skipping 412 matching lines @@
     expect(node.offset <= start, isTrue, reason: "Node starts after range");
     expect(node.offset + node.length > end, isTrue,
         reason: "Node ends before range");
     EngineTestCase.assertInstanceOf(predicate, expectedClass, node);
   }
 }
 
 @reflectiveTest
 class ResolutionCopierTest extends EngineTestCase {
   void test_visitAdjacentStrings() {
-    AdjacentStrings createNode() => astFactory.adjacentStrings([
-          astFactory.simpleStringLiteral(null, 'hello'),
-          astFactory.simpleStringLiteral(null, 'world')
+    AdjacentStrings createNode() => new AdjacentStrings([
+          new SimpleStringLiteral(null, 'hello'),
+          new SimpleStringLiteral(null, 'world')
         ]);
 
     AdjacentStrings fromNode = createNode();
     DartType propagatedType = ElementFactory.classElement2("A").type;
     fromNode.propagatedType = propagatedType;
     DartType staticType = ElementFactory.classElement2("B").type;
     fromNode.staticType = staticType;
 
     AdjacentStrings toNode = createNode();
     ResolutionCopier.copyResolutionData(fromNode, toNode);
@@ skipping 1095 matching lines @@
         AstTestFactory.withClause([AstTestFactory.typeName4("M1")]),
         null);
     declaration.metadata.add(
         AstTestFactory.annotation(AstTestFactory.identifier3("deprecated")));
     _assertSource("@deprecated class C = S with M1;", declaration);
   }
 
   void test_visitComment() {
     _assertSource(
         "",
-        astFactory.blockComment(
+        Comment.createBlockComment(
             <Token>[TokenFactory.tokenFromString("/* comment */")]));
   }
 
   void test_visitCommentReference() {
     _assertSource(
-        "", astFactory.commentReference(null, AstTestFactory.identifier3("a")));
+        "", new CommentReference(null, AstTestFactory.identifier3("a")));
   }
 
   void test_visitCompilationUnit_declaration() {
     _assertSource(
         "var a;",
         AstTestFactory.compilationUnit2([
           AstTestFactory.topLevelVariableDeclaration2(
               Keyword.VAR, [AstTestFactory.variableDeclaration("a")])
         ]));
   }
@@ skipping 365 matching lines @@
             null,
             AstTestFactory.typeName4("A"),
             "a",
             AstTestFactory.formalParameterList(
                 [AstTestFactory.simpleFormalParameter3("b")])));
   }
 
   void test_visitFieldFormalParameter_functionTyped_typeParameters() {
     _assertSource(
         "A this.a<E, F>(b)",
-        astFactory.fieldFormalParameter(
+        new FieldFormalParameter(
             null,
             null,
             null,
             AstTestFactory.typeName4('A'),
             TokenFactory.tokenFromKeyword(Keyword.THIS),
             TokenFactory.tokenFromType(TokenType.PERIOD),
             AstTestFactory.identifier3('a'),
             AstTestFactory.typeParameterList(['E', 'F']),
             AstTestFactory.formalParameterList(
                 [AstTestFactory.simpleFormalParameter3("b")])));
@@ skipping 21 matching lines @@
   void test_visitForEachStatement_declared() {
     _assertSource(
         "for (var a in b) {}",
         AstTestFactory.forEachStatement(AstTestFactory.declaredIdentifier3("a"),
             AstTestFactory.identifier3("b"), AstTestFactory.block()));
   }
 
   void test_visitForEachStatement_variable() {
     _assertSource(
         "for (a in b) {}",
-        astFactory.forEachStatementWithReference(
+        new ForEachStatement.withReference(
             null,
             TokenFactory.tokenFromKeyword(Keyword.FOR),
             TokenFactory.tokenFromType(TokenType.OPEN_PAREN),
             AstTestFactory.identifier3("a"),
             TokenFactory.tokenFromKeyword(Keyword.IN),
             AstTestFactory.identifier3("b"),
             TokenFactory.tokenFromType(TokenType.CLOSE_PAREN),
             AstTestFactory.block()));
   }
 
   void test_visitForEachStatement_variable_await() {
     _assertSource(
         "await for (a in b) {}",
-        astFactory.forEachStatementWithReference(
+        new ForEachStatement.withReference(
             TokenFactory.tokenFromString("await"),
             TokenFactory.tokenFromKeyword(Keyword.FOR),
             TokenFactory.tokenFromType(TokenType.OPEN_PAREN),
             AstTestFactory.identifier3("a"),
             TokenFactory.tokenFromKeyword(Keyword.IN),
             AstTestFactory.identifier3("b"),
             TokenFactory.tokenFromType(TokenType.CLOSE_PAREN),
             AstTestFactory.block()));
   }
 
@@ skipping 281 matching lines @@
     _assertSource(
         "get f() {}",
         AstTestFactory.functionDeclaration(
             null, Keyword.GET, "f", AstTestFactory.functionExpression()));
   }
 
   void test_visitFunctionDeclaration_local_blockBody() {
     FunctionDeclaration f = AstTestFactory.functionDeclaration(
         null, null, "f", AstTestFactory.functionExpression());
     FunctionDeclarationStatement fStatement =
-        astFactory.functionDeclarationStatement(f);
+        new FunctionDeclarationStatement(f);
     _assertSource(
         "main() {f() {} 42;}",
         AstTestFactory.functionDeclaration(
             null,
             null,
             "main",
             AstTestFactory.functionExpression2(
                 AstTestFactory.formalParameterList(),
                 AstTestFactory.blockFunctionBody2([
                   fStatement,
                   AstTestFactory.expressionStatement(AstTestFactory.integer(42))
                 ]))));
   }
 
   void test_visitFunctionDeclaration_local_expressionBody() {
     FunctionDeclaration f = AstTestFactory.functionDeclaration(
         null,
         null,
         "f",
         AstTestFactory.functionExpression2(AstTestFactory.formalParameterList(),
             AstTestFactory.expressionFunctionBody(AstTestFactory.integer(1))));
     FunctionDeclarationStatement fStatement =
-        astFactory.functionDeclarationStatement(f);
+        new FunctionDeclarationStatement(f);
     _assertSource(
         "main() {f() => 1; 2;}",
         AstTestFactory.functionDeclaration(
             null,
             null,
             "main",
             AstTestFactory.functionExpression2(
                 AstTestFactory.formalParameterList(),
                 AstTestFactory.blockFunctionBody2([
                   fStatement,
@@ skipping 115 matching lines @@
   void test_visitFunctionTypedFormalParameter_type() {
     _assertSource(
         "T f()",
         AstTestFactory.functionTypedFormalParameter(
             AstTestFactory.typeName4("T"), "f"));
   }
 
   void test_visitFunctionTypedFormalParameter_typeParameters() {
     _assertSource(
         "T f<E>()",
-        astFactory.functionTypedFormalParameter(
+        new FunctionTypedFormalParameter(
             null,
             null,
             AstTestFactory.typeName4("T"),
             AstTestFactory.identifier3('f'),
             AstTestFactory.typeParameterList(['E']),
             AstTestFactory.formalParameterList([])));
   }
 
   void test_visitIfStatement_withElse() {
     _assertSource(
@@ skipping 1400 matching lines @@
         AstTestFactory.withClause([AstTestFactory.typeName4("M1")]),
         null);
     declaration.metadata.add(
         AstTestFactory.annotation(AstTestFactory.identifier3("deprecated")));
     _assertSource("@deprecated class C = S with M1;", declaration);
   }
 
   void test_visitComment() {
     _assertSource(
         "",
-        astFactory.blockComment(
+        Comment.createBlockComment(
             <Token>[TokenFactory.tokenFromString("/* comment */")]));
   }
 
   void test_visitCommentReference() {
     _assertSource(
-        "", astFactory.commentReference(null, AstTestFactory.identifier3("a")));
+        "", new CommentReference(null, AstTestFactory.identifier3("a")));
   }
 
   void test_visitCompilationUnit_declaration() {
     _assertSource(
         "var a;",
         AstTestFactory.compilationUnit2([
           AstTestFactory.topLevelVariableDeclaration2(
               Keyword.VAR, [AstTestFactory.variableDeclaration("a")])
         ]));
   }
@@ skipping 365 matching lines @@
             null,
             AstTestFactory.typeName4("A"),
             "a",
             AstTestFactory.formalParameterList(
                 [AstTestFactory.simpleFormalParameter3("b")])));
   }
 
   void test_visitFieldFormalParameter_functionTyped_typeParameters() {
     _assertSource(
         "A this.a<E, F>(b)",
-        astFactory.fieldFormalParameter(
+        new FieldFormalParameter(
             null,
             null,
             null,
             AstTestFactory.typeName4('A'),
             TokenFactory.tokenFromKeyword(Keyword.THIS),
             TokenFactory.tokenFromType(TokenType.PERIOD),
             AstTestFactory.identifier3('a'),
             AstTestFactory.typeParameterList(['E', 'F']),
             AstTestFactory.formalParameterList(
                 [AstTestFactory.simpleFormalParameter3("b")])));
@@ skipping 21 matching lines @@
   void test_visitForEachStatement_declared() {
     _assertSource(
         "for (var a in b) {}",
         AstTestFactory.forEachStatement(AstTestFactory.declaredIdentifier3("a"),
             AstTestFactory.identifier3("b"), AstTestFactory.block()));
   }
 
   void test_visitForEachStatement_variable() {
     _assertSource(
         "for (a in b) {}",
-        astFactory.forEachStatementWithReference(
+        new ForEachStatement.withReference(
             null,
             TokenFactory.tokenFromKeyword(Keyword.FOR),
             TokenFactory.tokenFromType(TokenType.OPEN_PAREN),
             AstTestFactory.identifier3("a"),
             TokenFactory.tokenFromKeyword(Keyword.IN),
             AstTestFactory.identifier3("b"),
             TokenFactory.tokenFromType(TokenType.CLOSE_PAREN),
             AstTestFactory.block()));
   }
 
   void test_visitForEachStatement_variable_await() {
     _assertSource(
         "await for (a in b) {}",
-        astFactory.forEachStatementWithReference(
+        new ForEachStatement.withReference(
             TokenFactory.tokenFromString("await"),
             TokenFactory.tokenFromKeyword(Keyword.FOR),
             TokenFactory.tokenFromType(TokenType.OPEN_PAREN),
             AstTestFactory.identifier3("a"),
             TokenFactory.tokenFromKeyword(Keyword.IN),
             AstTestFactory.identifier3("b"),
             TokenFactory.tokenFromType(TokenType.CLOSE_PAREN),
             AstTestFactory.block()));
   }
 
@@ skipping 281 matching lines @@
     _assertSource(
         "get f() {}",
         AstTestFactory.functionDeclaration(
             null, Keyword.GET, "f", AstTestFactory.functionExpression()));
   }
 
   void test_visitFunctionDeclaration_local_blockBody() {
     FunctionDeclaration f = AstTestFactory.functionDeclaration(
         null, null, "f", AstTestFactory.functionExpression());
     FunctionDeclarationStatement fStatement =
-        astFactory.functionDeclarationStatement(f);
+        new FunctionDeclarationStatement(f);
     _assertSource(
         "main() {f() {} 42;}",
         AstTestFactory.functionDeclaration(
             null,
             null,
             "main",
             AstTestFactory.functionExpression2(
                 AstTestFactory.formalParameterList(),
                 AstTestFactory.blockFunctionBody2([
                   fStatement,
                   AstTestFactory.expressionStatement(AstTestFactory.integer(42))
                 ]))));
   }
 
   void test_visitFunctionDeclaration_local_expressionBody() {
     FunctionDeclaration f = AstTestFactory.functionDeclaration(
         null,
         null,
         "f",
         AstTestFactory.functionExpression2(AstTestFactory.formalParameterList(),
             AstTestFactory.expressionFunctionBody(AstTestFactory.integer(1))));
     FunctionDeclarationStatement fStatement =
-        astFactory.functionDeclarationStatement(f);
+        new FunctionDeclarationStatement(f);
     _assertSource(
         "main() {f() => 1; 2;}",
         AstTestFactory.functionDeclaration(
             null,
             null,
             "main",
             AstTestFactory.functionExpression2(
                 AstTestFactory.formalParameterList(),
                 AstTestFactory.blockFunctionBody2([
                   fStatement,
@@ skipping 115 matching lines @@
   void test_visitFunctionTypedFormalParameter_type() {
     _assertSource(
         "T f()",
         AstTestFactory.functionTypedFormalParameter(
             AstTestFactory.typeName4("T"), "f"));
   }
 
   void test_visitFunctionTypedFormalParameter_typeParameters() {
     _assertSource(
         "T f<E>()",
-        astFactory.functionTypedFormalParameter(
+        new FunctionTypedFormalParameter(
             null,
             null,
             AstTestFactory.typeName4("T"),
             AstTestFactory.identifier3('f'),
             AstTestFactory.typeParameterList(['E']),
             AstTestFactory.formalParameterList([])));
   }
 
   void test_visitIfStatement_withElse() {
     _assertSource(
@@ skipping 959 matching lines @@
   /**
    * Assert that a `ToSourceVisitor` will produce the [expectedSource] when
    * visiting the given [node].
    */
   void _assertSource(String expectedSource, AstNode node) {
     PrintStringWriter writer = new PrintStringWriter();
     node.accept(new ToSourceVisitor(writer));
     expect(writer.toString(), expectedSource);
   }
 }