- fixed a mistake in the DOM tests, and an organizational issue that made...
authordarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 3 Sep 2005 20:45:35 +0000 (20:45 +0000)
committerdarin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 3 Sep 2005 20:45:35 +0000 (20:45 +0000)
          run with run-webkit-tests (because run-webkit-tests assumes that any file with an .html
          extension is one of the tests)

        * layout-tests/dom/html/level2/html/HTMLFrameElement09-expected.txt: Updated to expect success.
        The failure we were seeing was due to an incorrect title in frame.html.

        * layout-tests/dom/html/level2/html/HTMLFrameElement09.html: Updated to get at iframe.html
        and frame.html from the resources subdirectory.

        * layout-tests/dom/html/level2/html/HTMLIFrameElement11.html-disabled: Updated to get at iframe.html
        and frame.html from the resources subdirectory.

        * layout-tests/dom/html/level2/html/frame.html: Removed. Since this is not a test, moved it into the
        resources subdirectory so the layout test engine won't see it.
        * layout-tests/dom/html/level2/html/iframe.html: Ditto.

        * layout-tests/dom/html/level2/html/resources/frame.html: Moved down here from the directory above.
        Adjusted URLs that specify resources still in the directory above to use "../" to find those.
        Also corrected the title of the file which was incorrect and causing HTMLFrameElement09 to fail.
        * layout-tests/dom/html/level2/html/resources/iframe.html: More of the same.

        * layout-tests/dom/html/level2/html/frame-expected.txt: Removed. This was not a test, so it
        should not have expected results.
        * layout-tests/dom/html/level2/html/iframe-expected.txt: Ditto.

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

LayoutTests/dom/html/level2/html/frame-expected.txt [deleted file]
LayoutTests/dom/html/level2/html/iframe-expected.txt [deleted file]
LayoutTests/dom/html/level2/html/resources/frame.html [moved from LayoutTests/dom/html/level2/html/frame.html with 81% similarity]
LayoutTests/dom/html/level2/html/resources/iframe.html [moved from LayoutTests/dom/html/level2/html/iframe.html with 87% similarity]

index f24a108a7f702ef5935a80216c55b7d18b74f6e2..ad5e6359cd62e8cd5f1331a5e75a13a93a6a0427 100644 (file)
@@ -1,3 +1,2 @@
-Test:  http://www.w3.org/2001/DOM-Test-Suite/level2/html/HTMLFrameElement09    
-Status:        failure
-Detail:        titleLink: assertEquals failed, actual NIST DOM HTML Test - FRAME, expected NIST DOM HTML Test - FRAMESET.
+Test:  http://www.w3.org/2001/DOM-Test-Suite/level2/html/HTMLFrameElement09
+Status:        Success
index ec48ce4213d14568e4610c86f525c88f1bbefc04..0f63d45795aa069a6ccd23ebbec1c826676cfc21 100644 (file)
@@ -9,8 +9,8 @@
 <script type='text/javascript' src='selfhtml.js'></script><script charset='UTF-8' type='text/javascript' src='HTMLFrameElement09.js'></script><script type='text/javascript'>function loadComplete() { startTest(); }</script></HEAD>
 <FRAMESET COLS="20, 80"  onload="loadComplete()">
 <FRAMESET ROWS="100, 200">
-<FRAME ID="Frame1" NAME="Frame1" SRC="frame.html">
+<FRAME ID="Frame1" NAME="Frame1" SRC="resources/frame.html">
-<FRAME ID="Frame2" NAME="Frame2" SRC="iframe.html">
+<FRAME ID="Frame2" NAME="Frame2" SRC="resources/iframe.html">
index 1fcd4755d113c0705d7b0c34d5f69083f2c7d283..d401e52193e2aa7816a3cb22dfc106f42c7bc451 100644 (file)
@@ -7,7 +7,7 @@
 <SCRIPT type="text/javascript">function loadComplete() { }</SCRIPT>
 <script type='text/javascript' src='selfhtml.js'></script><script charset='UTF-8' type='text/javascript' src='HTMLIFrameElement11.js'></script><script type='text/javascript'>function loadComplete() { startTest(); }</script></HEAD>
 <BODY onload="loadComplete()">
