RS by Beth "pants on fire" Dakin.
authorggaren <ggaren@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 21 Oct 2006 02:02:51 +0000 (02:02 +0000)
committerggaren <ggaren@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 21 Oct 2006 02:02:51 +0000 (02:02 +0000)
        Put some layout tests in their place.

        * fast/dom/Window/window-object-cross-frame-calls-expected.txt: Added.
        * fast/dom/Window/window-object-cross-frame-calls.html: Added.
        * fast/dom/Window/window-onFocus-expected.checksum: Added.
        * fast/dom/Window/window-onFocus-expected.png: Added.
        * fast/dom/Window/window-onFocus-expected.txt: Added.
        * fast/dom/Window/window-onFocus.html: Added.
        * fast/dom/Window/window-xy-properties-expected.txt: Added.
        * fast/dom/Window/window-xy-properties.html: Added.
        * fast/dom/window-object-cross-frame-calls-expected.txt: Removed.
        * fast/dom/window-object-cross-frame-calls.html: Removed.
        * fast/dom/window-onFocus-expected.checksum: Removed.
        * fast/dom/window-onFocus-expected.png: Removed.
        * fast/dom/window-onFocus-expected.txt: Removed.
        * fast/dom/window-onFocus.html: Removed.
        * fast/dom/window-xy-properties-expected.txt: Removed.
        * fast/dom/window-xy-properties.html: Removed.
        * fast/html/xhtml-serialize-expected.txt: Added.
        * fast/html/xhtml-serialize.html: Added.
        * fast/js/resources/xhtml-serialize.js: Removed.
        * fast/js/resources/xslt-fragment-in-empty-doc.js: Removed.
        * fast/js/xhtml-serialize-expected.txt: Removed.
        * fast/js/xhtml-serialize.html: Removed.
        * fast/js/xslt-fragment-in-empty-doc-expected.txt: Removed.
        * fast/js/xslt-fragment-in-empty-doc.html: Removed.
        * fast/xsl/xslt-fragment-in-empty-doc-expected.txt: Added.
        * fast/xsl/xslt-fragment-in-empty-doc.html: Added.
        * fast/dom/resources/child.html: Removed.
        * fast/dom/Window/resources/child.html: Added.

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

18 files changed:
LayoutTests/ChangeLog
LayoutTests/fast/dom/Window/resources/child.html [moved from LayoutTests/fast/dom/resources/child.html with 100% similarity]
LayoutTests/fast/dom/Window/window-object-cross-frame-calls-expected.txt [moved from LayoutTests/fast/dom/window-object-cross-frame-calls-expected.txt with 100% similarity]
LayoutTests/fast/dom/Window/window-object-cross-frame-calls.html [moved from LayoutTests/fast/dom/window-object-cross-frame-calls.html with 100% similarity]
LayoutTests/fast/dom/Window/window-onFocus-expected.checksum [moved from LayoutTests/fast/dom/window-onFocus-expected.checksum with 100% similarity]
LayoutTests/fast/dom/Window/window-onFocus-expected.png [moved from LayoutTests/fast/dom/window-onFocus-expected.png with 100% similarity]
LayoutTests/fast/dom/Window/window-onFocus-expected.txt [moved from LayoutTests/fast/dom/window-onFocus-expected.txt with 100% similarity]
LayoutTests/fast/dom/Window/window-onFocus.html [moved from LayoutTests/fast/dom/window-onFocus.html with 100% similarity]
LayoutTests/fast/dom/Window/window-xy-properties-expected.txt [moved from LayoutTests/fast/dom/window-xy-properties-expected.txt with 100% similarity]
LayoutTests/fast/dom/Window/window-xy-properties.html [moved from LayoutTests/fast/dom/window-xy-properties.html with 97% similarity]
LayoutTests/fast/html/xhtml-serialize-expected.txt [new file with mode: 0644]
LayoutTests/fast/html/xhtml-serialize.html [new file with mode: 0644]
LayoutTests/fast/js/resources/xhtml-serialize.js [deleted file]
LayoutTests/fast/js/xhtml-serialize-expected.txt [deleted file]
LayoutTests/fast/js/xhtml-serialize.html [deleted file]
LayoutTests/fast/js/xslt-fragment-in-empty-doc.html [deleted file]
LayoutTests/fast/xsl/xslt-fragment-in-empty-doc-expected.txt [moved from LayoutTests/fast/js/xslt-fragment-in-empty-doc-expected.txt with 50% similarity]
LayoutTests/fast/xsl/xslt-fragment-in-empty-doc.html [moved from LayoutTests/fast/js/resources/xslt-fragment-in-empty-doc.js with 69% similarity]

