Fixes for map literal 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/element/element.dart';
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/src/generated/parser.dart' as analyzer;
 import 'package:analyzer/src/generated/utilities_dart.dart';
@@ skipping 533 matching lines @@
   }
 
   @override
   @failingTest
   void test_parseListOrMapLiteral_map_type() {
     super.test_parseListOrMapLiteral_map_type();
   }
 
   @override
   @failingTest
-  void test_parseMapLiteral_empty() {
-    super.test_parseMapLiteral_empty();
-  }
-
-  @override
-  @failingTest
-  void test_parseMapLiteral_multiple() {
-    super.test_parseMapLiteral_multiple();
-  }
-
-  @override
-  @failingTest
-  void test_parseMapLiteral_single() {
-    super.test_parseMapLiteral_single();
-  }
-
-  @override
-  @failingTest
-  void test_parseMapLiteralEntry_complex() {
-    super.test_parseMapLiteralEntry_complex();
-  }
-
-  @override
-  @failingTest
-  void test_parseMapLiteralEntry_int() {
-    super.test_parseMapLiteralEntry_int();
-  }
-
-  @override
-  @failingTest
-  void test_parseMapLiteralEntry_string() {
-    super.test_parseMapLiteralEntry_string();
-  }
-
-  @override
-  @failingTest
   void
       test_parsePostfixExpression_none_methodInvocation_question_dot_typeArgumentComments() {
     super
         .test_parsePostfixExpression_none_methodInvocation_question_dot_typeArgumentComments();
   }
 
   @override
   @failingTest
   void
       test_parsePostfixExpression_none_methodInvocation_typeArgumentComments() {
@@ skipping 342 matching lines @@
   MapLiteral parseMapLiteral(
       analyzer.Token token, String typeArgumentsCode, String code) {
     String sc = '';
     if (token != null) {
       sc += token.lexeme + ' ';
     }
     if (typeArgumentsCode != null) {
       sc += typeArgumentsCode;
     }
     sc += code;
-    return _parseExpression(sc);
+    return _parseMapLiteralCode(sc);
   }
 
   @override
   MapLiteralEntry parseMapLiteralEntry(String code) {
-    return (_parseExpression('{$code}') as MapLiteral).entries.single;
+    return _parseMapLiteralCode('{$code}').entries.single;
   }
 
   @override
   Expression parseMultiplicativeExpression(String code) {
     return _parseExpression(code);
   }
 
   @override
   InstanceCreationExpression parseNewExpression(String code) {
     return _parseExpression(code);
@@ skipping 80 matching lines @@
   @override
   PrefixExpression parseUnaryExpression(String code) {
     return _parseExpression(code);
   }
 
   Expression _parseExpression(String code) {
     var statement = parseStatement('$code;') as ExpressionStatement;
     return statement.expression;
   }
 
+  MapLiteral _parseMapLiteralCode(String code) {
+    var statement =
+        parseStatement('var v = $code;') as VariableDeclarationStatement;
+    return statement.variables.variables.single.initializer as MapLiteral;
+  }
+
   Object _runParser(
       String source, ParseFunction getParseFunction(fasta.Parser parser),
       [List<ErrorCode> errorCodes = const <ErrorCode>[]]) {
     if (errorCodes.isNotEmpty) {
       // TODO(paulberry): Check that the parser generates the proper errors.
       throw new UnimplementedError();
     }
     createParser(source);
     return _parserProxy._run(getParseFunction);
   }
@@ skipping 474 matching lines @@
   void test_parseTypeAlias_genericFunction_typeParameters_voidReturnType() {
     super.test_parseTypeAlias_genericFunction_typeParameters_voidReturnType();
   }
 
   @override
   @failingTest
   void test_parseTypeAlias_genericFunction_voidReturnType() {
     super.test_parseTypeAlias_genericFunction_voidReturnType();
   }
 }