Rename ContributionPoint and error result

pkg/analyzer/test/src/task/dart_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 test.src.task.dart_test;
 
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/memory_file_system.dart';
 import 'package:analyzer/src/context/cache.dart';
 import 'package:analyzer/src/generated/ast.dart';
@@ skipping 518 matching lines @@
     expect(libraryElement.parts,
         unorderedEquals([partUnits[0].element, partUnits[1].element]));
     // LibraryElement references
     expect((libraryUnit.directives[0] as LibraryDirective).element,
         same(libraryElement));
     expect((partUnits[0].directives[0] as PartOfDirective).element,
         same(libraryElement));
     expect((partUnits[1].directives[0] as PartOfDirective).element,
         same(libraryElement));
     // CompilationUnitElement(s)
-    {
-      CompilationUnitElement unitElement = partUnits[0].element;
-      expect(unitElement.uri, 'part1.dart');
-      expect(unitElement.uriOffset, 18);
-      expect(unitElement.uriEnd, 30);
-      expect((libraryUnit.directives[1] as PartDirective).element,
-          same(unitElement));
+    CompilationUnitElement firstPart;
+    CompilationUnitElement secondPart;
+    if (partUnits[0].element.uri == 'part1.dart') {
+      firstPart = partUnits[0].element;
+      secondPart = partUnits[1].element;
+    } else {
+      firstPart = partUnits[1].element;
+      secondPart = partUnits[0].element;
     }
-    {
-      CompilationUnitElement unitElement = partUnits[1].element;
-      expect(unitElement.uri, 'part2.dart');
-      expect(unitElement.uriOffset, 37);
-      expect(unitElement.uriEnd, 49);
-      expect((libraryUnit.directives[2] as PartDirective).element,
-          same(unitElement));
-    }
+    expect(firstPart.uri, 'part1.dart');
+    expect(firstPart.uriOffset, 18);
+    expect(firstPart.uriEnd, 30);
+    expect(
+        (libraryUnit.directives[1] as PartDirective).element, same(firstPart));
+
+    expect(secondPart.uri, 'part2.dart');
+    expect(secondPart.uriOffset, 37);
+    expect(secondPart.uriEnd, 49);
+    expect(
+        (libraryUnit.directives[2] as PartDirective).element, same(secondPart));
   }
 
   test_perform_error_missingLibraryDirectiveWithPart_hasCommon() {
     _performBuildTask({
       '/lib.dart': '''
 part 'partA.dart';
 part 'partB.dart';
 ''',
       '/partA.dart': '''
 part of my_lib;
@@ skipping 448 matching lines @@
     return entryMap.putIfAbsent(target, () => new CacheEntry());
   }
 
   TimestampedData<String> getContents(Source source) => source.contents;
 
   noSuchMethod(Invocation invocation) {
     print('noSuchMethod: ${invocation.memberName}');
     return super.noSuchMethod(invocation);
   }
 }