- fixed a few things in the DOM test suite
authordarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 27 Aug 2005 05:28:43 +0000 (05:28 +0000)
committerdarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 27 Aug 2005 05:28:43 +0000 (05:28 +0000)
        * layout-tests/dom/html/level1/core/selfhtml.js:
        * layout-tests/dom/html/level2/core/selfhtml.js:
        * layout-tests/dom/html/level2/events/selfhtml.js:
        * layout-tests/dom/html/level2/html/selfhtml.js:
        Updated all 4 of these to match and have better comments.

        * layout-tests/dom/html/level2/html/HTMLDocument17-expected.txt: Added.
        * layout-tests/dom/html/level2/html/HTMLDocument17.html: Added.
        * layout-tests/dom/html/level2/html/HTMLDocument17.html-disabled: Removed.
        Re-enabled this test since it's no longer crashing (and succeeding)!

        * layout-tests/dom/html/level2/html/HTMLDocument19-expected.txt: Added.
        * layout-tests/dom/html/level2/html/HTMLDocument19.html: Added.
        * layout-tests/dom/html/level2/html/HTMLDocument19.html-disabled: Removed.
        Re-enabled this test since it's no longer crashing (and succeeding)!

        * layout-tests/dom/html/level2/html/HTMLDocument20-expected.txt: Added.
        * layout-tests/dom/html/level2/html/HTMLDocument20.html: Added.
        * layout-tests/dom/html/level2/html/HTMLDocument20.html-disabled: Removed.
        Re-enabled this test since it's no longer crashing (and succeeding)!

        * layout-tests/dom/html/level2/html/HTMLDocument21-expected.txt: Added.
        * layout-tests/dom/html/level2/html/HTMLDocument21.html: Added.
        * layout-tests/dom/html/level2/html/HTMLDocument21.html-disabled: Removed.
        Re-enabled this test since it's no longer crashing (and succeeding)!

        * layout-tests/dom/html/level2/html/HTMLFormElement10-expected.txt: Removed.
        * layout-tests/dom/html/level2/html/HTMLFormElement10.html-disabled: Reverted the changes
        to this disabled test; it's still disabled, but now not changed locally in WebKit.
        * layout-tests/dom/html/level2/html/HTMLFormElement10.js: Reverted the changes in this
        script. Should no longer be needed.

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

16 files changed:
LayoutTests/dom/html/level1/core/selfhtml.js
LayoutTests/dom/html/level2/core/selfhtml.js
LayoutTests/dom/html/level2/events/selfhtml.js
LayoutTests/dom/html/level2/html/HTMLDocument17-expected.txt [new file with mode: 0644]
LayoutTests/dom/html/level2/html/HTMLDocument17.html [moved from LayoutTests/dom/html/level2/html/HTMLDocument17.html-disabled with 100% similarity]
LayoutTests/dom/html/level2/html/HTMLDocument19-expected.txt [new file with mode: 0644]
LayoutTests/dom/html/level2/html/HTMLDocument19.html [moved from LayoutTests/dom/html/level2/html/HTMLDocument19.html-disabled with 100% similarity]
LayoutTests/dom/html/level2/html/HTMLDocument20-expected.txt [new file with mode: 0644]
LayoutTests/dom/html/level2/html/HTMLDocument20.html [moved from LayoutTests/dom/html/level2/html/HTMLDocument20.html-disabled with 100% similarity]
LayoutTests/dom/html/level2/html/HTMLDocument21-expected.txt [new file with mode: 0644]
LayoutTests/dom/html/level2/html/HTMLDocument21.html [moved from LayoutTests/dom/html/level2/html/HTMLDocument21.html-disabled with 100% similarity]
LayoutTests/dom/html/level2/html/HTMLFormElement10-expected.txt [deleted file]
LayoutTests/dom/html/level2/html/HTMLFormElement10.html-disabled
LayoutTests/dom/html/level2/html/HTMLFormElement10.js
LayoutTests/dom/html/level2/html/selfhtml.js
WebCore/ChangeLog-2005-12-19

