Clean up of library names, mirror usage, deprecated pkg/test usage of Throws

Author: kevmoo

lib/src/annotation.dart

@@ -222,7 +222,7 @@ bool matchAnnotation(Type annotationType, ElementAnnotation annotation) {
     throw new ArgumentError.value(annotation, 'annotation',
         'Could not determine type of annotation. Are you missing a dependency?');
   }
-  
+
   return matchTypes(annotationType, annotationValueType);
 }
 

test/json_serializable_integration_test.dart

@@ -2,8 +2,6 @@
 // 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 source_gen.test.json_serializable_integration_test;
-
 import 'dart:convert';
 
 import 'package:test/test.dart';

test/src/comment_generator.dart

@@ -1,5 +1,3 @@
-library source_gen.test.comment_generator;
-
 import 'dart:async';
 
 import 'package:analyzer/dart/element/element.dart';

test/src/io.dart

@@ -1,7 +1,6 @@
 // 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 source_gen.test.src.io;
 
 import 'dart:async';
 import 'dart:io';

test/test_all.dart

@@ -2,8 +2,6 @@
 // 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 source_gen.test.test_all;
-
 import 'annotation_test.dart' as annotation;
 import 'builder_test.dart' as builder;
 import 'find_libraries_test.dart' as find_libraries;

test/test_utils.dart

@@ -2,8 +2,6 @@
 // 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 source_gen.test.utils;
-
 import 'dart:mirrors';
 
 import 'package:path/path.dart' as p;
@@ -13,19 +11,21 @@ import 'package:test/test.dart';
 String _packagePathCache;
 
 String getPackagePath() {
-  // TODO(kevmoo) - ideally we'd have a more clean way to do this
-  // See https://github.com/dart-lang/sdk/issues/23990
   if (_packagePathCache == null) {
-    var currentFilePath =
-        currentMirrorSystem().findLibrary(#source_gen.test.utils).uri.path;
+    // Getting the location of this file – via reflection
+    var currentFilePath = (reflect(getPackagePath) as ClosureMirror)
+        .function
+        .location
+        .sourceUri
+        .path;
 
     _packagePathCache = p.normalize(p.join(p.dirname(currentFilePath), '..'));
   }
   return _packagePathCache;
 }
 
-const Matcher throwsInvalidGenerationSourceError =
-    const Throws(isInvalidGenerationSourceError);
+final Matcher throwsInvalidGenerationSourceError =
+    throwsA(isInvalidGenerationSourceError);
 
 const Matcher isInvalidGenerationSourceError =
     const _InvalidGenerationSourceError();