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

pkg/path/test/windows_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 path.test.windows_test;
 
 import 'package:unittest/unittest.dart';
 import 'package:path/path.dart' as path;
 
 import 'utils.dart';
@@ skipping 572 matching lines @@
     expect(context.withoutExtension(r'a\.'), r'a\.');
     expect(context.withoutExtension(r'a\.b'), r'a\.b');
     expect(context.withoutExtension(r'a.b\c'), r'a.b\c');
     expect(context.withoutExtension(r'a/b.c/d'), r'a/b.c/d');
     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(r'a.b/c'), r'a.b/c');
     expect(context.withoutExtension(r'a\b.c\'), r'a\b\');
   });
 
-  test('fromUri', () {
-    expect(context.fromUri(Uri.parse('file:///C:/path/to/foo')),
-        r'C:\path\to\foo');
-    expect(context.fromUri(Uri.parse('file://server/share/path/to/foo')),
-        r'\\server\share\path\to\foo');
-    expect(context.fromUri(Uri.parse('file:///C:/')), r'C:\');
-    expect(context.fromUri(Uri.parse('file://server/share')),
-        r'\\server\share');
-    expect(context.fromUri(Uri.parse('foo/bar')), r'foo\bar');
-    expect(context.fromUri(Uri.parse('/C:/path/to/foo')), r'C:\path\to\foo');
-    expect(context.fromUri(Uri.parse('///C:/path/to/foo')), r'C:\path\to\foo');
-    expect(context.fromUri(Uri.parse('//server/share/path/to/foo')),
-        r'\\server\share\path\to\foo');
-    expect(context.fromUri(Uri.parse('file:///C:/path/to/foo%23bar')),
-        r'C:\path\to\foo#bar');
-    expect(context.fromUri(Uri.parse('file://server/share/path/to/foo%23bar')),
-        r'\\server\share\path\to\foo#bar');
-    expect(context.fromUri(Uri.parse('_%7B_%7D_%60_%5E_%20_%22_%25_')),
-        r'_{_}_`_^_ _"_%_');
-    expect(() => context.fromUri(Uri.parse('http://dartlang.org')),
-        throwsArgumentError);
+  group('fromUri', () {
+    test('with a URI', () {
+      expect(context.fromUri(Uri.parse('file:///C:/path/to/foo')),
+          r'C:\path\to\foo');
+      expect(context.fromUri(Uri.parse('file://server/share/path/to/foo')),
+          r'\\server\share\path\to\foo');
+      expect(context.fromUri(Uri.parse('file:///C:/')), r'C:\');
+      expect(context.fromUri(Uri.parse('file://server/share')),
+          r'\\server\share');
+      expect(context.fromUri(Uri.parse('foo/bar')), r'foo\bar');
+      expect(context.fromUri(Uri.parse('/C:/path/to/foo')), r'C:\path\to\foo');
+      expect(context.fromUri(Uri.parse('///C:/path/to/foo')), r'C:\path\to\foo');

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

Long lines.

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

Done.

+      expect(context.fromUri(Uri.parse('//server/share/path/to/foo')),
+          r'\\server\share\path\to\foo');
+      expect(context.fromUri(Uri.parse('file:///C:/path/to/foo%23bar')),
+          r'C:\path\to\foo#bar');
+      expect(context.fromUri(Uri.parse('file://server/share/path/to/foo%23bar')),
+          r'\\server\share\path\to\foo#bar');
+      expect(context.fromUri(Uri.parse('_%7B_%7D_%60_%5E_%20_%22_%25_')),
+          r'_{_}_`_^_ _"_%_');
+      expect(() => context.fromUri(Uri.parse('http://dartlang.org')),
+          throwsArgumentError);
+    });
+
+    test('with a string', () {
+      expect(context.fromUri('file:///C:/path/to/foo'), r'C:\path\to\foo');
+    });
   });
 
   test('toUri', () {
     expect(context.toUri(r'C:\path\to\foo'),
         Uri.parse('file:///C:/path/to/foo'));
     expect(context.toUri(r'C:\path\to\foo\'),
         Uri.parse('file:///C:/path/to/foo/'));
     expect(context.toUri(r'C:\'), Uri.parse('file:///C:/'));
     expect(context.toUri(r'\\server\share'), Uri.parse('file://server/share'));
     expect(context.toUri(r'\\server\share\'),
         Uri.parse('file://server/share/'));
     expect(context.toUri(r'foo\bar'), Uri.parse('foo/bar'));
     expect(context.toUri(r'C:\path\to\foo#bar'),
         Uri.parse('file:///C:/path/to/foo%23bar'));
     expect(context.toUri(r'\\server\share\path\to\foo#bar'),
         Uri.parse('file://server/share/path/to/foo%23bar'));
     expect(context.toUri(r'C:\_{_}_`_^_ _"_%_'),
         Uri.parse('file:///C:/_%7B_%7D_%60_%5E_%20_%22_%25_'));
     expect(context.toUri(r'_{_}_`_^_ _"_%_'),
         Uri.parse('_%7B_%7D_%60_%5E_%20_%22_%25_'));
   });
 }