Update WebKit to r58033

webkit/glue/dom_serializer_unittest.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/hash_tables.h"
 #include "base/utf_string_conversions.h"
 #include "net/base/net_util.h"
@@ skipping 263 matching lines @@
       // Get actual charset info.
       charset_info = content.substr(start_pos, end_pos - start_pos);
       return true;
     }
   }
   return true;
 }
 
 // If original contents have document type, the serialized contents also have
 // document type.
-TEST_F(DomSerializerTests, SerialzeHTMLDOMWithDocType) {
+TEST_F(DomSerializerTests, SerializeHTMLDOMWithDocType) {
   FilePath page_file_path = data_dir_;
   page_file_path = page_file_path.AppendASCII("dom_serializer");
   page_file_path = page_file_path.AppendASCII("youtube_1.htm");
   GURL file_url = net::FilePathToFileURL(page_file_path);
   ASSERT_TRUE(file_url.SchemeIsFile());
   // Load the test file.
   LoadPageFromURL(file_url);
   // Make sure original contents have document type.
   WebFrame* web_frame = FindSubFrameByURL(test_shell_->webView(), file_url);
   ASSERT_TRUE(web_frame != NULL);
   WebDocument doc = web_frame->document();
   ASSERT_TRUE(HasDocType(doc));
   // Do serialization.
   SerializeDomForURL(file_url, false);
   // Load the serialized contents.
   ASSERT_TRUE(HasSerializedFrame(file_url));
   const std::string& serialized_contents =
       GetSerializedContentForFrame(file_url);
   LoadContents(serialized_contents, file_url,
                web_frame->encoding());
   // Make sure serialized contents still have document type.
   web_frame = test_shell_->webView()->mainFrame();
   doc = web_frame->document();
   ASSERT_TRUE(HasDocType(doc));
 }
 
 // If original contents do not have document type, the serialized contents
 // also do not have document type.
-TEST_F(DomSerializerTests, SerialzeHTMLDOMWithoutDocType) {
+TEST_F(DomSerializerTests, SerializeHTMLDOMWithoutDocType) {
   FilePath page_file_path = data_dir_;
   page_file_path = page_file_path.AppendASCII("dom_serializer");
   page_file_path = page_file_path.AppendASCII("youtube_2.htm");
   GURL file_url = net::FilePathToFileURL(page_file_path);
   ASSERT_TRUE(file_url.SchemeIsFile());
   // Load the test file.
   LoadPageFromURL(file_url);
   // Make sure original contents do not have document type.
   WebFrame* web_frame = FindSubFrameByURL(test_shell_->webView(), file_url);
   ASSERT_TRUE(web_frame != NULL);
   WebDocument doc = web_frame->document();
   ASSERT_TRUE(!HasDocType(doc));
   // Do serialization.
   SerializeDomForURL(file_url, false);
   // Load the serialized contents.
   ASSERT_TRUE(HasSerializedFrame(file_url));
   const std::string& serialized_contents =
       GetSerializedContentForFrame(file_url);
   LoadContents(serialized_contents, file_url,
                web_frame->encoding());
   // Make sure serialized contents do not have document type.
   web_frame = test_shell_->webView()->mainFrame();
   doc = web_frame->document();
   ASSERT_TRUE(!HasDocType(doc));
 }
 
 // Serialize XML document which has all 5 built-in entities. After
 // finishing serialization, the serialized contents should be same
 // with original XML document.
-TEST_F(DomSerializerTests, SerialzeXMLDocWithBuiltInEntities) {
+TEST_F(DomSerializerTests, SerializeXMLDocWithBuiltInEntities) {
   FilePath page_file_path = data_dir_;
   page_file_path = page_file_path.AppendASCII("dom_serializer");
   page_file_path = page_file_path.AppendASCII("note.xml");
   // Read original contents for later comparison.
   std::string original_contents;
   ASSERT_TRUE(file_util::ReadFileToString(page_file_path, &original_contents));
   // Get file URL.
   GURL file_url = net::FilePathToFileURL(page_file_path);
   ASSERT_TRUE(file_url.SchemeIsFile());
   // Load the test file.
   LoadPageFromURL(file_url);
   // Do serialization.
   SerializeDomForURL(file_url, false);
   // Compare the serialized contents with original contents.
   ASSERT_TRUE(HasSerializedFrame(file_url));
   const std::string& serialized_contents =
       GetSerializedContentForFrame(file_url);
   ASSERT_EQ(original_contents, serialized_contents);
 }
 
 // When serializing DOM, we add MOTW declaration before html tag.
-TEST_F(DomSerializerTests, SerialzeHTMLDOMWithAddingMOTW) {
+TEST_F(DomSerializerTests, SerializeHTMLDOMWithAddingMOTW) {
   FilePath page_file_path = data_dir_;
   page_file_path = page_file_path.AppendASCII("dom_serializer");
   page_file_path = page_file_path.AppendASCII("youtube_2.htm");
   // Read original contents for later comparison .
   std::string original_contents;
   ASSERT_TRUE(file_util::ReadFileToString(page_file_path, &original_contents));
   // Get file URL.
   GURL file_url = net::FilePathToFileURL(page_file_path);
   ASSERT_TRUE(file_url.SchemeIsFile());
   // Make sure original contents does not have MOTW;
@@ skipping 13 matching lines @@
   const std::string& serialized_contents =
       GetSerializedContentForFrame(file_url);
   ASSERT_FALSE(std::string::npos ==
       serialized_contents.find(motw_declaration));
 }
 
 // When serializing DOM, we will add the META which have correct charset
 // declaration as first child of HEAD element for resolving WebKit bug:
 // http://bugs.webkit.org/show_bug.cgi?id=16621 even the original document
 // does not have META charset declaration.
-TEST_F(DomSerializerTests, SerialzeHTMLDOMWithNoMetaCharsetInOriginalDoc) {
+TEST_F(DomSerializerTests, SerializeHTMLDOMWithNoMetaCharsetInOriginalDoc) {
   FilePath page_file_path = data_dir_;
   page_file_path = page_file_path.AppendASCII("dom_serializer");
   page_file_path = page_file_path.AppendASCII("youtube_1.htm");
   // Get file URL.
   GURL file_url = net::FilePathToFileURL(page_file_path);
   ASSERT_TRUE(file_url.SchemeIsFile());
   // Load the test file.
   LoadPageFromURL(file_url);
 
   // Make sure there is no META charset declaration in original document.
@@ skipping 42 matching lines @@
     if (IsMetaElement(child, charset_info))
       ASSERT_TRUE(charset_info.empty());
   }
 }
 
 // When serializing DOM, if the original document has multiple META charset
 // declaration, we will add the META which have correct charset declaration
 // as first child of HEAD element and remove all original META charset
 // declarations.
 TEST_F(DomSerializerTests,
-       SerialzeHTMLDOMWithMultipleMetaCharsetInOriginalDoc) {
+       SerializeHTMLDOMWithMultipleMetaCharsetInOriginalDoc) {
   FilePath page_file_path = data_dir_;
   page_file_path = page_file_path.AppendASCII("dom_serializer");
   page_file_path = page_file_path.AppendASCII("youtube_2.htm");
   // Get file URL.
   GURL file_url = net::FilePathToFileURL(page_file_path);
   ASSERT_TRUE(file_url.SchemeIsFile());
   // Load the test file.
   LoadPageFromURL(file_url);
 
   // Make sure there are multiple META charset declarations in original
@@ skipping 43 matching lines @@
   // Make sure no more additional META tags which have charset declaration.
   for (WebNode child = meta_node.nextSibling(); !child.isNull();
        child = child.nextSibling()) {
     std::string charset_info;
     if (IsMetaElement(child, charset_info))
       ASSERT_TRUE(charset_info.empty());
   }
 }
 
 // Test situation of html entities in text when serializing HTML DOM.
-TEST_F(DomSerializerTests, SerialzeHTMLDOMWithEntitiesInText) {
+TEST_F(DomSerializerTests, SerializeHTMLDOMWithEntitiesInText) {
   FilePath page_file_path = data_dir_;
   page_file_path = page_file_path.AppendASCII(
       "dom_serializer/htmlentities_in_text.htm");
   // Get file URL. The URL is dummy URL to identify the following loading
   // actions. The test content is in constant:original_contents.
   GURL file_url = net::FilePathToFileURL(page_file_path);
   ASSERT_TRUE(file_url.SchemeIsFile());
   // Test contents.
   static const char* const original_contents =
-      "<HTML><BODY>&amp;&lt;&gt;\"\'</BODY></HTML>";
+      "<html><body>&amp;&lt;&gt;\"\'</body></html>";
   // Load the test contents.
   LoadContents(original_contents, file_url, WebString());
 
   // Get BODY's text content in DOM.
   WebFrame* web_frame = FindSubFrameByURL(test_shell_->webView(), file_url);
   ASSERT_TRUE(web_frame != NULL);
   WebDocument doc = web_frame->document();
   ASSERT_TRUE(doc.isHTMLDocument());
   WebElement body_ele = doc.body();
   ASSERT_TRUE(!body_ele.isNull());
@@ skipping 13 matching lines @@
   // need to add MOTW to original_contents.
   std::string original_str =
     WebPageSerializer::generateMarkOfTheWebDeclaration(file_url).utf8();
   original_str += original_contents;
   // Since WebCore now inserts a new HEAD element if there is no HEAD element
   // when creating BODY element. (Please see HTMLParser::bodyCreateErrorCheck.)
   // We need to append the HEAD content and corresponding META content if we
   // find WebCore-generated HEAD element.
   if (!doc.head().isNull()) {
     WebString encoding = web_frame->encoding();
-    std::string htmlTag("<HTML>");
+    std::string htmlTag("<html>");
     std::string::size_type pos = original_str.find(htmlTag);
     ASSERT_NE(std::string::npos, pos);
     pos += htmlTag.length();
-    std::string head_part("<HEAD>");
+    std::string head_part("<head>");
     head_part +=
         WebPageSerializer::generateMetaCharsetDeclaration(encoding).utf8();
-    head_part += "</HEAD>";
+    head_part += "</head>";
     original_str.insert(pos, head_part);
   }
   ASSERT_EQ(original_str, serialized_contents);
 }
 
 // Test situation of html entities in attribute value when serializing
 // HTML DOM.
-TEST_F(DomSerializerTests, SerialzeHTMLDOMWithEntitiesInAttributeValue) {
+TEST_F(DomSerializerTests, SerializeHTMLDOMWithEntitiesInAttributeValue) {
   FilePath page_file_path = data_dir_;
   page_file_path = page_file_path.AppendASCII(
       "dom_serializer/htmlentities_in_attribute_value.htm");
   // Get file URL. The URL is dummy URL to identify the following loading
   // actions. The test content is in constant:original_contents.
   GURL file_url = net::FilePathToFileURL(page_file_path);
   ASSERT_TRUE(file_url.SchemeIsFile());
   // Test contents.
   static const char* const original_contents =
       "<HTML><BODY title=\"&amp;&lt;&gt;&quot;&#39;\"></BODY></HTML>";
@@ skipping 28 matching lines @@
     std::string head_part("<HEAD>");
     head_part +=
         WebPageSerializer::generateMetaCharsetDeclaration(encoding).utf8();
     head_part += "</HEAD>";
     original_str.insert(pos, head_part);
   }
   ASSERT_EQ(original_str, serialized_contents);
 }
 
 // Test situation of non-standard HTML entities when serializing HTML DOM.
-TEST_F(DomSerializerTests, SerialzeHTMLDOMWithNonStandardEntities) {
+TEST_F(DomSerializerTests, SerializeHTMLDOMWithNonStandardEntities) {
   // Make a test file URL and load it.
   FilePath page_file_path = data_dir_;
   page_file_path = page_file_path.AppendASCII("dom_serializer");
   page_file_path = page_file_path.AppendASCII("nonstandard_htmlentities.htm");
   GURL file_url = net::FilePathToFileURL(page_file_path);
   LoadPageFromURL(file_url);
 
   // Get value of BODY's title attribute in DOM.
   WebFrame* web_frame = FindSubFrameByURL(test_shell_->webView(), file_url);
   WebDocument doc = web_frame->document();
@@ skipping 20 matching lines @@
   ASSERT_EQ(std::string::npos, serialized_contents.find("&percnt;"));
   ASSERT_EQ(std::string::npos, serialized_contents.find("&nsup;"));
   ASSERT_EQ(std::string::npos, serialized_contents.find("&supl;"));
   ASSERT_EQ(std::string::npos, serialized_contents.find("&apos;"));
 }
 
 // Test situation of BASE tag in original document when serializing HTML DOM.
 // When serializing, we should comment the BASE tag, append a new BASE tag.
 // rewrite all the savable URLs to relative local path, and change other URLs
 // to absolute URLs.
-TEST_F(DomSerializerTests, SerialzeHTMLDOMWithBaseTag) {
+TEST_F(DomSerializerTests, SerializeHTMLDOMWithBaseTag) {
   // There are total 2 available base tags in this test file.
   const int kTotalBaseTagCountInTestFile = 2;
 
   FilePath page_file_path = data_dir_.AppendASCII("dom_serializer");
   file_util::EnsureEndsWithSeparator(&page_file_path);
 
   // Get page dir URL which is base URL of this file.
   GURL path_dir_url = net::FilePathToFileURL(page_file_path);
   // Get file path.
   page_file_path =
@@ skipping 86 matching lines @@
     }
   }
   // We have one more added BASE tag which is generated by JavaScript.
   ASSERT_EQ(new_base_tag_count, original_base_tag_count + 1);
   // Make sure in new document, the base URL is equal with the |path_dir_url|.
   GURL new_base_url(doc.baseURL());
   ASSERT_EQ(new_base_url, path_dir_url);
 }
 
 // Serializing page which has an empty HEAD tag.
-TEST_F(DomSerializerTests, SerialzeHTMLDOMWithEmptyHead) {
+TEST_F(DomSerializerTests, SerializeHTMLDOMWithEmptyHead) {
   FilePath page_file_path = data_dir_;
   page_file_path = page_file_path.AppendASCII("dom_serializer");
   page_file_path = page_file_path.AppendASCII("empty_head.htm");
   GURL file_url = net::FilePathToFileURL(page_file_path);
   ASSERT_TRUE(file_url.SchemeIsFile());
 
   // Load the test html content.
   static const char* const empty_head_contents =
-    "<HTML><HEAD></HEAD><BODY>hello world</BODY></HTML>";
+    "<html><head></head><body>hello world</body></html>";
   LoadContents(empty_head_contents, file_url, WebString());
 
   // Make sure the head tag is empty.
   WebFrame* web_frame = test_shell_->webView()->mainFrame();
   ASSERT_TRUE(web_frame != NULL);
   WebDocument doc = web_frame->document();
   ASSERT_TRUE(doc.isHTMLDocument());
   WebElement head_element = doc.head();
   ASSERT_TRUE(!head_element.isNull());
   ASSERT_TRUE(!head_element.hasChildNodes());
@@ skipping 28 matching lines @@
   // "hello world"
   WebElement body_element = doc.body();
   ASSERT_TRUE(!body_element.isNull());
   WebNode text_node = body_element.firstChild();
   ASSERT_TRUE(text_node.isTextNode());
   WebString text_node_contents = text_node.nodeValue();
   ASSERT_TRUE(std::string(text_node_contents.utf8()) == "hello world");
 }
 
 }  // namespace