| Index: packages/package_config/test/parse_test.dart
|
| diff --git a/packages/package_config/test/parse_test.dart b/packages/package_config/test/parse_test.dart
|
| index 8ed5c2eb79b953b1db93359286c9a69bd141b6b8..7a2fce7e2e2bdee9ba1082eee2df7578ae5a8898 100644
|
| --- a/packages/package_config/test/parse_test.dart
|
| +++ b/packages/package_config/test/parse_test.dart
|
| @@ -73,8 +73,7 @@ main() {
|
|
|
| test("multiple", () {
|
| var packages = doParse(multiRelativeSample, base);
|
| - expect(
|
| - packages.packages.toList()..sort(), equals(["bar", "foo"]));
|
| + expect(packages.packages.toList()..sort(), equals(["bar", "foo"]));
|
| expect(packages.resolve(Uri.parse("package:foo/bar/baz.dart")),
|
| equals(base.resolve("../test/").resolve("bar/baz.dart")));
|
| expect(packages.resolve(Uri.parse("package:bar/foo/baz.dart")),
|
| @@ -135,33 +134,32 @@ Packages doParse(String sample, Uri baseUri) {
|
| }
|
|
|
| // Valid samples.
|
| -var emptySample = "";
|
| -var commentOnlySample = "# comment only\n";
|
| -var emptyLinesSample = "\n\n\r\n";
|
| -var singleRelativeSample = "foo:../test/\n";
|
| -var singleRelativeSampleNoSlash = "foo:../test\n";
|
| +var emptySample = "";
|
| +var commentOnlySample = "# comment only\n";
|
| +var emptyLinesSample = "\n\n\r\n";
|
| +var singleRelativeSample = "foo:../test/\n";
|
| +var singleRelativeSampleNoSlash = "foo:../test\n";
|
| var singleRelativeSampleNoNewline = "foo:../test/";
|
| -var singleAbsoluteSample = "foo:http://example.com/some/where/\n";
|
| -var singleEmptyPathSample = "foo:\n";
|
| -var singleAbsolutePathSample = "foo:/test/\n";
|
| -var multiRelativeSample = "foo:../test/\nbar:../test2/\n";
|
| +var singleAbsoluteSample = "foo:http://example.com/some/where/\n";
|
| +var singleEmptyPathSample = "foo:\n";
|
| +var singleAbsolutePathSample = "foo:/test/\n";
|
| +var multiRelativeSample = "foo:../test/\nbar:../test2/\n";
|
| // All valid path segment characters in an URI.
|
| -var allValidChars =
|
| - r"!$&'()*+,-.0123456789;="
|
| +var allValidChars = r"!$&'()*+,-.0123456789;="
|
| r"@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~";
|
|
|
| var allValidCharsSample = "${allValidChars}:../test/\n";
|
|
|
| // Invalid samples.
|
| var invalid = [
|
| - ":baz.dart", // empty.
|
| - "foobar=baz.dart", // no colon (but an equals, which is not the same)
|
| - ".:../test/", // dot segment
|
| - "..:../test/", // dot-dot segment
|
| - "...:../test/", // dot-dot-dot segment
|
| - "foo/bar:../test/", // slash in name
|
| - "/foo:../test/", // slash at start of name
|
| - "?:../test/", // invalid characters.
|
| - "[:../test/", // invalid characters.
|
| - "x#:../test/", // invalid characters.
|
| + ":baz.dart", // empty.
|
| + "foobar=baz.dart", // no colon (but an equals, which is not the same)
|
| + ".:../test/", // dot segment
|
| + "..:../test/", // dot-dot segment
|
| + "...:../test/", // dot-dot-dot segment
|
| + "foo/bar:../test/", // slash in name
|
| + "/foo:../test/", // slash at start of name
|
| + "?:../test/", // invalid characters.
|
| + "[:../test/", // invalid characters.
|
| + "x#:../test/", // invalid characters.
|
| ];
|
|
|