git://git.webkit.org / WebKit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e5cb716)
2010-09-23 Adam Barth <abarth@webkit.org>
authorabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 23 Sep 2010 11:13:58 +0000 (11:13 +0000)
committerabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 23 Sep 2010 11:13:58 +0000 (11:13 +0000)
        Rubber-stamped by Eric Seidel.

        Sync HTML5lib tests with upstream.

        * html5lib/resources/comments01.dat:
        * html5lib/resources/pending-spec-changes-plain-text-unsafe.dat: Added.
        * html5lib/resources/pending-spec-changes.dat: Added.
        * html5lib/resources/plain-text-unsafe.dat: Added.
        * html5lib/resources/tests1.dat:
        * html5lib/resources/tests10.dat:
        * html5lib/resources/tests13.dat: Removed.
        * html5lib/resources/tests14.dat:
        * html5lib/resources/tests15.dat:
        * html5lib/resources/tests17.dat:
        * html5lib/resources/tests19.dat:
        * html5lib/resources/tests20.dat:
        * html5lib/resources/tests21.dat:
        * html5lib/resources/tests9.dat:
        * html5lib/resources/tests_innerHTML_1.dat:
        * html5lib/runner-expected.txt:

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

18 files changed:
LayoutTests/ChangeLog patch | blob | history
LayoutTests/html5lib/resources/comments01.dat patch | blob | history
LayoutTests/html5lib/resources/pending-spec-changes-plain-text-unsafe.dat [new file with mode: 0644] patch | blob
LayoutTests/html5lib/resources/pending-spec-changes.dat [new file with mode: 0644] patch | blob
LayoutTests/html5lib/resources/plain-text-unsafe.dat [new file with mode: 0644] patch | blob
LayoutTests/html5lib/resources/tests1.dat patch | blob | history
LayoutTests/html5lib/resources/tests10.dat patch | blob | history
LayoutTests/html5lib/resources/tests13.dat [deleted file] patch | blob | history
LayoutTests/html5lib/resources/tests14.dat patch | blob | history
LayoutTests/html5lib/resources/tests15.dat patch | blob | history
LayoutTests/html5lib/resources/tests17.dat patch | blob | history
LayoutTests/html5lib/resources/tests19.dat patch | blob | history
LayoutTests/html5lib/resources/tests20.dat patch | blob | history
LayoutTests/html5lib/resources/tests21.dat patch | blob | history
LayoutTests/html5lib/resources/tests9.dat patch | blob | history
LayoutTests/html5lib/resources/tests_innerHTML_1.dat patch | blob | history
LayoutTests/html5lib/runner-expected.txt patch | blob | history
LayoutTests/html5lib/runner.html patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e560ded5fb34e8c57436e54199e98c1601c0572b..789227d4c2f9d19dad467197314fbb7270a31635 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,26 @@
+2010-09-23  Adam Barth  <abarth@webkit.org>
+
+        Rubber-stamped by Eric Seidel.
+
+        Sync HTML5lib tests with upstream.
+
+        * html5lib/resources/comments01.dat:
+        * html5lib/resources/pending-spec-changes-plain-text-unsafe.dat: Added.
+        * html5lib/resources/pending-spec-changes.dat: Added.
+        * html5lib/resources/plain-text-unsafe.dat: Added.
+        * html5lib/resources/tests1.dat:
+        * html5lib/resources/tests10.dat:
+        * html5lib/resources/tests13.dat: Removed.
+        * html5lib/resources/tests14.dat:
+        * html5lib/resources/tests15.dat:
+        * html5lib/resources/tests17.dat:
+        * html5lib/resources/tests19.dat:
+        * html5lib/resources/tests20.dat:
+        * html5lib/resources/tests21.dat:
+        * html5lib/resources/tests9.dat:
+        * html5lib/resources/tests_innerHTML_1.dat:
+        * html5lib/runner-expected.txt:
+
 2010-09-22  Dimitri Glazkov  <dglazkov@chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/LayoutTests/html5lib/resources/comments01.dat b/LayoutTests/html5lib/resources/comments01.dat
