2006-02-11 Eric Seidel <eseidel@apple.com>

        Reviewed by hyatt.

        Adding support for external entity declarations in XSLT.
        http://bugzilla.opendarwin.org/show_bug.cgi?id=7184
        <rdar://problem/4271696> support external DTD references in XSLT

        * fast/parser/external-entities-expected.checksum: Added.
        * fast/parser/external-entities-expected.png: Added.
        * fast/parser/external-entities-expected.txt: Added.
        * fast/parser/external-entities-in-xslt-expected.txt: Added.
        * fast/parser/external-entities-in-xslt.xml: Added.
        * fast/parser/external-entities.xml: Added.
        * fast/parser/resources: Added.
        * fast/parser/resources/external-entities.dtd: Added.
        * fast/parser/resources/external-entities.xsl: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@12751 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0b424e23826d2a1c125d83711cef1feb4cdb549c..ffd8a71702bd4ee58ec2ebc9adc6f880938f1832 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,21 @@
+2006-02-11  Eric Seidel  <eseidel@apple.com>
+
+        Reviewed by hyatt.
+
+        Adding support for external entity declarations in XSLT.
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=7184
+        <rdar://problem/4271696> support external DTD references in XSLT
+
+        * fast/parser/external-entities-expected.checksum: Added.
+        * fast/parser/external-entities-expected.png: Added.
+        * fast/parser/external-entities-expected.txt: Added.
+        * fast/parser/external-entities-in-xslt-expected.txt: Added.
+        * fast/parser/external-entities-in-xslt.xml: Added.
+        * fast/parser/external-entities.xml: Added.
+        * fast/parser/resources: Added.
+        * fast/parser/resources/external-entities.dtd: Added.
+        * fast/parser/resources/external-entities.xsl: Added.
+
 2006-02-10  Beth Dakin  <bdakin@apple.com>
 
         Reviewed by Hyatt

diff --git a/LayoutTests/fast/parser/external-entities-expected.checksum b/LayoutTests/fast/parser/external-entities-expected.checksum
new file mode 100644 (file)
index 0000000..07fa594
--- /dev/null
+++ b/LayoutTests/fast/parser/external-entities-expected.checksum
@@ -0,0 +1 @@
+279ed72170a65487263be28162c89f82
\ No newline at end of file

diff --git a/LayoutTests/fast/parser/external-entities-expected.png b/LayoutTests/fast/parser/external-entities-expected.png
new file mode 100644 (file)
index 0000000..5bbc30e
Binary files /dev/null and b/LayoutTests/fast/parser/external-entities-expected.png differ

diff --git a/LayoutTests/fast/parser/external-entities-expected.txt b/LayoutTests/fast/parser/external-entities-expected.txt
new file mode 100644 (file)
index 0000000..acf82ad
--- /dev/null
+++ b/LayoutTests/fast/parser/external-entities-expected.txt
@@ -0,0 +1,25 @@
+layer at (0,0) size 800x600
+  RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x164
+  RenderBlock {HTML} at (0,0) size 800x164
+    RenderBlock (anonymous) at (0,0) size 800x0
+      RenderInline {PARSERERROR} at (0,0) size 0x0 [bgcolor=#FFDDDD] [border: (2px solid #CC7777)]
+    RenderBlock (anonymous) at (0,18) size 800x94
+      RenderBlock {H3} at (0,0) size 800x22
+        RenderText {TEXT} at (0,0) size 324x22
+          text run at (0,0) width 324: "This page contains the following errors:"
+      RenderBlock {DIV} at (0,40) size 800x14
+        RenderText {TEXT} at (0,0) size 406x14
+          text run at (0,0) width 406: "error on line 9 at column 47: Entity 'message' not defined"
+      RenderBlock {H3} at (0,72) size 800x22
+        RenderText {TEXT} at (0,0) size 429x22
+          text run at (0,0) width 429: "Below is a rendering of the page up to the first error."
+    RenderBlock (anonymous) at (0,130) size 800x0
+      RenderInline {PARSERERROR} at (0,0) size 0x0 [bgcolor=#FFDDDD] [border: (2px solid #CC7777)]
+    RenderBody {BODY} at (8,130) size 784x18
+      RenderBlock {P} at (0,0) size 784x0
+      RenderBlock {P} at (0,0) size 784x18
+        RenderInline {FONT} at (0,0) size 489x18 [color=#FF0000]
+          RenderText {TEXT} at (0,0) size 489x18
+            text run at (0,0) width 263: "This should be the only line on this page. "
+            text run at (263,0) width 226: "You should see a parse error above."

diff --git a/LayoutTests/fast/parser/external-entities-in-xslt-expected.txt b/LayoutTests/fast/parser/external-entities-in-xslt-expected.txt
new file mode 100644 (file)
index 0000000..ff43ca4
--- /dev/null
+++ b/LayoutTests/fast/parser/external-entities-in-xslt-expected.txt
@@ -0,0 +1 @@
+SUCCESS

diff --git a/LayoutTests/fast/parser/external-entities-in-xslt.xml b/LayoutTests/fast/parser/external-entities-in-xslt.xml
new file mode 100755 (executable)
index 0000000..96bc2f5
--- /dev/null
+++ b/LayoutTests/fast/parser/external-entities-in-xslt.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" ?>\r
+<?xml-stylesheet type="text/xsl" href="resources/external-entities.xsl"?>\r
+<root/>\r

diff --git a/LayoutTests/fast/parser/external-entities.xml b/LayoutTests/fast/parser/external-entities.xml
new file mode 100755 (executable)
index 0000000..c7b235d
--- /dev/null
+++ b/LayoutTests/fast/parser/external-entities.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>\r
+<!DOCTYPE html SYSTEM "resources/external-entities.dtd">\r
+<html xmlns="http://www.w3.org/1999/xhtml">\r
+<body>\r
+<script type="text/javascript">\r
+if (window.layoutTestController)\r
+    layoutTestController.dumpAsText();\r
+</script>\r
+<p>&message;</p>\r
+<p class="test"><font color="red"> This should be the only line on this page.  You should see a parse error above.</font></p>\r
+</body>\r
+</html>\r

diff --git a/LayoutTests/fast/parser/resources/external-entities.dtd b/LayoutTests/fast/parser/resources/external-entities.dtd
new file mode 100755 (executable)
index 0000000..44a2268
--- /dev/null
+++ b/LayoutTests/fast/parser/resources/external-entities.dtd
@@ -0,0 +1 @@
+<!ENTITY message "SUCCESS">
\ No newline at end of file

diff --git a/LayoutTests/fast/parser/resources/external-entities.xsl b/LayoutTests/fast/parser/resources/external-entities.xsl
new file mode 100755 (executable)
index 0000000..0b408e4
--- /dev/null
+++ b/LayoutTests/fast/parser/resources/external-entities.xsl
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>\r
+<!DOCTYPE xsl:stylesheet SYSTEM "resources/external-entities.dtd">\r
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">\r
+    <xsl:template match="/">\r
+        <HTML>\r
+        <SCRIPT type="text/javascript">\r
+        if (window.layoutTestController)\r
+            layoutTestController.dumpAsText();\r
+        </SCRIPT>\r
+            <BODY>\r
+               &message;\r
+            </BODY>\r
+        </HTML>\r
+    </xsl:template>\r
+</xsl:stylesheet>
\ No newline at end of file