Rename BadNumberFormatException -> FormatException.

utils/tests/pub/version_test.dart

 // Copyright (c) 2012, 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('version_test');
 
 #import('../../../lib/unittest/unittest.dart');
 #import('../../pub/utils.dart');
 #import('../../pub/version.dart');
 
@@ skipping 103 matching lines @@
           new Version(1, 2, 3, pre: 'x.7.z-92')));
 
       expect(new Version.parse('1.2.3+build.1'), equals(
           new Version(1, 2, 3, build: 'build.1')));
       expect(new Version.parse('1.2.3+x.7.z-92'), equals(
           new Version(1, 2, 3, build: 'x.7.z-92')));
 
       expect(new Version.parse('1.0.0-rc-1+build-1'), equals(
           new Version(1, 0, 0, pre: 'rc-1', build: 'build-1')));
 
-      throwsBadFormat(() => new Version.parse('1.0'));
-      throwsBadFormat(() => new Version.parse('1.2.3.4'));
-      throwsBadFormat(() => new Version.parse('1234'));
-      throwsBadFormat(() => new Version.parse('-2.3.4'));
-      throwsBadFormat(() => new Version.parse('1.3-pre'));
-      throwsBadFormat(() => new Version.parse('1.3+build'));
-      throwsBadFormat(() => new Version.parse('1.3+bu?!3ild'));
+      expect(() => new Version.parse('1.0'), throwsFormatException);
+      expect(() => new Version.parse('1.2.3.4'), throwsFormatException);
+      expect(() => new Version.parse('1234'), throwsFormatException);
+      expect(() => new Version.parse('-2.3.4'), throwsFormatException);
+      expect(() => new Version.parse('1.3-pre'), throwsFormatException);
+      expect(() => new Version.parse('1.3+build'), throwsFormatException);
+      expect(() => new Version.parse('1.3+bu?!3ild'), throwsFormatException);
     });
 
     test('toString()', () {
       expect(new Version(0, 0, 0).toString(), equals('0.0.0'));
       expect(new Version(12, 34, 56).toString(), equals('12.34.56'));
 
       expect(new Version(1, 2, 3, pre: 'alpha.1').toString(), equals(
           '1.2.3-alpha.1'));
       expect(new Version(1, 2, 3, pre: 'x.7.z-92').toString(), equals(
           '1.2.3-x.7.z-92'));
@@ skipping 222 matching lines @@
         expect(constraint, allows([
             new Version.parse('1.2.3'),
             new Version.parse('1.2.5')]));
         expect(constraint, doesNotAllow([
             new Version.parse('1.2.3-pre'),
             new Version.parse('1.3.0'),
             new Version.parse('3.4.5')]));
       });
 
       test('throws FormatException on a bad string', () {
-        throwsBadFormat(() => new VersionConstraint.parse(''));
-        throwsBadFormat(() => new VersionConstraint.parse('   '));
-        throwsBadFormat(() => new VersionConstraint.parse('not a version'));
+        expect(() => new VersionConstraint.parse(''), throwsFormatException);
+        expect(() => new VersionConstraint.parse('   '), throwsFormatException);
+        expect(() => new VersionConstraint.parse('not a version'),
+            throwsFormatException);
       });
     });
   });
 }
 
 class VersionConstraintMatcher implements Matcher {
   final List<Version> _expected;
   final bool _allow;
 
   VersionConstraintMatcher(this._expected, this._allow);
@@ skipping 35 matching lines @@
 
 Matcher allows(List<Version> versions) =>
     new VersionConstraintMatcher(versions, true);
 
 Matcher doesNotAllow(List<Version> versions) =>
     new VersionConstraintMatcher(versions, false);
 
 throwsIllegalArg(function) {
   expect(function, throwsA((e) => e is IllegalArgumentException));
 }
-
-throwsBadFormat(function) {
-  expect(function, throwsA((e) => e is FormatException));
-}