Cleanup tests and remove prefixFor. (#306)

Author: matanlurey

lib/src/library.dart

@@ -180,48 +180,4 @@ class LibraryReader {
     }
     return [element];
   }
-
-  /// Returns the identifier prefix of [element] if it is referenced by one.
-  ///
-  /// For example in the following file:
-  /// ```
-  /// import 'bar.dart' as bar;
-  ///
-  /// bar.Bar b;
-  /// ```
-  ///
-  /// ... we'd assume that `b`'s type has a prefix of `bar`.
-  ///
-  /// If there is no prefix, one could not be computed, `null` is returned.
-  ///
-  /// If there is an attempt to read a prefix of a file _other_ than the current
-  /// library being read this will throw [StateError], as it is not always
-  /// possible to read details of the source file from other inputs.
-  String _prefixForType(Element element) {
-    final astNode = element.computeNode();
-    if (astNode is VariableDeclaration) {
-      final parentNode = astNode.parent as VariableDeclarationList;
-      return _prefixForTypeAnnotation(parentNode.type);
-    }
-    return null;
-  }
-
-  static String _prefixForTypeAnnotation(TypeAnnotation astNode) {
-    if (astNode is NamedType) {
-      return _prefixForIdentifier(astNode.name);
-    }
-    return null;
-  }
-
-  static String _prefixForIdentifier(Identifier id) {
-    return id is PrefixedIdentifier ? id.prefix.name : null;
-  }
 }
-
-// Testing-only access to LibraryReader._prefixFor.
-//
-// This is used to iterate on the tests without launching the feature.
-// Additionally it looks ike `computeNode()` will be deprecated, so we might
-// have to rewrite the entire body of the function in the near future; at least
-// the tests can help for correctness.
-String testingPrefixForType(LibraryReader r, Element e) => r._prefixForType(e);

test/analysis_utils.dart

@@ -1,4 +1,4 @@
-// Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2018, 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.
 
@@ -7,39 +7,41 @@ import 'package:build_test/build_test.dart';
 import 'package:source_gen/source_gen.dart';
 import 'package:test/test.dart';
 
+final _source = r'''
+  library test_lib;
+
+  export 'dart:collection' show LinkedHashMap;
+  export 'package:source_gen/source_gen.dart' show Generator;
+  import 'dart:async' show Stream;
+
+  class Example {}
+''';
+
 void main() {
   LibraryReader library;
 
   setUpAll(() async {
     library = await resolveSource(
-        r'''
-      library test_lib;
-
-      export 'dart:collection' show LinkedHashMap;
-      export 'package:source_gen/source_gen.dart' show Generator;
-      import 'dart:async' show Stream;
-
-      class Example {}
-    ''',
-        (resolver) async =>
-            new LibraryReader(await resolver.findLibraryByName('test_lib')));
+      _source,
+      (r) async => new LibraryReader(await r.findLibraryByName('test_lib')),
+    );
   });
 
-  final isClassElement = const isInstanceOf<ClassElement>();
-
   test('should return a type not exported', () {
-    expect(library.findType('Example'), isClassElement);
+    expect(library.findType('Example'), _isClassElement);
   });
 
   test('should return a type exported from dart:', () {
-    expect(library.findType('LinkedHashMap'), isClassElement);
+    expect(library.findType('LinkedHashMap'), _isClassElement);
   });
 
   test('should return a type exported from package:', () {
-    expect(library.findType('Generator'), isClassElement);
+    expect(library.findType('Generator'), _isClassElement);
   });
 
   test('should not return a type imported', () {
     expect(library.findType('Stream'), isNull);
   });
 }
+
+final _isClassElement = const isInstanceOf<ClassElement>();