git://git.webkit.org / WebKit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2830d6e)
2010-10-13 James Simonsen <simonjam@chromium.org>
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 14 Oct 2010 06:58:30 +0000 (06:58 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 14 Oct 2010 06:58:30 +0000 (06:58 +0000)
        Reviewed by Adam Barth.

        Sync tests from html5lib.
        https://bugs.webkit.org/show_bug.cgi?id=47627

        * html5lib/resources/adoption02.dat: Copied from html5lib.
        * html5lib/resources/entities01.dat: Ditto.
        * html5lib/resources/pending-spec-changes.dat: Ditto.
        * html5lib/resources/tests21.dat: Ditto.
        * html5lib/runner-expected.txt: 2 tests now pass.
        * platform/chromium/html5lib/runner-expected.txt: Ditto.
        * platform/win/html5lib/runner-expected.txt: Ditto.

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

LayoutTests/ChangeLog patch | blob | history
LayoutTests/html5lib/resources/adoption02.dat patch | blob | history
LayoutTests/html5lib/resources/entities01.dat patch | blob | history
LayoutTests/html5lib/resources/pending-spec-changes.dat patch | blob | history
LayoutTests/html5lib/resources/tests21.dat patch | blob | history
LayoutTests/html5lib/runner-expected.txt patch | blob | history
LayoutTests/platform/chromium/html5lib/runner-expected.txt patch | blob | history
LayoutTests/platform/win/html5lib/runner-expected.txt patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f5e0947d1e406bf44f58fdc900c006f6689de006..37b1e2bc356ab29bb0e7632326cfdd753556587c 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2010-10-13  James Simonsen  <simonjam@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Sync tests from html5lib.
+        https://bugs.webkit.org/show_bug.cgi?id=47627
+
+        * html5lib/resources/adoption02.dat: Copied from html5lib.
+        * html5lib/resources/entities01.dat: Ditto.
+        * html5lib/resources/pending-spec-changes.dat: Ditto.
+        * html5lib/resources/tests21.dat: Ditto.
+        * html5lib/runner-expected.txt: 2 tests now pass.
+        * platform/chromium/html5lib/runner-expected.txt: Ditto.
+        * platform/win/html5lib/runner-expected.txt: Ditto.
+
 2010-10-13  Martin Robinson  <mrobinson@igalia.com>
 
         Rebaseline canvas/philip/tests/2d.gradient.radial.negative.html. It seems
diff --git a/LayoutTests/html5lib/resources/adoption02.dat b/LayoutTests/html5lib/resources/adoption02.dat
index e6e6826713b25209b5275bc5184c9692b1d10dfc..d18151b44f0e3a034278d9c7120119db084e832d 100644 (file)
--- a/LayoutTests/html5lib/resources/adoption02.dat
+++ b/LayoutTests/html5lib/resources/adoption02.dat
@@ -15,29 +15,6 @@
 |           "3"
 |         "4"
 
-#data
-<b id="b">1<i id="i">2<p>3<script>document.getElementById("b").id = "c";document.getElementById("i").id = "j"</script></b>4
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       id="c"
-|       "1"
-|       <i>
-|         id="j"
-|         "2"
-|     <i>
-|       id="i"
-|       <p>
-|         <b>
-|           id="b"
-|           "3"
-|           <script>
-|             "document.getElementById("b").id = "c";document.getElementById("i").id = "j""
-|         "4"
-
 #data
 <a><div><style></style><address><a>
 #errors
diff --git a/LayoutTests/html5lib/resources/entities01.dat b/LayoutTests/html5lib/resources/entities01.dat
index 926642e2e227111ac7396d4b5f728de6cf8e5714..c8073b7810b8dcc0340db720af2a83c9b0195db2 100644 (file)
--- a/LayoutTests/html5lib/resources/entities01.dat
+++ b/LayoutTests/html5lib/resources/entities01.dat
@@ -188,15 +188,6 @@ FOO&#x0000;ZOO
 |   <body>
 |     "FOO�ZOO"
 
-#data
-FOO&#x000D;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO\rZOO"
-
 #data
 FOO&#x0078;ZOO
 #errors
diff --git a/LayoutTests/html5lib/resources/pending-spec-changes.dat b/LayoutTests/html5lib/resources/pending-spec-changes.dat
index 4663c8b28fd166c0810af4b40ac02fd84c11e6bb..b933025a00b39ca95bede1e69ab8268c0a4e9f12 100644 (file)
--- a/LayoutTests/html5lib/resources/pending-spec-changes.dat
+++ b/LayoutTests/html5lib/resources/pending-spec-changes.dat
@@ -1,45 +1,8 @@
 #data
-FOO<!-- BAR -- <QUX> -- MUX -- >BAZ
+Placeholder
 #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>
+|     "Placeholder"
diff --git a/LayoutTests/html5lib/resources/tests21.dat b/LayoutTests/html5lib/resources/tests21.dat
index 9acc845601da606b9185c06f315bc08d7a00730c..1260ec03e2029443b1566cd9dbe80fe9b4a9c142 100644 (file)
--- a/LayoutTests/html5lib/resources/tests21.dat
+++ b/LayoutTests/html5lib/resources/tests21.dat
@@ -86,6 +86,26 @@
 |     <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/runner-expected.txt b/LayoutTests/html5lib/runner-expected.txt
index c4d0f900d1426c7d60b10816ce1b9a929a773de8..b24c3adbfec4a8f546376e9fe50102dacc37a9f7 100644 (file)
--- a/LayoutTests/html5lib/runner-expected.txt
+++ b/LayoutTests/html5lib/runner-expected.txt
@@ -11,37 +11,8 @@ 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
+resources/pending-spec-changes.dat: PASS
 
-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
@@ -229,49 +200,8 @@ resources/comments01.dat: PASS
 
 resources/adoption01.dat: PASS
 
-resources/adoption02.dat:
-2
+resources/adoption02.dat: PASS
 
-Test 2 of 3 in resources/adoption02.dat failed. Input:
-<b id="b">1<i id="i">2<p>3<script>document.getElementById("b").id = "c";document.getElementById("i").id = "j"</script></b>4
-Got:
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       id="c"
-|       "1"
-|       <i>
-|         id="j"
-|         "2"
-|     <i>
-|       id="j"
-|       <p>
-|         <b>
-|           id="c"
-|           "3"
-|           <script>
-|             "document.getElementById("b").id = "c";document.getElementById("i").id = "j""
-|         "4"
-Expected:
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       id="c"
-|       "1"
-|       <i>
-|         id="j"
-|         "2"
-|     <i>
-|       id="i"
-|       <p>
-|         <b>
-|           id="b"
-|           "3"
-|           <script>
-|             "document.getElementById("b").id = "c";document.getElementById("i").id = "j""
-|         "4"
 resources/inbody01.dat: PASS
 
 resources/isindex.dat: PASS
diff --git a/LayoutTests/platform/chromium/html5lib/runner-expected.txt b/LayoutTests/platform/chromium/html5lib/runner-expected.txt
index 42af374a261ec1213cb4632bf2c76befee9737d5..ae08bbed31e46da2fee37324e2bc253defc3f1b2 100755 (executable)
--- a/LayoutTests/platform/chromium/html5lib/runner-expected.txt
+++ b/LayoutTests/platform/chromium/html5lib/runner-expected.txt
@@ -11,37 +11,8 @@ 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
+resources/pending-spec-changes.dat: PASS
 
-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
@@ -225,49 +196,8 @@ resources/comments01.dat: PASS
 
 resources/adoption01.dat: PASS
 
-resources/adoption02.dat:
-2
+resources/adoption02.dat: PASS
 
-Test 2 of 3 in resources/adoption02.dat failed. Input:
-<b id="b">1<i id="i">2<p>3<script>document.getElementById("b").id = "c";document.getElementById("i").id = "j"</script></b>4
-Got:
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       id="c"
-|       "1"
-|       <i>
-|         id="j"
-|         "2"
-|     <i>
-|       id="j"
-|       <p>
-|         <b>
-|           id="c"
-|           "3"
-|           <script>
-|             "document.getElementById("b").id = "c";document.getElementById("i").id = "j""
-|         "4"
-Expected:
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       id="c"
-|       "1"
-|       <i>
-|         id="j"
-|         "2"
-|     <i>
-|       id="i"
-|       <p>
-|         <b>
-|           id="b"
-|           "3"
-|           <script>
-|             "document.getElementById("b").id = "c";document.getElementById("i").id = "j""
-|         "4"
 resources/inbody01.dat: PASS
 
 resources/isindex.dat: PASS
diff --git a/LayoutTests/platform/win/html5lib/runner-expected.txt b/LayoutTests/platform/win/html5lib/runner-expected.txt
index 318d94e5a9074619e97be12306eac8395128443b..e6259c8e2a5454bc42284cb667a9c8257cb422b8 100644 (file)
--- a/LayoutTests/platform/win/html5lib/runner-expected.txt
+++ b/LayoutTests/platform/win/html5lib/runner-expected.txt
@@ -11,37 +11,8 @@ 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
+resources/pending-spec-changes.dat: PASS
 
-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
@@ -187,49 +158,8 @@ resources/comments01.dat: PASS
 
 resources/adoption01.dat: PASS
 
-resources/adoption02.dat:
-2
+resources/adoption02.dat: PASS
 
-Test 2 of 3 in resources/adoption02.dat failed. Input:
-<b id="b">1<i id="i">2<p>3<script>document.getElementById("b").id = "c";document.getElementById("i").id = "j"</script></b>4
-Got:
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       id="c"
-|       "1"
-|       <i>
-|         id="j"
-|         "2"
-|     <i>
-|       id="j"
-|       <p>
-|         <b>
-|           id="c"
-|           "3"
-|           <script>
-|             "document.getElementById("b").id = "c";document.getElementById("i").id = "j""
-|         "4"
-Expected:
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       id="c"
-|       "1"
-|       <i>
-|         id="j"
-|         "2"
-|     <i>
-|       id="i"
-|       <p>
-|         <b>
-|           id="b"
-|           "3"
-|           <script>
-|             "document.getElementById("b").id = "c";document.getElementById("i").id = "j""
-|         "4"
 resources/inbody01.dat: PASS
 
 resources/isindex.dat: PASS
Mirror of the WebKit open source project on svn.webkit.org.