Title: [195521] trunk/LayoutTests
Revision
195521
Author
[email protected]
Date
2016-01-24 17:19:06 -0800 (Sun, 24 Jan 2016)

Log Message

Unreviewed, update test after r195497

This test did not make much sense as it was, after the behavior change
in r195497.

* fast/dom/Document/document-charset-expected.txt:
* fast/dom/Document/document-charset.html:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (195520 => 195521)


--- trunk/LayoutTests/ChangeLog	2016-01-25 01:11:35 UTC (rev 195520)
+++ trunk/LayoutTests/ChangeLog	2016-01-25 01:19:06 UTC (rev 195521)
@@ -1,5 +1,15 @@
 2016-01-24  Chris Dumez  <[email protected]>
 
+        Unreviewed, update test after r195497
+
+        This test did not make much sense as it was, after the behavior change
+        in r195497.
+
+        * fast/dom/Document/document-charset-expected.txt:
+        * fast/dom/Document/document-charset.html:
+
+2016-01-24  Chris Dumez  <[email protected]>
+
         An XMLDocument interface should be exposed on the global Window object
         https://bugs.webkit.org/show_bug.cgi?id=153378
         <rdar://problem/24315465>

Modified: trunk/LayoutTests/fast/dom/Document/document-charset-expected.txt (195520 => 195521)


--- trunk/LayoutTests/fast/dom/Document/document-charset-expected.txt	2016-01-25 01:11:35 UTC (rev 195520)
+++ trunk/LayoutTests/fast/dom/Document/document-charset-expected.txt	2016-01-25 01:19:06 UTC (rev 195521)
@@ -8,7 +8,7 @@
 
  document.inputEncoding: KOI8-R
 
-Setting charset to UTF-8...
+Setting charset to UTF-8 (expected to fail as it is read-only)
 
  document.charset: KOI8-R
 
@@ -18,7 +18,7 @@
 
  document.inputEncoding: KOI8-R
 
-Setting characterSet to KOI8-R (expected to fail, matching Firefox)...
+Setting characterSet to UTF-8 (expected to fail as it is read-only)
 
  document.charset: KOI8-R
 

Modified: trunk/LayoutTests/fast/dom/Document/document-charset.html (195520 => 195521)


--- trunk/LayoutTests/fast/dom/Document/document-charset.html	2016-01-25 01:11:35 UTC (rev 195520)
+++ trunk/LayoutTests/fast/dom/Document/document-charset.html	2016-01-25 01:19:06 UTC (rev 195521)
@@ -10,12 +10,12 @@
     testRunner.dumpAsText();
 
 document.write("<p>Initial</p>");
-document.write("<p>&nbsp;document.charset: " + document.charset + "</p>"); // MSIE
-document.write("<p>&nbsp;document.defaultCharset: " + (document.defaultCharset ? "defined" : "undefined") + "</p>"); // MSIE
-document.write("<p>&nbsp;document.characterSet: " + document.characterSet + "</p>"); // Firefox
-document.write("<p>&nbsp;document.inputEncoding: " + document.inputEncoding + "</p>"); // DOM3
+document.write("<p>&nbsp;document.charset: " + document.charset + "</p>");
+document.write("<p>&nbsp;document.defaultCharset: " + (document.defaultCharset ? "defined" : "undefined") + "</p>");
+document.write("<p>&nbsp;document.characterSet: " + document.characterSet + "</p>");
+document.write("<p>&nbsp;document.inputEncoding: " + document.inputEncoding + "</p>");
 
-document.write("<p>Setting charset to UTF-8...</p>");
+document.write("<p>Setting charset to UTF-8 (expected to fail as it is read-only)</p>");
 try {
     document.charset = "utf-8";
     document.write("<p>&nbsp;document.charset: " + document.charset + "</p>");
@@ -23,13 +23,12 @@
     document.write("<p>&nbsp;document.characterSet: " + document.characterSet + "</p>");
     document.write("<p>&nbsp;document.inputEncoding: " + document.inputEncoding + "</p>");
 } catch (ex) {
-    document.write("<p>Failure</p>");
+    document.write("<p>Failure (expected)</p>");
 }
 
-// throws an exception in Firefox, but _javascript_Core seems to silently ignore assignment to read-only properties
-document.write("<p>Setting characterSet to KOI8-R (expected to fail, matching Firefox)...</p>");
+document.write("<p>Setting characterSet to UTF-8 (expected to fail as it is read-only)</p>");
 try {
-    document.characterSet = "KOI8-R";
+    document.characterSet = "utf-8";
     document.write("<p>&nbsp;document.charset: " + document.charset + "</p>");
     document.write("<p>&nbsp;document.defaultCharset: " + (document.defaultCharset ? "defined" : "undefined") + "</p>");
     document.write("<p>&nbsp;document.characterSet: " + document.characterSet + "</p>");
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to