index a4be3a274e825e808395c65d9ea3925b1d7788d6..4bab21e254479ed4a49a0ff5b886bd3ae7caf195 100644 (file)
@@ -1,3 +1,38 @@
+2006-10-20  Geoffrey Garen  <ggaren@apple.com>
+
+        RS by Beth "pants on fire" Dakin.
+        
+        Put some layout tests in their place.
+
+        * fast/dom/Window/window-object-cross-frame-calls-expected.txt: Added.
+        * fast/dom/Window/window-object-cross-frame-calls.html: Added.
+        * fast/dom/Window/window-onFocus-expected.checksum: Added.
+        * fast/dom/Window/window-onFocus-expected.png: Added.
+        * fast/dom/Window/window-onFocus-expected.txt: Added.
+        * fast/dom/Window/window-onFocus.html: Added.
+        * fast/dom/Window/window-xy-properties-expected.txt: Added.
+        * fast/dom/Window/window-xy-properties.html: Added.
+        * fast/dom/window-object-cross-frame-calls-expected.txt: Removed.
+        * fast/dom/window-object-cross-frame-calls.html: Removed.
+        * fast/dom/window-onFocus-expected.checksum: Removed.
+        * fast/dom/window-onFocus-expected.png: Removed.
+        * fast/dom/window-onFocus-expected.txt: Removed.
+        * fast/dom/window-onFocus.html: Removed.
+        * fast/dom/window-xy-properties-expected.txt: Removed.
+        * fast/dom/window-xy-properties.html: Removed.
+        * fast/html/xhtml-serialize-expected.txt: Added.
+        * fast/html/xhtml-serialize.html: Added.
+        * fast/js/resources/xhtml-serialize.js: Removed.
+        * fast/js/resources/xslt-fragment-in-empty-doc.js: Removed.
+        * fast/js/xhtml-serialize-expected.txt: Removed.
+        * fast/js/xhtml-serialize.html: Removed.
+        * fast/js/xslt-fragment-in-empty-doc-expected.txt: Removed.
+        * fast/js/xslt-fragment-in-empty-doc.html: Removed.
+        * fast/xsl/xslt-fragment-in-empty-doc-expected.txt: Added.
+        * fast/xsl/xslt-fragment-in-empty-doc.html: Added.
+        * fast/dom/resources/child.html: Removed.
+        * fast/dom/Window/resources/child.html: Added.
+
 2006-10-20  Beth Dakin  <bdakin@apple.com>
 
         Reviewed by Geoff.
similarity index 97%
rename from LayoutTests/fast/dom/window-xy-properties.html
rename to LayoutTests/fast/dom/Window/window-xy-properties.html
index 6c542652a2a184ddcbad05aa56741c15e0f9675d..2b95c9548b2176539363d1dcf92d9938b7e33b30 100644 (file)
@@ -1,5 +1,5 @@
 <head>
-<script src="../js/resources/js-test-pre.js"></script>
+<script src="../../js/resources/js-test-pre.js"></script>
 <script>
 var nrmouseclicks = 0; // small hack to distinguish between clicks
 var ev;
