Allow [path.fromUri] to take a string as well as a URI.

pkg/path/test/url_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.
 
 import 'package:unittest/unittest.dart';
 import 'package:path/path.dart' as path;
 
 main() {
   var context = new path.Context(style: path.Style.url,
       current: 'http://dartlang.org/root/path');
@@ skipping 682 matching lines @@
     expect(context.withoutExtension('a/.'), 'a/.');
     expect(context.withoutExtension('a/.b'), 'a/.b');
     expect(context.withoutExtension('a.b/c'), 'a.b/c');
     expect(context.withoutExtension(r'a.b\c'), r'a');
     expect(context.withoutExtension(r'a/b\c'), r'a/b\c');
     expect(context.withoutExtension(r'a/b\c.d'), r'a/b\c');
     expect(context.withoutExtension('a/b.c/'), 'a/b/');
     expect(context.withoutExtension('a/b.c//'), 'a/b//');
   });
 
-  test('fromUri', () {
-    expect(context.fromUri(Uri.parse('http://dartlang.org/path/to/foo')),
-        'http://dartlang.org/path/to/foo');
-    expect(context.fromUri(Uri.parse('http://dartlang.org/path/to/foo/')),
-        'http://dartlang.org/path/to/foo/');
-    expect(context.fromUri(Uri.parse('file:///path/to/foo')),
-        'file:///path/to/foo');
-    expect(context.fromUri(Uri.parse('foo/bar')), 'foo/bar');
-    expect(context.fromUri(Uri.parse('http://dartlang.org/path/to/foo%23bar')),
-        'http://dartlang.org/path/to/foo%23bar');
-    // Since the resulting "path" is also a URL, special characters should
-    // remain percent-encoded in the result.
-    expect(context.fromUri(Uri.parse('_%7B_%7D_%60_%5E_%20_%22_%25_')),
-        r'_%7B_%7D_%60_%5E_%20_%22_%25_');
+  group('fromUri', () {
+    test('with a URI', () {
+      expect(context.fromUri(Uri.parse('http://dartlang.org/path/to/foo')),
+          'http://dartlang.org/path/to/foo');
+      expect(context.fromUri(Uri.parse('http://dartlang.org/path/to/foo/')),
+          'http://dartlang.org/path/to/foo/');
+      expect(context.fromUri(Uri.parse('file:///path/to/foo')),
+          'file:///path/to/foo');
+      expect(context.fromUri(Uri.parse('foo/bar')), 'foo/bar');
+      expect(context.fromUri(Uri.parse('http://dartlang.org/path/to/foo%23bar')),

[Bob Nystrom, 2014/03/18 20:31:09]

Long line.

[nweiz, 2014/03/18 22:02:19]

Done.

+          'http://dartlang.org/path/to/foo%23bar');
+      // Since the resulting "path" is also a URL, special characters should
+      // remain percent-encoded in the result.
+      expect(context.fromUri(Uri.parse('_%7B_%7D_%60_%5E_%20_%22_%25_')),
+          r'_%7B_%7D_%60_%5E_%20_%22_%25_');
+    });
+
+    test('with a string', () {
+      expect(context.fromUri('http://dartlang.org/path/to/foo'),
+          'http://dartlang.org/path/to/foo');
+    });
   });
 
   test('toUri', () {
     expect(context.toUri('http://dartlang.org/path/to/foo'),
         Uri.parse('http://dartlang.org/path/to/foo'));
     expect(context.toUri('http://dartlang.org/path/to/foo/'),
         Uri.parse('http://dartlang.org/path/to/foo/'));
     expect(context.toUri('file:///path/to/foo'),
         Uri.parse('file:///path/to/foo'));
     expect(context.toUri('foo/bar'), Uri.parse('foo/bar'));
     expect(context.toUri('http://dartlang.org/path/to/foo%23bar'),
         Uri.parse('http://dartlang.org/path/to/foo%23bar'));
     // Since the input path is also a URI, special characters should already
     // be percent encoded there too.
     expect(context.toUri(r'http://foo.com/_%7B_%7D_%60_%5E_%20_%22_%25_'),
         Uri.parse('http://foo.com/_%7B_%7D_%60_%5E_%20_%22_%25_'));
     expect(context.toUri(r'_%7B_%7D_%60_%5E_%20_%22_%25_'),
         Uri.parse('_%7B_%7D_%60_%5E_%20_%22_%25_'));
   });
 }