Index: tests/compiler/dart2js/uri_extras_test.dart |
diff --git a/tests/compiler/dart2js/uri_extras_test.dart b/tests/compiler/dart2js/uri_extras_test.dart |
index 6e263d68f2553bc55d5d47bc489ce55ef49ffd22..b53db4bbb1025c282ae09346463ca99d243590d7 100644 |
--- a/tests/compiler/dart2js/uri_extras_test.dart |
+++ b/tests/compiler/dart2js/uri_extras_test.dart |
@@ -6,7 +6,6 @@ import "package:expect/expect.dart"; |
import 'package:compiler/src/util/uri_extras.dart'; |
- |
void testRelativize() { |
void c(String expected, String base, String path, bool isWindows) { |
if (isWindows == null) { |
@@ -27,18 +26,15 @@ void testRelativize() { |
Expect.stringEquals(expected, r); |
} |
- test(Uri.parse('file:$base'), |
- Uri.parse('file:$path')); |
+ test(Uri.parse('file:$base'), Uri.parse('file:$path')); |
- test(Uri.parse('FILE:$base'), |
- Uri.parse('FILE:$path')); |
+ test(Uri.parse('FILE:$base'), Uri.parse('FILE:$path')); |
- test(Uri.parse('file:$base'), |
- Uri.parse('FILE:$path')); |
+ test(Uri.parse('file:$base'), Uri.parse('FILE:$path')); |
- test(Uri.parse('FILE:$base'), |
- Uri.parse('file:$path')); |
+ test(Uri.parse('FILE:$base'), Uri.parse('file:$path')); |
} |
+ |
c('bar', '/', '/bar', null); |
c('bar', '/foo', '/bar', null); |
c('/bar', '/foo/', '/bar', null); |
@@ -51,44 +47,40 @@ void testRelativize() { |
c('BAR', '///c:/foo', '///c:/BAR', true); |
c('/c:/BAR', '///c:/foo/', '///c:/BAR', true); |
- c('../sdk/lib/_internal/compiler/implementation/dart2js.dart', |
- '///C:/Users/person/dart_checkout_for_stuff/dart/ReleaseIA32/dart.exe', |
- '///c:/Users/person/dart_checkout_for_stuff/dart/sdk/lib/_internal/compiler/' |
- 'implementation/dart2js.dart', |
- true); |
+ c( |
+ '../sdk/lib/_internal/compiler/implementation/dart2js.dart', |
+ '///C:/Users/person/dart_checkout_for_stuff/dart/ReleaseIA32/dart.exe', |
+ '///c:/Users/person/dart_checkout_for_stuff/dart/sdk/lib/_internal/compiler/' |
+ 'implementation/dart2js.dart', |
+ true); |
c('/Users/person/file.dart', '/users/person/', '/Users/person/file.dart', |
- false); |
+ false); |
c('file.dart', '/Users/person/', '/Users/person/file.dart', null); |
c('../person/file.dart', '/Users/other/', '/Users/person/file.dart', false); |
c('/Users/person/file.dart', '/Users/other/', '/Users/person/file.dart', |
- true); |
+ true); |
c('out.js.map', '/Users/person/out.js', '/Users/person/out.js.map', null); |
- c('../person/out.js.map', |
- '/Users/other/out.js', |
- '/Users/person/out.js.map', false); |
+ c('../person/out.js.map', '/Users/other/out.js', '/Users/person/out.js.map', |
+ false); |
- c('/Users/person/out.js.map', |
- '/Users/other/out.js', |
- '/Users/person/out.js.map', true); |
+ c('/Users/person/out.js.map', '/Users/other/out.js', |
+ '/Users/person/out.js.map', true); |
c('out.js', '/Users/person/out.js.map', '/Users/person/out.js', null); |
- c('../person/out.js', |
- '/Users/other/out.js.map', |
- '/Users/person/out.js', false); |
+ c('../person/out.js', '/Users/other/out.js.map', '/Users/person/out.js', |
+ false); |
- c('/Users/person/out.js', |
- '/Users/other/out.js.map', |
- '/Users/person/out.js', true); |
+ c('/Users/person/out.js', '/Users/other/out.js.map', '/Users/person/out.js', |
+ true); |
c('out.js', '/out.js.map', '/out.js', null); |
- |
} |
void main() { |