Test cleanup.

pkg/analyzer/test/generated/source_factory_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.
 
 // This code was auto-generated, is not intended to be edited, and is subject to
 // significant change. Please see the README file for more information.
 
 library analyzer.test.generated.source_factory;
 
 import 'package:analyzer/file_system/file_system.dart';
@@ skipping 13 matching lines @@
 main() {
   groupSep = ' | ';
   runReflectiveTests(SourceFactoryTest);
 }
 
 @reflectiveTest
 class SourceFactoryTest {
   void test_creation() {
     expect(new SourceFactory([]), isNotNull);
   }
+
   void test_fromEncoding_invalidUri() {
     SourceFactory factory = new SourceFactory([]);
-    try {
-      factory.fromEncoding("<:&%>");
-      fail("Expected IllegalArgumentException");
-    } on IllegalArgumentException {}
+    expect(() => factory.fromEncoding("<:&%>"),
+        throwsA(new isInstanceOf<IllegalArgumentException>()));
   }
+
   void test_fromEncoding_noResolver() {
     SourceFactory factory = new SourceFactory([]);
-    try {
-      factory.fromEncoding("foo:/does/not/exist.dart");
-      fail("Expected IllegalArgumentException");
-    } on IllegalArgumentException {}
+    expect(() => factory.fromEncoding("foo:/does/not/exist.dart"),
+        throwsA(new isInstanceOf<IllegalArgumentException>()));
   }
+
   void test_fromEncoding_valid() {
     String encoding = "file:///does/not/exist.dart";
     SourceFactory factory = new SourceFactory(
         [new UriResolver_SourceFactoryTest_test_fromEncoding_valid(encoding)]);
     expect(factory.fromEncoding(encoding), isNotNull);
   }
+
   void test_resolveUri_absolute() {
     UriResolver_absolute resolver = new UriResolver_absolute();
     SourceFactory factory = new SourceFactory([resolver]);
     factory.resolveUri(null, "dart:core");
     expect(resolver.invoked, isTrue);
   }
+
   void test_resolveUri_nonAbsolute_absolute() {
     SourceFactory factory =
         new SourceFactory([new UriResolver_nonAbsolute_absolute()]);
     String absolutePath = "/does/not/matter.dart";
     Source containingSource =
         new FileBasedSource(FileUtilities2.createFile("/does/not/exist.dart"));
     Source result = factory.resolveUri(containingSource, absolutePath);
     expect(result.fullName,
         FileUtilities2.createFile(absolutePath).getAbsolutePath());
   }
+
   void test_resolveUri_nonAbsolute_relative() {
     SourceFactory factory =
         new SourceFactory([new UriResolver_nonAbsolute_relative()]);
     Source containingSource =
         new FileBasedSource(FileUtilities2.createFile("/does/not/have.dart"));
     Source result = factory.resolveUri(containingSource, "exist.dart");
     expect(result.fullName,
         FileUtilities2.createFile("/does/not/exist.dart").getAbsolutePath());
   }
 
@@ skipping 59 matching lines @@
 
 class UriResolver_nonAbsolute_relative extends UriResolver {
   @override
   Source resolveAbsolute(Uri uri) {
     return new FileBasedSource(new JavaFile.fromUri(uri), uri);
   }
 }
 
 class UriResolver_restoreUri extends UriResolver {
   Source source1;
-
   Uri expected1;
-
   UriResolver_restoreUri(this.source1, this.expected1);
 
   @override
   Source resolveAbsolute(Uri uri) => null;
 
   @override
   Uri restoreAbsolute(Source source) {
     if (identical(source, source1)) {
       return expected1;
     }
     return null;
   }
 }
 
 class UriResolver_SourceFactoryTest_test_fromEncoding_valid
     extends UriResolver {
   String encoding;
-
   UriResolver_SourceFactoryTest_test_fromEncoding_valid(this.encoding);
 
   @override
   Source resolveAbsolute(Uri uri) {
     if (uri.toString() == encoding) {
       return new TestSource();
     }
     return null;
   }
 }