Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(648)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webkit/glue/dom_serializer_unittest.cc

Issue 1705004: Update WebKit to r58033 (Closed)
Patch Set: Merge in issue 1712005 Created 10 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/ui/ui_test.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/dom_serializer_unittest.cc
diff --git a/webkit/glue/dom_serializer_unittest.cc b/webkit/glue/dom_serializer_unittest.cc
index 19706e5f40a86a5e2084ca7e59c7611a1b48fed3..2941175bb2ed84607a418e1ef8d3cb77794557ad 100644
--- a/webkit/glue/dom_serializer_unittest.cc
+++ b/webkit/glue/dom_serializer_unittest.cc
@@ -281,7 +281,7 @@ bool IsMetaElement(const WebNode& node, std::string& charset_info) {
// 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");
@@ -310,7 +310,7 @@ TEST_F(DomSerializerTests, SerialzeHTMLDOMWithDocType) {
// 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");
@@ -340,7 +340,7 @@ TEST_F(DomSerializerTests, SerialzeHTMLDOMWithoutDocType) {
// 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");
@@ -362,7 +362,7 @@ TEST_F(DomSerializerTests, SerialzeXMLDocWithBuiltInEntities) {
}
// 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");
@@ -396,7 +396,7 @@ TEST_F(DomSerializerTests, SerialzeHTMLDOMWithAddingMOTW) {
// 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");
@@ -459,7 +459,7 @@ TEST_F(DomSerializerTests, SerialzeHTMLDOMWithNoMetaCharsetInOriginalDoc) {
// 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");
@@ -523,7 +523,7 @@ TEST_F(DomSerializerTests,
}
// 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");
@@ -533,7 +533,7 @@ TEST_F(DomSerializerTests, SerialzeHTMLDOMWithEntitiesInText) {
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());
@@ -567,14 +567,14 @@ TEST_F(DomSerializerTests, SerialzeHTMLDOMWithEntitiesInText) {
// 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);
@@ -582,7 +582,7 @@ TEST_F(DomSerializerTests, SerialzeHTMLDOMWithEntitiesInText) {
// 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");
@@ -631,7 +631,7 @@ TEST_F(DomSerializerTests, SerialzeHTMLDOMWithEntitiesInAttributeValue) {
}
// 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");
@@ -672,7 +672,7 @@ TEST_F(DomSerializerTests, SerialzeHTMLDOMWithNonStandardEntities) {
// 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;
@@ -779,7 +779,7 @@ TEST_F(DomSerializerTests, SerialzeHTMLDOMWithBaseTag) {
}
// 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");
@@ -788,7 +788,7 @@ TEST_F(DomSerializerTests, SerialzeHTMLDOMWithEmptyHead) {
// 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.
« no previous file with comments | « chrome/test/ui/ui_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698