[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
darin at apple.com
darin at apple.com
Thu Apr 8 00:55:52 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 650c0791a9b4625cda0453b3b428bd1168d336b3
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jan 6 20:24:29 2010 +0000
Some script tests have wrappers that don't match their templates
https://bugs.webkit.org/show_bug.cgi?id=33239
Reviewed by Eric Seidel.
* fast/dom/StyleSheet/get-stylesheet-byname.html: Updated to use
a standard test wrapper instead of a custom one.
* fast/dom/StyleSheet/script-tests/get-stylesheet-byname.js:
Changed test to not depend on a non-standard wrapper.
* fast/dom/StyleSheet/get-stylesheet-byname-expected.txt: Updated
results since I changed the test around.
* platform/mac/editing/selection/script-tests/TEMPLATE.html: Fix
incorrect path in template that broke the test when we called
make-script-test-wrappers.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52863 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 18ab435..8fe69e1 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,21 @@
+2010-01-06 Darin Adler <darin at apple.com>
+
+ Reviewed by Eric Seidel.
+
+ Some script tests have wrappers that don't match their templates
+ https://bugs.webkit.org/show_bug.cgi?id=33239
+
+ * fast/dom/StyleSheet/get-stylesheet-byname.html: Updated to use
+ a standard test wrapper instead of a custom one.
+ * fast/dom/StyleSheet/script-tests/get-stylesheet-byname.js:
+ Changed test to not depend on a non-standard wrapper.
+ * fast/dom/StyleSheet/get-stylesheet-byname-expected.txt: Updated
+ results since I changed the test around.
+
+ * platform/mac/editing/selection/script-tests/TEMPLATE.html: Fix
+ incorrect path in template that broke the test when we called
+ make-script-test-wrappers.
+
2010-01-05 Kent Tamura <tkent at chromium.org>
Reviewed by Maciej Stachowiak.
diff --git a/LayoutTests/fast/dom/StyleSheet/get-stylesheet-byname-expected.txt b/LayoutTests/fast/dom/StyleSheet/get-stylesheet-byname-expected.txt
index 02d10cf..31fb4c8 100644
--- a/LayoutTests/fast/dom/StyleSheet/get-stylesheet-byname-expected.txt
+++ b/LayoutTests/fast/dom/StyleSheet/get-stylesheet-byname-expected.txt
@@ -3,7 +3,7 @@ This test verifies that a StyleSheet object will be returned instead of a HTMLSt
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS document.styleSheets["test"].toString() is document.styleSheets[1].toString()
+PASS document.styleSheets["test"] is styleElement.sheet
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/dom/StyleSheet/get-stylesheet-byname.html b/LayoutTests/fast/dom/StyleSheet/get-stylesheet-byname.html
index 5689f7d..ed23080 100644
--- a/LayoutTests/fast/dom/StyleSheet/get-stylesheet-byname.html
+++ b/LayoutTests/fast/dom/StyleSheet/get-stylesheet-byname.html
@@ -2,11 +2,6 @@
<html>
<head>
<link rel="stylesheet" href="../../js/resources/js-test-style.css">
-<style id="test">
-.unknown {
- left: 0px;
-}
-</style>
<script src="../../js/resources/js-test-pre.js"></script>
</head>
<body>
@@ -15,4 +10,4 @@
<script src="script-tests/get-stylesheet-byname.js"></script>
<script src="../../js/resources/js-test-post.js"></script>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/LayoutTests/fast/dom/StyleSheet/script-tests/get-stylesheet-byname.js b/LayoutTests/fast/dom/StyleSheet/script-tests/get-stylesheet-byname.js
index 30042bf..793ed65 100644
--- a/LayoutTests/fast/dom/StyleSheet/script-tests/get-stylesheet-byname.js
+++ b/LayoutTests/fast/dom/StyleSheet/script-tests/get-stylesheet-byname.js
@@ -1,6 +1,8 @@
description("This test verifies that a StyleSheet object will be returned instead of a HTMLStyleElement when calling document.styleSheets named property getter.");
-// The type of returned object by number getter should be equal with the named property getter.
-shouldBe('document.styleSheets["test"].toString()', 'document.styleSheets[1].toString()');
+var styleElement = document.createElement("style");
+styleElement.setAttribute("id", "test");
+document.head.appendChild(styleElement);
+shouldBe('document.styleSheets["test"]', 'styleElement.sheet');
var successfullyParsed = true;
diff --git a/LayoutTests/platform/mac/editing/selection/script-tests/TEMPLATE.html b/LayoutTests/platform/mac/editing/selection/script-tests/TEMPLATE.html
index bcfeb6b..c1a9c4d 100644
--- a/LayoutTests/platform/mac/editing/selection/script-tests/TEMPLATE.html
+++ b/LayoutTests/platform/mac/editing/selection/script-tests/TEMPLATE.html
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<html>
<head>
-<link rel="stylesheet" href="../../../fast/js/resources/js-test-style.css">
-<script src="../../../fast/js/resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../fast/js/resources/js-test-style.css">
+<script src="../../../../fast/js/resources/js-test-pre.js"></script>
</head>
<body>
<p id="description"></p>
<div id="console"></div>
<script src="YOUR_JS_FILE_HERE"></script>
-<script src="../../../fast/js/resources/js-test-post.js"></script>
+<script src="../../../../fast/js/resources/js-test-post.js"></script>
</body>
</html>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list