[webkit-changes] cvs commit: LayoutTests/fast/xsl
xslt-processer-expected.txt
Anders
andersca at opensource.apple.com
Fri Dec 30 06:53:39 PST 2005
andersca 05/12/30 06:53:39
Modified: . ChangeLog
fast/dom XMLSerializer-expected.txt XMLSerializer.html
dom-parse-serialize-expected.txt
dom-parse-serialize.html
fast/xsl xslt-processer-expected.txt
Log:
2005-12-30 Anders Carlsson <andersca at mac.com>
Reviewed by Eric.
- Update tests for http://bugzilla.opendarwin.org/show_bug.cgi?id=6297
XMLSerializer should use createMarkup
* fast/dom/XMLSerializer.html:
* fast/dom/XMLSerializer-expected.txt:
Create a document fragment and serialize it.
* fast/dom/dom-parse-serialize.html:
* fast/dom/dom-parse-serialize-expected.txt:
Add some entities to attributes and text nodes.
* fast/xsl/xslt-processer-expected.txt:
Update test results.
Revision Changes Path
1.208 +18 -0 LayoutTests/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/LayoutTests/ChangeLog,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- ChangeLog 30 Dec 2005 09:27:19 -0000 1.207
+++ ChangeLog 30 Dec 2005 14:53:37 -0000 1.208
@@ -1,3 +1,21 @@
+2005-12-30 Anders Carlsson <andersca at mac.com>
+
+ Reviewed by Eric.
+
+ - Update tests for http://bugzilla.opendarwin.org/show_bug.cgi?id=6297
+ XMLSerializer should use createMarkup
+
+ * fast/dom/XMLSerializer.html:
+ * fast/dom/XMLSerializer-expected.txt:
+ Create a document fragment and serialize it.
+
+ * fast/dom/dom-parse-serialize.html:
+ * fast/dom/dom-parse-serialize-expected.txt:
+ Add some entities to attributes and text nodes.
+
+ * fast/xsl/xslt-processer-expected.txt:
+ Update test results.
+
2005-12-30 Eric Seidel <eseidel at apple.com>
No review, just adding a couple missing results.
1.2 +2 -1 LayoutTests/fast/dom/XMLSerializer-expected.txt
Index: XMLSerializer-expected.txt
===================================================================
RCS file: /cvs/root/LayoutTests/fast/dom/XMLSerializer-expected.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLSerializer-expected.txt 9 Aug 2005 19:15:56 -0000 1.1
+++ XMLSerializer-expected.txt 30 Dec 2005 14:53:38 -0000 1.2
@@ -1,6 +1,7 @@
-This tests XMLSerializer on different node types. If the test is successful, there should be four lines of output. The first line should be the child1 tag. The second should be the child2 tag. The third one should be a comment and the fourth one should be the complete document.
+This tests XMLSerializer on different node types. If the test is successful, there should be five lines of output. The first line should be the child1 tag. The second should be the child2 tag. The third one should be a comment, the fourth one should be the complete document and the fifth one should be the complete document but serialized from a document fragment node.
<child1>First child</child1>
<child2 attr="an attribute">Second child</child2>
<!-- A comment -->
<test><child1>First child</child1><child2 attr="an attribute">Second child</child2><!-- A comment --></test>
+<test><child1>First child</child1><child2 attr="an attribute">Second child</child2><!-- A comment --></test>
1.2 +6 -1 LayoutTests/fast/dom/XMLSerializer.html
Index: XMLSerializer.html
===================================================================
RCS file: /cvs/root/LayoutTests/fast/dom/XMLSerializer.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLSerializer.html 9 Aug 2005 19:15:57 -0000 1.1
+++ XMLSerializer.html 30 Dec 2005 14:53:38 -0000 1.2
@@ -30,18 +30,23 @@
child2 = child1.nextSibling
comment = child2.nextSibling;
+ fragment = doc.createDocumentFragment();
+ fragment.appendChild(doc.documentElement.cloneNode(true))
+
serializer = new XMLSerializer();
debug(serializer.serializeToString(child1));
debug(serializer.serializeToString(child2));
debug(serializer.serializeToString(comment));
debug(serializer.serializeToString(doc));
+ debug(serializer.serializeToString(fragment));
+
}
</script>
</head>
<body onload="runTests()">
-This tests XMLSerializer on different node types. If the test is successful, there should be four lines of output. The first line should be the child1 tag. The second should be the child2 tag. The third one should be a comment and the fourth one should be the complete document.
+This tests XMLSerializer on different node types. If the test is successful, there should be five lines of output. The first line should be the child1 tag. The second should be the child2 tag. The third one should be a comment, the fourth one should be the complete document and the fifth one should be the complete document but serialized from a document fragment node.
<ul id="console">
</ul>
</body>
1.3 +2 -2 LayoutTests/fast/dom/dom-parse-serialize-expected.txt
Index: dom-parse-serialize-expected.txt
===================================================================
RCS file: /cvs/root/LayoutTests/fast/dom/dom-parse-serialize-expected.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dom-parse-serialize-expected.txt 19 Jul 2005 18:35:52 -0000 1.2
+++ dom-parse-serialize-expected.txt 30 Dec 2005 14:53:38 -0000 1.3
@@ -25,7 +25,7 @@
text run at (0,60) width 40: "<doc>"
text run at (0,75) width 536: " <foo xmlns=\"foobar\">One</foo> <x:bar xmlns:x=\"barfoo\">Two</x:bar>"
text run at (0,90) width 184: " <d id=\"id3\">Three</d>"
- text run at (0,105) width 48: "</doc>"
+ text run at (0,105) width 392: "<f id=\"&<>\">Four&<></f></doc>"
RenderBlock {DIV} at (0,268) size 784x61 [border: (1px solid #000000)]
RenderBlock (anonymous) at (1,1) size 782x18
RenderInline {SPAN} at (0,0) size 112x18 [color=#800000]
@@ -46,4 +46,4 @@
text run at (0,0) width 40: "<doc>"
text run at (0,15) width 536: " <foo xmlns=\"foobar\">One</foo> <x:bar xmlns:x=\"barfoo\">Two</x:bar>"
text run at (0,30) width 184: " <d id=\"id3\">Three</d>"
- text run at (0,45) width 48: "</doc>"
+ text run at (0,45) width 392: "<f id=\"&<>\">Four&<></f></doc>"
1.2 +1 -1 LayoutTests/fast/dom/dom-parse-serialize.html
Index: dom-parse-serialize.html
===================================================================
RCS file: /cvs/root/LayoutTests/fast/dom/dom-parse-serialize.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dom-parse-serialize.html 8 Jun 2005 08:39:20 -0000 1.1
+++ dom-parse-serialize.html 30 Dec 2005 14:53:38 -0000 1.2
@@ -40,7 +40,7 @@
{
var parser = new DOMParser();
var str =
- '<?xml version="1.0"?>\n<!DOCTYPE doc [\n<!ATTLIST d id ID #IMPLIED>\n]>\n<doc>\n <foo xmlns="foobar">One</foo> <x:bar xmlns:x="barfoo">Two</x:bar>\n <d id="id3">Three</d>\n</doc>\n';
+ '<?xml version="1.0"?>\n<!DOCTYPE doc [\n<!ATTLIST d id ID #IMPLIED>\n]>\n<doc>\n <foo xmlns="foobar">One</foo> <x:bar xmlns:x="barfoo">Two</x:bar>\n <d id="id3">Three</d>\n<f id="&<>">Four&<></f><empty/><empty></empty></doc>\n';
var doc = parser.parseFromString(str,"text/xml");
document.getElementById("id1").firstChild.nodeValue = str;
1.4 +12 -12 LayoutTests/fast/xsl/xslt-processer-expected.txt
Index: xslt-processer-expected.txt
===================================================================
RCS file: /cvs/root/LayoutTests/fast/xsl/xslt-processer-expected.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xslt-processer-expected.txt 23 Dec 2005 08:02:17 -0000 1.3
+++ xslt-processer-expected.txt 30 Dec 2005 14:53:39 -0000 1.4
@@ -1,34 +1,34 @@
0.1 original xml:
-<?xml-stylesheet type="text/xsl" href="xslt-text.xsl"?><TEST>SOURCE XML: <<<&теÑÑ‚&>>></TEST>
+<?xml-stylesheet type="text/xsl" href="xslt-text.xsl"?><TEST>SOURCE XML: <<<&теÑÑ‚&>>></TEST>
0.2 xsl1:
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-<xsl:output method="text" encoding="KOI8-R" />
-<xsl:template match="TEST">CHARACTERS IN XSLT: <<<&теÑÑ‚&>>>
-<xsl:apply-templates /><xsl:text>
+<xsl:output method="text" encoding="KOI8-R"/>
+<xsl:template match="TEST">CHARACTERS IN XSLT: <<<&теÑÑ‚&>>>
+<xsl:apply-templates/><xsl:text>
</xsl:text></xsl:template>
<xsl:template>
- <xsl:value-of select="." />
+<xsl:value-of select="."/>
</xsl:template>
</xsl:stylesheet>
0.3 xsl2:
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
- <xsl:output method="html" encoding="UTF-8" />
+ <xsl:output method="html" encoding="UTF-8"/>
<xsl:template match="TEST">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
</head>
<body>
- CHARACTERS IN XSLT: ééééééééééé <br /> <xsl:apply-templates />
+ CHARACTERS IN XSLT: ééééééééééé <br /> <xsl:apply-templates/>
</body>
</html>
</xsl:template>
<xsl:template>
- <xsl:value-of select="." />
+ <xsl:value-of select="."/>
</xsl:template>
</xsl:stylesheet>
@@ -37,11 +37,11 @@
1.1 Import two different stylesheets:
<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=UTF-8"></HEAD><BODY>
- CHARACTERS IN XSLT: ééééééééééé <BR><BR>SOURCE XML: <<<&теÑÑ‚&>>>
+ CHARACTERS IN XSLT: ééééééééééé <BR><BR>SOURCE XML: <<<&теÑÑ‚&>>>
</BODY></HTML>
1.2 Import same stylesheet twice:
<html xmlns="http://www.w3.org/1999/xhtml">
-<head><title /></head>
+<head><title></title></head>
<body>
<pre>CHARACTERS IN XSLT: <<<&теÑÑ‚&>>>
SOURCE XML: <<<&теÑÑ‚&>>>
@@ -67,9 +67,9 @@
Success
2.5 transformed fragment containing only text:
****Failure**** (expected: "SUCCESS" actual: "<html xmlns="http://www.w3.org/1999/xhtml">
-<head><title /></head>
+<head><title></title></head>
<body>
-<pre />
+<pre></pre>
</body>
</html>")
2.6 fragment using passed parameters:
More information about the webkit-changes
mailing list