Optimize KURL protocols

third_party/WebKit/Source/platform/weborigin/KURLTest.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 349 matching lines @@
 
 TEST(KURLTest, Valid_HTTP_FTP_URLsHaveHosts) {
   // Since the suborigin schemes are added at the content layer, its
   // necessary it explicitly add them as standard schemes for this test. If
   // this is needed in the future across mulitple KURLTests, then KURLTest
   // should probably be converted to a test fixture with a proper SetUp()
   // method.
   url::AddStandardScheme("http-so", url::SCHEME_WITH_PORT);
   url::AddStandardScheme("https-so", url::SCHEME_WITH_PORT);
 
-  KURL kurl;
+  KURL kurl(ParsedURLString, "foo://www.google.com/");
   EXPECT_TRUE(kurl.setProtocol("http"));
   EXPECT_TRUE(kurl.protocolIs("http"));
-  EXPECT_FALSE(kurl.isValid());
+  EXPECT_TRUE(kurl.protocolIsInHTTPFamily());
+  EXPECT_TRUE(kurl.isValid());
 
   EXPECT_TRUE(kurl.setProtocol("http-so"));
   EXPECT_TRUE(kurl.protocolIs("http-so"));
-  EXPECT_FALSE(kurl.isValid());
+  EXPECT_TRUE(kurl.isValid());
 
   EXPECT_TRUE(kurl.setProtocol("https"));
   EXPECT_TRUE(kurl.protocolIs("https"));
-  EXPECT_FALSE(kurl.isValid());
+  EXPECT_TRUE(kurl.isValid());
 
   EXPECT_TRUE(kurl.setProtocol("https-so"));
   EXPECT_TRUE(kurl.protocolIs("https-so"));
-  EXPECT_FALSE(kurl.isValid());
+  EXPECT_TRUE(kurl.isValid());
 
   EXPECT_TRUE(kurl.setProtocol("ftp"));
   EXPECT_TRUE(kurl.protocolIs("ftp"));
-  EXPECT_FALSE(kurl.isValid());
+  EXPECT_TRUE(kurl.isValid());
 
   kurl = KURL(KURL(), "http://");
+  EXPECT_FALSE(kurl.protocolIs("http"));
+
+  kurl = KURL(KURL(), "http://wide#鸡");
   EXPECT_TRUE(kurl.protocolIs("http"));
-  EXPECT_FALSE(kurl.isValid());
+  EXPECT_EQ(kurl.protocol(), "http");
 
-  kurl = KURL(KURL(), "http-so://");
+  kurl = KURL(KURL(), "http-so://foo");
   EXPECT_TRUE(kurl.protocolIs("http-so"));
-  EXPECT_FALSE(kurl.isValid());
 
-  kurl = KURL(KURL(), "https://");
+  kurl = KURL(KURL(), "https://foo");
   EXPECT_TRUE(kurl.protocolIs("https"));
-  EXPECT_FALSE(kurl.isValid());
 
-  kurl = KURL(KURL(), "https-so://");
+  kurl = KURL(KURL(), "https-so://foo");
   EXPECT_TRUE(kurl.protocolIs("https-so"));
-  EXPECT_FALSE(kurl.isValid());
 
-  kurl = KURL(KURL(), "ftp://");
+  kurl = KURL(KURL(), "ftp://foo");
   EXPECT_TRUE(kurl.protocolIs("ftp"));
-  EXPECT_FALSE(kurl.isValid());
 
   kurl = KURL(KURL(), "http://host/");
   EXPECT_TRUE(kurl.isValid());
   kurl.setHost("");
   EXPECT_FALSE(kurl.isValid());
 
   kurl = KURL(KURL(), "http-so://host/");
   EXPECT_TRUE(kurl.isValid());
   kurl.setHost("");
   EXPECT_FALSE(kurl.isValid());
@@ skipping 272 matching lines @@
   KURL url1(ParsedURLString, "foo://bar");
   EXPECT_TRUE(url1.protocolIs("foo"));
   EXPECT_FALSE(url1.protocolIs("foo-bar"));
 
   KURL url2(ParsedURLString, "foo-bar:");
   EXPECT_TRUE(url2.protocolIs("foo-bar"));
   EXPECT_FALSE(url2.protocolIs("foo"));
 
   KURL invalidUTF8(ParsedURLString, "http://a@9%aa%:");
   EXPECT_FALSE(invalidUTF8.protocolIs("http"));
-  EXPECT_TRUE(invalidUTF8.protocolIs(""));
 
   KURL capital(KURL(), "HTTP://www.example.text");
   EXPECT_TRUE(capital.protocolIs("http"));
   EXPECT_EQ(capital.protocol(), "http");
 }
 
 TEST(KURLTest, strippedForUseAsReferrer) {
   struct ReferrerCase {
     const char* input;
     const char* output;
@@ skipping 12 matching lines @@
   };
 
   for (size_t i = 0; i < WTF_ARRAY_LENGTH(referrerCases); i++) {
     KURL kurl(ParsedURLString, referrerCases[i].input);
     String referrer = kurl.strippedForUseAsReferrer();
     EXPECT_STREQ(referrerCases[i].output, referrer.utf8().data());
   }
 }
 
 }  // namespace blink