diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-22 22:48:36 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-22 22:48:36 +0000 |
| commit | 2a7da0fe044447c231f12a5b0a619bcde6e8ced9 (patch) | |
| tree | bf0614e430a2d17d541eed0db451570e3849dd70 /webkit/glue/dom_serializer_unittest.cc | |
| parent | d0aa2034a240084c5a5d4ae53de838ce5e09d211 (diff) | |
| download | chromium_src-2a7da0fe044447c231f12a5b0a619bcde6e8ced9.zip chromium_src-2a7da0fe044447c231f12a5b0a619bcde6e8ced9.tar.gz chromium_src-2a7da0fe044447c231f12a5b0a619bcde6e8ced9.tar.bz2 | |
More case fixing following DOM serialization change.
BUG=37612,42281
TEST=DomSerializerTests.SerializeHTMLDOMWithEntitiesInAttributeValue
Review URL: http://codereview.chromium.org/1712008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45369 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/dom_serializer_unittest.cc')
| -rw-r--r-- | webkit/glue/dom_serializer_unittest.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/webkit/glue/dom_serializer_unittest.cc b/webkit/glue/dom_serializer_unittest.cc index 54d256c..d690d68 100644 --- a/webkit/glue/dom_serializer_unittest.cc +++ b/webkit/glue/dom_serializer_unittest.cc @@ -582,8 +582,7 @@ TEST_F(DomSerializerTests, SerializeHTMLDOMWithEntitiesInText) { // Test situation of html entities in attribute value when serializing // HTML DOM. -// Disabled, bug 42281 -TEST_F(DomSerializerTests, DISABLED_SerializeHTMLDOMWithEntitiesInAttributeValue) { +TEST_F(DomSerializerTests, SerializeHTMLDOMWithEntitiesInAttributeValue) { FilePath page_file_path = data_dir_; page_file_path = page_file_path.AppendASCII( "dom_serializer/htmlentities_in_attribute_value.htm"); @@ -593,7 +592,7 @@ TEST_F(DomSerializerTests, DISABLED_SerializeHTMLDOMWithEntitiesInAttributeValue ASSERT_TRUE(file_url.SchemeIsFile()); // Test contents. static const char* const original_contents = - "<HTML><BODY title=\"&<>"'\"></BODY></HTML>"; + "<html><body title=\"&<>"'\"></body></html>"; // Load the test contents. LoadContents(original_contents, file_url, WebString()); // Get value of BODY's title attribute in DOM. @@ -618,14 +617,14 @@ TEST_F(DomSerializerTests, DISABLED_SerializeHTMLDOMWithEntitiesInAttributeValue original_str += original_contents; if (!doc.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); |