Make SdkLibrary.shortName consistently include 'dart:'

pkg/analysis_server/test/services/correction/fix_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.services.correction.fix;
 
 import 'package:analysis_server/src/protocol.dart' hide AnalysisError;
 import 'package:analysis_server/src/services/correction/fix.dart';
 import 'package:analysis_server/src/services/index/index.dart';
 import 'package:analysis_server/src/services/index/local_memory_index.dart';
@@ skipping 1006 matching lines @@
     assertHasFix(FixKind.IMPORT_LIBRARY_PROJECT, '''
 import 'lib.dart';
 
 main() {
   Test t = null;
 }
 ''');
   }
 
   void test_importLibrarySdk_withTopLevelVariable() {
-    _ensureSdkMathLibraryResolved();
     _indexTestUnit('''
 main() {
   print(PI);
 }
 ''');
     performAllAnalysisTasks();
     assertHasFix(FixKind.IMPORT_LIBRARY_SDK, '''
 import 'dart:math';
 
 main() {
   print(PI);
 }
 ''');
   }
 
   void test_importLibrarySdk_withType_invocationTarget() {
-    _ensureSdkAsyncLibraryResolved();
     _indexTestUnit('''
 main() {
   Future.wait(null);
 }
 ''');
     assertHasFix(FixKind.IMPORT_LIBRARY_SDK, '''
 import 'dart:async';
 
 main() {
   Future.wait(null);
 }
 ''');
   }
 
   void test_importLibrarySdk_withType_typeAnnotation() {
-    _ensureSdkAsyncLibraryResolved();
     _indexTestUnit('''
 main() {
   Future f = null;
 }
 ''');
     assertHasFix(FixKind.IMPORT_LIBRARY_SDK, '''
 import 'dart:async';
 
 main() {
   Future f = null;
 }
 ''');
   }
 
   void test_importLibrarySdk_withType_typeAnnotation_PrefixedIdentifier() {
-    _ensureSdkAsyncLibraryResolved();
     _indexTestUnit('''
 main() {
   Future.wait;
 }
 ''');
     assertHasFix(FixKind.IMPORT_LIBRARY_SDK, '''
 import 'dart:async';
 
 main() {
   Future.wait;
@@ skipping 719 matching lines @@
 
   void _assertLinkedGroup(LinkedEditGroup group, List<String> expectedStrings,
       [List<LinkedEditSuggestion> expectedSuggestions]) {
     List<Position> expectedPositions = _findResultPositions(expectedStrings);
     expect(group.positions, unorderedEquals(expectedPositions));
     if (expectedSuggestions != null) {
       expect(group.suggestions, unorderedEquals(expectedSuggestions));
     }
   }
 
-  /**
-   * We search for elements only already resolved lbiraries, and we use
-   * `dart:async` elements in tests.
-   */
-  void _ensureSdkAsyncLibraryResolved() {
-    resolveLibraryUnit(addSource('/other.dart', 'import "dart:async";'));
-  }
-
-  /**
-   * We search for elements only already resolved lbiraries, and we use
-   * `dart:async` elements in tests.
-   */
-  void _ensureSdkMathLibraryResolved() {
-    resolveLibraryUnit(addSource('/other.dart', 'import "dart:math";'));
-  }
-
   AnalysisError _findErrorToFix() {
     List<AnalysisError> errors = context.computeErrors(testSource);
     expect(
         errors,
         hasLength(1),
         reason: 'Exactly 1 error expected, but ${errors.length} found:\n' +
             errors.join('\n'));
     return errors[0];
   }
 
   List<Position> _findResultPositions(List<String> searchStrings) {
     List<Position> positions = <Position>[];
     for (String search in searchStrings) {
       int offset = resultCode.indexOf(search);
       int length = getLeadingIdentifierLength(search);
       positions.add(new Position(testFile, offset));
     }
     return positions;
   }
 
   void _indexTestUnit(String code) {
     resolveTestUnit(code);
     index.indexUnit(context, testUnit);
   }
 }