Rename CONSTANT_RESOLVED_UNIT to RESOLVED_UNIT.

pkg/analyzer/test/src/context/context_test.dart

Index: pkg/analyzer/test/src/context/context_test.dart
diff --git a/pkg/analyzer/test/src/context/context_test.dart b/pkg/analyzer/test/src/context/context_test.dart
index f8d788026d802c53afd51fad5213c687c7441586..a5b71636f696b51e2f43e6e9359bc8abcbe3aeab 100644
--- a/pkg/analyzer/test/src/context/context_test.dart
+++ b/pkg/analyzer/test/src/context/context_test.dart
@@ -34,6 +34,7 @@ import 'package:analyzer/src/generated/java_engine.dart';
 import 'package:analyzer/src/generated/resolver.dart';
 import 'package:analyzer/src/generated/scanner.dart';
 import 'package:analyzer/src/generated/source.dart';
+import 'package:analyzer/src/task/dart.dart';
 import 'package:analyzer/task/dart.dart';
 import 'package:unittest/unittest.dart';
 import 'package:watcher/src/utils.dart';
@@ -1233,9 +1234,9 @@ main() {}''');
   void test_ensureResolvedDartUnits_definingUnit_hasResolved() {
     Source source = addSource('/test.dart', '');
     LibrarySpecificUnit libTarget = new LibrarySpecificUnit(source, source);
-    analysisDriver.computeResult(libTarget, RESOLVED_UNIT);
+    analysisDriver.computeResult(libTarget, RESOLVED_UNIT6);
     CompilationUnit unit =
-        context.getCacheEntry(libTarget).getValue(RESOLVED_UNIT);
+        context.getCacheEntry(libTarget).getValue(RESOLVED_UNIT6);
     List<CompilationUnit> units = context.ensureResolvedDartUnits(source);
     expect(units, unorderedEquals([unit]));
   }
@@ -1243,17 +1244,17 @@ main() {}''');
   void test_ensureResolvedDartUnits_definingUnit_notResolved() {
     Source source = addSource('/test.dart', '');
     LibrarySpecificUnit libTarget = new LibrarySpecificUnit(source, source);
-    analysisDriver.computeResult(libTarget, RESOLVED_UNIT);
+    analysisDriver.computeResult(libTarget, RESOLVED_UNIT6);
     // flush
     context.getCacheEntry(libTarget).setState(
-        RESOLVED_UNIT, CacheState.FLUSHED);
+        RESOLVED_UNIT6, CacheState.FLUSHED);
     // schedule recomputing
     List<CompilationUnit> units = context.ensureResolvedDartUnits(source);
     expect(units, isNull);
     // should be the next result to compute
     TargetedResult nextResult = context.dartWorkManager.getNextResult();
     expect(nextResult.target, libTarget);
-    expect(nextResult.result, RESOLVED_UNIT);
+    expect(nextResult.result, RESOLVED_UNIT6);
   }
 
   void test_ensureResolvedDartUnits_partUnit_notResolved() {
@@ -1272,20 +1273,20 @@ part of lib;
         new LibrarySpecificUnit(libSource1, partSource);
     LibrarySpecificUnit partTarget2 =
         new LibrarySpecificUnit(libSource2, partSource);
-    analysisDriver.computeResult(partTarget1, RESOLVED_UNIT);
-    analysisDriver.computeResult(partTarget2, RESOLVED_UNIT);
+    analysisDriver.computeResult(partTarget1, RESOLVED_UNIT6);
+    analysisDriver.computeResult(partTarget2, RESOLVED_UNIT6);
     // flush
     context.getCacheEntry(partTarget1).setState(
-        RESOLVED_UNIT, CacheState.FLUSHED);
+        RESOLVED_UNIT6, CacheState.FLUSHED);
     context.getCacheEntry(partTarget2).setState(
-        RESOLVED_UNIT, CacheState.FLUSHED);
+        RESOLVED_UNIT6, CacheState.FLUSHED);
     // schedule recomputing
     List<CompilationUnit> units = context.ensureResolvedDartUnits(partSource);
     expect(units, isNull);
     // should be the next result to compute
     TargetedResult nextResult = context.dartWorkManager.getNextResult();
     expect(nextResult.target, anyOf(partTarget1, partTarget2));
-    expect(nextResult.result, RESOLVED_UNIT);
+    expect(nextResult.result, RESOLVED_UNIT6);
   }
 
   void test_ensureResolvedDartUnits_partUnit_hasResolved() {
@@ -1304,12 +1305,12 @@ part of lib;
         new LibrarySpecificUnit(libSource1, partSource);
     LibrarySpecificUnit partTarget2 =
         new LibrarySpecificUnit(libSource2, partSource);
-    analysisDriver.computeResult(partTarget1, RESOLVED_UNIT);
-    analysisDriver.computeResult(partTarget2, RESOLVED_UNIT);
+    analysisDriver.computeResult(partTarget1, RESOLVED_UNIT6);
+    analysisDriver.computeResult(partTarget2, RESOLVED_UNIT6);
     CompilationUnit unit1 =
-        context.getCacheEntry(partTarget1).getValue(RESOLVED_UNIT);
+        context.getCacheEntry(partTarget1).getValue(RESOLVED_UNIT6);
     CompilationUnit unit2 =
-        context.getCacheEntry(partTarget2).getValue(RESOLVED_UNIT);
+        context.getCacheEntry(partTarget2).getValue(RESOLVED_UNIT6);
     List<CompilationUnit> units = context.ensureResolvedDartUnits(partSource);
     expect(units, unorderedEquals([unit1, unit2]));
   }
@@ -2034,7 +2035,7 @@ int a = 0;''');
 
   void _flushAst(Source source) {
     CacheEntry entry = context.getReadableSourceEntryOrNull(new LibrarySpecificUnit(source, source));
-    entry.setState(RESOLVED_UNIT, CacheState.FLUSHED);
+    entry.setState(RESOLVED_UNIT6, CacheState.FLUSHED);
   }
 
   IncrementalAnalysisCache _getIncrementalAnalysisCache(