[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
abarth at webkit.org
abarth at webkit.org
Wed Dec 22 12:50:21 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit bdfeb8beb68457c3d7a38f26dcfe297dcc69658e
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 31 14:22:00 2010 +0000
2010-08-31 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
Update in-test expectations to account for HTML5 parsing changes
https://bugs.webkit.org/show_bug.cgi?id=44889
We've already updated the -expected.txt files for these tests to
account for the behavior changes with the HTML5 parser. This patch
updates the redundant "in-test" expectations so that the results say
"PASS" instead of "FAIL".
* fast/forms/datalist-nonoption-child.html:
* fast/forms/state-restore-to-non-edited-controls-expected.txt:
* fast/forms/state-restore-to-non-edited-controls.html:
* fast/parser/fragment-parser-expected.txt:
* fast/parser/residual-style-close-across-n-blocks-expected.txt:
* fast/parser/residual-style-close-across-n-blocks.html:
* fast/parser/script-tests/fragment-parser.js:
* http/tests/misc/isindex-formdata-expected.txt:
* http/tests/misc/isindex-formdata.html:
* http/tests/misc/isindex-with-no-form-base-href-expected.txt:
* http/tests/misc/resources/isindex-with-no-form-base-href.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66482 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b1954d7..5e196d3 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,27 @@
+2010-08-31 Adam Barth <abarth at webkit.org>
+
+ Reviewed by Eric Seidel.
+
+ Update in-test expectations to account for HTML5 parsing changes
+ https://bugs.webkit.org/show_bug.cgi?id=44889
+
+ We've already updated the -expected.txt files for these tests to
+ account for the behavior changes with the HTML5 parser. This patch
+ updates the redundant "in-test" expectations so that the results say
+ "PASS" instead of "FAIL".
+
+ * fast/forms/datalist-nonoption-child.html:
+ * fast/forms/state-restore-to-non-edited-controls-expected.txt:
+ * fast/forms/state-restore-to-non-edited-controls.html:
+ * fast/parser/fragment-parser-expected.txt:
+ * fast/parser/residual-style-close-across-n-blocks-expected.txt:
+ * fast/parser/residual-style-close-across-n-blocks.html:
+ * fast/parser/script-tests/fragment-parser.js:
+ * http/tests/misc/isindex-formdata-expected.txt:
+ * http/tests/misc/isindex-formdata.html:
+ * http/tests/misc/isindex-with-no-form-base-href-expected.txt:
+ * http/tests/misc/resources/isindex-with-no-form-base-href.html:
+
2010-08-31 Mihai Parparita <mihaip at chromium.org>
Reviewed by Tony Chang.
diff --git a/LayoutTests/fast/forms/datalist-nonoption-child-expected.txt b/LayoutTests/fast/forms/datalist-nonoption-child-expected.txt
index d76c433..b0aa7d5 100644
--- a/LayoutTests/fast/forms/datalist-nonoption-child-expected.txt
+++ b/LayoutTests/fast/forms/datalist-nonoption-child-expected.txt
@@ -5,7 +5,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS datalist.firstChild.nodeName is "#text"
PASS datalist.firstChild.nodeName is "B"
-FAIL datalist.firstChild.nodeName should be #text. Was DIV.
+PASS datalist.firstChild.nodeName is "DIV"
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/forms/datalist-nonoption-child.html b/LayoutTests/fast/forms/datalist-nonoption-child.html
index c1539f1..6229b6b 100644
--- a/LayoutTests/fast/forms/datalist-nonoption-child.html
+++ b/LayoutTests/fast/forms/datalist-nonoption-child.html
@@ -22,8 +22,7 @@ datalist = document.getElementById('dl2');
shouldBe('datalist.firstChild.nodeName', '"B"');
datalist = document.getElementById('dl3');
-// <div> tag should be ignored.
-shouldBe('datalist.firstChild.nodeName', '"#text"');
+shouldBe('datalist.firstChild.nodeName', '"DIV"');
var successfullyParsed = true;
</script>
diff --git a/LayoutTests/fast/forms/state-restore-to-non-edited-controls-expected.txt b/LayoutTests/fast/forms/state-restore-to-non-edited-controls-expected.txt
index 9f67578..5a92c15 100644
--- a/LayoutTests/fast/forms/state-restore-to-non-edited-controls-expected.txt
+++ b/LayoutTests/fast/forms/state-restore-to-non-edited-controls-expected.txt
@@ -5,7 +5,7 @@ PASS document.getElementById("hidden").value is "2"
PASS document.getElementById("image").value is "2"
PASS document.getElementById("reset").value is "2"
PASS document.getElementById("submit1").value is "2"
-FAIL document.getElementById("text1").value should be edit. Was 2.
+PASS document.getElementById("text1").value is "2"
PASS document.getElementById("text2").value is "2"
PASS document.getElementById("textarea").value is "2"
diff --git a/LayoutTests/fast/forms/state-restore-to-non-edited-controls.html b/LayoutTests/fast/forms/state-restore-to-non-edited-controls.html
index c75ecf6..4793268 100644
--- a/LayoutTests/fast/forms/state-restore-to-non-edited-controls.html
+++ b/LayoutTests/fast/forms/state-restore-to-non-edited-controls.html
@@ -50,7 +50,7 @@ function runTest()
shouldBe('document.getElementById("image").value', '"2"');
shouldBe('document.getElementById("reset").value', '"2"');
shouldBe('document.getElementById("submit1").value', '"2"');
- shouldBe('document.getElementById("text1").value', '"edit"');
+ shouldBe('document.getElementById("text1").value', '"2"');
shouldBe('document.getElementById("text2").value', '"2"');
shouldBe('document.getElementById("textarea").value', '"2"');
diff --git a/LayoutTests/fast/parser/fragment-parser-expected.txt b/LayoutTests/fast/parser/fragment-parser-expected.txt
index 60fb26d..a919694 100644
--- a/LayoutTests/fast/parser/fragment-parser-expected.txt
+++ b/LayoutTests/fast/parser/fragment-parser-expected.txt
@@ -5,19 +5,19 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS parse('<span><body bgcolor=red>') is ['<span></span>','<html><body></body></html>']
PASS parse('<span><html bgcolor=red>') is ['<span></span>','<html><body></body></html>']
-FAIL parse('<span><meta>') should be <span></span>,<html><body></body></html>. Was <span><meta></span>,<html><body></body></html>.
-FAIL parse('<span><base>') should be <span></span>,<html><body></body></html>. Was <span><base></span>,<html><body></body></html>.
-FAIL parse('<html><script>') should be ,<html><body></body></html>. Was <script></script>,<html><body></body></html>.
-FAIL parse('<html><style>') should be ,<html><body></body></html>. Was <style></style>,<html><body></body></html>.
-FAIL parse('<html><meta>') should be ,<html><body></body></html>. Was <meta>,<html><body></body></html>.
-FAIL parse('<html><link>') should be ,<html><body></body></html>. Was <link>,<html><body></body></html>.
+PASS parse('<span><meta>') is ['<span><meta></span>','<html><body></body></html>']
+PASS parse('<span><base>') is ['<span><base></span>','<html><body></body></html>']
+PASS parse('<html><script>') is ['<script></script>','<html><body></body></html>']
+PASS parse('<html><style>') is ['<style></style>','<html><body></body></html>']
+PASS parse('<html><meta>') is ['<meta>','<html><body></body></html>']
+PASS parse('<html><link>') is ['<link>','<html><body></body></html>']
PASS parse('<html><object>') is ['<object></object>','<html><body></body></html>']
PASS parse('<html><embed>') is ['<embed>','<html><body></body></html>']
-FAIL parse('<html><title>') should be ,<html><body></body></html>. Was <title></title>,<html><body></body></html>.
-FAIL parse('<html><isindex>') should be <div><hr>This is a searchable index. Enter search keywords: <isindex type="khtml_isindex"><hr></div>,<html><body></body></html>. Was <form><hr><label>This is a searchable index. Enter search keywords: <input name="isindex"></label><hr></form>,<html><body></body></html>.
+PASS parse('<html><title>') is ['<title></title>','<html><body></body></html>']
+PASS parse('<html><isindex>') is ['<form><hr><label>This is a searchable index. Enter search keywords: <input name="isindex"></label><hr></form>','<html><body></body></html>']
FAIL parse('<html><base>') should be ,<html><body></body></html>. Was <base>,<html><body></body></html>.
PASS parse('<html><div>') is ['<div></div>','<html><body></body></html>']
-FAIL parse('<frameset>') should be <frameset></frameset>,<html><body></body></html>. Was ,<html><body></body></html>.
+PASS parse('<frameset>') is ['','<html><body></body></html>']
PASS parse('<html>x', true) is ['x','no document element']
PASS successfullyParsed is true
diff --git a/LayoutTests/fast/parser/residual-style-close-across-n-blocks-expected.txt b/LayoutTests/fast/parser/residual-style-close-across-n-blocks-expected.txt
index b15bdb0..0520c64 100644
--- a/LayoutTests/fast/parser/residual-style-close-across-n-blocks-expected.txt
+++ b/LayoutTests/fast/parser/residual-style-close-across-n-blocks-expected.txt
@@ -6,8 +6,8 @@ PASS: 1<i>2<div>3<span>4<pre>5</i>6</pre>7</div>8 parsed as 1<i>2</i><div><i>3<s
PASS: 1<i>2<div>3<pre>4<b>5</i>6</b>7</pre>8</div>9 parsed as 1<i>2</i><div><i>3</i><pre><i>4<b>5</b></i><b>6</b>7</pre>8</div>9 as expected.
PASS: 1<i>2<div>3<pre>4<p>5</i>6</p>7</pre>8</div>9 parsed as 1<i>2</i><div><i>3</i><pre><i>4</i><p><i>5</i>6</p>7</pre>8</div>9 as expected.
PASS: 1<i>2<div>3<object>4<p>5</i>6</p>7</object>8</div>9 parsed as 1<i>2<div>3<object>4<p>56</p>7</object>8</div>9</i> as expected.
-FAIL: <a href="#1"><div><div><a href="#2"></a><p>Shouldn't be a link</p></div><p>Shouldn't be a link</p></div><p>Shouldn't be a link</p></a> parsed as <a href="#1"></a><div><a href="#1"></a><div><a href="#1"></a><a href="#2"></a><p>Shouldn't be a link</p></div><p>Shouldn't be a link</p></div><p>Shouldn't be a link</p> instead of <a href="#1"></a><div><a href="#1"></a><div><a href="#2"></a><p>Shouldn't be a link</p></div><p>Shouldn't be a link</p></div><p>Shouldn't be a link</p>
+PASS: <a href="#1"><div><div><a href="#2"></a><p>Shouldn't be a link</p></div><p>Shouldn't be a link</p></div><p>Shouldn't be a link</p></a> parsed as <a href="#1"></a><div><a href="#1"></a><div><a href="#1"></a><a href="#2"></a><p>Shouldn't be a link</p></div><p>Shouldn't be a link</p></div><p>Shouldn't be a link</p> as expected.
PASS: <p><a>RED</p>RED<div>RED<p>RED<a>RED</a>BLACK</p>BLACK</div>BLACK parsed as <p><a>RED</a></p><a>RED</a><div><a>RED</a><p><a>RED</a><a>RED</a>BLACK</p>BLACK</div>BLACK as expected.
-FAIL: <a href="#outside"><p>Outside link.</p><div><div><a href="#inside">Inside link.</a></div></div><p>After all links</p> parsed as <a href="#outside"><p>Outside link.</p></a><div><a href="#outside"></a><div><a href="#outside"></a><a href="#inside">Inside link.</a></div></div><p>After all links</p> instead of <a href="#outside"><p>Outside link.</p></a><div><a href="#outside"></a><div><a href="#inside">Inside link.</a></div></div><p>After all links</p>
-FAIL: <a href="http://webkit.org"><div><h3><a href="about:blank">This is a link.</a></h3>This is not a link under Firefox, but it is under Safari. parsed as <a href="http://webkit.org"></a><div><a href="http://webkit.org"></a><h3><a href="http://webkit.org"></a><a href="about:blank">This is a link.</a></h3>This is not a link under Firefox, but it is under Safari.</div> instead of <a href="http://webkit.org"></a><div><a href="http://webkit.org"></a><h3><a href="about:blank">This is a link.</a></h3>This is not a link under Firefox, but it is under Safari.</div>
+PASS: <a href="#outside"><p>Outside link.</p><div><div><a href="#inside">Inside link.</a></div></div><p>After all links</p> parsed as <a href="#outside"><p>Outside link.</p></a><div><a href="#outside"></a><div><a href="#outside"></a><a href="#inside">Inside link.</a></div></div><p>After all links</p> as expected.
+PASS: <a href="http://webkit.org"><div><h3><a href="about:blank">This is a link.</a></h3>This is not a link under Firefox, but it is under Safari. parsed as <a href="http://webkit.org"></a><div><a href="http://webkit.org"></a><h3><a href="http://webkit.org"></a><a href="about:blank">This is a link.</a></h3>This is not a link under Firefox, but it is under Safari.</div> as expected.
diff --git a/LayoutTests/fast/parser/residual-style-close-across-n-blocks.html b/LayoutTests/fast/parser/residual-style-close-across-n-blocks.html
index 51be78a..3a6be37 100644
--- a/LayoutTests/fast/parser/residual-style-close-across-n-blocks.html
+++ b/LayoutTests/fast/parser/residual-style-close-across-n-blocks.html
@@ -58,7 +58,7 @@
// Bug 13603 reduction:
testParsing("<a href=\"#1\"><div><div><a href=\"#2\"></a><p>Shouldn't be a link</p></div><p>Shouldn't be a link</p></div><p>Shouldn't be a link</p></a>",
- "<a href=\"#1\"></a><div><a href=\"#1\"></a><div><a href=\"#2\"></a><p>Shouldn't be a link</p></div><p>Shouldn't be a link</p></div><p>Shouldn't be a link</p>");
+ "<a href=\"#1\"></a><div><a href=\"#1\"></a><div><a href=\"#1\"></a><a href=\"#2\"></a><p>Shouldn't be a link</p></div><p>Shouldn't be a link</p></div><p>Shouldn't be a link</p>");
// Almost bug 8750 reduction:
testParsing("<p><a>RED</p>RED<div>RED<p>RED<a>RED</a>BLACK</p>BLACK</div>BLACK",
@@ -66,11 +66,11 @@
// Bug 12808 reduction:
testParsing("<a href=\"#outside\"><p>Outside link.</p><div><div><a href=\"#inside\">Inside link.</a></div></div><p>After all links</p>",
- "<a href=\"#outside\"><p>Outside link.</p></a><div><a href=\"#outside\"></a><div><a href=\"#inside\">Inside link.</a></div></div><p>After all links</p>");
+ "<a href=\"#outside\"><p>Outside link.</p></a><div><a href=\"#outside\"></a><div><a href=\"#outside\"></a><a href=\"#inside\">Inside link.</a></div></div><p>After all links</p>");
// Bug 12861 reduction:
testParsing("<a href=\"http://webkit.org\"><div><h3><a href=\"about:blank\">This is a link.</a></h3>This is not a link under Firefox, but it is under Safari.",
- "<a href=\"http://webkit.org\"></a><div><a href=\"http://webkit.org\"></a><h3><a href=\"about:blank\">This is a link.</a></h3>This is not a link under Firefox, but it is under Safari.</div>");
+ "<a href=\"http://webkit.org\"></a><div><a href=\"http://webkit.org\"></a><h3><a href=\"http://webkit.org\"></a><a href=\"about:blank\">This is a link.</a></h3>This is not a link under Firefox, but it is under Safari.</div>");
}
</script>
diff --git a/LayoutTests/fast/parser/script-tests/fragment-parser.js b/LayoutTests/fast/parser/script-tests/fragment-parser.js
index 3b9076a..efd9a85 100644
--- a/LayoutTests/fast/parser/script-tests/fragment-parser.js
+++ b/LayoutTests/fast/parser/script-tests/fragment-parser.js
@@ -16,20 +16,20 @@ function parse(string, removeDocumentElement) {
shouldBe("parse('<span><body bgcolor=red>')", "['<span></span>','<html><body></body></html>']");
shouldBe("parse('<span><html bgcolor=red>')", "['<span></span>','<html><body></body></html>']");
-shouldBe("parse('<span><meta>')", "['<span></span>','<html><body></body></html>']");
-shouldBe("parse('<span><base>')", "['<span></span>','<html><body></body></html>']");
-shouldBe("parse('<html><script>')", "['','<html><body></body></html>']");
-shouldBe("parse('<html><style>')", "['','<html><body></body></html>']");
-shouldBe("parse('<html><meta>')", "['','<html><body></body></html>']");
-shouldBe("parse('<html><link>')", "['','<html><body></body></html>']");
+shouldBe("parse('<span><meta>')", "['<span><meta></span>','<html><body></body></html>']");
+shouldBe("parse('<span><base>')", "['<span><base></span>','<html><body></body></html>']");
+shouldBe("parse('<html><script>')", "['<script></script>','<html><body></body></html>']");
+shouldBe("parse('<html><style>')", "['<style></style>','<html><body></body></html>']");
+shouldBe("parse('<html><meta>')", "['<meta>','<html><body></body></html>']");
+shouldBe("parse('<html><link>')", "['<link>','<html><body></body></html>']");
shouldBe("parse('<html><object>')", "['<object></object>','<html><body></body></html>']");
shouldBe("parse('<html><embed>')", "['<embed>','<html><body></body></html>']");
-shouldBe("parse('<html><title>')", "['','<html><body></body></html>']");
-shouldBe("parse('<html><isindex>')", "['<div><hr>This is a searchable index. Enter search keywords: <isindex type=\"khtml_isindex\"><hr></div>','<html><body></body></html>']");
+shouldBe("parse('<html><title>')", "['<title></title>','<html><body></body></html>']");
+shouldBe("parse('<html><isindex>')", "['<form><hr><label>This is a searchable index. Enter search keywords: <input name=\"isindex\"></label><hr></form>','<html><body></body></html>']");
shouldBe("parse('<html><base>')", "['','<html><body></body></html>']");
shouldBe("parse('<html><div>')", "['<div></div>','<html><body></body></html>']");
-shouldBe("parse('<frameset>')", "['<frameset></frameset>','<html><body></body></html>']");
+shouldBe("parse('<frameset>')", "['','<html><body></body></html>']");
shouldBe("parse('<html>x', true)", "['x','no document element']");
var successfullyParsed = true;
diff --git a/LayoutTests/http/tests/misc/isindex-formdata-expected.txt b/LayoutTests/http/tests/misc/isindex-formdata-expected.txt
index 2883349..58b1ba9 100644
--- a/LayoutTests/http/tests/misc/isindex-formdata-expected.txt
+++ b/LayoutTests/http/tests/misc/isindex-formdata-expected.txt
@@ -1,4 +1,4 @@
This page tests that we correctly put the value of an <isindex> element into the form data.
-FAIL: could not find isindex element
+Could not find isindex element
diff --git a/LayoutTests/http/tests/misc/isindex-formdata.html b/LayoutTests/http/tests/misc/isindex-formdata.html
index e9ecc5b..2532f3c 100644
--- a/LayoutTests/http/tests/misc/isindex-formdata.html
+++ b/LayoutTests/http/tests/misc/isindex-formdata.html
@@ -8,7 +8,7 @@ function test()
}
if (!document.getElementById("isindex")) {
- log("FAIL: could not find isindex element");
+ log("Could not find isindex element");
if (window.layoutTestController)
layoutTestController.notifyDone();
return;
diff --git a/LayoutTests/http/tests/misc/isindex-with-no-form-base-href-expected.txt b/LayoutTests/http/tests/misc/isindex-with-no-form-base-href-expected.txt
index 4566355..0567938 100644
--- a/LayoutTests/http/tests/misc/isindex-with-no-form-base-href-expected.txt
+++ b/LayoutTests/http/tests/misc/isindex-with-no-form-base-href-expected.txt
@@ -3,7 +3,7 @@
--------
Frame: '<!--framePath //<!--frame0-->-->'
--------
-FAIL: could not find form with expected action
+Could not find form with expected action
This page tests that we correctly put the value of an <isindex> element into the form data.
If you are running this test by hand, press the enter/return key on your keyboard to submit.
diff --git a/LayoutTests/http/tests/misc/resources/isindex-with-no-form-base-href.html b/LayoutTests/http/tests/misc/resources/isindex-with-no-form-base-href.html
index c2ec08d..a8ca84d 100644
--- a/LayoutTests/http/tests/misc/resources/isindex-with-no-form-base-href.html
+++ b/LayoutTests/http/tests/misc/resources/isindex-with-no-form-base-href.html
@@ -11,7 +11,7 @@ function test()
{
var forms = document.getElementsByTagName('form');
if (forms.length != 1 || forms[0].action != 'http://localhost:8000/misc/resources/isindex-with-no-form-base-href-submit.html') {
- log('FAIL: could not find form with expected action');
+ log('Could not find form with expected action');
if (window.layoutTestController)
layoutTestController.notifyDone();
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list