index 4db3017b649c07080104c9efdfe0cb76326ab077..06b0cc1b15614896e4f1c8bd83d303690d1cb43d 100644 (file)
@@ -10,16 +10,6 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 */
 
 
-//
-//   Webkit modification:  28-July-2005
-//
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
-//
-//   End modification
-//
-
-
   function assertSize(descr, expected, actual) {
     var actualSize;
     assertNotNull(descr, actual);
@@ -681,6 +671,21 @@ function getResourceURI(name, scheme, contentType) {
 
 
 function startTest() {
+
+//
+//  WebKit modification: 18-August-2005
+//
+//  Inform the test controller that this test has a text-format result and so should
+//  be dumped as text, and also that the dump should not occur automatically.
+//
+if (window.layoutTestController) {
+    layoutTestController.dumpAsText();
+    layoutTestController.waitUntilDone();
+}
+//
+//  End WebKit modification
+//
+
        //
        //   invoke test setup
        //
@@ -700,4 +705,17 @@ function startTest() {
             setResult("error", ex);
         }
     }
-}
\ No newline at end of file
+
+//
+//  WebKit modification: 18-August-2005
+//
+//  Inform the test controller that this test is complete, so it's time to dump.
+//
+    if (window.layoutTestController) {
+        layoutTestController.notifyDone();
+    }
+//
+//  End WebKit modification
+//      
+
+}
index 4db3017b649c07080104c9efdfe0cb76326ab077..06b0cc1b15614896e4f1c8bd83d303690d1cb43d 100644 (file)
@@ -10,16 +10,6 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 */
 
 
-//
-//   Webkit modification:  28-July-2005
-//
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
-//
-//   End modification
-//
-
-
   function assertSize(descr, expected, actual) {
     var actualSize;
     assertNotNull(descr, actual);
@@ -681,6 +671,21 @@ function getResourceURI(name, scheme, contentType) {
 
 
 function startTest() {
+
+//
+//  WebKit modification: 18-August-2005
+//
+//  Inform the test controller that this test has a text-format result and so should
+//  be dumped as text, and also that the dump should not occur automatically.
+//
+if (window.layoutTestController) {
+    layoutTestController.dumpAsText();
+    layoutTestController.waitUntilDone();
+}
+//
+//  End WebKit modification
+//
+
        //
        //   invoke test setup
        //
@@ -700,4 +705,17 @@ function startTest() {
             setResult("error", ex);
         }
     }
-}
\ No newline at end of file
+
+//
+//  WebKit modification: 18-August-2005
+//
+//  Inform the test controller that this test is complete, so it's time to dump.
+//
+    if (window.layoutTestController) {
+        layoutTestController.notifyDone();
+    }
+//
+//  End WebKit modification
+//      
+
+}
index 4db3017b649c07080104c9efdfe0cb76326ab077..06b0cc1b15614896e4f1c8bd83d303690d1cb43d 100644 (file)
@@ -10,16 +10,6 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 */
 
 
-//
-//   Webkit modification:  28-July-2005
-//
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
-//
-//   End modification
-//
-
-
   function assertSize(descr, expected, actual) {
     var actualSize;
     assertNotNull(descr, actual);
@@ -681,6 +671,21 @@ function getResourceURI(name, scheme, contentType) {
 
 
 function startTest() {
+
+//
+//  WebKit modification: 18-August-2005
+//
+//  Inform the test controller that this test has a text-format result and so should
+//  be dumped as text, and also that the dump should not occur automatically.
+//
+if (window.layoutTestController) {
+    layoutTestController.dumpAsText();
+    layoutTestController.waitUntilDone();
+}
+//
+//  End WebKit modification
+//
+
        //
        //   invoke test setup
        //
@@ -700,4 +705,17 @@ function startTest() {
             setResult("error", ex);
         }
     }
-}
\ No newline at end of file
+
+//
+//  WebKit modification: 18-August-2005
+//
+//  Inform the test controller that this test is complete, so it's time to dump.
+//
+    if (window.layoutTestController) {
+        layoutTestController.notifyDone();
+    }
+//
+//  End WebKit modification
+//      
+
+}
diff --git a/LayoutTests/dom/html/level2/html/HTMLDocument17-expected.txt b/LayoutTests/dom/html/level2/html/HTMLDocument17-expected.txt
new file mode 100644 (file)
index 0000000..65338cb
--- /dev/null
@@ -0,0 +1,2 @@
+Test:  http://www.w3.org/2001/DOM-Test-Suite/level2/html/HTMLDocument17
+Status:        Success
diff --git a/LayoutTests/dom/html/level2/html/HTMLDocument19-expected.txt b/LayoutTests/dom/html/level2/html/HTMLDocument19-expected.txt
new file mode 100644 (file)
index 0000000..4cf53cf
--- /dev/null
@@ -0,0 +1,2 @@
+Test:  http://www.w3.org/2001/DOM-Test-Suite/level2/html/HTMLDocument19
+Status:        Success
diff --git a/LayoutTests/dom/html/level2/html/HTMLDocument20-expected.txt b/LayoutTests/dom/html/level2/html/HTMLDocument20-expected.txt
new file mode 100644 (file)
index 0000000..3f02965
--- /dev/null
@@ -0,0 +1,2 @@
+Test:  http://www.w3.org/2001/DOM-Test-Suite/level2/html/HTMLDocument20
+Status:        Success
diff --git a/LayoutTests/dom/html/level2/html/HTMLDocument21-expected.txt b/LayoutTests/dom/html/level2/html/HTMLDocument21-expected.txt
new file mode 100644 (file)
index 0000000..ea02a8c
--- /dev/null
@@ -0,0 +1,2 @@
+Test:  http://www.w3.org/2001/DOM-Test-Suite/level2/html/HTMLDocument21
+Status:        Success
diff --git a/LayoutTests/dom/html/level2/html/HTMLFormElement10-expected.txt b/LayoutTests/dom/html/level2/html/HTMLFormElement10-expected.txt
deleted file mode 100644 (file)
index 8b13789..0000000
+++ /dev/null
@@ -1 +0,0 @@
-
index d2428523d39154a418e35601271e5d1fb6609fe4..365cceafeee36923c2f65beb241e2499e4f75d4a 100644 (file)
@@ -5,9 +5,7 @@
 <TITLE>FORM3</TITLE>
 <script type='text/javascript' src='selfhtml.js'></script><script charset='UTF-8' type='text/javascript' src='HTMLFormElement10.js'></script><script type='text/javascript'>function loadComplete() { startTest(); }</script></HEAD>
 <BODY onload="loadComplete()">