index b0a89b81d5ffa9e324c340b0bda34aa42d897bc0..44f187683004b904f06f92f1ca31cbd7641ae1dd 100644 (file)
--- a/LayoutTests/html5lib/resources/comments01.dat
+++ b/LayoutTests/html5lib/resources/comments01.dat
@@ -28,8 +28,7 @@ FOO<!-- BAR --   >BAZ
 |   <head>
 |   <body>
 |     "FOO"
-|     <!--  BAR --    -->
-|     "BAZ"
+|     <!--  BAR --   >BAZ -->
 
 #data
 FOO<!-- BAR -- <QUX> -- MUX -->BAZ
@@ -61,8 +60,7 @@ FOO<!-- BAR -- <QUX> -- MUX -- >BAZ
 |   <head>
 |   <body>
 |     "FOO"
-|     <!--  BAR -- <QUX> -- MUX --  -->
-|     "BAZ"
+|     <!--  BAR -- <QUX> -- MUX -- >BAZ -->
 
 #data
 FOO<!---->BAZ
diff --git a/LayoutTests/html5lib/resources/pending-spec-changes-plain-text-unsafe.dat b/LayoutTests/html5lib/resources/pending-spec-changes-plain-text-unsafe.dat
new file mode 100644 (file)
index 0000000..af00e9d
Binary files /dev/null and b/LayoutTests/html5lib/resources/pending-spec-changes-plain-text-unsafe.dat differ
diff --git a/LayoutTests/html5lib/resources/pending-spec-changes.dat b/LayoutTests/html5lib/resources/pending-spec-changes.dat
new file mode 100644 (file)
index 0000000..4663c8b
--- /dev/null
+++ b/LayoutTests/html5lib/resources/pending-spec-changes.dat
@@ -0,0 +1,45 @@
+#data
+FOO<!-- BAR -- <QUX> -- MUX -- >BAZ
+#errors
+3: Non-space characters found without seeing a doctype first. Expected “<!DOCTYPE html>”.
+15: Consecutive hyphens did not terminate a comment. “--” is not permitted inside a comment, but e.g. “- -” is.
+24: Consecutive hyphens did not terminate a comment. “--” is not permitted inside a comment, but e.g. “- -” is.
+31: Consecutive hyphens did not terminate a comment. “--” is not permitted inside a comment, but e.g. “- -” is.
+35: End of file inside comment.
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <!--  BAR -- <QUX> -- MUX -- >BAZ -->
+
+#data
+FOO<!-- BAR --   >BAZ
+#errors
+3: Non-space characters found without seeing a doctype first. Expected “<!DOCTYPE html>”.
+15: Consecutive hyphens did not terminate a comment. “--” is not permitted inside a comment, but e.g. “- -” is.
+21: End of file inside comment.
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO"
+|     <!--  BAR --   >BAZ -->
+
+#data
+<svg><![CDATA[]]
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+
+#data
+<svg><![CDATA[]
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
diff --git a/LayoutTests/html5lib/resources/plain-text-unsafe.dat b/LayoutTests/html5lib/resources/plain-text-unsafe.dat
new file mode 100644 (file)
index 0000000..2f40e83
--- /dev/null
+++ b/LayoutTests/html5lib/resources/plain-text-unsafe.dat
@@ -0,0 +1,8 @@
+#data
+FOO&#x000D;ZOO
+#errors
+#document
+| <html>
+|   <head>
+|   <body>
+|     "FOO\rZOO"
diff --git a/LayoutTests/html5lib/resources/tests1.dat b/LayoutTests/html5lib/resources/tests1.dat
index 6a117834afaf93ac7e5542099d3f46d69190a17e..52d8d6bf289ea229c7baa859d560d8721aa969f1 100644 (file)
--- a/LayoutTests/html5lib/resources/tests1.dat
+++ b/LayoutTests/html5lib/resources/tests1.dat
@@ -1261,6 +1261,18 @@ Line: 1 Col: 49 Unexpected end tag (code). Ignored.
 |       <code>
 |         <strike>
 
+#data
+<!DOCTYPE html><spacer>foo
+#errors
+26: End of file seen and there were open elements.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <spacer>
+|       "foo"
+
 #data
 <title><meta></title><link><title><meta></title>
 #errors
diff --git a/LayoutTests/html5lib/resources/tests10.dat b/LayoutTests/html5lib/resources/tests10.dat
index 71a760072ced2336293516187c9e708d5fa556cb..7148faa0da51e3d232f58855404558bcbc3dda7c 100644 (file)
--- a/LayoutTests/html5lib/resources/tests10.dat
+++ b/LayoutTests/html5lib/resources/tests10.dat
@@ -8,6 +8,18 @@
 |   <body>
 |     <svg svg>
 
+#data
+<!DOCTYPE html><svg></svg><![CDATA[a]]>
+#errors
+29: Bogus comment
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|     <!-- [CDATA[a]] -->
+
 #data
 <!DOCTYPE html><body><svg></svg>
 #errors
@@ -501,6 +513,39 @@
 |             <p>
 |               "a"
 
+#data
+<!DOCTYPE html><svg><desc><div><svg><ul>a
+#errors
+40: HTML start tag “ul” in a foreign namespace context.
+41: End of file in a foreign namespace context.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       <svg desc>
+|         <div>
+|           <svg svg>
+|           <ul>
+|             "a"
+
+#data
+<!DOCTYPE html><svg><desc><svg><ul>a
+#errors
+35: HTML start tag “ul” in a foreign namespace context.
+36: End of file in a foreign namespace context.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       <svg desc>
+|         <svg svg>
+|         <ul>
+|           "a"
+
 #data
 <div><svg><path><foreignObject><p></foreignObject><p>
 #errors
@@ -725,4 +770,4 @@
 |               <math mo>
 |             <span>
 |           <svg path>
-|       <math mi>
\ No newline at end of file
+|       <math mi>
diff --git a/LayoutTests/html5lib/resources/tests13.dat b/LayoutTests/html5lib/resources/tests13.dat
deleted file mode 100644 (file)
index d180e8e..0000000
--- a/LayoutTests/html5lib/resources/tests13.dat
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
-<html><head>
-<title>404 Not Found</title>
-</head><body>
-<h1>Not Found</h1>
-<p>The requested URL /html5lib-tests/data/tests13.dat was not found on this server.</p>
-<p>Additionally, a 404 Not Found
-error was encountered while trying to use an ErrorDocument to handle the request.</p>
-</body></html>
diff --git a/LayoutTests/html5lib/resources/tests14.dat b/LayoutTests/html5lib/resources/tests14.dat
index 72f8015f6e0239cf962a696bc01a6badab87997e..b8713f88582c2c3c11596ac1b178d4bbd1ba7c70 100644 (file)
--- a/LayoutTests/html5lib/resources/tests14.dat
+++ b/LayoutTests/html5lib/resources/tests14.dat
@@ -71,4 +71,4 @@
 | <html>
 |   <head>
 |   <body>
-|     789="012"
\ No newline at end of file
+|     789="012"
diff --git a/LayoutTests/html5lib/resources/tests15.dat b/LayoutTests/html5lib/resources/tests15.dat
index 7f016cae386dbd8af7605984d32344f6ada68f1f..6ce1c0d166320448002292397d28f210d2debceb 100644 (file)
--- a/LayoutTests/html5lib/resources/tests15.dat
+++ b/LayoutTests/html5lib/resources/tests15.dat
@@ -205,4 +205,4 @@ XXX: These errors are wrong, please fix me!
 | <html>
 |   <head>
 |   <body>
-|     <object>
\ No newline at end of file
+|     <object>
diff --git a/LayoutTests/html5lib/resources/tests17.dat b/LayoutTests/html5lib/resources/tests17.dat
index da59ef84e8eabb32be937b3a813788c76725d762..7b555f888dede982c223a33f15cbcb5f382a9d83 100644 (file)
--- a/LayoutTests/html5lib/resources/tests17.dat
+++ b/LayoutTests/html5lib/resources/tests17.dat
@@ -150,4 +150,4 @@
 |     <table>
 |       <tbody>
 |         <tr>
-|     "a"
\ No newline at end of file
+|     "a"
diff --git a/LayoutTests/html5lib/resources/tests19.dat b/LayoutTests/html5lib/resources/tests19.dat
index 085faaeddac8d946ff13fdd98a70f6fa850c4b8f..06674cef17a59918f719feabc735c8f06dea7477 100644 (file)
--- a/LayoutTests/html5lib/resources/tests19.dat
+++ b/LayoutTests/html5lib/resources/tests19.dat
@@ -830,48 +830,6 @@
 |   <body>
 |     "a "
 
-#data
-<html>�<frameset></frameset>
-#errors
-#document
-| <html>
-|   <head>
-|   <frameset>
-
-#data
-<html> � <frameset></frameset>
-#errors
-#document
-| <html>
-|   <head>
-|   <frameset>
-
-#data
-<html>a�a<frameset></frameset>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "a�a"
-
-#data
-<html>��<frameset></frameset>
-#errors
-#document
-| <html>
-|   <head>
-|   <frameset>
-
-#data
-<html>�
- <frameset></frameset>
-#errors
-#document
-| <html>
-|   <head>
-|   <frameset>
-
 #data
 <!doctype html><p><math></p>a
 #errors
diff --git a/LayoutTests/html5lib/resources/tests20.dat b/LayoutTests/html5lib/resources/tests20.dat
index c4672eb6de94977aa1401e95eaf0c69ba91ba7b6..31e7b13a988a4953d96316360ec77f5924df6cce 100644 (file)
--- a/LayoutTests/html5lib/resources/tests20.dat
+++ b/LayoutTests/html5lib/resources/tests20.dat
@@ -348,4 +348,4 @@
 |   <body>
 |     <svg svg>
 |       <svg title>
-|         "abc"
\ No newline at end of file
+|         "abc"
diff --git a/LayoutTests/html5lib/resources/tests21.dat b/LayoutTests/html5lib/resources/tests21.dat
index 1260ec03e2029443b1566cd9dbe80fe9b4a9c142..9acc845601da606b9185c06f315bc08d7a00730c 100644 (file)
--- a/LayoutTests/html5lib/resources/tests21.dat
+++ b/LayoutTests/html5lib/resources/tests21.dat
@@ -86,26 +86,6 @@
 |     <svg svg>
 |       "]] >"
 
-#data
-<svg><![CDATA[]]
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       "]]"
-
-#data
-<svg><![CDATA[]
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       "]"
-
 #data
 <svg><![CDATA[]>a
 #errors
diff --git a/LayoutTests/html5lib/resources/tests9.dat b/LayoutTests/html5lib/resources/tests9.dat
index 2b715f83dd4646cd03d6bbf7c6adb8ccc5ffa0f9..554e27aecf6ded5bdb2d247d7550fbd05d57c262 100644 (file)
--- a/LayoutTests/html5lib/resources/tests9.dat
+++ b/LayoutTests/html5lib/resources/tests9.dat
@@ -18,6 +18,33 @@
 |   <body>
 |     <math math>
 
+#data
+<!DOCTYPE html><math><mi>
+#errors
+25: End of file in a foreign namespace context.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math mi>
+
+#data
+<!DOCTYPE html><math><annotation-xml><svg><u>
+#errors
+45: HTML start tag “u” in a foreign namespace context.
+45: End of file seen and there were open elements.
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <math math>
+|       <math annotation-xml>
+|         <svg svg>
+|     <u>
+
 #data
 <!DOCTYPE html><body><select><math></math></select>
 #errors
diff --git a/LayoutTests/html5lib/resources/tests_innerHTML_1.dat b/LayoutTests/html5lib/resources/tests_innerHTML_1.dat
index 718b36f8c84e121d5b50f41132509fe62d91e2ae..052fac7d5541fdf434529df1d5cf237ef2e45a7d 100644 (file)
--- a/LayoutTests/html5lib/resources/tests_innerHTML_1.dat
+++ b/LayoutTests/html5lib/resources/tests_innerHTML_1.dat
@@ -730,4 +730,4 @@ html
 #document-fragment
 frameset
 #document
-| <frame>
\ No newline at end of file
+| <frame>
diff --git a/LayoutTests/html5lib/runner-expected.txt b/LayoutTests/html5lib/runner-expected.txt
index 6f4d48738bdbf6c090fa3fab1593ece7102976e5..c4d0f900d1426c7d60b10816ce1b9a929a773de8 100644 (file)
--- a/LayoutTests/html5lib/runner-expected.txt
+++ b/LayoutTests/html5lib/runner-expected.txt
@@ -9,6 +9,41 @@ CONSOLE MESSAGE: line 1: SyntaxError: Parse error
 CONSOLE MESSAGE: line 1: SyntaxError: Parse error
 CONSOLE MESSAGE: line 2: PASS
 CONSOLE MESSAGE: line 2: FOO<span>BAR</span>BAZ
+resources/pending-spec-changes-plain-text-unsafe.dat: PASS
+
+resources/pending-spec-changes.dat:
+3
+4
+
+Test 3 of 4 in resources/pending-spec-changes.dat failed. Input:
+<svg><![CDATA[]]
+Got:
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       "]]"
+Expected:
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+
+Test 4 of 4 in resources/pending-spec-changes.dat failed. Input:
+<svg><![CDATA[]
+Got:
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+|       "]"
+Expected:
+| <html>
+|   <head>
+|   <body>
+|     <svg svg>
+resources/plain-text-unsafe.dat: PASS
+
 resources/tests1.dat: PASS
 
 resources/tests2.dat: PASS
@@ -49,11 +84,11 @@ resources/tests8.dat: PASS
 resources/tests9.dat: PASS
 
 resources/tests10.dat:
-35
-48
-49
+38
+51
+52
 
-Test 35 of 49 in resources/tests10.dat failed. Input:
+Test 38 of 52 in resources/tests10.dat failed. Input:
 <svg><script></script><path>
 Got:
 | <html>
@@ -70,7 +105,7 @@ Expected:
 |       <svg script>
 |       <svg path>
 
-Test 48 of 49 in resources/tests10.dat failed. Input:
+Test 51 of 52 in resources/tests10.dat failed. Input:
 <math><annotation-xml><svg><foreignObject><div><math><mi></mi></math><span></span></div></foreignObject><path></path></svg></annotation-xml><mi>
 Got:
 | <html>
@@ -101,7 +136,7 @@ Expected:
 |           <svg path>
 |       <math mi>
 
-Test 49 of 49 in resources/tests10.dat failed. Input:
+Test 52 of 52 in resources/tests10.dat failed. Input:
 <math><annotation-xml><svg><foreignObject><math><mi><svg></svg></mi><mo></mo></math><span></span></foreignObject><path></path></svg></annotation-xml><mi>
 Got:
 | <html>
@@ -150,7 +185,7 @@ resources/tests18.dat: PASS
 resources/tests19.dat:
 63
 
-Test 63 of 102 in resources/tests19.dat failed. Input:
+Test 63 of 97 in resources/tests19.dat failed. Input:
 <!doctype html><keygen><frameset>
 Got:
 | <!DOCTYPE html>
@@ -190,41 +225,8 @@ resources/entities01.dat: PASS
 
 resources/entities02.dat: PASS
 
-resources/comments01.dat:
-3
-6
+resources/comments01.dat: PASS
 
-Test 3 of 13 in resources/comments01.dat failed. Input:
-FOO<!-- BAR --   >BAZ
-Got:
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <!--  BAR --   >BAZ -->
-Expected:
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <!--  BAR --    -->
-|     "BAZ"
-
-Test 6 of 13 in resources/comments01.dat failed. Input:
-FOO<!-- BAR -- <QUX> -- MUX -- >BAZ
-Got:
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <!--  BAR -- <QUX> -- MUX -- >BAZ -->
-Expected:
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <!--  BAR -- <QUX> -- MUX --  -->
-|     "BAZ"
 resources/adoption01.dat: PASS
 
 resources/adoption02.dat:
diff --git a/LayoutTests/html5lib/runner.html b/LayoutTests/html5lib/runner.html
index a616ec47cdc7d6a86c653b47d4891e4273e7282d..b54de4e6e4abe000144dfd0c9650950354f84ecf 100644 (file)
--- a/LayoutTests/html5lib/runner.html
+++ b/LayoutTests/html5lib/runner.html
@@ -36,6 +36,9 @@ display: none;
 Markup.noAutoDump();
 
 var test_files = [
+        'resources/pending-spec-changes-plain-text-unsafe.dat',
+        'resources/pending-spec-changes.dat',
+        'resources/plain-text-unsafe.dat',
         'resources/tests1.dat',
         'resources/tests2.dat',
         'resources/tests3.dat',
Mirror of the WebKit open source project on svn.webkit.org.