| Index: url/scheme_host_port_unittest.cc
|
| diff --git a/url/scheme_host_port_unittest.cc b/url/scheme_host_port_unittest.cc
|
| index a2b594c0614dafcb46a7d698826c3ff4d529be99..81d4371a85b04f5fbd0f2592e705ab6800115a42 100644
|
| --- a/url/scheme_host_port_unittest.cc
|
| +++ b/url/scheme_host_port_unittest.cc
|
| @@ -12,6 +12,28 @@
|
|
|
| namespace {
|
|
|
| +void ExpectParsedUrlsEqual(const GURL& a, const GURL& b) {
|
| + EXPECT_EQ(a, b);
|
| + const url::Parsed& a_parsed = a.parsed_for_possibly_invalid_spec();
|
| + const url::Parsed& b_parsed = b.parsed_for_possibly_invalid_spec();
|
| + EXPECT_EQ(a_parsed.scheme.begin, b_parsed.scheme.begin);
|
| + EXPECT_EQ(a_parsed.scheme.len, b_parsed.scheme.len);
|
| + EXPECT_EQ(a_parsed.username.begin, b_parsed.username.begin);
|
| + EXPECT_EQ(a_parsed.username.len, b_parsed.username.len);
|
| + EXPECT_EQ(a_parsed.password.begin, b_parsed.password.begin);
|
| + EXPECT_EQ(a_parsed.password.len, b_parsed.password.len);
|
| + EXPECT_EQ(a_parsed.host.begin, b_parsed.host.begin);
|
| + EXPECT_EQ(a_parsed.host.len, b_parsed.host.len);
|
| + EXPECT_EQ(a_parsed.port.begin, b_parsed.port.begin);
|
| + EXPECT_EQ(a_parsed.port.len, b_parsed.port.len);
|
| + EXPECT_EQ(a_parsed.path.begin, b_parsed.path.begin);
|
| + EXPECT_EQ(a_parsed.path.len, b_parsed.path.len);
|
| + EXPECT_EQ(a_parsed.query.begin, b_parsed.query.begin);
|
| + EXPECT_EQ(a_parsed.query.len, b_parsed.query.len);
|
| + EXPECT_EQ(a_parsed.ref.begin, b_parsed.ref.begin);
|
| + EXPECT_EQ(a_parsed.ref.len, b_parsed.ref.len);
|
| +}
|
| +
|
| TEST(SchemeHostPortTest, Invalid) {
|
| url::SchemeHostPort invalid;
|
| EXPECT_EQ("", invalid.scheme());
|
| @@ -37,6 +59,7 @@ TEST(SchemeHostPortTest, Invalid) {
|
| EXPECT_TRUE(tuple.Equals(tuple));
|
| EXPECT_TRUE(tuple.Equals(invalid));
|
| EXPECT_TRUE(invalid.Equals(tuple));
|
| + ExpectParsedUrlsEqual(GURL(tuple.Serialize()), tuple.GetURL());
|
| }
|
| }
|
|
|
| @@ -63,6 +86,7 @@ TEST(SchemeHostPortTest, ExplicitConstruction) {
|
| EXPECT_EQ(test.port, tuple.port());
|
| EXPECT_FALSE(tuple.IsInvalid());
|
| EXPECT_TRUE(tuple.Equals(tuple));
|
| + ExpectParsedUrlsEqual(GURL(tuple.Serialize()), tuple.GetURL());
|
| }
|
| }
|
|
|
| @@ -98,6 +122,7 @@ TEST(SchemeHostPortTest, InvalidConstruction) {
|
| EXPECT_EQ(0, tuple.port());
|
| EXPECT_TRUE(tuple.IsInvalid());
|
| EXPECT_TRUE(tuple.Equals(tuple));
|
| + ExpectParsedUrlsEqual(GURL(tuple.Serialize()), tuple.GetURL());
|
| }
|
| }
|
|
|
| @@ -125,6 +150,7 @@ TEST(SchemeHostPortTest, InvalidConstructionWithEmbeddedNulls) {
|
| EXPECT_EQ("", tuple.host());
|
| EXPECT_EQ(0, tuple.port());
|
| EXPECT_TRUE(tuple.IsInvalid());
|
| + ExpectParsedUrlsEqual(GURL(tuple.Serialize()), tuple.GetURL());
|
| }
|
| }
|
|
|
| @@ -160,6 +186,7 @@ TEST(SchemeHostPortTest, GURLConstruction) {
|
| EXPECT_EQ(test.port, tuple.port());
|
| EXPECT_FALSE(tuple.IsInvalid());
|
| EXPECT_TRUE(tuple.Equals(tuple));
|
| + ExpectParsedUrlsEqual(GURL(tuple.Serialize()), tuple.GetURL());
|
| }
|
| }
|
|
|
| @@ -184,6 +211,7 @@ TEST(SchemeHostPortTest, Serialization) {
|
| GURL url(test.url);
|
| url::SchemeHostPort tuple(url);
|
| EXPECT_EQ(test.expected, tuple.Serialize());
|
| + ExpectParsedUrlsEqual(GURL(tuple.Serialize()), tuple.GetURL());
|
| }
|
| }
|
|
|
|
|