-<!-- disable this for now, since it causes all layout tests after this test to fail
-<FORM ID="form1" ACTION="data:text/html,<script>if(window.layoutTestController){layoutTestController.notifyDone();}</script><span style='visibility: hidden'>">
--->
+<FORM ID="form1" ACTION="about:blank">
 <P>
 <TEXTAREA NAME="text1" COLS="20" ROWS="7"></TEXTAREA>
 <INPUT TYPE="submit" NAME="submit1" VALUE="Submit" />
index 987ee3b42624067a153dfad99f2b03900e28fe5c..769b38815d6b6be910cad95d2a9e368f64d38ce2 100644 (file)
@@ -95,10 +95,6 @@ function HTMLFormElement10() {
       nodeList = doc.getElementsByTagName("form");
       assertSize("Asize",1,nodeList);
 testNode = nodeList.item(0);
-
-      if (window.layoutTestController)
-          layoutTestController.waitUntilDone();
-
       testNode.submit();
       
 }
index bb57e4f68ca3be1f3871e6270eddb8d8592ac5d2..06b0cc1b15614896e4f1c8bd83d303690d1cb43d 100644 (file)
@@ -10,18 +10,6 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 */
 
 
-//
-//   Webkit modification:  18-August-2005
-//
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
-}
-//
-//   End modification
-//
-
-
   function assertSize(descr, expected, actual) {
     var actualSize;
     assertNotNull(descr, actual);
@@ -683,6 +671,21 @@ function getResourceURI(name, scheme, contentType) {
 
 
 function startTest() {
+
+//
+//  WebKit modification: 18-August-2005
+//
+//  Inform the test controller that this test has a text-format result and so should
+//  be dumped as text, and also that the dump should not occur automatically.
+//
+if (window.layoutTestController) {
+    layoutTestController.dumpAsText();
+    layoutTestController.waitUntilDone();
+}
+//
+//  End WebKit modification
+//
+
        //
        //   invoke test setup
        //
@@ -702,13 +705,17 @@ function startTest() {
             setResult("error", ex);
         }
     }
+
 //
-//   Webkit modification:  18-August-2005
+//  WebKit modification: 18-August-2005
 //
-if (window.layoutTestController) {
-    layoutTestController.notifyDone();
-}
+//  Inform the test controller that this test is complete, so it's time to dump.
 //
-//   End modification
+    if (window.layoutTestController) {
+        layoutTestController.notifyDone();
+    }
+//
+//  End WebKit modification
 //      
+
 }
index 1184fb8fa4be023c7db0d586b66b4a3266e2c1dc..2701a2a2a028e5ceb313e7521d65a6a0d60f51e0 100644 (file)
@@ -1,3 +1,39 @@
+2005-08-26  Darin Adler  <darin@apple.com>
+
+        - fixed a few things in the DOM test suite
+
+        * layout-tests/dom/html/level1/core/selfhtml.js:
+        * layout-tests/dom/html/level2/core/selfhtml.js:
+        * layout-tests/dom/html/level2/events/selfhtml.js:
+        * layout-tests/dom/html/level2/html/selfhtml.js:
+        Updated all 4 of these to match and have better comments.
+
+        * layout-tests/dom/html/level2/html/HTMLDocument17-expected.txt: Added.
+        * layout-tests/dom/html/level2/html/HTMLDocument17.html: Added.
+        * layout-tests/dom/html/level2/html/HTMLDocument17.html-disabled: Removed.
+        Re-enabled this test since it's no longer crashing (and succeeding)!
+
+        * layout-tests/dom/html/level2/html/HTMLDocument19-expected.txt: Added.
+        * layout-tests/dom/html/level2/html/HTMLDocument19.html: Added.
+        * layout-tests/dom/html/level2/html/HTMLDocument19.html-disabled: Removed.
+        Re-enabled this test since it's no longer crashing (and succeeding)!
+
+        * layout-tests/dom/html/level2/html/HTMLDocument20-expected.txt: Added.
+        * layout-tests/dom/html/level2/html/HTMLDocument20.html: Added.
+        * layout-tests/dom/html/level2/html/HTMLDocument20.html-disabled: Removed.
+        Re-enabled this test since it's no longer crashing (and succeeding)!
+
+        * layout-tests/dom/html/level2/html/HTMLDocument21-expected.txt: Added.
+        * layout-tests/dom/html/level2/html/HTMLDocument21.html: Added.
+        * layout-tests/dom/html/level2/html/HTMLDocument21.html-disabled: Removed.
+        Re-enabled this test since it's no longer crashing (and succeeding)!
+
+        * layout-tests/dom/html/level2/html/HTMLFormElement10-expected.txt: Removed.
+        * layout-tests/dom/html/level2/html/HTMLFormElement10.html-disabled: Reverted the changes
+        to this disabled test; it's still disabled, but now not changed locally in WebKit.
+        * layout-tests/dom/html/level2/html/HTMLFormElement10.js: Reverted the changes in this
+        script. Should no longer be needed.
+
 2005-08-26  Curt Arnold  <curt.arnold@mac.com>
 
         Reviewed and landed by Darin.