commit 87c62539a85135e646e139ab3b496ae33193398e
author Brian Wilkerson <brianwilkerson@google.com> Wed Jun 06 20:08:34 2018 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Wed Jun 06 20:08:34 2018 +0000
tree b160ef45e98fe116e7b8957b48a0d2cf004178be
parent 3ece660fea98ae5d195658f6e1cb7e3452cb8eea

Fix issues in the test framework that were causing some tests to fail

Change-Id: I6dd8ef3f044fa6f968fe5f4449421ce15225b50f
Reviewed-on: https://dart-review.googlesource.com/58802
Reviewed-by: Dan Rubel <danrubel@google.com>
Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>

pkg/analyzer/test/generated/parser_forest_test.dart

diff --git a/pkg/analyzer/test/generated/parser_forest_test.dart b/pkg/analyzer/test/generated/parser_forest_test.dart
index e428f1c..ed65757 100644
--- a/pkg/analyzer/test/generated/parser_forest_test.dart
+++ b/pkg/analyzer/test/generated/parser_forest_test.dart
@@ -2834,11 +2834,6 @@
   }
 
   @failingTest
-  void test_parseExpression_assign_compound() {
-    super.test_parseExpression_assign_compound();
-  }
-
-  @failingTest
   void test_parseExpression_comparison() {
     super.test_parseExpression_comparison();
   }
@@ -5219,6 +5214,7 @@
 
   @failingTest
   void test_parseStatement_singleLabel() {
+    // Failing because the label doesn't know it's in a declaration context.
     super.test_parseStatement_singleLabel();
   }
 
@@ -5973,21 +5969,11 @@
   }
 
   @failingTest
-  void test_parseFunctionDeclaration_functionWithTypeParameters_comment() {
-    super.test_parseFunctionDeclaration_functionWithTypeParameters_comment();
-  }
-
-  @failingTest
   void test_parseFunctionDeclaration_getter() {
     super.test_parseFunctionDeclaration_getter();
   }
 
   @failingTest
-  void test_parseFunctionDeclaration_getter_generic_comment_returnType() {
-    super.test_parseFunctionDeclaration_getter_generic_comment_returnType();
-  }
-
-  @failingTest
   void test_parseFunctionDeclaration_metadata() {
     super.test_parseFunctionDeclaration_metadata();
   }

pkg/analyzer/test/src/fasta/body_builder_test_helper.dart

diff --git a/pkg/analyzer/test/src/fasta/body_builder_test_helper.dart b/pkg/analyzer/test/src/fasta/body_builder_test_helper.dart
index 827a00a..64569c3 100644
--- a/pkg/analyzer/test/src/fasta/body_builder_test_helper.dart
+++ b/pkg/analyzer/test/src/fasta/body_builder_test_helper.dart
@@ -167,12 +167,19 @@
   /// finished parsing, or `null` (the default) if EOF is expected.
   int expectedEndOffset;
 
+  @override
+  void set enableGenericMethodComments(_) {
+    // Ignored.
+  }
+
   FastaBodyBuilderTestCase(this.resolveTypes);
 
   analyzer.Parser get parser => new ParserProxy(this);
 
   TypeProvider get typeProvider => CompilerTestContext.current._typeProvider;
 
+  bool get usingFastaParser => true;
+
   @override
   void assertNoErrors() {
     // TODO(brianwilkerson) Implement this.
@@ -188,6 +195,11 @@
     // TODO(brianwilkerson) Implement this.
   }
 
+  @override
+  ExpectedError expectedError(ErrorCode code, int offset, int length) {
+    return new ExpectedError(code, offset, length);
+  }
+
   noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
 
   @override