diff --git a/LayoutTests/fast/html/xhtml-serialize-expected.txt b/LayoutTests/fast/html/xhtml-serialize-expected.txt
new file mode 100644 (file)
index 0000000..2aadfc5
--- /dev/null
@@ -0,0 +1,7 @@
+This test checks whether serialized invalid XHTML is valid XML (for bug 9901).
+
+If the test passes, you'll see a series of 'PASS' messages below.
+
+PASS: doc.firstChild.firstChild.nodeValue should be 123 and is.
+PASS: str should be <input xmlns="http://www.w3.org/1999/xhtml">123</input> and is.
+
diff --git a/LayoutTests/fast/html/xhtml-serialize.html b/LayoutTests/fast/html/xhtml-serialize.html
new file mode 100644 (file)
index 0000000..8d650bf
--- /dev/null
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<body>
+<p>This test checks whether serialized invalid XHTML is valid XML (for bug 9901).</p>
+<p>If the test passes, you'll see a series of 'PASS' messages below.</p>
+<pre id="console"></pre>
+
+<script>
+if (window.layoutTestController)
+    layoutTestController.dumpAsText();
+    
+function log(s)
+{
+    document.getElementById('console').appendChild(document.createTextNode(s));
+}
+
+function shouldBe(a, b)
+{
+    var evalA;
+    try {
+        evalA = eval(a);
+    } catch(e) {
+        evalA = e;
+    }
+    
+    if (evalA == b)
+        log('PASS: ' + a + ' should be ' + b + ' and is.\n');
+    else
+        log('FAIL: ' + a + ' should be ' + b + ' but instead is ' + evalA + '.\n');
+}
+
+var doc = (new DOMParser()).parseFromString('<input xmlns="http://www.w3.org/1999/xhtml">123</input>', 'text/xml');
+var str = (new XMLSerializer()).serializeToString(doc);
+
+shouldBe('doc.firstChild.firstChild.nodeValue', '123');
+shouldBe('str', '<input xmlns=\"http://www.w3.org/1999/xhtml\">123</input>');
+</script>
+</body>
+</html>
diff --git a/LayoutTests/fast/js/resources/xhtml-serialize.js b/LayoutTests/fast/js/resources/xhtml-serialize.js
deleted file mode 100644 (file)
index aeb55ca..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-description(
-"This test checks whether serialized invalid XHTML is valid XML (for bug 9901)."
-);
-
-var doc = (new DOMParser()).parseFromString('<input xmlns="http://www.w3.org/1999/xhtml">123</input>', 'text/xml');
-var str = (new XMLSerializer()).serializeToString(doc);
-
-shouldBe('doc.firstChild.firstChild.nodeValue', '"123"');
-shouldBe('str', "'<input xmlns=\"http://www.w3.org/1999/xhtml\">123</input>'");
-
-var successfullyParsed = true;
diff --git a/LayoutTests/fast/js/xhtml-serialize-expected.txt b/LayoutTests/fast/js/xhtml-serialize-expected.txt
deleted file mode 100644 (file)
index 60dbd78..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-This test checks whether serialized invalid XHTML is valid XML (for bug 9901).
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS doc.firstChild.firstChild.nodeValue is "123"
-PASS str is '<input xmlns="http://www.w3.org/1999/xhtml">123</input>'
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/fast/js/xhtml-serialize.html b/LayoutTests/fast/js/xhtml-serialize.html
deleted file mode 100644 (file)
index 8d64d20..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href="resources/js-test-style.css">
-<script src="resources/js-test-pre.js"></script>
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script src="resources/xhtml-serialize.js"></script>
-<script src="resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/fast/js/xslt-fragment-in-empty-doc.html b/LayoutTests/fast/js/xslt-fragment-in-empty-doc.html
deleted file mode 100644 (file)
index 3aa0078..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href="resources/js-test-style.css">
-<script src="resources/js-test-pre.js"></script>
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script src="resources/xslt-fragment-in-empty-doc.js"></script>
-<script src="resources/js-test-post.js"></script>
-</body>
-</html>
similarity index 50%
rename from LayoutTests/fast/js/xslt-fragment-in-empty-doc-expected.txt
rename to LayoutTests/fast/xsl/xslt-fragment-in-empty-doc-expected.txt
index f043f9cf397e91e342bedcb36ccf427c29c80bae..7f8d658b3439eadad9644500c49e30f8159d0c42 100644 (file)
@@ -1,9 +1,5 @@
 This test checks whether XSLTProcessor.transformToFragment() does not crash when the target document does not have a root node.
 
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+PASS: You didn't crash.
 
 
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
similarity index 69%
rename from LayoutTests/fast/js/resources/xslt-fragment-in-empty-doc.js
rename to LayoutTests/fast/xsl/xslt-fragment-in-empty-doc.html
index 504facaa6eb9cebca5097b3713fe41ab828064b2..7b8b889ffe7ef741341642d50127ee5fcac468d9 100644 (file)
@@ -1,7 +1,14 @@
-description(
-"This test checks whether XSLTProcessor.transformToFragment() does not crash when the target document does not have a root node."
-);
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<body>
+<p>This test checks whether XSLTProcessor.transformToFragment() does not crash
+when the target document does not have a root node.</p>
 
+<div id="console"></div>
+<script>
+if (window.layoutTestController)
+    layoutTestController.dumpAsText();
+    
 var xml = (new DOMParser()).parseFromString('<doc/>', 'application/xml');
 var xsl = (new DOMParser()).parseFromString(
     '<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">' +
@@ -19,5 +26,7 @@ var f = p.transformToFragment(xml, ownerDocument);
 // "An attempt was made to create or change an object in a way which is incorrect with regard to namespaces."
 ownerDocument = document.implementation.createDocument("", null, null);
 f = p.transformToFragment(xml, ownerDocument);
-
-var successfullyParsed = true;
+</script>
+<p>PASS: You didn't crash.</p>
+</body>
+</html>