Revert "Issue 28580. Relax instantiate to bounds."

pkg/analyzer/test/src/summary/resynthesize_ast_test.dart

 // Copyright (c) 2016, 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.summary.resynthesize_ast_test;
 
 import 'dart:async';
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
@@ skipping 40 matching lines @@
 
 @reflectiveTest
 class AstInferredTypeTest extends AbstractResynthesizeTest
     with _AstResynthesizeTestMixin, InferredTypeMixin {
   @override
   bool get isStrongMode => true;
 
   @override
   bool get mayCheckTypesOfLocals => false;
 
-  bool shouldCompareElementsWithAnalysisContext = true;
-
   @override
   void addFile(String content, {String name: '/main.dart'}) {
     addLibrarySource(name, content);
   }
 
   @override
   Future<CompilationUnitElement> checkFileElement(String content) async {
     Source source = addSource('/main.dart', content);
     SummaryResynthesizer resynthesizer = _encodeLibrary(source);
     LibraryElementImpl resynthesized = _checkSource(resynthesizer, source);
@@ skipping 79 matching lines @@
   }
 
   @override
   @failingTest
   test_blockBodiedLambdas_nestedLambdas_topLevel() async {
     await super.test_blockBodiedLambdas_nestedLambdas_topLevel();
   }
 
   @override
   @failingTest
-  test_blockBodiedLambdas_noReturn_topLevel() =>
-      super.test_blockBodiedLambdas_noReturn_topLevel();
-
-  @override
-  @failingTest
   test_blockBodiedLambdas_syncStar_topLevel() async {
     await super.test_blockBodiedLambdas_syncStar_topLevel();
   }
 
   @override
   @failingTest
   test_circularReference_viaClosures_initializerTypes() async {
     await super.test_circularReference_viaClosures_initializerTypes();
   }
 
+  @override
+  @failingTest
+  test_blockBodiedLambdas_noReturn_topLevel() =>
+      super.test_blockBodiedLambdas_noReturn_topLevel();
+
+  @failingTest
+  @override
+  test_listLiteralsCanInferNull_topLevel() =>
+      super.test_listLiteralsCanInferNull_topLevel();
+
+  @failingTest
+  @override
+  test_mapLiteralsCanInferNull_topLevel() =>
+      super.test_mapLiteralsCanInferNull_topLevel();
+
   test_infer_extractIndex_custom() async {
     var unit = await checkFileElement('''
 class A {
   String operator [](_) => null;
 }
 var a = new A();
 var b = a[0];
   ''');
     expect(unit.topLevelVariables[1].type.toString(), 'String');
   }
@@ skipping 339 matching lines @@
   test_inferredType_blockBodiedClosure_noArguments() async {
     await super.test_inferredType_blockBodiedClosure_noArguments();
   }
 
   @override
   @failingTest
   test_inferredType_blockClosure_noArgs_noReturn() async {
     await super.test_inferredType_blockClosure_noArgs_noReturn();
   }
 
-  @override
-  test_instantiateToBounds_typeName_OK_hasBound_definedAfter() async {
-    shouldCompareElementsWithAnalysisContext = false;
-    await super.test_instantiateToBounds_typeName_OK_hasBound_definedAfter();
-  }
-
   test_invokeMethod_notGeneric_genericClass() async {
     var unit = await checkFileElement(r'''
 class C<T> {
   T m(int a, {String b, T c}) => null;
 }
 var v = new C<double>().m(1, b: 'bbb', c: 2.0);
   ''');
     expect(unit.topLevelVariables[0].type.toString(), 'double');
   }
 
   test_invokeMethod_notGeneric_notGenericClass() async {
     var unit = await checkFileElement(r'''
 class C {
   int m(int a, {String b, int c}) => null;
 }
 var v = new C().m(1, b: 'bbb', c: 2.0);
   ''');
     expect(unit.topLevelVariables[0].type.toString(), 'int');
   }
 
-  @failingTest
-  @override
-  test_listLiteralsCanInferNull_topLevel() =>
-      super.test_listLiteralsCanInferNull_topLevel();
-
-  @failingTest
-  @override
-  test_mapLiteralsCanInferNull_topLevel() =>
-      super.test_mapLiteralsCanInferNull_topLevel();
-
   @override
   @failingTest
   test_nullCoalescingOperator() async {
     await super.test_nullCoalescingOperator();
   }
 
   @override
   @failingTest
   test_unsafeBlockClosureInference_closureCall() async {
     await super.test_unsafeBlockClosureInference_closureCall();
@@ skipping 92 matching lines @@
   @failingTest
   test_unsafeBlockClosureInference_methodCall_implicitTypeParam_comment() async {
     return super
         .test_unsafeBlockClosureInference_methodCall_implicitTypeParam_comment();
   }
 
   LibraryElementImpl _checkSource(
       SummaryResynthesizer resynthesizer, Source source) {
     LibraryElementImpl resynthesized =
         resynthesizer.getLibraryElement(source.uri.toString());
-    if (shouldCompareElementsWithAnalysisContext) {
-      LibraryElementImpl original = context.computeLibraryElement(source);
-      checkLibraryElements(original, resynthesized);
-    }
+    LibraryElementImpl original = context.computeLibraryElement(source);
+    checkLibraryElements(original, resynthesized);
     return resynthesized;
   }
 }
 
 @reflectiveTest
 class ResynthesizeAstSpecTest extends _ResynthesizeAstTest {
   @override
   bool get isStrongMode => false;
 }
 
@@ skipping 220 matching lines @@
 
   @override
   AnalysisOptionsImpl createOptions() =>
       super.createOptions()..strongMode = isStrongMode;
 
   @override
   TestSummaryResynthesizer encodeDecodeLibrarySource(Source source) {
     return _encodeLibrary(source);
   }
 }