Clone tokens when cloning ASTs for constants

pkg/analyzer/test/generated/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.
 
 // This code was auto-generated, is not intended to be edited, and is subject to
 // significant change. Please see the README file for more information.
 
 library engine.utilities_test;
 
 import 'dart:collection';
@@ skipping 64 matching lines @@
   }
 
   void test_visitAssignmentExpression() {
     _assertClone(
         AstFactory.assignmentExpression(
             AstFactory.identifier3("a"),
             TokenType.EQ,
             AstFactory.identifier3("b")));
   }
 
+  void test_visitAwaitExpression() {
+    _assertClone(AstFactory.awaitExpression(AstFactory.identifier3("a")));
+  }
+
   void test_visitBinaryExpression() {
     _assertClone(
         AstFactory.binaryExpression(
             AstFactory.identifier3("a"),
             TokenType.PLUS,
             AstFactory.identifier3("b")));
   }
 
   void test_visitBlockFunctionBody() {
     _assertClone(AstFactory.blockFunctionBody2([]));
@@ skipping 1929 matching lines @@
             [
                 AstFactory.typeName4("A", []),
                 AstFactory.typeName4("B", []),
                 AstFactory.typeName4("C", [])]));
   }
 
   void test_visitWithClause_single() {
     _assertClone(AstFactory.withClause([AstFactory.typeName4("A", [])]));
   }
 
+  void test_visitYieldStatement() {
+    _assertClone(AstFactory.yieldStatement(AstFactory.identifier3("A")));
+  }
+
   /**
-   * Assert that an `AstCloner` will produce the expected ASt structure when visiting the
-   * given node.
+   * Assert that an `AstCloner` will produce the expected AST structure when
+   * visiting the given [node].
    *
    * @param node the AST node being visited to produce the cloned structure
    * @throws AFE if the visitor does not produce the expected source for the given node
    */
   void _assertClone(AstNode node) {
     AstNode clone = node.accept(new AstCloner());
-    if (!AstComparator.equalNodes(node, clone)) {
+    AstCloneComparator comparitor = new AstCloneComparator(false);
+    if (!comparitor.isEqualNodes(node, clone)) {
+      JUnitTestCase.fail("Failed to clone ${node.runtimeType.toString()}");
+    }
+
+    clone = node.accept(new AstCloner(true));
+    comparitor = new AstCloneComparator(true);
+    if (!comparitor.isEqualNodes(node, clone)) {
       JUnitTestCase.fail("Failed to clone ${node.runtimeType.toString()}");
     }
   }
 }
 
+class AstCloneComparator extends AstComparator {
+  final bool expectTokensCopied;
+
+  AstCloneComparator(this.expectTokensCopied);
+
+  @override
+  bool isEqualNodes(AstNode first, AstNode second) {
+    if (first != null && identical(first, second)) {
+      JUnitTestCase.fail('Failed to copy node: $first (${first.offset})');
+      return false;
+    }
+    return super.isEqualNodes(first, second);
+  }
+
+  @override
+  bool isEqualTokens(Token first, Token second) {
+    if (expectTokensCopied && first != null && identical(first, second)) {
+      JUnitTestCase.fail('Failed to copy token: ${first.lexeme} (${first.offset})');
+      return false;
+    }
+    return super.isEqualTokens(first, second);
+  }
+}
+
 class BooleanArrayTest extends JUnitTestCase {
   void test_get_negative() {
     try {
       BooleanArray.get(0, -1);
       JUnitTestCase.fail("Expected ");
     } on RangeError catch (exception) {
       // Expected
     }
   }
 
@@ skipping 3306 matching lines @@
   }
 
   void test_get_added() {
     TokenMap tokenMap = new TokenMap();
     Token key = TokenFactory.tokenFromType(TokenType.AT);
     Token value = TokenFactory.tokenFromType(TokenType.AT);
     tokenMap.put(key, value);
     JUnitTestCase.assertSame(value, tokenMap.get(key));
   }
 }