Fix several failing tests

pkg/analyzer/test/generated/parser_fasta_test.dart

 // Copyright (c) 2017, 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.
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart' as analyzer;
 import 'package:analyzer/dart/ast/token.dart' show TokenType;
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/error/listener.dart' show ErrorReporter;
 import 'package:analyzer/src/dart/scanner/scanner.dart';
 import 'package:analyzer/src/fasta/ast_builder.dart';
 import 'package:analyzer/src/generated/parser.dart' as analyzer;
+import 'package:analyzer/src/generated/parser.dart' show CommentAndMetadata;
 import 'package:analyzer/src/generated/utilities_dart.dart';
 import 'package:analyzer/src/string_source.dart';
 import 'package:front_end/src/fasta/fasta_codes.dart' show Message;
 import 'package:front_end/src/fasta/kernel/kernel_builder.dart';
 import 'package:front_end/src/fasta/kernel/kernel_library_builder.dart';
 import 'package:front_end/src/fasta/parser.dart' show IdentifierContext;
 import 'package:front_end/src/fasta/parser.dart' as fasta;
 import 'package:front_end/src/fasta/scanner/string_scanner.dart';
 import 'package:front_end/src/fasta/scanner/token.dart' as fasta;
+import 'package:front_end/src/fasta/source/stack_listener.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
 import 'parser_fasta_listener.dart';
 import 'parser_test.dart';
 import 'test_support.dart';
 
 main() {
   defineReflectiveSuite(() {
     defineReflectiveTests(ClassMemberParserTest_Fasta);
@@ skipping 2769 matching lines @@
     _eventListener.end('CompilationUnit');
     _astBuilder.className = null;
     return result;
   }
 
   List<Combinator> parseCombinators() {
     return _run((parser) => parser.parseCombinators);
   }
 
   @override
+  CommentAndMetadata parseCommentAndMetadata() {
+    List metadata = _run((parser) => parser.parseMetadataStar, nodeCount: -1);

[Brian Wilkerson, 2017/08/30 16:17:03]

I think this method is wrong. After looking at the code more I think
`parseMetadataStar` will always return a two element list, the first element
being either a `Comment` or a `NullValue` and that the second element will
always be either a `List<Annotation>` or a `NullValue`. I can either fix it now
or in a separate CL.

[danrubel, 2017/08/30 16:18:17]

Smaller CLs are better in general.

+    Comment comment = null;
+    if (metadata.length > 0 && metadata[0] is Comment) {
+      comment = metadata[0];
+      if (metadata.length > 1 && metadata[1] is List) {
+        metadata = metadata[1];
+      } else {
+        metadata = metadata.sublist(1);
+      }
+    }
+    for (Object element in metadata) {
+      if (element is NullValue) {
+        fail('Expected annotation but found $element');
+      }
+    }
+    return new CommentAndMetadata(comment, new List<Annotation>.from(metadata));
+  }
+
+  @override
   CompilationUnit parseCompilationUnit2() {
     var result = _run(null) as CompilationUnit;
     _eventListener.expectEmpty();
     return result;
   }
 
   @override
   Configuration parseConfiguration() {
     return _run((parser) => parser.parseConditionalUri) as Configuration;
   }
@@ skipping 21 matching lines @@
   TypeAnnotation parseTypeAnnotation(bool inExpression) {
     return _run((parser) => parser.parseType) as TypeAnnotation;
   }
 
   @override
   TypeArgumentList parseTypeArgumentList() {
     return _run((parser) => parser.parseTypeVariablesOpt) as TypeArgumentList;
   }
 
   /**
-   * Runs a single parser function, and returns the result as an analyzer AST.
+   * Runs a single parser function (returned by [getParseFunction]), and returns
+   * the result as an analyzer AST. It checks that the parse consumed all of the
+   * tokens and that there were [nodeCount] AST nodes created (unless the node
+   * count is negative).
    */
-  Object _run(ParseFunction getParseFunction(fasta.Parser parser)) {
+  Object _run(ParseFunction getParseFunction(fasta.Parser parser),
+      {int nodeCount: 1}) {
     ParseFunction parseFunction;
     if (getParseFunction != null) {
       parseFunction = getParseFunction(_fastaParser);
       _fastaParser.firstToken = _currentFastaToken;
     } else {
       parseFunction = _fastaParser.parseUnit;
       // firstToken should be set by beginCompilationUnit event.
     }
     _currentFastaToken = parseFunction(_currentFastaToken);
     expect(_currentFastaToken.isEof, isTrue);
-    expect(_astBuilder.stack, hasLength(1));
+    if (nodeCount >= 0) {
+      expect(_astBuilder.stack, hasLength(nodeCount));
+    }
+    if (nodeCount != 1) {
+      return _astBuilder.stack.values;
+    }
     return _astBuilder.pop();
   }
 }
 
 @reflectiveTest
 class RecoveryParserTest_Fasta extends FastaParserTestCase
     with RecoveryParserTestMixin {
   @override
   @failingTest
   void test_additiveExpression_missing_LHS() {
@@ skipping 930 matching lines @@
   @failingTest
   void test_parseArgumentList_trailing_comma() {
     // TODO(brianwilkerson) Produces a method invocation rather than an empty
     // argument list.
     super.test_parseArgumentList_trailing_comma();
   }
 
   @override
   @failingTest
   void test_parseCombinator_hide() {
-    // TODO(brianwilkerson) exception:
     // Uninteresting. Covered by the test_parseCombinators_* methods.
     super.test_parseCombinator_hide();
   }
 
   @override
   @failingTest
   void test_parseCombinator_show() {
-    // TODO(brianwilkerson) exception:
     // Uninteresting. Covered by the test_parseCombinators_* methods.
     super.test_parseCombinator_show();
   }
 
   @override
   @failingTest
-  void test_parseCombinators_h() {
-    // TODO(brianwilkerson) Failed to use all tokens.
-    super.test_parseCombinators_h();
-  }
-
-  @override
-  @failingTest
-  void test_parseCombinators_hs() {
-    // TODO(brianwilkerson) Failed to use all tokens.
-    super.test_parseCombinators_hs();
-  }
-
-  @override
-  @failingTest
-  void test_parseCombinators_hshs() {
-    // TODO(brianwilkerson) Failed to use all tokens.
-    super.test_parseCombinators_hshs();
-  }
-
-  @override
-  @failingTest
-  void test_parseCombinators_s() {
-    // TODO(brianwilkerson) Failed to use all tokens.
-    super.test_parseCombinators_s();
-  }
-
-  @override
-  @failingTest
   void test_parseCommentAndMetadata_c() {
-    // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseCommentAndMetadata'.
+    // TODO(brianwilkerson) Expected annotation but found NullValue.Metadata
     super.test_parseCommentAndMetadata_c();
   }
 
   @override
   @failingTest
-  void test_parseCommentAndMetadata_cmc() {
-    // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseCommentAndMetadata'.
-    super.test_parseCommentAndMetadata_cmc();
-  }
-
-  @override
-  @failingTest
-  void test_parseCommentAndMetadata_cmcm() {
-    // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseCommentAndMetadata'.
-    super.test_parseCommentAndMetadata_cmcm();
-  }
-
-  @override
-  @failingTest
-  void test_parseCommentAndMetadata_cmm() {
-    // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseCommentAndMetadata'.
-    super.test_parseCommentAndMetadata_cmm();
-  }
-
-  @override
-  @failingTest
   void test_parseCommentAndMetadata_m() {
-    // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseCommentAndMetadata'.
+    // TODO(brianwilkerson) Expected annotation but found NullValue.Comments
     super.test_parseCommentAndMetadata_m();
   }
 
   @override
   @failingTest
   void test_parseCommentAndMetadata_mcm() {
-    // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseCommentAndMetadata'.
+    // TODO(brianwilkerson) Expected annotation but found NullValue.Comments
     super.test_parseCommentAndMetadata_mcm();
   }
 
   @override
   @failingTest
   void test_parseCommentAndMetadata_mcmc() {
-    // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseCommentAndMetadata'.
+    // TODO(brianwilkerson) Expected annotation but found NullValue.Comments
     super.test_parseCommentAndMetadata_mcmc();
   }
 
   @override
   @failingTest
   void test_parseCommentAndMetadata_mm() {
-    // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseCommentAndMetadata'.
+    // TODO(brianwilkerson) Expected annotation but found NullValue.Comments
     super.test_parseCommentAndMetadata_mm();
   }
 
   @override
   @failingTest
   void test_parseCommentAndMetadata_none() {
-    // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseCommentAndMetadata'.
+    // TODO(brianwilkerson) Expected annotation but found NullValue.Comments
     super.test_parseCommentAndMetadata_none();
   }
 
   @override
   @failingTest
   void test_parseCommentAndMetadata_singleLine() {
-    // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseCommentAndMetadata'.
+    // TODO(brianwilkerson) Expected annotation but found NullValue.Metadata
     super.test_parseCommentAndMetadata_singleLine();
   }
 
   @override
   @failingTest
-  void test_parseConfiguration_noOperator_dottedIdentifier() {
-    // TODO(brianwilkerson) Missing right parenthesis.
-    super.test_parseConfiguration_noOperator_dottedIdentifier();
-  }
-
-  @override
-  @failingTest
-  void test_parseConfiguration_noOperator_simpleIdentifier() {
-    // TODO(brianwilkerson) Missing right parenthesis.
-    super.test_parseConfiguration_noOperator_simpleIdentifier();
-  }
-
-  @override
-  @failingTest
-  void test_parseConfiguration_operator_dottedIdentifier() {
-    // TODO(brianwilkerson) Missing right parenthesis.
-    super.test_parseConfiguration_operator_dottedIdentifier();
-  }
-
-  @override
-  @failingTest
-  void test_parseConfiguration_operator_simpleIdentifier() {
-    // TODO(brianwilkerson) Missing right parenthesis.
-    super.test_parseConfiguration_operator_simpleIdentifier();
-  }
-
-  @override
-  @failingTest
   void test_parseConstructorName_named_noPrefix() {
     // TODO(brianwilkerson) exception:
     // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseConstructorName'.
     super.test_parseConstructorName_named_noPrefix();
   }
 
   @override
   @failingTest
   void test_parseConstructorName_named_prefixed() {
     // TODO(brianwilkerson) exception:
@@ skipping 413 matching lines @@
   @override
   @failingTest
   void test_parseReturnType_void() {
     // TODO(brianwilkerson) Test isn't passing in enough context.
     // Type 'void' can't be used here because it isn't a return type.
     super.test_parseReturnType_void();
   }
 
   @override
   @failingTest
-  void test_parseTypeAnnotation_function_noReturnType_noParameters() {
-    // TODO(brianwilkerson) Failed to use all tokens.
-    super.test_parseTypeAnnotation_function_noReturnType_noParameters();
-  }
-
-  @override
-  @failingTest
-  void test_parseTypeAnnotation_function_noReturnType_parameters() {
-    // TODO(brianwilkerson) Failed to use all tokens.
-    super.test_parseTypeAnnotation_function_noReturnType_parameters();
-  }
-
-  @override
-  @failingTest
-  void test_parseTypeAnnotation_function_returnType_classFunction() {
-    // TODO(brianwilkerson) Failed to use all tokens.
-    super.test_parseTypeAnnotation_function_returnType_classFunction();
-  }
-
-  @override
-  @failingTest
-  void test_parseTypeAnnotation_function_returnType_function() {
-    // TODO(brianwilkerson) Failed to use all tokens.
-    super.test_parseTypeAnnotation_function_returnType_function();
-  }
-
-  @override
-  @failingTest
-  void test_parseTypeAnnotation_function_returnType_simple() {
-    // TODO(brianwilkerson) Failed to use all tokens.
-    super.test_parseTypeAnnotation_function_returnType_simple();
-  }
-
-  @override
-  @failingTest
-  void test_parseTypeAnnotation_function_returnType_withArguments() {
-    // TODO(brianwilkerson) Failed to use all tokens.
-    super.test_parseTypeAnnotation_function_returnType_withArguments();
-  }
-
-  @override
-  @failingTest
-  void test_parseTypeAnnotation_named() {
-    // TODO(brianwilkerson) Failed to use all tokens.
-    super.test_parseTypeAnnotation_named();
-  }
-
-  @override
-  @failingTest
   void test_parseTypeArgumentList_empty() {
     // TODO(brianwilkerson) reportUnrecoverableErrorWithToken
     super.test_parseTypeArgumentList_empty();
   }
 
   @override
   @failingTest
   void test_parseTypeArgumentList_multiple() {
     // TODO(brianwilkerson) exception:
     //   type 'TypeParameterListImpl' is not a subtype of type 'TypeArgumentList' in type cast where
@@ skipping 343 matching lines @@
   @override
   @failingTest
   void test_parseDirectives_mixed() {
     // TODO(paulberry,ahe): This test verifies the analyzer parser's ability to
     // stop parsing as soon as the first non-directive is encountered; this is
     // useful for quickly traversing an import graph.  Consider adding a similar
     // ability to Fasta's parser.
     super.test_parseDirectives_mixed();
   }
 }