Roll WebKit to 47010

webkit/tools/webcore_unit_tests/GKURL_unittest.cpp

 // Copyright (c) 2008, 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 83 matching lines @@
     // UTF-8
     WebCore::KURL gurl(cases[i].url);
 
     EXPECT_EQ(cases[i].protocol, gurl.protocol());
     EXPECT_EQ(cases[i].host, gurl.host());
     EXPECT_EQ(cases[i].port, gurl.port());
     EXPECT_EQ(cases[i].user, gurl.user());
     EXPECT_EQ(cases[i].pass, gurl.pass());
     EXPECT_EQ(cases[i].last_path_component, gurl.lastPathComponent());
     EXPECT_EQ(cases[i].query, gurl.query());
-    EXPECT_EQ(cases[i].ref, gurl.ref());
-    EXPECT_EQ(cases[i].has_ref, gurl.hasRef());
+    EXPECT_EQ(cases[i].ref, gurl.fragmentIdentifier());
+    EXPECT_EQ(cases[i].has_ref, gurl.hasFragmentIdentifier());
 
     // UTF-16
     string16 wstr(UTF8ToUTF16(cases[i].url));
     WebCore::String utf16(
         reinterpret_cast<const ::UChar*>(wstr.c_str()),
         static_cast<int>(wstr.length()));
     gurl = WebCore::KURL(utf16);
 
     EXPECT_EQ(cases[i].protocol, gurl.protocol());
     EXPECT_EQ(cases[i].host, gurl.host());
     EXPECT_EQ(cases[i].port, gurl.port());
     EXPECT_EQ(cases[i].user, gurl.user());
     EXPECT_EQ(cases[i].pass, gurl.pass());
     EXPECT_EQ(cases[i].last_path_component, gurl.lastPathComponent());
     EXPECT_EQ(cases[i].query, gurl.query());
-    EXPECT_EQ(cases[i].ref, gurl.ref());
-    EXPECT_EQ(cases[i].has_ref, gurl.hasRef());
+    EXPECT_EQ(cases[i].ref, gurl.fragmentIdentifier());
+    EXPECT_EQ(cases[i].has_ref, gurl.hasFragmentIdentifier());
   }
 }
 
 // Test a few cases where we're different just to make sure we give reasonable
 // output.
 TEST(GKURL, DifferentGetters) {
   ComponentCase cases[] = {
      // url                                   protocol      host        port  user  pass    path                last_path query      ref
 
     // Old WebKit allows references and queries in what we call "path" URLs
@@ skipping 17 matching lines @@
     EXPECT_EQ(cases[i].protocol, gurl.protocol());
     EXPECT_EQ(cases[i].host, gurl.host());
     EXPECT_EQ(cases[i].port, gurl.port());
     EXPECT_EQ(cases[i].user, gurl.user());
     EXPECT_EQ(cases[i].pass, gurl.pass());
     EXPECT_EQ(cases[i].last_path, gurl.lastPathComponent());
     EXPECT_EQ(cases[i].query, gurl.query());
     // Want to compare UCS-16 refs (or to NULL).
     if (cases[i].ref) {
       EXPECT_EQ(webkit_glue::StdWStringToString(UTF8ToWide(cases[i].ref)),
-                gurl.ref());
+                gurl.fragmentIdentifier());
     } else {
-      EXPECT_TRUE(gurl.ref().isNull());
+      EXPECT_TRUE(gurl.fragmentIdentifier().isNull());
     }
   }
 }
 
 // Ensures that both ASCII and UTF-8 canonical URLs are handled properly and we
 // get the correct string object out.
 TEST(GKURL, UTF8) {
   const char ascii_url[] = "http://foo/bar#baz";
   WebCore::KURL ascii_gurl(ascii_url);
   EXPECT_TRUE(ascii_gurl.string() == WebCore::String(ascii_url));
@@ skipping 266 matching lines @@
   gurl.setQuery(query);
   EXPECT_STREQ("http://www.google.com/search?foo=bar",
                gurl.string().utf8().data());
 }
 
 TEST(GKURL, Ref) {
   WebCore::KURL gurl("http://foo/bar#baz");
 
   // Basic ref setting.
   WebCore::KURL cur("http://foo/bar");
-  cur.setRef("asdf");
+  cur.setFragmentIdentifier("asdf");
   EXPECT_STREQ("http://foo/bar#asdf", cur.string().utf8().data());
   cur = gurl;
-  cur.setRef("asdf");
+  cur.setFragmentIdentifier("asdf");
   EXPECT_STREQ("http://foo/bar#asdf", cur.string().utf8().data());
 
   // Setting a ref to the empty string will set it to "#".
   cur = WebCore::KURL("http://foo/bar");
-  cur.setRef("");
+  cur.setFragmentIdentifier("");
   EXPECT_STREQ("http://foo/bar#", cur.string().utf8().data());
   cur = gurl;
-  cur.setRef("");
+  cur.setFragmentIdentifier("");
   EXPECT_STREQ("http://foo/bar#", cur.string().utf8().data());
 
   // Setting the ref to the null string will clear it altogether.
   cur = WebCore::KURL("http://foo/bar");
-  cur.setRef(WebCore::String());
+  cur.setFragmentIdentifier(WebCore::String());
   EXPECT_STREQ("http://foo/bar", cur.string().utf8().data());
   cur = gurl;
-  cur.setRef(WebCore::String());
+  cur.setFragmentIdentifier(WebCore::String());
   EXPECT_STREQ("http://foo/bar", cur.string().utf8().data());
 }
 
 TEST(GKURL, Empty) {
   WebCore::KURL gurl;
 
   // First test that regular empty URLs are the same.
   EXPECT_TRUE(gurl.isEmpty());
   EXPECT_FALSE(gurl.isValid());
   EXPECT_TRUE(gurl.isNull());
@@ skipping 112 matching lines @@
   const char url[] = "http://www.google.com/";
   WebCore::KURL src(url);
   EXPECT_TRUE(src.string() == url);  // This really just initializes the cache.
   WebCore::KURL dest = src.copy();
   EXPECT_TRUE(dest.string() == url);  // This really just initializes the cache.
 
   // The pointers should be different for both UTF-8 and UTF-16.
   EXPECT_NE(dest.string().characters(), src.string().characters());
   EXPECT_NE(dest.utf8String().data(), src.utf8String().data());
 }