Revert 6ad38498c8673f1fbe3e12c49b1cf590305676dd (PARSED_UNIT).

pkg/analyzer/test/src/task/dart_work_manager_test.dart

 // Copyright (c) 2015, 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.task.dart_work_manager_test;
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/src/context/cache.dart';
 import 'package:analyzer/src/dart/scanner/scanner.dart' show ScannerErrorCode;
 import 'package:analyzer/src/generated/engine.dart'
@@ skipping 509 matching lines @@
     expect(manager.getNextResultPriority(), WorkOrderPriority.NORMAL);
   }
 
   void test_getNextResultPriority_nothingToDo() {
     expect(manager.getNextResultPriority(), WorkOrderPriority.NONE);
   }
 
   void test_onAnalysisOptionsChanged() {
     when(context.exists(anyObject)).thenReturn(true);
     // set cache values
-    entry1.setValue(PARSED_UNIT1, AstFactory.compilationUnit(), []);
+    entry1.setValue(PARSED_UNIT, AstFactory.compilationUnit(), []);
     entry1.setValue(IMPORTED_LIBRARIES, <Source>[], []);
     entry1.setValue(EXPLICITLY_IMPORTED_LIBRARIES, <Source>[], []);
     entry1.setValue(EXPORTED_LIBRARIES, <Source>[], []);
     entry1.setValue(INCLUDED_PARTS, <Source>[], []);
     // configure LibrarySpecificUnit
     LibrarySpecificUnit unitTarget = new LibrarySpecificUnit(source2, source3);
     CacheEntry unitEntry = new CacheEntry(unitTarget);
     cache.put(unitEntry);
     unitEntry.setValue(BUILD_LIBRARY_ERRORS, <AnalysisError>[], []);
     expect(unitEntry.getState(BUILD_LIBRARY_ERRORS), CacheState.VALID);
     // notify
     manager.onAnalysisOptionsChanged();
     // resolution is invalidated
     expect(unitEntry.getState(BUILD_LIBRARY_ERRORS), CacheState.INVALID);
     // ...but URIs are still value
-    expect(entry1.getState(PARSED_UNIT1), CacheState.VALID);
+    expect(entry1.getState(PARSED_UNIT), CacheState.VALID);
     expect(entry1.getState(IMPORTED_LIBRARIES), CacheState.VALID);
     expect(entry1.getState(EXPLICITLY_IMPORTED_LIBRARIES), CacheState.VALID);
     expect(entry1.getState(EXPORTED_LIBRARIES), CacheState.VALID);
     expect(entry1.getState(INCLUDED_PARTS), CacheState.VALID);
   }
 
   void test_onResultInvalidated_scheduleInvalidatedLibraries() {
     // make source3 implicit
     entry3.explicitlyAdded = false;
     // set SOURCE_KIND
     entry1.setValue(SOURCE_KIND, SourceKind.LIBRARY, []);
     entry2.setValue(SOURCE_KIND, SourceKind.PART, []);
     entry3.setValue(SOURCE_KIND, SourceKind.LIBRARY, []);
     // set LIBRARY_ERRORS_READY for source1 and source3
     entry1.setValue(LIBRARY_ERRORS_READY, true, []);
     entry3.setValue(LIBRARY_ERRORS_READY, true, []);
     // invalidate LIBRARY_ERRORS_READY for source1, schedule it
     entry1.setState(LIBRARY_ERRORS_READY, CacheState.INVALID);
     expect_librarySourceQueue([source1]);
     // invalidate LIBRARY_ERRORS_READY for source3, implicit, not scheduled
     entry3.setState(LIBRARY_ERRORS_READY, CacheState.INVALID);
     expect_librarySourceQueue([source1]);
   }
 
   void test_onSourceFactoryChanged() {
     when(context.exists(anyObject)).thenReturn(true);
     // set cache values
-    CompilationUnit unit = AstFactory.compilationUnit();
-    entry1.setValue(PARSED_UNIT1, unit, []);
-    entry1.setValue(PARSED_UNIT, unit, []);
+    entry1.setValue(PARSED_UNIT, AstFactory.compilationUnit(), []);
     entry1.setValue(IMPORTED_LIBRARIES, <Source>[], []);
     entry1.setValue(EXPLICITLY_IMPORTED_LIBRARIES, <Source>[], []);
     entry1.setValue(EXPORTED_LIBRARIES, <Source>[], []);
     entry1.setValue(INCLUDED_PARTS, <Source>[], []);
     entry1.setValue(LIBRARY_SPECIFIC_UNITS, <LibrarySpecificUnit>[], []);
     entry1.setValue(UNITS, <Source>[], []);
     // configure LibrarySpecificUnit
     LibrarySpecificUnit unitTarget = new LibrarySpecificUnit(source2, source3);
     CacheEntry unitEntry = new CacheEntry(unitTarget);
     cache.put(unitEntry);
     unitEntry.setValue(BUILD_LIBRARY_ERRORS, <AnalysisError>[], []);
     expect(unitEntry.getState(BUILD_LIBRARY_ERRORS), CacheState.VALID);
     // notify
     manager.onSourceFactoryChanged();
     // resolution is invalidated
     expect(unitEntry.getState(BUILD_LIBRARY_ERRORS), CacheState.INVALID);
     // ...and URIs resolution too
-    expect(entry1.getState(PARSED_UNIT1), CacheState.INVALID);
     expect(entry1.getState(PARSED_UNIT), CacheState.INVALID);
     expect(entry1.getState(IMPORTED_LIBRARIES), CacheState.INVALID);
     expect(entry1.getState(EXPLICITLY_IMPORTED_LIBRARIES), CacheState.INVALID);
     expect(entry1.getState(EXPORTED_LIBRARIES), CacheState.INVALID);
     expect(entry1.getState(INCLUDED_PARTS), CacheState.INVALID);
     expect(entry1.getState(LIBRARY_SPECIFIC_UNITS), CacheState.INVALID);
     expect(entry1.getState(UNITS), CacheState.INVALID);
   }
 
   void test_resultsComputed_errors_forLibrarySpecificUnit() {
@@ skipping 27 matching lines @@
     AnalysisError error2 =
         new AnalysisError(source1, 2, 0, ScannerErrorCode.MISSING_DIGIT);
     when(context.getLibrariesContaining(source1)).thenReturn([source2]);
     when(context.getErrors(source1))
         .thenReturn(new AnalysisErrorInfoImpl([error1, error2], lineInfo));
     entry1.setValue(LINE_INFO, lineInfo, []);
     entry1.setValue(SCAN_ERRORS, <AnalysisError>[error1], []);
     entry1.setValue(PARSE_ERRORS, <AnalysisError>[error2], []);
     // PARSED_UNIT is ready, set errors
     manager
-        .resultsComputed(source1, {PARSED_UNIT1: AstFactory.compilationUnit()});
+        .resultsComputed(source1, {PARSED_UNIT: AstFactory.compilationUnit()});
     // all of the errors are included
     ChangeNoticeImpl notice = context.getNotice(source1);
     expect(notice.errors, unorderedEquals([error1, error2]));
     expect(notice.lineInfo, lineInfo);
   }
 
   void test_resultsComputed_includedParts_updatePartLibraries() {
     Source part1 = new TestSource('part1.dart');
     Source part2 = new TestSource('part2.dart');
     Source part3 = new TestSource('part3.dart');
@@ skipping 64 matching lines @@
     expect_unknownSourceQueue([source1, source2]);
   }
 
   void test_resultsComputed_parsedUnit() {
     LineInfo lineInfo = new LineInfo([0]);
     when(context.getLibrariesContaining(source1)).thenReturn([]);
     when(context.getErrors(source1))
         .thenReturn(new AnalysisErrorInfoImpl([], lineInfo));
     entry1.setValue(LINE_INFO, lineInfo, []);
     CompilationUnit unit = AstFactory.compilationUnit();
-    manager.resultsComputed(source1, {PARSED_UNIT1: unit});
+    manager.resultsComputed(source1, {PARSED_UNIT: unit});
     ChangeNoticeImpl notice = context.getNotice(source1);
     expect(notice.parsedDartUnit, unit);
     expect(notice.resolvedDartUnit, isNull);
     expect(notice.lineInfo, lineInfo);
   }
 
   void test_resultsComputed_resolvedUnit() {
     LineInfo lineInfo = new LineInfo([0]);
     when(context.getLibrariesContaining(source2)).thenReturn([]);
     when(context.getErrors(source2))
@@ skipping 119 matching lines @@
 class _SourceFactoryMock extends TypedMock implements SourceFactory {}
 
 class _SourceMock extends TypedMock implements Source {
   final String shortName;
   _SourceMock(this.shortName);
   @override
   String get fullName => '/' + shortName;
   @override
   String toString() => fullName;
 }