| Index: runtime/vm/uri_test.cc
|
| diff --git a/runtime/vm/uri_test.cc b/runtime/vm/uri_test.cc
|
| index 14f26fbb444fc7326c0ffa6cd1773bf60d00c853..6c2bdd0a063c8a031644d55cec1a671db72fef32 100644
|
| --- a/runtime/vm/uri_test.cc
|
| +++ b/runtime/vm/uri_test.cc
|
| @@ -19,7 +19,6 @@ TEST_CASE(ParseUri_WithScheme_NoQueryNoUser) {
|
| EXPECT(uri.fragment == NULL);
|
| }
|
|
|
| -
|
| TEST_CASE(ParseUri_WithScheme_WithQuery) {
|
| ParsedUri uri;
|
| EXPECT(ParseUri("foo://example.com:8042/over/there?name=ferret", &uri));
|
| @@ -32,7 +31,6 @@ TEST_CASE(ParseUri_WithScheme_WithQuery) {
|
| EXPECT(uri.fragment == NULL);
|
| }
|
|
|
| -
|
| TEST_CASE(ParseUri_WithScheme_WithFragment) {
|
| ParsedUri uri;
|
| EXPECT(ParseUri("foo://example.com:8042/over/there#fragment", &uri));
|
| @@ -45,7 +43,6 @@ TEST_CASE(ParseUri_WithScheme_WithFragment) {
|
| EXPECT_STREQ("fragment", uri.fragment);
|
| }
|
|
|
| -
|
| TEST_CASE(ParseUri_WithScheme_WithQueryWithFragment) {
|
| ParsedUri uri;
|
| EXPECT(
|
| @@ -59,7 +56,6 @@ TEST_CASE(ParseUri_WithScheme_WithQueryWithFragment) {
|
| EXPECT_STREQ("fragment", uri.fragment);
|
| }
|
|
|
| -
|
| TEST_CASE(ParseUri_WithScheme_WithUser) {
|
| ParsedUri uri;
|
| EXPECT(ParseUri("foo://user@example.com:8042/over/there", &uri));
|
| @@ -72,7 +68,6 @@ TEST_CASE(ParseUri_WithScheme_WithUser) {
|
| EXPECT(uri.fragment == NULL);
|
| }
|
|
|
| -
|
| TEST_CASE(ParseUri_WithScheme_ShortPath) {
|
| ParsedUri uri;
|
| EXPECT(ParseUri("foo://example.com:8042/", &uri));
|
| @@ -85,7 +80,6 @@ TEST_CASE(ParseUri_WithScheme_ShortPath) {
|
| EXPECT(uri.fragment == NULL);
|
| }
|
|
|
| -
|
| TEST_CASE(ParseUri_WithScheme_EmptyPath) {
|
| ParsedUri uri;
|
| EXPECT(ParseUri("foo://example.com:8042", &uri));
|
| @@ -98,7 +92,6 @@ TEST_CASE(ParseUri_WithScheme_EmptyPath) {
|
| EXPECT(uri.fragment == NULL);
|
| }
|
|
|
| -
|
| TEST_CASE(ParseUri_WithScheme_Rootless1) {
|
| ParsedUri uri;
|
| EXPECT(ParseUri("foo:here", &uri));
|
| @@ -111,7 +104,6 @@ TEST_CASE(ParseUri_WithScheme_Rootless1) {
|
| EXPECT(uri.fragment == NULL);
|
| }
|
|
|
| -
|
| TEST_CASE(ParseUri_WithScheme_Rootless2) {
|
| ParsedUri uri;
|
| EXPECT(ParseUri("foo:or/here", &uri));
|
| @@ -124,7 +116,6 @@ TEST_CASE(ParseUri_WithScheme_Rootless2) {
|
| EXPECT(uri.fragment == NULL);
|
| }
|
|
|
| -
|
| TEST_CASE(ParseUri_NoScheme_AbsPath_WithAuthority) {
|
| ParsedUri uri;
|
| EXPECT(ParseUri("//example.com:8042/over/there", &uri));
|
| @@ -137,7 +128,6 @@ TEST_CASE(ParseUri_NoScheme_AbsPath_WithAuthority) {
|
| EXPECT(uri.fragment == NULL);
|
| }
|
|
|
| -
|
| TEST_CASE(ParseUri_NoScheme_AbsPath_NoAuthority) {
|
| ParsedUri uri;
|
| EXPECT(ParseUri("/over/there", &uri));
|
| @@ -150,7 +140,6 @@ TEST_CASE(ParseUri_NoScheme_AbsPath_NoAuthority) {
|
| EXPECT(uri.fragment == NULL);
|
| }
|
|
|
| -
|
| // Colons are permitted in path segments, in many cases.
|
| TEST_CASE(ParseUri_NoScheme_AbsPath_StrayColon) {
|
| ParsedUri uri;
|
| @@ -163,7 +152,6 @@ TEST_CASE(ParseUri_NoScheme_AbsPath_StrayColon) {
|
| EXPECT(uri.query == NULL);
|
| }
|
|
|
| -
|
| TEST_CASE(ParseUri_NoScheme_Rootless1) {
|
| ParsedUri uri;
|
| EXPECT(ParseUri("here", &uri));
|
| @@ -176,7 +164,6 @@ TEST_CASE(ParseUri_NoScheme_Rootless1) {
|
| EXPECT(uri.fragment == NULL);
|
| }
|
|
|
| -
|
| TEST_CASE(ParseUri_NoScheme_Rootless2) {
|
| ParsedUri uri;
|
| EXPECT(ParseUri("or/here", &uri));
|
| @@ -189,7 +176,6 @@ TEST_CASE(ParseUri_NoScheme_Rootless2) {
|
| EXPECT(uri.fragment == NULL);
|
| }
|
|
|
| -
|
| TEST_CASE(ParseUri_NoScheme_Empty) {
|
| ParsedUri uri;
|
| EXPECT(ParseUri("", &uri));
|
| @@ -202,7 +188,6 @@ TEST_CASE(ParseUri_NoScheme_Empty) {
|
| EXPECT(uri.fragment == NULL);
|
| }
|
|
|
| -
|
| TEST_CASE(ParseUri_NoScheme_QueryOnly) {
|
| ParsedUri uri;
|
| EXPECT(ParseUri("?name=ferret", &uri));
|
| @@ -215,7 +200,6 @@ TEST_CASE(ParseUri_NoScheme_QueryOnly) {
|
| EXPECT(uri.fragment == NULL);
|
| }
|
|
|
| -
|
| TEST_CASE(ParseUri_NoScheme_FragmentOnly) {
|
| ParsedUri uri;
|
| EXPECT(ParseUri("#fragment", &uri));
|
| @@ -228,7 +212,6 @@ TEST_CASE(ParseUri_NoScheme_FragmentOnly) {
|
| EXPECT_STREQ("fragment", uri.fragment);
|
| }
|
|
|
| -
|
| TEST_CASE(ParseUri_LowerCaseScheme) {
|
| ParsedUri uri;
|
| EXPECT(ParseUri("ScHeMe:path", &uri));
|
| @@ -241,7 +224,6 @@ TEST_CASE(ParseUri_LowerCaseScheme) {
|
| EXPECT(uri.fragment == NULL);
|
| }
|
|
|
| -
|
| TEST_CASE(ParseUri_NormalizeEscapes_PathQueryFragment) {
|
| ParsedUri uri;
|
| EXPECT(ParseUri("scheme:/This%09Is A P%61th?This%09Is A Qu%65ry#A Fr%61gment",
|
| @@ -255,7 +237,6 @@ TEST_CASE(ParseUri_NormalizeEscapes_PathQueryFragment) {
|
| EXPECT_STREQ("A%20Fragment", uri.fragment);
|
| }
|
|
|
| -
|
| TEST_CASE(ParseUri_NormalizeEscapes_UppercaseEscapesPreferred) {
|
| ParsedUri uri;
|
| EXPECT(ParseUri("scheme:/%1b%1B", &uri));
|
| @@ -268,7 +249,6 @@ TEST_CASE(ParseUri_NormalizeEscapes_UppercaseEscapesPreferred) {
|
| EXPECT(uri.fragment == NULL);
|
| }
|
|
|
| -
|
| TEST_CASE(ParseUri_NormalizeEscapes_Authority) {
|
| ParsedUri uri;
|
| EXPECT(ParseUri("scheme://UsEr N%61%4de@h%4FsT.c%6fm:80/", &uri));
|
| @@ -281,7 +261,6 @@ TEST_CASE(ParseUri_NormalizeEscapes_Authority) {
|
| EXPECT(uri.fragment == NULL);
|
| }
|
|
|
| -
|
| TEST_CASE(ParseUri_NormalizeEscapes_UppercaseEscapeInHost) {
|
| ParsedUri uri;
|
| EXPECT(ParseUri("scheme://tEst%1b/", &uri));
|
| @@ -294,7 +273,6 @@ TEST_CASE(ParseUri_NormalizeEscapes_UppercaseEscapeInHost) {
|
| EXPECT(uri.fragment == NULL);
|
| }
|
|
|
| -
|
| TEST_CASE(ParseUri_BrokenEscapeSequence) {
|
| ParsedUri uri;
|
| EXPECT(ParseUri("scheme:/%1g", &uri));
|
| @@ -307,7 +285,6 @@ TEST_CASE(ParseUri_BrokenEscapeSequence) {
|
| EXPECT(uri.fragment == NULL);
|
| }
|
|
|
| -
|
| TEST_CASE(ResolveUri_WithScheme_NoAuthorityNoQuery) {
|
| const char* target_uri;
|
| EXPECT(ResolveUri("rscheme:/ref/path",
|
| @@ -316,7 +293,6 @@ TEST_CASE(ResolveUri_WithScheme_NoAuthorityNoQuery) {
|
| EXPECT_STREQ("rscheme:/ref/path", target_uri);
|
| }
|
|
|
| -
|
| TEST_CASE(ResolveUri_WithScheme_WithAuthorityWithQuery) {
|
| const char* target_uri;
|
| EXPECT(ResolveUri("rscheme://ruser@rhost:22/ref/path?refQuery",
|
| @@ -325,7 +301,6 @@ TEST_CASE(ResolveUri_WithScheme_WithAuthorityWithQuery) {
|
| EXPECT_STREQ("rscheme://ruser@rhost:22/ref/path?refQuery", target_uri);
|
| }
|
|
|
| -
|
| TEST_CASE(ResolveUri_NoScheme_WithAuthority) {
|
| const char* target_uri;
|
| EXPECT(ResolveUri("//ruser@rhost:22/ref/path",
|
| @@ -334,7 +309,6 @@ TEST_CASE(ResolveUri_NoScheme_WithAuthority) {
|
| EXPECT_STREQ("bscheme://ruser@rhost:22/ref/path", target_uri);
|
| }
|
|
|
| -
|
| TEST_CASE(ResolveUri_NoSchemeNoAuthority_AbsolutePath) {
|
| const char* target_uri;
|
| EXPECT(ResolveUri("/ref/path", "bscheme://buser@bhost:11/base/path?baseQuery",
|
| @@ -342,7 +316,6 @@ TEST_CASE(ResolveUri_NoSchemeNoAuthority_AbsolutePath) {
|
| EXPECT_STREQ("bscheme://buser@bhost:11/ref/path", target_uri);
|
| }
|
|
|
| -
|
| TEST_CASE(ResolveUri_NoSchemeNoAuthority_RelativePath) {
|
| const char* target_uri;
|
| EXPECT(ResolveUri("ref/path", "bscheme://buser@bhost:11/base/path?baseQuery",
|
| @@ -350,21 +323,18 @@ TEST_CASE(ResolveUri_NoSchemeNoAuthority_RelativePath) {
|
| EXPECT_STREQ("bscheme://buser@bhost:11/base/ref/path", target_uri);
|
| }
|
|
|
| -
|
| TEST_CASE(ResolveUri_NoSchemeNoAuthority_RelativePathEmptyBasePath) {
|
| const char* target_uri;
|
| EXPECT(ResolveUri("ref/path", "bscheme://buser@bhost:11", &target_uri));
|
| EXPECT_STREQ("bscheme://buser@bhost:11/ref/path", target_uri);
|
| }
|
|
|
| -
|
| TEST_CASE(ResolveUri_NoSchemeNoAuthority_RelativePathWeirdBasePath) {
|
| const char* target_uri;
|
| EXPECT(ResolveUri("ref/path", "bscheme:base", &target_uri));
|
| EXPECT_STREQ("bscheme:ref/path", target_uri);
|
| }
|
|
|
| -
|
| TEST_CASE(ResolveUri_NoSchemeNoAuthority_EmptyPath) {
|
| const char* target_uri;
|
| EXPECT(ResolveUri("",
|
| @@ -374,7 +344,6 @@ TEST_CASE(ResolveUri_NoSchemeNoAuthority_EmptyPath) {
|
| EXPECT_STREQ("bscheme://buser@bhost:11/base/path?baseQuery", target_uri);
|
| }
|
|
|
| -
|
| TEST_CASE(ResolveUri_NoSchemeNoAuthority_EmptyPathWithQuery) {
|
| const char* target_uri;
|
| EXPECT(ResolveUri("?refQuery",
|
| @@ -383,7 +352,6 @@ TEST_CASE(ResolveUri_NoSchemeNoAuthority_EmptyPathWithQuery) {
|
| EXPECT_STREQ("bscheme://buser@bhost:11/base/path?refQuery", target_uri);
|
| }
|
|
|
| -
|
| TEST_CASE(ResolveUri_NoSchemeNoAuthority_EmptyPathWithFragment) {
|
| const char* target_uri;
|
| EXPECT(ResolveUri("#rfragment",
|
| @@ -393,35 +361,30 @@ TEST_CASE(ResolveUri_NoSchemeNoAuthority_EmptyPathWithFragment) {
|
| target_uri);
|
| }
|
|
|
| -
|
| TEST_CASE(ResolveUri_RemoveDots_RemoveOneDotSegment) {
|
| const char* target_uri;
|
| EXPECT(ResolveUri("./refpath", "scheme://auth/a/b/c/d", &target_uri));
|
| EXPECT_STREQ("scheme://auth/a/b/c/refpath", target_uri);
|
| }
|
|
|
| -
|
| TEST_CASE(ResolveUri_RemoveDots_RemoveTwoDotSegments) {
|
| const char* target_uri;
|
| EXPECT(ResolveUri("././refpath", "scheme://auth/a/b/c/d", &target_uri));
|
| EXPECT_STREQ("scheme://auth/a/b/c/refpath", target_uri);
|
| }
|
|
|
| -
|
| TEST_CASE(ResolveUri_RemoveDots_RemoveOneDotDotSegment) {
|
| const char* target_uri;
|
| EXPECT(ResolveUri("../refpath", "scheme://auth/a/b/c/d", &target_uri));
|
| EXPECT_STREQ("scheme://auth/a/b/refpath", target_uri);
|
| }
|
|
|
| -
|
| TEST_CASE(ResolveUri_RemoveDots_RemoveTwoDotDotSegments) {
|
| const char* target_uri;
|
| EXPECT(ResolveUri("../../refpath", "scheme://auth/a/b/c/d", &target_uri));
|
| EXPECT_STREQ("scheme://auth/a/refpath", target_uri);
|
| }
|
|
|
| -
|
| TEST_CASE(ResolveUri_RemoveDots_RemoveTooManyDotDotSegments) {
|
| const char* target_uri;
|
| EXPECT(ResolveUri("../../../../../../../../../refpath",
|
| @@ -429,28 +392,24 @@ TEST_CASE(ResolveUri_RemoveDots_RemoveTooManyDotDotSegments) {
|
| EXPECT_STREQ("scheme://auth/refpath", target_uri);
|
| }
|
|
|
| -
|
| TEST_CASE(ResolveUri_RemoveDots_RemoveDotSegmentsNothingLeft1) {
|
| const char* target_uri;
|
| EXPECT(ResolveUri("../../../../..", "scheme://auth/a/b/c/d", &target_uri));
|
| EXPECT_STREQ("scheme://auth/", target_uri);
|
| }
|
|
|
| -
|
| TEST_CASE(ResolveUri_RemoveDots_RemoveDotSegmentsNothingLeft2) {
|
| const char* target_uri;
|
| EXPECT(ResolveUri(".", "scheme://auth/", &target_uri));
|
| EXPECT_STREQ("scheme://auth/", target_uri);
|
| }
|
|
|
| -
|
| TEST_CASE(ResolveUri_RemoveDots_RemoveDotSegmentsInitialPrefix) {
|
| const char* target_uri;
|
| EXPECT(ResolveUri("../../../../refpath", "scheme://auth", &target_uri));
|
| EXPECT_STREQ("scheme://auth/refpath", target_uri);
|
| }
|
|
|
| -
|
| TEST_CASE(ResolveUri_RemoveDots_RemoveDotSegmentsMixed) {
|
| const char* target_uri;
|
| EXPECT(ResolveUri("../../1/./2/../3/4/../5/././6/../7",
|
| @@ -458,7 +417,6 @@ TEST_CASE(ResolveUri_RemoveDots_RemoveDotSegmentsMixed) {
|
| EXPECT_STREQ("scheme://auth/a/b/1/3/5/7", target_uri);
|
| }
|
|
|
| -
|
| TEST_CASE(ResolveUri_NormalizeEscapes_PathQueryFragment) {
|
| const char* target_uri;
|
| EXPECT(ResolveUri("#A Fr%61gment",
|
| @@ -469,14 +427,12 @@ TEST_CASE(ResolveUri_NormalizeEscapes_PathQueryFragment) {
|
| target_uri);
|
| }
|
|
|
| -
|
| TEST_CASE(ResolveUri_NormalizeEscapes_UppercaseHexPreferred) {
|
| const char* target_uri;
|
| EXPECT(ResolveUri("", "scheme:/%1b%1B", &target_uri));
|
| EXPECT_STREQ("scheme:/%1B%1B", target_uri);
|
| }
|
|
|
| -
|
| TEST_CASE(ResolveUri_NormalizeEscapes_Authority) {
|
| const char* target_uri;
|
| EXPECT(
|
| @@ -486,7 +442,6 @@ TEST_CASE(ResolveUri_NormalizeEscapes_Authority) {
|
| EXPECT_STREQ("scheme://UsEr%20NaMe@host.com:80/", target_uri);
|
| }
|
|
|
| -
|
| TEST_CASE(ResolveUri_NormalizeEscapes_BrokenEscapeSequence) {
|
| const char* target_uri;
|
| EXPECT(ResolveUri("", "scheme:/%1g", &target_uri));
|
| @@ -494,7 +449,6 @@ TEST_CASE(ResolveUri_NormalizeEscapes_BrokenEscapeSequence) {
|
| EXPECT_STREQ("scheme:/%1g", target_uri);
|
| }
|
|
|
| -
|
| TEST_CASE(ResolveUri_DataUri) {
|
| const char* data_uri =
|
| "data:application/"
|
| @@ -548,14 +502,12 @@ TEST_CASE(ResolveUri_RelativeBase_NotImplemented) {
|
| EXPECT(target_uri == NULL);
|
| }
|
|
|
| -
|
| static const char* TestResolve(const char* base_uri, const char* uri) {
|
| const char* target_uri;
|
| EXPECT(ResolveUri(uri, base_uri, &target_uri));
|
| return target_uri;
|
| }
|
|
|
| -
|
| // This test is ported from sdk/tests/corelib/uri_test.dart (testUriPerRFCs).
|
| TEST_CASE(ResolveUri_TestUriPerRFCs) {
|
| const char* base = "http://a/b/c/d;p?q";
|
| @@ -611,7 +563,6 @@ TEST_CASE(ResolveUri_TestUriPerRFCs) {
|
| EXPECT_STREQ("s:/c", TestResolve(base, "../c"));
|
| }
|
|
|
| -
|
| // This test is ported from sdk/tests/corelib/uri_test.dart (testResolvePath).
|
| TEST_CASE(ResolveUri_MoreDotSegmentTests) {
|
| const char* base = "/";
|
|
|