Updated suborigin serialization to latest spec proposal

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 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 // Basic tests that verify our KURL's interface behaves the same as the
 // original KURL's.
 
 #include "platform/weborigin/KURL.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/url_util.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 TEST(KURLTest, Getters)
 {
     struct GetterCase {
         const char* url;
@@ skipping 317 matching lines @@
     EXPECT_STREQ("http://www.google.com:8000/favicon.ico", kurl.getString().utf8().data());
 
     // Now let's test that giving an invalid replacement fails. Invalid
     // protocols fail without modifying the URL, which should remain valid.
     EXPECT_FALSE(kurl.setProtocol("f/sj#@"));
     EXPECT_TRUE(kurl.isValid());
 }
 
 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;
     EXPECT_TRUE(kurl.setProtocol("http"));
     EXPECT_TRUE(kurl.protocolIs("http"));
     EXPECT_FALSE(kurl.isValid());
 
+    EXPECT_TRUE(kurl.setProtocol("http-so"));
+    EXPECT_TRUE(kurl.protocolIs("http-so"));
+    EXPECT_FALSE(kurl.isValid());
+
     EXPECT_TRUE(kurl.setProtocol("https"));
     EXPECT_TRUE(kurl.protocolIs("https"));
     EXPECT_FALSE(kurl.isValid());
 
+    EXPECT_TRUE(kurl.setProtocol("https-so"));
+    EXPECT_TRUE(kurl.protocolIs("https-so"));
+    EXPECT_FALSE(kurl.isValid());
+
     EXPECT_TRUE(kurl.setProtocol("ftp"));
     EXPECT_TRUE(kurl.protocolIs("ftp"));
     EXPECT_FALSE(kurl.isValid());
 
     kurl = KURL(KURL(), "http://");
     EXPECT_TRUE(kurl.protocolIs("http"));
     EXPECT_FALSE(kurl.isValid());
 
+    kurl = KURL(KURL(), "http-so://");
+    EXPECT_TRUE(kurl.protocolIs("http-so"));
+    EXPECT_FALSE(kurl.isValid());
+
     kurl = KURL(KURL(), "https://");
     EXPECT_TRUE(kurl.protocolIs("https"));
     EXPECT_FALSE(kurl.isValid());
 
+    kurl = KURL(KURL(), "https-so://");
+    EXPECT_TRUE(kurl.protocolIs("https-so"));
+    EXPECT_FALSE(kurl.isValid());
+
     kurl = KURL(KURL(), "ftp://");
     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());
+
     kurl = KURL(KURL(), "https://host/");
     EXPECT_TRUE(kurl.isValid());
     kurl.setHost("");
     EXPECT_FALSE(kurl.isValid());
 
+    kurl = KURL(KURL(), "https-so://host/");
+    EXPECT_TRUE(kurl.isValid());
+    kurl.setHost("");
+    EXPECT_FALSE(kurl.isValid());
+
     kurl = KURL(KURL(), "ftp://host/");
     EXPECT_TRUE(kurl.isValid());
     kurl.setHost("");
     EXPECT_FALSE(kurl.isValid());
 
     kurl = KURL(KURL(), "http:///noodles/pho.php");
     EXPECT_STREQ("http://noodles/pho.php", kurl.getString().utf8().data());
     EXPECT_STREQ("noodles", kurl.host().utf8().data());
     EXPECT_TRUE(kurl.isValid());
 
@@ skipping 291 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