More fixes to the new analysis context implementation

pkg/analyzer/test/src/context/context_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.
 
 library test.src.context.context_test;
 
 import 'dart:async';
 import 'dart:collection';
 
 import 'package:analyzer/src/cancelable_future.dart';
@@ skipping 33 matching lines @@
 import 'package:analyzer/src/generated/testing/test_type_provider.dart';
 import 'package:analyzer/src/generated/utilities_dart.dart';
 import 'package:analyzer/src/plugin/engine_plugin.dart';
 import 'package:plugin/manager.dart';
 import 'package:unittest/unittest.dart';
 import 'package:watcher/src/utils.dart';
 
 import '../../generated/engine_test.dart';
 import '../../generated/test_support.dart';
 import '../../reflective_tests.dart';
+import 'package:analyzer/task/dart.dart';
+import '../mock_sdk.dart';
 
 main() {
   groupSep = ' | ';
   runReflectiveTests(AnalysisContextImplTest);
 }
 
 contextWithCore() {
   return new AnalysisContextForTests();
 }
 
 /**
  * An analysis context that has a fake SDK that is much smaller and faster for
  * testing purposes.
  */
 class AnalysisContextForTests extends AnalysisContextImpl {
   AnalysisContextForTests() {
-    initWithCore();
+    DartSdk sdk = new MockSdk();
+    SourceFactory sourceFactory =
+        new SourceFactory([new DartUriResolver(sdk), new FileUriResolver()]);
+    this.sourceFactory = sourceFactory;
+//    initWithCore();
   }
 
   @override
   void set analysisOptions(AnalysisOptions options) {
     AnalysisOptions currentOptions = analysisOptions;
     bool needsRecompute = currentOptions.analyzeFunctionBodiesPredicate !=
             options.analyzeFunctionBodiesPredicate ||
         currentOptions.generateImplicitErrors !=
             options.generateImplicitErrors ||
         currentOptions.generateSdkErrors != options.generateSdkErrors ||
@@ skipping 33 matching lines @@
     return super.getModificationStamp(source);
   }
 
   /**
    * Initialize the given analysis context with a fake core library already resolved.
    *
    * @param context the context to be initialized (not `null`)
    * @return the analysis context that was created
    */
   void initWithCore() {
-    DirectoryBasedDartSdk sdk = new FakeSdk(new JavaFile("/fake/sdk"));
-    SourceFactory sourceFactory =
-        new SourceFactory([new DartUriResolver(sdk), new FileUriResolver()]);
-    this.sourceFactory = sourceFactory;
-    AnalysisContext coreContext = sdk.context;
+    AnalysisContext coreContext = sourceFactory.dartSdk.context;
     //
     // dart:core
     //
     TestTypeProvider provider = new TestTypeProvider();
     typeProvider = provider;
     CompilationUnitElementImpl coreUnit =
         new CompilationUnitElementImpl("core.dart");
     Source coreSource = sourceFactory.forUri(DartSdk.DART_CORE);
     coreContext.setContents(coreSource, "");
     coreUnit.source = coreSource;
@@ skipping 215 matching lines @@
     //
     // Record the elements.
     //
     HashMap<Source, LibraryElement> elementMap =
         new HashMap<Source, LibraryElement>();
     elementMap[coreSource] = coreLibrary;
     elementMap[asyncSource] = asyncLibrary;
     elementMap[htmlSource] = htmlLibrary;
     elementMap[mathSource] = mathLibrary;
     recordLibraryElements(elementMap);
+    elementMap.forEach((Source librarySource, LibraryElement library) {
+      CompilationUnit unit = new CompilationUnit(null, null, null, null, null);
+      unit.element = library.definingCompilationUnit;
+      CacheEntry entry = getCacheEntry(librarySource);
+      entry.setValue(PARSED_UNIT, unit);
+    });
   }
 
   /**
    * Set the analysis options, even if they would force re-analysis. This method should only be
    * invoked before the fake SDK is initialized.
    *
    * @param options the analysis options to be set
    */
   void _internalSetAnalysisOptions(AnalysisOptions options) {
     super.analysisOptions = options;
@@ skipping 18 matching lines @@
     Source librarySource = _addSource("/lib.dart", r'''
 library lib;
 int a = 0;''');
     expect(_context.computeLibraryElement(librarySource), isNotNull);
     _context.setContents(librarySource, r'''
 library lib;
 int aa = 0;''');
     expect(_context.getLibraryElement(librarySource), isNull);
   }
 
-  Future fail_applyChanges_change_multiple() {
+  Future test_applyChanges_change_multiple() {
     _context = contextWithCore();
     SourcesChangedListener listener = new SourcesChangedListener();
     _context.onSourcesChanged.listen(listener.onData);
     _sourceFactory = _context.sourceFactory;
     String libraryContents1 = r'''
 library lib;
 part 'part.dart';
 int a = 0;''';
     Source librarySource = _addSource("/lib.dart", libraryContents1);
     String partContents1 = r'''
@@ skipping 124 matching lines @@
     return pumpEventQueue().then((_) {
       listener.assertEvent(wereSourcesAdded: true);
       listener.assertEvent(changedSources: [libA]);
       listener.assertEvent(wereSourcesAdded: true);
       listener.assertEvent(changedSources: [libB]);
       listener.assertEvent(wereSourcesRemovedOrDeleted: true);
       listener.assertNoMoreEvents();
     });
   }
 
-  void fail_computeDocumentationComment_block() {
+  void test_computeDocumentationComment_block() {
     _context = contextWithCore();
     _sourceFactory = _context.sourceFactory;
     String comment = "/** Comment */";
     Source source = _addSource("/test.dart", """
 $comment
 class A {}""");
     LibraryElement libraryElement = _context.computeLibraryElement(source);
     expect(libraryElement, isNotNull);
     ClassElement classElement = libraryElement.definingCompilationUnit.types[0];
     expect(libraryElement, isNotNull);
     expect(_context.computeDocumentationComment(classElement), comment);
   }
 
-  void fail_computeDocumentationComment_none() {
+  void test_computeDocumentationComment_none() {
     _context = contextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source source = _addSource("/test.dart", "class A {}");
     LibraryElement libraryElement = _context.computeLibraryElement(source);
     expect(libraryElement, isNotNull);
     ClassElement classElement = libraryElement.definingCompilationUnit.types[0];
     expect(libraryElement, isNotNull);
     expect(_context.computeDocumentationComment(classElement), isNull);
   }
 
-  void fail_computeDocumentationComment_singleLine_multiple_EOL_n() {
+  void test_computeDocumentationComment_singleLine_multiple_EOL_n() {
     _context = contextWithCore();
     _sourceFactory = _context.sourceFactory;
     String comment = "/// line 1\n/// line 2\n/// line 3\n";
     Source source = _addSource("/test.dart", "${comment}class A {}");
     LibraryElement libraryElement = _context.computeLibraryElement(source);
     expect(libraryElement, isNotNull);
     ClassElement classElement = libraryElement.definingCompilationUnit.types[0];
     expect(libraryElement, isNotNull);
     String actual = _context.computeDocumentationComment(classElement);
     expect(actual, "/// line 1\n/// line 2\n/// line 3");
   }
 
-  void fail_computeDocumentationComment_singleLine_multiple_EOL_rn() {
+  void test_computeDocumentationComment_singleLine_multiple_EOL_rn() {
     _context = contextWithCore();
     _sourceFactory = _context.sourceFactory;
     String comment = "/// line 1\r\n/// line 2\r\n/// line 3\r\n";
     Source source = _addSource("/test.dart", "${comment}class A {}");
     LibraryElement libraryElement = _context.computeLibraryElement(source);
     expect(libraryElement, isNotNull);
     ClassElement classElement = libraryElement.definingCompilationUnit.types[0];
     expect(libraryElement, isNotNull);
     String actual = _context.computeDocumentationComment(classElement);
     expect(actual, "/// line 1\n/// line 2\n/// line 3");
@@ skipping 46 matching lines @@
     Source source = _addSource(
         "/test.dart", "library test; import 'lib1.dart'; import 'lib2.dart';");
     expect(_context.computeImportedLibraries(source), hasLength(2));
   }
 
   void fail_computeKindOf_html() {
     Source source = _addSource("/test.html", "");
     expect(_context.computeKindOf(source), same(SourceKind.HTML));
   }
 
-  void fail_computeLibraryElement() {
+  void test_computeLibraryElement() {
     _context = contextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source source = _addSource("/test.dart", "library lib;");
     LibraryElement element = _context.computeLibraryElement(source);
     expect(element, isNotNull);
   }
 
   void fail_computeResolvableCompilationUnit_dart_exception() {
     TestSource source = _addSourceWithException("/test.dart");
     try {
@@ skipping 41 matching lines @@
       completed = true;
     });
     return pumpEventQueue().then((_) {
       expect(completed, isFalse);
       _performPendingAnalysisTasks();
     }).then((_) => pumpEventQueue()).then((_) {
       expect(completed, isTrue);
     });
   }
 
-  Future fail_computeResolvedCompilationUnitAsync_afterDispose() {
+  Future test_computeResolvedCompilationUnitAsync_afterDispose() {
     _context = contextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source source = _addSource("/lib.dart", "library lib;");
     // Complete all pending analysis tasks and flush the AST so that it won't
     // be available immediately.
     _performPendingAnalysisTasks();
     CacheEntry entry = _context.getReadableSourceEntryOrNull(source);
     entry.flushAstStructures();
     // Dispose of the context.
     _context.dispose();
@@ skipping 268 matching lines @@
 <script type='application/dart' src='test.js'/>
 </head></html>''');
     Source librarySource = _addSource("/test.dart", "library lib;");
     _context.computeLibraryElement(librarySource);
     _context.parseHtmlUnit(htmlSource);
     List<Source> result = _context.getLibrariesReferencedFromHtml(htmlSource);
     expect(result, hasLength(1));
     expect(result[0], librarySource);
   }
 
-  void fail_getLibraryElement() {
+  void test_getLibraryElement() {
     _context = contextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source source = _addSource("/test.dart", "library lib;");
     LibraryElement element = _context.getLibraryElement(source);
     expect(element, isNull);
     _context.computeLibraryElement(source);
     element = _context.getLibraryElement(source);
     expect(element, isNotNull);
   }
 
-  void fail_getPublicNamespace_element() {
+  void test_getPublicNamespace_element() {
     _context = contextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source source = _addSource("/test.dart", "class A {}");
     LibraryElement library = _context.computeLibraryElement(source);
     expect(library, isNotNull);
     Namespace namespace = _context.getPublicNamespace(library);
     expect(namespace, isNotNull);
     EngineTestCase.assertInstanceOf(
         (obj) => obj is ClassElement, ClassElement, namespace.get("A"));
   }
 
   void fail_getResolvedCompilationUnit_library() {
     _context = contextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source source = _addSource("/lib.dart", "library libb;");
     LibraryElement library = _context.computeLibraryElement(source);
     expect(_context.getResolvedCompilationUnit(source, library), isNotNull);
     _context.setContents(source, "library lib;");
     expect(_context.getResolvedCompilationUnit(source, library), isNull);
   }
 
-  void fail_getResolvedCompilationUnit_source_dart() {
+  void test_getResolvedCompilationUnit_source_dart() {
     _context = contextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source source = _addSource("/lib.dart", "library lib;");
     expect(_context.getResolvedCompilationUnit2(source, source), isNull);
     _context.resolveCompilationUnit2(source, source);
     expect(_context.getResolvedCompilationUnit2(source, source), isNotNull);
   }
 
   void fail_getResolvedHtmlUnit() {
     _context = contextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source source = _addSource("/test.html", "<html></html>");
     expect(_context.getResolvedHtmlUnit(source), isNull);
     _context.resolveHtmlUnit(source);
     expect(_context.getResolvedHtmlUnit(source), isNotNull);
   }
 
   void fail_mergeContext() {
     fail("Implement this");
   }
 
-  void fail_parseCompilationUnit_errors() {
+  void test_parseCompilationUnit_errors() {
     Source source = _addSource("/lib.dart", "library {");
     CompilationUnit compilationUnit = _context.parseCompilationUnit(source);
     expect(compilationUnit, isNotNull);
     var errorInfo = _context.getErrors(source);
     expect(errorInfo, isNotNull);
     List<AnalysisError> errors = errorInfo.errors;
     expect(errors, isNotNull);
     expect(errors.length > 0, isTrue);
   }
 
-  void fail_parseCompilationUnit_exception() {
+  void test_parseCompilationUnit_exception() {
     Source source = _addSourceWithException("/test.dart");
     try {
       _context.parseCompilationUnit(source);
       fail("Expected AnalysisException");
     } on AnalysisException {
       // Expected
     }
   }
 
-  void fail_parseCompilationUnit_noErrors() {
+  void test_parseCompilationUnit_noErrors() {
     Source source = _addSource("/lib.dart", "library lib;");
     CompilationUnit compilationUnit = _context.parseCompilationUnit(source);
     expect(compilationUnit, isNotNull);
     AnalysisErrorInfo errorInfo = _context.getErrors(source);
     expect(errorInfo, isNotNull);
     expect(errorInfo.errors, hasLength(0));
   }
 
-  void fail_parseCompilationUnit_nonExistentSource() {
+  void test_parseCompilationUnit_nonExistentSource() {
     Source source =
         new FileBasedSource.con1(FileUtilities2.createFile("/test.dart"));
     try {
       _context.parseCompilationUnit(source);
       fail("Expected AnalysisException because file does not exist");
     } on AnalysisException {
       // Expected result
     }
   }
 
@@ skipping 403 matching lines @@
     CompilationUnit compilationUnit =
         _context.resolveCompilationUnit2(sourceA, sourceA);
     expect(compilationUnit, isNotNull);
     LibraryElement library = compilationUnit.element.library;
     List<LibraryElement> importedLibraries = library.importedLibraries;
     assertNamedElements(importedLibraries, ["dart.core", "libB"]);
     List<LibraryElement> visibleLibraries = library.visibleLibraries;
     assertNamedElements(visibleLibraries, ["dart.core", "libA", "libB"]);
   }
 
-  void fail_resolveCompilationUnit_library() {
+  void test_resolveCompilationUnit_library() {
     _context = contextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source source = _addSource("/lib.dart", "library lib;");
     LibraryElement library = _context.computeLibraryElement(source);
     CompilationUnit compilationUnit =
         _context.resolveCompilationUnit(source, library);
     expect(compilationUnit, isNotNull);
     expect(compilationUnit.element, isNotNull);
   }
 
-  void fail_resolveCompilationUnit_source() {
+  void test_resolveCompilationUnit_source() {
     _context = contextWithCore();
     _sourceFactory = _context.sourceFactory;
     Source source = _addSource("/lib.dart", "library lib;");
     CompilationUnit compilationUnit =
         _context.resolveCompilationUnit2(source, source);
     expect(compilationUnit, isNotNull);
   }
 
   void fail_resolveHtmlUnit() {
     Source source = _addSource("/lib.html", "<html></html>");
@@ skipping 939 matching lines @@
     List<AnalysisError> errors = errorInfo.errors;
     for (AnalysisError analysisError in errors) {
       if (analysisError.errorCode.errorSeverity == ErrorSeverity.ERROR) {
         return true;
       }
     }
     return false;
   }
 }
 
-class FakeSdk extends DirectoryBasedDartSdk {
-  FakeSdk(JavaFile arg0) : super(arg0);
-
-  @override
-  LibraryMap initialLibraryMap(bool useDart2jsPaths) {
-    LibraryMap map = new LibraryMap();
-    _addLibrary(map, DartSdk.DART_ASYNC, false, "async.dart");
-    _addLibrary(map, DartSdk.DART_CORE, false, "core.dart");
-    _addLibrary(map, DartSdk.DART_HTML, false, "html_dartium.dart");
-    _addLibrary(map, "dart:math", false, "math.dart");
-    _addLibrary(map, "dart:_interceptors", true, "_interceptors.dart");
-    _addLibrary(map, "dart:_js_helper", true, "_js_helper.dart");
-    return map;
-  }
-
-  void _addLibrary(LibraryMap map, String uri, bool isInternal, String path) {
-    SdkLibraryImpl library = new SdkLibraryImpl(uri);
-    if (isInternal) {
-      library.category = "Internal";
-    }
-    library.path = path;
-    map.setLibrary(uri, library);
-  }
-}
+//class FakeSdk extends DirectoryBasedDartSdk {
+//  FakeSdk(JavaFile arg0) : super(arg0);
+//
+//  @override
+//  LibraryMap initialLibraryMap(bool useDart2jsPaths) {
+//    LibraryMap map = new LibraryMap();
+//    _addLibrary(map, DartSdk.DART_ASYNC, false, "async.dart");
+//    _addLibrary(map, DartSdk.DART_CORE, false, "core.dart");
+//    _addLibrary(map, DartSdk.DART_HTML, false, "html_dartium.dart");
+//    _addLibrary(map, "dart:math", false, "math.dart");
+//    _addLibrary(map, "dart:_interceptors", true, "_interceptors.dart");
+//    _addLibrary(map, "dart:_js_helper", true, "_js_helper.dart");
+//    return map;
+//  }
+//
+//  void _addLibrary(LibraryMap map, String uri, bool isInternal, String path) {
+//    SdkLibraryImpl library = new SdkLibraryImpl(uri);
+//    if (isInternal) {
+//      library.category = "Internal";
+//    }
+//    library.path = path;
+//    map.setLibrary(uri, library);
+//  }
+//}
 
 class _AnalysisContextImplTest_test_applyChanges_removeContainer
     implements SourceContainer {
   Source libB;
   _AnalysisContextImplTest_test_applyChanges_removeContainer(this.libB);
   @override
   bool contains(Source source) => source == libB;
 }
 
 class _Source_getContent_throwException extends NonExistingSource {
   _Source_getContent_throwException(String name)
       : super(name, UriKind.FILE_URI);
 
   @override
   TimestampedData<String> get contents {
     throw 'Read error';
   }
 
   @override
   bool exists() => true;
 }