-<IFRAME ID="Iframe1" NAME="Iframe1" SRC="iframe.html">IFRAME1</IFRAME>
-<IFRAME ID="Iframe2" SRC="frame.html" NAME="Iframe2">IFRAME2</IFRAME>
+<IFRAME ID="Iframe1" NAME="Iframe1" SRC="resources/iframe.html">IFRAME1</IFRAME>
+<IFRAME ID="Iframe2" SRC="resources/frame.html" NAME="Iframe2">IFRAME2</IFRAME>
diff --git a/LayoutTests/dom/html/level2/html/frame-expected.txt b/LayoutTests/dom/html/level2/html/frame-expected.txt
deleted file mode 100644 (file)
index 1253b58..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
-  RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderFrameSet {FRAMESET} at (0,0) size 800x600
-      RenderFrameSet {FRAMESET} at (0,0) size 159x600
-        RenderFrame {FRAME} at (0,0) size 159x198
-      RenderFrame {FRAME} at (163,0) size 636x600
diff --git a/LayoutTests/dom/html/level2/html/iframe-expected.txt b/LayoutTests/dom/html/level2/html/iframe-expected.txt
deleted file mode 100644 (file)
index 643a6e0..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
-  RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderPartObject {IFRAME} at (0,0) size 60x50
-      RenderText {TEXT} at (0,0) size 0x0
-      RenderText {TEXT} at (0,0) size 0x0
similarity index 81%
rename from LayoutTests/dom/html/level2/html/frame.html
rename to LayoutTests/dom/html/level2/html/resources/frame.html
index 41182c9be3fe15d69aa64059a6e78b28ec02e2e6..3cafa0956d01ee1e75884547a93c0e5ab15c801b 100644 (file)
@@ -3,12 +3,12 @@
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=utf-8">
 <FRAMESET COLS="20, 80"  onload="parent.loadComplete()">
 <FRAMESET ROWS="100, 200">
-<FRAME SRC="w3c_main.png">
+<FRAME SRC="../w3c_main.png">
similarity index 87%
rename from LayoutTests/dom/html/level2/html/iframe.html
rename to LayoutTests/dom/html/level2/html/resources/iframe.html
index 0a44fc3354ae1e1c3503f2f7e7f03949f16db6b0..914d0bc09c8c0ae8a81f39915ecae5d2dbaf3429 100644 (file)
@@ -5,6 +5,6 @@
 <BODY onload="parent.loadComplete()">
index 72d0d95ee87eebb27d0c26e214caf56c26aa3444..8d3199074ced44dc9dce8008b4bd551b51a5d603 100644 (file)
@@ -1,3 +1,31 @@
+2005-09-03  Darin Adler  <darin@apple.com>
+        - fixed a mistake in the DOM tests, and an organizational issue that made them hard to
+          run with run-webkit-tests (because run-webkit-tests assumes that any file with an .html
+          extension is one of the tests)
+        * layout-tests/dom/html/level2/html/HTMLFrameElement09-expected.txt: Updated to expect success.
+        The failure we were seeing was due to an incorrect title in frame.html.
+        * layout-tests/dom/html/level2/html/HTMLFrameElement09.html: Updated to get at iframe.html
+        and frame.html from the resources subdirectory.
+        * layout-tests/dom/html/level2/html/HTMLIFrameElement11.html-disabled: Updated to get at iframe.html
+        and frame.html from the resources subdirectory.
+        * layout-tests/dom/html/level2/html/frame.html: Removed. Since this is not a test, moved it into the
+        resources subdirectory so the layout test engine won't see it.
+        * layout-tests/dom/html/level2/html/iframe.html: Ditto.
+        * layout-tests/dom/html/level2/html/resources/frame.html: Moved down here from the directory above.
+        Adjusted URLs that specify resources still in the directory above to use "../" to find those.
+        Also corrected the title of the file which was incorrect and causing HTMLFrameElement09 to fail.
+        * layout-tests/dom/html/level2/html/resources/iframe.html: More of the same.
+        * layout-tests/dom/html/level2/html/frame-expected.txt: Removed. This was not a test, so it
+        should not have expected results.
+        * layout-tests/dom/html/level2/html/iframe-expected.txt: Ditto.
 2005-09-02  Eric Seidel  <eseidel@apple.com>
         No review requested (only affects SVG), continuation of 4790.