Many accessibility js-tests use waitUntilDone
authorap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 19 May 2017 23:37:59 +0000 (23:37 +0000)
committerap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 19 May 2017 23:37:59 +0000 (23:37 +0000)
https://bugs.webkit.org/show_bug.cgi?id=172372

Reviewed by Tim Horton.

Corrected the use of js-test harness, updated the tests to use js-test.js instead
of js-test-pre.js where possible.

* accessibility/anonymous-render-block-in-continuation-causes-crash-expected.txt:
* accessibility/anonymous-render-block-in-continuation-causes-crash.html:
* accessibility/aria-checkbox-sends-notification.html:
* accessibility/aria-invalid.html:
* accessibility/aria-switch-sends-notification.html:
* accessibility/deleting-iframe-destroys-axcache.html:
* accessibility/file-upload-button-with-axpress.html:
* accessibility/frame-disconnect-textmarker-cache-crash-expected.txt:
* accessibility/frame-disconnect-textmarker-cache-crash.html:
* accessibility/gtk/aria-listbox-crash.html:
* accessibility/heading-title-includes-links-expected.txt:
* accessibility/heading-title-includes-links.html:
* accessibility/image-map-update-parent-crash-expected.txt:
* accessibility/image-map-update-parent-crash.html:
* accessibility/insert-children-assert-expected.txt:
* accessibility/insert-children-assert.html:
* accessibility/ios-simulator/focus-change-notifications.html:
* accessibility/label-element-press.html:
* accessibility/loading-iframe-updates-axtree.html:
* accessibility/mac/aria-expanded-notifications.html:
* accessibility/mac/aria-listbox-selectedchildren-change.html:
* accessibility/mac/aria-liveregion-on-image.html:
* accessibility/mac/aria-liveregions-addedelement.html:
* accessibility/mac/aria-liveregions-changedalt.html:
* accessibility/mac/aria-liveregions-changedtext.html:
* accessibility/mac/aria-liveregions-removedelement.html:
* accessibility/mac/combobox-activedescendant-notifications-expected.txt:
* accessibility/mac/combobox-activedescendant-notifications.html:
* accessibility/mac/focus-setting-selection-syncronizing-not-clearing-expected.txt:
* accessibility/mac/focus-setting-selection-syncronizing-not-clearing.html:
* accessibility/mac/html-slider-indicator.html:
* accessibility/mac/input-replacevalue-userinfo-expected.txt:
* accessibility/mac/input-replacevalue-userinfo.html:
* accessibility/mac/ordered-textmarker-crash-expected.txt:
* accessibility/mac/ordered-textmarker-crash.html:
* accessibility/mac/search-with-frames-expected.txt:
* accessibility/mac/search-with-frames.html:
* accessibility/mac/selection-boundary-userinfo.html:
* accessibility/mac/selection-change-userinfo.html:
* accessibility/mac/selection-element-tabbing-to-link.html:
* accessibility/mac/selection-value-changes-for-aria-textbox.html:
* accessibility/mac/stale-textmarker-crash-expected.txt:
* accessibility/mac/stale-textmarker-crash.html:
* accessibility/mac/textbox-role-reports-notifications-expected.txt:
* accessibility/mac/textbox-role-reports-notifications.html:
* accessibility/mac/value-change/value-change-user-info-contenteditable.html:
* accessibility/mac/value-change/value-change-user-info-textarea.html:
* accessibility/mac/value-change/value-change-user-info-textfield.html:
* accessibility/media-element.html:
* accessibility/menu-list-sends-change-notification.html:
* accessibility/multiselect-list-reports-active-option.html:
* accessibility/paragraph-with-linebreaks.html:
* accessibility/platform-name.html:
* accessibility/radio-button-group-members.html:
* accessibility/radio-button-title-label.html:
* accessibility/selection-states-expected.txt:
* accessibility/selection-states.html:
* accessibility/spinbutton-value.html:
* accessibility/svg-bounds.html:
* accessibility/table-cell-for-column-and-row-crash.html:
* accessibility/table-cells-roles.html:
* accessibility/table-roles-hierarchy.html:
* accessibility/table-with-aria-role.html:
* accessibility/textarea-insertion-point-line-number.html:
* accessibility/textbox-role-reports-selection.html:
* accessibility/title-ui-element-correctness.html:
* accessibility/unknown-roles-not-exposed-expected.txt:
* accessibility/unknown-roles-not-exposed.html:
* accessibility/win/bstr-elements-role.html:
* accessibility/win/detached-object-notification-crash.html:
* accessibility/win/heading-elements.html:
* accessibility/win/img-alt-attribute.html:
* accessibility/win/linked-elements.html:
* accessibility/win/list-item-role.html:
* accessibility/win/list-marker-role.html:
* accessibility/win/list-role.html:
* accessibility/win/multiple-select-element-role.html:
* accessibility/win/option-element-position-and-size.html:
* accessibility/win/parent-element.html:
* accessibility/win/select-element-role.html:
* accessibility/win/selection-and-focus.html:
* accessibility/win/single-select-children-changed.html:
* accessibility/win/single-select-children.html:
* accessibility/win/text-role.html:
* platform/mac-wk1/accessibility/loading-iframe-updates-axtree-expected.txt:
* platform/mac-wk2/accessibility/deleting-iframe-destroys-axcache-expected.txt:
* platform/mac/accessibility/deleting-iframe-destroys-axcache-expected.txt:
* platform/mac/accessibility/media-element-expected.txt:
* platform/mac/accessibility/table-cells-roles-expected.txt:
* platform/mac/accessibility/table-roles-hierarchy-expected.txt:

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

91 files changed:
LayoutTests/ChangeLog
LayoutTests/accessibility/anonymous-render-block-in-continuation-causes-crash-expected.txt
LayoutTests/accessibility/anonymous-render-block-in-continuation-causes-crash.html
LayoutTests/accessibility/aria-checkbox-sends-notification.html
LayoutTests/accessibility/aria-invalid.html
LayoutTests/accessibility/aria-switch-sends-notification.html
LayoutTests/accessibility/deleting-iframe-destroys-axcache.html
LayoutTests/accessibility/file-upload-button-with-axpress.html
LayoutTests/accessibility/frame-disconnect-textmarker-cache-crash-expected.txt
LayoutTests/accessibility/frame-disconnect-textmarker-cache-crash.html
LayoutTests/accessibility/gtk/aria-listbox-crash.html
LayoutTests/accessibility/heading-title-includes-links-expected.txt
LayoutTests/accessibility/heading-title-includes-links.html
LayoutTests/accessibility/image-map-update-parent-crash-expected.txt
LayoutTests/accessibility/image-map-update-parent-crash.html
LayoutTests/accessibility/insert-children-assert-expected.txt
LayoutTests/accessibility/insert-children-assert.html
LayoutTests/accessibility/ios-simulator/focus-change-notifications.html
LayoutTests/accessibility/label-element-press.html
LayoutTests/accessibility/loading-iframe-updates-axtree.html
LayoutTests/accessibility/mac/aria-expanded-notifications.html
LayoutTests/accessibility/mac/aria-listbox-selectedchildren-change.html
LayoutTests/accessibility/mac/aria-liveregion-on-image.html
LayoutTests/accessibility/mac/aria-liveregions-addedelement.html
LayoutTests/accessibility/mac/aria-liveregions-changedalt.html
LayoutTests/accessibility/mac/aria-liveregions-changedtext.html
LayoutTests/accessibility/mac/aria-liveregions-removedelement.html
LayoutTests/accessibility/mac/combobox-activedescendant-notifications-expected.txt
LayoutTests/accessibility/mac/combobox-activedescendant-notifications.html
LayoutTests/accessibility/mac/focus-setting-selection-syncronizing-not-clearing-expected.txt
LayoutTests/accessibility/mac/focus-setting-selection-syncronizing-not-clearing.html
LayoutTests/accessibility/mac/html-slider-indicator.html
LayoutTests/accessibility/mac/input-replacevalue-userinfo-expected.txt
LayoutTests/accessibility/mac/input-replacevalue-userinfo.html
LayoutTests/accessibility/mac/ordered-textmarker-crash-expected.txt
LayoutTests/accessibility/mac/ordered-textmarker-crash.html
LayoutTests/accessibility/mac/search-with-frames-expected.txt
LayoutTests/accessibility/mac/search-with-frames.html
LayoutTests/accessibility/mac/selection-boundary-userinfo.html
LayoutTests/accessibility/mac/selection-change-userinfo.html
LayoutTests/accessibility/mac/selection-element-tabbing-to-link.html
LayoutTests/accessibility/mac/selection-value-changes-for-aria-textbox.html
LayoutTests/accessibility/mac/stale-textmarker-crash-expected.txt
LayoutTests/accessibility/mac/stale-textmarker-crash.html
LayoutTests/accessibility/mac/textbox-role-reports-notifications-expected.txt
LayoutTests/accessibility/mac/textbox-role-reports-notifications.html
LayoutTests/accessibility/mac/value-change/value-change-user-info-contenteditable.html
LayoutTests/accessibility/mac/value-change/value-change-user-info-textarea.html
LayoutTests/accessibility/mac/value-change/value-change-user-info-textfield.html
LayoutTests/accessibility/media-element.html
LayoutTests/accessibility/menu-list-sends-change-notification.html
LayoutTests/accessibility/multiselect-list-reports-active-option.html
LayoutTests/accessibility/paragraph-with-linebreaks.html
LayoutTests/accessibility/platform-name.html
LayoutTests/accessibility/radio-button-group-members.html
LayoutTests/accessibility/radio-button-title-label.html
LayoutTests/accessibility/selection-states-expected.txt
LayoutTests/accessibility/selection-states.html
LayoutTests/accessibility/spinbutton-value.html
LayoutTests/accessibility/svg-bounds.html
LayoutTests/accessibility/table-cell-for-column-and-row-crash.html
LayoutTests/accessibility/table-cells-roles.html
LayoutTests/accessibility/table-roles-hierarchy.html
LayoutTests/accessibility/table-with-aria-role.html
LayoutTests/accessibility/textarea-insertion-point-line-number.html
LayoutTests/accessibility/textbox-role-reports-selection.html
LayoutTests/accessibility/title-ui-element-correctness.html
LayoutTests/accessibility/unknown-roles-not-exposed-expected.txt
LayoutTests/accessibility/unknown-roles-not-exposed.html
LayoutTests/accessibility/win/bstr-elements-role.html
LayoutTests/accessibility/win/detached-object-notification-crash.html
LayoutTests/accessibility/win/heading-elements.html
LayoutTests/accessibility/win/img-alt-attribute.html
LayoutTests/accessibility/win/linked-elements.html
LayoutTests/accessibility/win/list-item-role.html
LayoutTests/accessibility/win/list-marker-role.html
LayoutTests/accessibility/win/list-role.html
LayoutTests/accessibility/win/multiple-select-element-role.html
LayoutTests/accessibility/win/option-element-position-and-size.html
LayoutTests/accessibility/win/parent-element.html
LayoutTests/accessibility/win/select-element-role.html
LayoutTests/accessibility/win/selection-and-focus.html
LayoutTests/accessibility/win/single-select-children-changed.html
LayoutTests/accessibility/win/single-select-children.html
LayoutTests/accessibility/win/text-role.html
LayoutTests/platform/mac-wk1/accessibility/loading-iframe-updates-axtree-expected.txt
LayoutTests/platform/mac-wk2/accessibility/deleting-iframe-destroys-axcache-expected.txt
LayoutTests/platform/mac/accessibility/deleting-iframe-destroys-axcache-expected.txt
LayoutTests/platform/mac/accessibility/media-element-expected.txt
LayoutTests/platform/mac/accessibility/table-cells-roles-expected.txt
LayoutTests/platform/mac/accessibility/table-roles-hierarchy-expected.txt

index 9a6f0db3e21ff61dc3c2112b216a2ebaeeec68ba..e6f890454f190bf9c0a5b2ea7862d0d082f4405d 100644 (file)
@@ -1,3 +1,104 @@
+2017-05-19  Alexey Proskuryakov  <ap@apple.com>
+
+        Many accessibility js-tests use waitUntilDone
+        https://bugs.webkit.org/show_bug.cgi?id=172372
+
+        Reviewed by Tim Horton.
+
+        Corrected the use of js-test harness, updated the tests to use js-test.js instead
+        of js-test-pre.js where possible.
+
+        * accessibility/anonymous-render-block-in-continuation-causes-crash-expected.txt:
+        * accessibility/anonymous-render-block-in-continuation-causes-crash.html:
+        * accessibility/aria-checkbox-sends-notification.html:
+        * accessibility/aria-invalid.html:
+        * accessibility/aria-switch-sends-notification.html:
+        * accessibility/deleting-iframe-destroys-axcache.html:
+        * accessibility/file-upload-button-with-axpress.html:
+        * accessibility/frame-disconnect-textmarker-cache-crash-expected.txt:
+        * accessibility/frame-disconnect-textmarker-cache-crash.html:
+        * accessibility/gtk/aria-listbox-crash.html:
+        * accessibility/heading-title-includes-links-expected.txt:
+        * accessibility/heading-title-includes-links.html:
+        * accessibility/image-map-update-parent-crash-expected.txt:
+        * accessibility/image-map-update-parent-crash.html:
+        * accessibility/insert-children-assert-expected.txt:
+        * accessibility/insert-children-assert.html:
+        * accessibility/ios-simulator/focus-change-notifications.html:
+        * accessibility/label-element-press.html:
+        * accessibility/loading-iframe-updates-axtree.html:
+        * accessibility/mac/aria-expanded-notifications.html:
+        * accessibility/mac/aria-listbox-selectedchildren-change.html:
+        * accessibility/mac/aria-liveregion-on-image.html:
+        * accessibility/mac/aria-liveregions-addedelement.html:
+        * accessibility/mac/aria-liveregions-changedalt.html:
+        * accessibility/mac/aria-liveregions-changedtext.html:
+        * accessibility/mac/aria-liveregions-removedelement.html:
+        * accessibility/mac/combobox-activedescendant-notifications-expected.txt:
+        * accessibility/mac/combobox-activedescendant-notifications.html:
+        * accessibility/mac/focus-setting-selection-syncronizing-not-clearing-expected.txt:
+        * accessibility/mac/focus-setting-selection-syncronizing-not-clearing.html:
+        * accessibility/mac/html-slider-indicator.html:
+        * accessibility/mac/input-replacevalue-userinfo-expected.txt:
+        * accessibility/mac/input-replacevalue-userinfo.html:
+        * accessibility/mac/ordered-textmarker-crash-expected.txt:
+        * accessibility/mac/ordered-textmarker-crash.html:
+        * accessibility/mac/search-with-frames-expected.txt:
+        * accessibility/mac/search-with-frames.html:
+        * accessibility/mac/selection-boundary-userinfo.html:
+        * accessibility/mac/selection-change-userinfo.html:
+        * accessibility/mac/selection-element-tabbing-to-link.html:
+        * accessibility/mac/selection-value-changes-for-aria-textbox.html:
+        * accessibility/mac/stale-textmarker-crash-expected.txt:
+        * accessibility/mac/stale-textmarker-crash.html:
+        * accessibility/mac/textbox-role-reports-notifications-expected.txt:
+        * accessibility/mac/textbox-role-reports-notifications.html:
+        * accessibility/mac/value-change/value-change-user-info-contenteditable.html:
+        * accessibility/mac/value-change/value-change-user-info-textarea.html:
+        * accessibility/mac/value-change/value-change-user-info-textfield.html:
+        * accessibility/media-element.html:
+        * accessibility/menu-list-sends-change-notification.html:
+        * accessibility/multiselect-list-reports-active-option.html:
+        * accessibility/paragraph-with-linebreaks.html:
+        * accessibility/platform-name.html:
+        * accessibility/radio-button-group-members.html:
+        * accessibility/radio-button-title-label.html:
+        * accessibility/selection-states-expected.txt:
+        * accessibility/selection-states.html:
+        * accessibility/spinbutton-value.html:
+        * accessibility/svg-bounds.html:
+        * accessibility/table-cell-for-column-and-row-crash.html:
+        * accessibility/table-cells-roles.html:
+        * accessibility/table-roles-hierarchy.html:
+        * accessibility/table-with-aria-role.html:
+        * accessibility/textarea-insertion-point-line-number.html:
+        * accessibility/textbox-role-reports-selection.html:
+        * accessibility/title-ui-element-correctness.html:
+        * accessibility/unknown-roles-not-exposed-expected.txt:
+        * accessibility/unknown-roles-not-exposed.html:
+        * accessibility/win/bstr-elements-role.html:
+        * accessibility/win/detached-object-notification-crash.html:
+        * accessibility/win/heading-elements.html:
+        * accessibility/win/img-alt-attribute.html:
+        * accessibility/win/linked-elements.html:
+        * accessibility/win/list-item-role.html:
+        * accessibility/win/list-marker-role.html:
+        * accessibility/win/list-role.html:
+        * accessibility/win/multiple-select-element-role.html:
+        * accessibility/win/option-element-position-and-size.html:
+        * accessibility/win/parent-element.html:
+        * accessibility/win/select-element-role.html:
+        * accessibility/win/selection-and-focus.html:
+        * accessibility/win/single-select-children-changed.html:
+        * accessibility/win/single-select-children.html:
+        * accessibility/win/text-role.html:
+        * platform/mac-wk1/accessibility/loading-iframe-updates-axtree-expected.txt:
+        * platform/mac-wk2/accessibility/deleting-iframe-destroys-axcache-expected.txt:
+        * platform/mac/accessibility/deleting-iframe-destroys-axcache-expected.txt:
+        * platform/mac/accessibility/media-element-expected.txt:
+        * platform/mac/accessibility/table-cells-roles-expected.txt:
+        * platform/mac/accessibility/table-roles-hierarchy-expected.txt:
+
 2017-05-19  Matt Lewis  <jlewis3@apple.com>
 
         Rebaselined js/dom/global-constructors-attributes.html after revision 217129
index 38deb474ecc4acbae8caa7c399fad68a73a2d137..b2052df1448815a3d50f6bfd898bbd8bd7d759aa 100644 (file)
@@ -7,6 +7,7 @@ This tests that having an anonymous render block in a continuation doesn't cause
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
+PASS successfullyParsed is true
 
 TEST COMPLETE
 
index 732118d09cf9f4e95b3d4b295fc885c16d31c31d..f59c119a1aaf464601b123b75b51254c50b7cb42 100644 (file)
@@ -1,9 +1,8 @@
 <html>
 <head>
-<script src="../resources/js-test-pre.js"></script>
+<script src="../resources/js-test.js"></script>
 <script>
-    if (window.testRunner)
-        testRunner.waitUntilDone();
+    jsTestIsAsync = true;
 
     function walkAccessibilityTree(accessibilityObject) {
         var count = accessibilityObject.childrenCount;
@@ -17,9 +16,7 @@
         window.root = accessibilityController.rootElement;
         walkAccessibilityTree(root);
 
-        debug('<br /><span class="pass">TEST COMPLETE</span>');
-        if (window.testRunner)
-            testRunner.notifyDone();
+        finishJSTest();
     }
 
     if (window.testRunner && window.accessibilityController) {
index 4c34b0ddbff129678a9d1bb6def3b3f6ad4739df..b3127f23927599fd3529326c4d34dd4823d907e8 100644 (file)
@@ -1,10 +1,9 @@
 <html>
 <head>
-<script src="../resources/js-test-pre.js"></script>
+<script src="../resources/js-test.js"></script>
 <script>
     function runTest() {
-        if (window.testRunner)
-            testRunner.waitUntilDone();
+        jsTestIsAsync = true;
 
         description("This tests that checking of an aria checkbox sends a notification.");
 
@@ -19,8 +18,7 @@
 
             if (notificationCount == 2) {
                 accessibleCheckbox.removeNotificationListener(listener);
-                if (window.testRunner)
-                    testRunner.notifyDone();
+                finishJSTest();
             }
         }
         accessibleCheckbox.addNotificationListener(listener);
     };
 </script>
 </head>
-<body>
+<body onload="runTest()">
 
 <div id="checkbox1" tabindex=0 role="checkbox" aria-checked="false">Test Checkbox</div>
 
 <p id="description"></p>
 <div id="console"></div>
-<script>
-    runTest();
-</script>
-<script src="../resources/js-test-post.js"></script>
 </body>
 </html>
index 8742142ca5d2d4d9e4ef4ec7de14af834c7acd1e..0c34460a4011ecb82fc457effb1be95bdd14993f 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script src="../resources/js-test-pre.js"></script>
+<script src="../resources/js-test.js"></script>
 </head>
 <body id="body">
 
@@ -53,7 +53,7 @@
             $("notifications").innerHTML += "Notification received successfully.";
             axNotificationElement.removeNotificationListener();
             $("examples").hidden = true;
-            window.testRunner.notifyDone();
+            finishJSTest();
         }
     }
 
@@ -66,7 +66,7 @@
     }
 
     if (window.accessibilityController) {
-        window.testRunner.waitUntilDone();
+        jsTestIsAsync = true;
 
         var examples = document.querySelectorAll(".ex");
         for (var i = 0, c = examples.length; i < c; i++) {
@@ -87,7 +87,5 @@
     }
 
 </script>
-
-<script src="../resources/js-test-post.js"></script>
 </body>
 </html>
index 7d33170800c376cd58e85cce05a5a9efedbfe2dc..616c7fc59a3a0503885ade85e8b384359969d093 100644 (file)
@@ -1,10 +1,9 @@
 <html>
 <head>
-<script src="../resources/js-test-pre.js"></script>
+<script src="../resources/js-test.js"></script>
 <script>
     function runTest() {
-        if (window.testRunner)
-            testRunner.waitUntilDone();
+        jsTestIsAsync = true;
 
         description("This tests that toggling an aria switch sends a notification.");
 
@@ -19,8 +18,7 @@
 
             if (notificationCount == 2) {
                 widget.removeNotificationListener(listener);
-                if (window.testRunner)
-                    testRunner.notifyDone();
+                finishJSTest();
             }
         }
         widget.addNotificationListener(listener);
     };
 </script>
 </head>
-<body>
+<body onload="runTest()">
 
 <div id="switch" role="switch" aria-checked="false">Test Switch</div>
 
 <p id="description"></p>
 <div id="console"></div>
-<script>
-    runTest();
-</script>
-<script src="../resources/js-test-post.js"></script>
 </body>
 </html>
index b443759a545afd03a2289aa3333e56cd27acf24b..9e7fd897a08153a01090457043c0206bb9a1e00d 100644 (file)
@@ -1,10 +1,9 @@
 <html>
 <head>
-<script src="../resources/js-test-pre.js"></script>
+<script src="../resources/js-test.js"></script>
 <script src="../resources/accessibility-helper.js"></script>
 <script>
-    if (window.testRunner)
-        testRunner.waitUntilDone();
+    jsTestIsAsync = true;
 
     function runTest()
     {
@@ -55,9 +54,7 @@
             shouldBeTrue("after.isEqual(newAfter)");
         }
 
-        debug('<br /><span class="pass">TEST COMPLETE</span>');
-        if (window.testRunner)
-            testRunner.notifyDone();
+        finishJSTest();
     }
     
     window.addEventListener('load', function() {
index 50900d46dbf484a0fca3c2a9dc9524d9618152e5..b055c5f35aac46f955ee93d0bdfd66efaafa5601 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html>
 <body>
-<script src="../resources/js-test-pre.js"></script>
+<script src="../resources/js-test.js"></script>
 
 <input id="filetype" type="file">
 
 description("This tests that when AXPress is used DOMActivate will be handled by the input file type.")
 
 if (window.testRunner && window.accessibilityController) {
-    window.testRunner.waitUntilDone();
+    jsTestIsAsync = true;
     
     var inputFile = document.getElementById("filetype");
 
     inputFile.addEventListener("DOMActivate", function() { 
         debug("DOMActivate was called"); 
-        window.testRunner.notifyDone(); 
+        finishJSTest();
     });
 
     accessibilityController.accessibleElementById("filetype").press();
 }
 
 </script>
-
-<script src="../resources/js-test-post.js"></script>
 </body>
 </html>
index 61b08605f936d7b2060ab66ad4a171b4dbb6d116..064879960e8b67fc0ac9cd756d4829c3ab3d88bd 100644 (file)
@@ -6,4 +6,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 PASS string is 'hello'
 PASS string is 'test text'
 TEST PASSED: NO CRASH
+PASS successfullyParsed is true
+
+TEST COMPLETE
 
index 1a07f501f2db062c0cf2b36e081ab07708f6f9b7..e301e45fb4e555ae704dbf7c8f8da7faa34ef2d4 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script src="../resources/js-test-pre.js"></script>
+<script src="../resources/js-test.js"></script>
 </head>
 <body id="body">
 
@@ -43,9 +43,7 @@
 
             debug("TEST PASSED: NO CRASH");
 
-            if (window.testRunner) {
-                testRunner.notifyDone();
-            }
+            finishJSTest();
             gc();
         };
 
         gc();
     }
 
-    if (window.accessibilityController) {
-        window.jsTestIsAsync = true;
-    }
+    jsTestIsAsync = true;
 
 </script>
-
-<script src="../resources/js-test-post.js"></script>
 </body>
 </html>
index 91f2b949a141e07975fc7c5323b2353a79652a8d..e77c54f527dcb47300eac4c11c583460c02c92ea 100644 (file)
@@ -1,16 +1,14 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script src="../../resources/js-test-pre.js"></script>
+<script src="../../resources/js-test.js"></script>
 <script>
 function test()
 {
   description("This tests that selecting an option in an ARIA listbox doesn't crash.");
+  jsTestIsAsync = true;
 
   if (window.testRunner) {
-    testRunner.dumpAsText();
-    testRunner.waitUntilDone();
-
     // We focus on the body and get the associated accessibility
     // object to force the creation of the accessibility hierarchy.
     if (window.accessibilityController)
@@ -31,7 +29,7 @@ function test()
    // since it's supposed to crash because of a notification about the
    // selection changing and so if we notifyDone() now it would be too
    // soon and we would skip such emission, not crashing at all.
-   window.setTimeout("testRunner.notifyDone()",0);
+   window.setTimeout(finishJSTest, 0);
 }
 </script>
 </head>
@@ -43,7 +41,5 @@ function test()
 
 <p id="description"></p>
 <div id="console"></div>
-
-<script src="../../resources/js-test-post.js"></script>
 </body>
 </html>
index e963e898eb87e86035ee6f190a0e13cd661de4ee..b0604f334a9a609df4aaf3eefe035947a1078373 100644 (file)
@@ -5,8 +5,8 @@ This tests that the title of a heading will include links if available.
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
+Heading title: AXTitle: Apple
 PASS successfullyParsed is true
 
 TEST COMPLETE
-Heading title: AXTitle: Apple
 
index fb2ce4f0cbc60afb3201aad307fad7af8f94fd9d..f9443d73f647f0ada53d26ff55d4913555350844 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script src="../resources/js-test-pre.js"></script>
+<script src="../resources/js-test.js"></script>
 </head>
 <body id="body" onload="setTimeout('runTest()', 0);">
 
 
 <script>
 
-if (window.testRunner && window.accessibilityController) {
-    window.testRunner.waitUntilDone();
-}
+jsTestIsAsync = true;
 
 function runTest() {
     description("This tests that the title of a heading will include links if available.");
 
-    if (window.accessibilityController) {
-
+    if (window.accessibilityController)
         debug("Heading title: " + accessibilityController.accessibleElementById("heading").title);
-    }
-    window.testRunner.notifyDone();
+
+    finishJSTest();
 }
 
 </script>
-<script src="../resources/js-test-post.js"></script>
 </body>
 </html>
index 875577146bd54b824305c5b360ba3b3036cd341e..8a956e001915f90b98675c3d3bac1f867ef402d1 100644 (file)
@@ -3,4 +3,7 @@ This tests that an image map's hold on it's parent will be cleared if the parent
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
+PASS successfullyParsed is true
+
+TEST COMPLETE
 
index e4335a3abbaee519a931bbcf677841f5f4276270..2f92845c7b230b724e74777a59145b585e488fd8 100644 (file)
@@ -1,15 +1,12 @@
 <html>
 <head>
-<script src="../resources/js-test-pre.js"></script>
+<script src="../resources/js-test.js"></script>
 <script src="../resources/accessibility-helper.js"></script>
 <script>
 
-if (window.testRunner)
-  testRunner.waitUntilDone();
+jsTestIsAsync = true;
 
 function runAXTest() {
-
-
    description("This tests that an image map's hold on it's parent will be cleared if the parent goes away.");
 
    // First access all children using AX
@@ -20,13 +17,12 @@ function runAXTest() {
    // Now verify we haven't crashed.
    touchAccessibilityTree(accessibilityController.rootElement);
 
-   if (window.testRunner)
-       testRunner.notifyDone();
+   finishJSTest();
 }
 </script>
 
 </head>
-<body>
+<body onload="runAXTest()">
 
 <map name="map">
 <div id="o7"></div>
@@ -34,8 +30,6 @@ function runAXTest() {
 
 <img id="img" usemap="#map"><span></span> 
 
-<script>setTimeout("runAXTest();", 1);</script> 
-
 <p id="description"></p>
 <div id="console"></div>
 
index 7be4cc2ea959ca9f97b3439c2b022cd944e31673..72da35f85b1a74cc5ca88f014cde235f8913ace2 100644 (file)
@@ -8,4 +8,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 PASS valueOccuranceInElementTree(content, value) is 1
 PASS valueOccuranceInElementTree(content, value) is 1
+PASS successfullyParsed is true
+
+TEST COMPLETE
 
index 86fe93c1d80e571eafd43339c54239c32c7e2e4d..f9623d2fa4f67ff7f0396dc24fc8e4174472e632 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script src="../resources/js-test-pre.js"></script>
+<script src="../resources/js-test.js"></script>
 <script src="../resources/accessibility-helper.js"></script>
 <script>
 var successfullyParsed = false;
@@ -23,10 +23,9 @@ body {
 
 <script>
     description("This tests that we only insert valid children when building ax tree.");
-    
+    jsTestIsAsync = true;
+
     if ("webkitRequestFullScreen" in Element.prototype) {
-        if (window.testRunner)
-            testRunner.waitUntilDone();
         var content = accessibilityController.accessibleElementById("content");
         var value = "AXValue: d";
         document.body.offsetTop;
@@ -37,10 +36,8 @@ body {
                 setTimeout(function () {
                     document.webkitCancelFullScreen();
                 }, 0)
-            } else {
-                if (window.testRunner)
-                    testRunner.notifyDone();
-            }
+            } else
+                finishJSTest();
             shouldBe("valueOccuranceInElementTree(content, value)", "1");
         };
 
index cc3e90268d28d9ec17849445016ec96c21cca5cd..ce614588bb748d3bd5886b1b6a3e7b14bac0ad13 100644 (file)
@@ -4,7 +4,7 @@
 <script>
 var successfullyParsed = false;
 </script>
-<script src="../../resources/js-test-pre.js"></script>
+<script src="../../resources/js-test.js"></script>
 </head>
 <body id="body">
 
@@ -27,7 +27,7 @@ var successfullyParsed = false;
             // We should get a total of 2 focus changes.
             if (focusChangeCount == 2) {
                rootElement.removeNotificationListener();
-               window.testRunner.notifyDone();
+               finishJSTest();
             }
         }
     }
@@ -35,7 +35,7 @@ var successfullyParsed = false;
     if (window.accessibilityController) {
         // Make sure AX gets turned on.
         rootElement = accessibilityController.rootElement.childAtIndex(0);
-        window.testRunner.waitUntilDone();
+        jsTestIsAsync = true;
 
         var addedNotification = rootElement.addNotificationListener(focusCallback);
         if (!addedNotification) {
@@ -54,7 +54,5 @@ var successfullyParsed = false;
 
     successfullyParsed = true;
 </script>
-
-<script src="../../resources/js-test-post.js"></script>
 </body>
 </html>
index 33b82177b0f0b5d2d21ea0bb58a2dd7e4d01d014..b6da07d7d5994e98b4c945a7601d37fd4c9d81c7 100644 (file)
@@ -1,12 +1,12 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script src="../resources/js-test-pre.js"></script>
+<script src="../resources/js-test.js"></script>
 </head>
 
 <body id="body">
 
-<label tabindex=0 onclick="performEvent();" id="labelElement">label</label>
+<label tabindex=0 onclick="finishJSTest()" id="labelElement">label</label>
 
 <p id="description"></p>
 <div id="console"></div>
 <script>
 
     description("This tests that a label element without a corresponding control will perform a press action on itself instead of nothing.");
-    function performEvent() {
-       testRunner.notifyDone();
-    }
+    jsTestIsAsync = true;
 
     if (window.accessibilityController) {
-        testRunner.waitUntilDone();
         document.getElementById("body").focus();
         var body = accessibilityController.focusedElement;
         var label = body.childAtIndex(0).childAtIndex(0);
@@ -31,7 +26,5 @@
     }
 
 </script>
-
-<script src="../resources/js-test-post.js"></script>
 </body>
 </html>
index 7a50b1454f06f95aca701ef263eaca9875505b2f..37ac1a77dd40b13e4f1b0b05b579e96ef09937e9 100644 (file)
@@ -1,10 +1,9 @@
 <html>
 <head>
-<script src="../resources/js-test-pre.js"></script>
+<script src="../resources/js-test.js"></script>
 
   <script>
-    if (window.testRunner)
-        testRunner.waitUntilDone();
+    jsTestIsAsync = true;
 
     function runTest()
     {
@@ -33,9 +32,7 @@
                 shouldBeTrue("newSubwebarea.childrenCount > 0");
             }
 
-            debug('<br /><span class="pass">TEST COMPLETE</span>');
-            if (window.testRunner)
-                testRunner.notifyDone();
+            finishJSTest();
         }, false);
 
         // Load content into the iframe. This will trigger the event
index a40db040ea4d43a95be63cf5860ad7e048c76f39..92ea054c5094fef5a1c3c3bf1f5f56b951a8dddf 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script src="../../resources/js-test-pre.js"></script>
+<script src="../../resources/js-test.js"></script>
 </head>
 <body id="body">
 
         else if (notifyCount == 3) {
             shouldBeEqualToString("notifyName", "AXRowExpanded");
             accessibilityController.removeNotificationListener();
-            var scriptElement = document.createElement("script");
-            scriptElement.src = "../../resources/js-test-post-async.js";
-            document.body.appendChild(scriptElement);
+            finishJSTest();
         }
         notifyCount++;
     }
 
     if (window.accessibilityController) {
-        window.testRunner.waitUntilDone();
+        jsTestIsAsync = true;
 
         var domTree = document.getElementById("tree0");
         domTree.focus();
@@ -68,6 +66,5 @@
     }
 
 </script>
-
 </body>
 </html>
index 83a4de19257464f13a66d8b10699829d264247ea..ac84aa9c0c8dc5dd430c6aeb38ed79f165373ea4 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script src="../../resources/js-test-pre.js"></script>
+<script src="../../resources/js-test.js"></script>
 </head>
 <body id="body">
 
             // We should get a total of 4 live region changes.
             if (notificationCount == 2) {
                window.accessibilityController.removeNotificationListener();
-               window.testRunner.notifyDone();
+               finishJSTest();
             }
         }
     }
 
     if (window.accessibilityController) {
-        window.testRunner.waitUntilDone();
+        jsTestIsAsync = true;
 
         document.getElementById("listbox").focus();
         listbox = window.accessibilityController.focusedElement;
@@ -47,7 +47,5 @@
     }
 
 </script>
-
-<script src="../../resources/js-test-post.js"></script>
 </body>
 </html>
index d025d78355bc87ecdedbe4db5436f4458e24b8c4..c319f0b2aa85e70f6bc8995db8eb825f0740ea12 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script src="../../resources/js-test-pre.js"></script>
+<script src="../../resources/js-test.js"></script>
 </head>
 <body id="body">
 
     function ariaCallback(notification) {
         if (notification == "AXLiveRegionChanged") {
             image.removeNotificationListener();
-            window.testRunner.notifyDone();
+            finishJSTest();
         }
     }
 
     if (window.accessibilityController) {
-        window.testRunner.waitUntilDone();
+        jsTestIsAsync = true;
 
         document.getElementById("image").focus();
         image = window.accessibilityController.focusedElement;
@@ -36,7 +36,5 @@
     }
 
 </script>
-
-<script src="../../resources/js-test-post.js"></script>
 </body>
 </html>
index 21dc50d8f9981c801736d2dd6ee5a4614abb3a38..fde66441e8ffcf756268f6e0a87bdfd6e1ebdedc 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script src="../../resources/js-test-pre.js"></script>
+<script src="../../resources/js-test.js"></script>
 </head>
 <body id="body">
 
         if (notification == "AXLiveRegionChanged") {
            document.getElementById("notifications").innerHTML += "Successfully received " + notification;
            liveRegion.removeNotificationListener();
-           window.testRunner.notifyDone();
+           finishJSTest();
         }
     }
 
     if (window.accessibilityController) {
-        window.testRunner.waitUntilDone();
+        jsTestIsAsync = true;
 
         document.getElementById("liveregion").focus();
         liveRegion = window.accessibilityController.focusedElement;
@@ -41,7 +41,5 @@
     }
 
 </script>
-
-<script src="../../resources/js-test-post.js"></script>
 </body>
 </html>
index 96e959d1e0f3522798d097132467b350c094982a..adc327ca25d0cfc42d608b3f757ed16a7e492823 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script src="../../resources/js-test-pre.js"></script>
+<script src="../../resources/js-test.js"></script>
 </head>
 <body id="body">
 
         if (notification == "AXLiveRegionChanged") {
            document.getElementById("notifications").innerHTML += "Successfully received " + notification;
            liveRegionAlt.removeNotificationListener();
-           window.testRunner.notifyDone();
+           finishJSTest();
         }
     }
 
     if (window.accessibilityController) {
-        window.testRunner.waitUntilDone();
+        jsTestIsAsync = true;
 
         document.getElementById("liveregion").focus();
         liveRegionAlt = window.accessibilityController.focusedElement;
@@ -40,7 +40,5 @@
     }
 
 </script>
-
-<script src="../../resources/js-test-post.js"></script>
 </body>
 </html>
index 14233c5d26e33840162a1213d35ca2d687f264b3..0f5ba0b2bb43795c89ba984196d9ba95893f849a 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script src="../../resources/js-test-pre.js"></script>
+<script src="../../resources/js-test.js"></script>
 </head>
 <body id="body">
 
         if (notification == "AXLiveRegionChanged") {
            document.getElementById("notifications").innerHTML += "Successfully received " + notification;
            liveRegionText.removeNotificationListener();
-           window.testRunner.notifyDone();
+           finishJSTest();
         }
     }
 
     if (window.accessibilityController) {
-        window.testRunner.waitUntilDone();
+        jsTestIsAsync = true;
 
         liveRegionText = accessibilityController.accessibleElementById("liveregion");
 
@@ -39,7 +39,5 @@
     }
 
 </script>
-
-<script src="../../resources/js-test-post.js"></script>
 </body>
 </html>
index 9712ae401330644a2804f71b7d42d64942d4f131..843d2aa556e5f7a8e2a2011d15461ac7e10ee935 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script src="../../resources/js-test-pre.js"></script>
+<script src="../../resources/js-test.js"></script>
 </head>
 <body id="body">
 
         if (notification == "AXLiveRegionChanged") {
            document.getElementById("notifications").innerHTML += "Successfully received " + notification;
            liveRegion.removeNotificationListener();
-           window.testRunner.notifyDone();
+           finishJSTest();
         }
     }
 
     if (window.accessibilityController) {
-        window.testRunner.waitUntilDone();
+        jsTestIsAsync = true;
 
         document.getElementById("liveregion").focus();
         liveRegion = window.accessibilityController.focusedElement;
@@ -41,7 +41,5 @@
     }
 
 </script>
-
-<script src="../../resources/js-test-post.js"></script>
 </body>
 </html>
index d5de240807f324885ed54979070cb04dd4c65961..e0f1d9a4dd54686b74e43853542d57df3c21854c 100644 (file)
@@ -9,4 +9,7 @@ PASS combo.isEqual(accessibilityController.focusedElement) is true
 The ComboBox should still be the focused element even after the aria-activedescendant was changed.
 PASS combo.isEqual(accessibilityController.focusedElement) is true
 Received notification: AXSelectedChildrenChanged
+PASS successfullyParsed is true
+
+TEST COMPLETE
 
index 6be5583c8887b9e9baebb448dceab24fb2e8a06d..dac0f325e01861637b737be6f88dd2cdff70b0c0 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC>
 <html>
 <head>
-<script src="../../resources/js-test-pre.js"></script>
+<script src="../../resources/js-test.js"></script>
 </head>
 <body>
 
@@ -31,7 +31,7 @@
            debug("Received notification: " + notification); 
            if (notification == "AXSelectedChildrenChanged") {
                 combo.removeNotificationListener();
-                window.testRunner.notifyDone();
+                finishJSTest();
            }
         });
 
@@ -43,7 +43,5 @@
     }
 
 </script>
-
-<script src="../../resources/js-test-post.js"></script>
 </body>
 </html>
index e0e89eca7c73f0ad128547ca298edf525001f861..d751774325b6fb3b24d0c21815e32fee6658d40c 100644 (file)
@@ -10,8 +10,8 @@ PASS addedNotification is true
 PASS axTextStateSyncOne is undefined
 PASS accessibilityController.accessibleElementById("1").isFocusable is true
 PASS accessibilityController.focusedElement.isEqual(accessibilityController.accessibleElementById("1")) is true
+PASS axTextStateSyncTwo is undefined
 PASS successfullyParsed is true
 
 TEST COMPLETE
-PASS axTextStateSyncTwo is undefined
 
index b8f3172b4eb2225c050be0dded363a44aa961c4a..a2ca361ab76233e8b12e730494dea64d19590228 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script src="../../resources/js-test-pre.js"></script>
+<script src="../../resources/js-test.js"></script>
 </head>
 <body id="body">
 
         }
         if (selectCount == 2 && focusCount == 3) {
             webArea.removeNotificationListener();
-            testRunner.notifyDone();
+            finishJSTest();
         }
     }
 
     if (window.accessibilityController) {
-        testRunner.waitUntilDone();
+        jsTestIsAsync = true;
         testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
 
         accessibilityController.enableEnhancedAccessibility(true);
@@ -74,7 +74,5 @@
     }
 
 </script>
-
-<script src="../../resources/js-test-post.js"></script>
 </body>
 </html>
index c78a2229b843cbcbbad4ef5c7ec3256aa3174916..ae93a7a29890bc008f87fe2e35a920d931c1e78a 100644 (file)
@@ -1,6 +1,6 @@
 <html>
 <head>
-<script src="../../resources/js-test-pre.js"></script>
+<script src="../../resources/js-test.js"></script>
 </head>
 <body id="body">
 
 
         if (valueChangeCount == 2) {
            range.removeNotificationListener();
-           window.testRunner.notifyDone();
+           finishJSTest();
         }
     }
 
     if (window.accessibilityController) {
-        window.testRunner.waitUntilDone();
+        jsTestIsAsync = true;
 
         document.getElementById("range1").focus();
         range = accessibilityController.focusedElement;
@@ -63,7 +63,5 @@
     }
 
 </script>
-
-<script src="../../resources/js-test-post.js"></script>
 </body>
 </html>
index efa6f82f0a7827bf657d145dfbbd850d61977474..2249df991f48d61a69c33d8d318bb80c05f0e9fe 100644 (file)
@@ -5,9 +5,6 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 
 PASS addedNotification is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
 PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeEdit
 PASS results[resultIndex]["AXTextChangeValues"][0]["AXTextChangeValue"] is "0"
 PASS results[resultIndex]["AXTextChangeValues"][0]["AXTextEditType"] is AXTextEditTypeDelete
@@ -17,4 +14,7 @@ PASS results[resultIndex]["AXTextChangeValues"][1]["AXTextEditType"] is AXTextEd
 PASS results[resultIndex]["AXTextStateChangeType"] is AXTextStateChangeTypeEdit
 PASS results[resultIndex]["AXTextChangeValues"][0]["AXTextChangeValue"] is " "
 PASS results[resultIndex]["AXTextChangeValues"][0]["AXTextEditType"] is AXTextEditTypeInsert
+PASS successfullyParsed is true
+
+TEST COMPLETE
 
index 5426c9a5b7c28068e17de8e00f12a9f6fc951b3d..e6f1b17f90e0dccd95fa308d7be3c781ba863cfc 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-    <script src="../../resources/js-test-pre.js"></script>
+    <script src="../../resources/js-test.js"></script>
     <script src="../../editing/editing.js"></script>
 </head>
 <body id="body">
@@ -47,7 +47,7 @@
                     shouldBe("results[resultIndex][\"AXTextChangeValues\"][0][\"AXTextEditType\"]", "AXTextEditTypeInsert");
 
                     webArea.removeNotificationListener();
-                    window.testRunner.notifyDone();
+                    finishJSTest();
                 }
             }
         }
@@ -64,7 +64,7 @@
         document.getElementById("securevaluetest").value = "0";
 
         if (window.accessibilityController) {
-             window.testRunner.waitUntilDone();
+            jsTestIsAsync = true;
 
             accessibilityController.enableEnhancedAccessibility(true);
 
@@ -77,7 +77,5 @@
             setsecurevalue();
         }
     </script>
-
-    <script src="../../resources/js-test-post.js"></script>
 </body>
 </html>
index 70b73bf5e0b7b49520ef3a7f93fc8b55fd3469a2..ca39412621df6664262e364ee574b4426ce1fbe8 100644 (file)
@@ -4,4 +4,7 @@ This tests that comparing text markers that have no common tree scope won't cras
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
+PASS successfullyParsed is true
+
+TEST COMPLETE
 
index 6f925213889b18a0c4cf748485e64c89b3f4ec5d..74a1e4e42ae1fa6192f2352b973010b04e91147b 100644 (file)
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script src="../../resources/js-test-pre.js"></script>
+<script src="../../resources/js-test.js"></script>
 </head>
-<body id="body" onload="setTimeout('runTest();', 1)">
+<body id="body" onload="runTest()">
 
 <div id="content1">
 <iframe src="data:text/html,<body><div>hello</div>"></iframe>
@@ -15,9 +15,7 @@
 
     description("This tests that comparing text markers that have no common tree scope won't crash");
 
-    if (window.accessibilityController && window.testRunner) {
-        window.jsTestIsAsync = true;
-    }
+    jsTestIsAsync = true;
 
     function runTest() {
 
         // Ask for the text marker range with the markers in a different tree.
         // This should NOT crash!
         var range = accessibilityController.rootElement.childAtIndex(0).textMarkerRangeForMarkers(marker1, marker2);
-        window.testRunner.notifyDone();
+
         finishJSTest();
     }
 
 </script>
-
-<script src="../../resources/js-test-post.js"></script>
 </body>
 </html>
index f5410ab4a4e98d8243baefc05b2e1571ff789efb..297ccfc474e544dbd2760476bfa875252d5a453a 100644 (file)
@@ -4,9 +4,6 @@ This tests whether searching works to find frames and to find elements within fr
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-PASS successfullyParsed is true
-
-TEST COMPLETE
 PASS resultElement.role is 'AXRole: AXButton'
 PASS resultElement.title is 'AXTitle: button1'
 PASS resultElement.role is 'AXRole: AXButton'
@@ -21,4 +18,7 @@ PASS resultElement.role is 'AXRole: AXWebArea'
 PASS resultElement.description is 'AXDescription: frame1a'
 PASS resultElement.role is 'AXRole: AXWebArea'
 PASS resultElement.description is 'AXDescription: frame2'
+PASS successfullyParsed is true
+
+TEST COMPLETE
 
index 56c426be5f9a59e1061a6e781562f4b38a13472c..06de2181b736f28ac7d4fceccd358b07373f21f6 100644 (file)
@@ -1,10 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script>
-var successfullyParsed = false;
-</script>
-<script src="../../resources/js-test-pre.js"></script>
+<script src="../../resources/js-test.js"></script>
 </head>
 <body id="body">
 
@@ -16,7 +13,7 @@ var successfullyParsed = false;
 <div id="console"></div>
 
 <script>
-    window.testRunner.waitUntilDone();
+    jsTestIsAsync = true;
 
     // We have to play some games to get these frames to load their sources in a timely fashion.
     document.getElementById("frame1").src = "data:text/html,<body id='body1'><button id=button1>button1</button><BR><BR><BR></body>";
@@ -112,11 +109,9 @@ function runTest() {
     }
 
     successfullyParsed = true;
-    window.testRunner.notifyDone();
+    finishJSTest();
 }
 
 </script>
-
-<script src="../../resources/js-test-post.js"></script>
 </body>
 </html>
index 8fe657d6c05a3845b0fc970573e6da422c048b25..8bd91954b2d8fdc914200829d18e1db37caef3ba 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script src="../../resources/js-test-pre.js"></script>
+<script src="../../resources/js-test.js"></script>
 </head>
 <body id="body">
 
                 shouldBeResults(true);
 
                 webArea.removeNotificationListener();
-                window.testRunner.notifyDone();
+                finishJSTest();
             }
         }
     }
 
     if (window.accessibilityController) {
-        window.testRunner.waitUntilDone();
+        jsTestIsAsync = true;
 
         accessibilityController.enableEnhancedAccessibility(true);
 
     }
 
 </script>
-
-<script src="../../resources/js-test-post.js"></script>
 </body>
 </html>
index 09cf0c72b1f6000dd8f55e9c01e50d4a127a660a..e1ebdec02742869965c5cdddc610f6bbd8eb2adf 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script src="../../resources/js-test-pre.js"></script>
+<script src="../../resources/js-test.js"></script>
 </head>
 <body id="body">
 
                 shouldBe("results[resultIndex][\"AXTextSelectionDirection\"]", "AXTextSelectionDirectionEnd");
 
                 webArea.removeNotificationListener();
-                window.testRunner.notifyDone();
+                finishJSTest();
             }
         }
     }
 
     if (window.accessibilityController) {
-        window.testRunner.waitUntilDone();
+        jsTestIsAsync = true;
 
         accessibilityController.enableEnhancedAccessibility(true);
 
     }
 
 </script>
-
-<script src="../../resources/js-test-post.js"></script>
 </body>
 </html>
index 0ed96febc9e94245c525cf354829c4491e9ee877..8b1960b9591ea51989e82e5f975eb49a81fb4e54 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script src="../../resources/js-test-pre.js"></script>
+<script src="../../resources/js-test.js"></script>
 </head>
 <body id="body">
 
                 linkOne = accessibilityController.accessibleElementById("one");
                 shouldBe("ancestorWithRole(changeElementTwo, \"AXRole: AXLink\").isEqual(linkOne)", "true");
                 webArea.removeNotificationListener();
-                testRunner.notifyDone();
+                finishJSTest();
             }
         }
     }
 
     if (window.accessibilityController) {
-        testRunner.waitUntilDone();
+        jsTestIsAsync = true;
         testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
 
         accessibilityController.enableEnhancedAccessibility(true);
@@ -72,7 +72,5 @@
     }
 
 </script>
-
-<script src="../../resources/js-test-post.js"></script>
 </body>
 </html>
index a3c4babf7780af46bd3c5468ca81abed6a9f077d..ee9e0a805a591a81b216a5ea58e8f48026b5a0db 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script src="../../resources/js-test-pre.js"></script>
+<script src="../../resources/js-test.js"></script>
 </head>
 <body id="body">
 
@@ -22,7 +22,7 @@ content inside
         if (notification == "AXValueChanged") {
            document.getElementById("notifications").innerHTML += "Successfully received " + notification + "<br>";
            axTextbox.removeNotificationListener();
-           window.testRunner.notifyDone();
+           finishJSTest();
         }
         else if (notification == "AXSelectedTextChanged") {
            document.getElementById("notifications").innerHTML += "Successfully received " + notification + "<br>";
@@ -30,7 +30,7 @@ content inside
     }
 
     if (window.accessibilityController) {
-        window.testRunner.waitUntilDone();
+        jsTestIsAsync = true;
 
         textbox = document.getElementById("textbox");
         textbox.focus();
@@ -52,7 +52,5 @@ content inside
     }
 
 </script>
-
-<script src="../../resources/js-test-post.js"></script>
 </body>
 </html>
index 6e9f7ba333247b6b15ee45e949703ae5a59d2da7..3a21c2cb6d4c32eb18b207c33ebe6d3399372b62 100644 (file)
@@ -7,4 +7,7 @@ Text marker 1 is valid: true
 Text marker 2 is valid: true
 Text marker 1 is valid: false
 Text marker 2 is valid: false
+PASS successfullyParsed is true
+
+TEST COMPLETE
 
index 4b8b5afd7eacf4f6a9e6ad67a723b87a495200dc..b8520b1bdfcf632d743226049e15068a82e6ac6e 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script src="../../resources/js-test-pre.js"></script>
+<script src="../../resources/js-test.js"></script>
 </head>
 <body id="body" onload="setTimeout('runTest();', 1)">
 
@@ -17,9 +17,7 @@
 
     var cachedMarker1 = 0;
     var cachedMarker2 = 0;
-    if (window.accessibilityController && window.testRunner) {
-        window.jsTestIsAsync = true;
-    }
+    jsTestIsAsync = true;
 
     function runTest() {
 
         var index2 = console.indexForTextMarker(cachedMarker2);
         debug("Text marker 2 is valid: " + console.isTextMarkerValid(cachedMarker2));
 
-        window.testRunner.notifyDone();
         finishJSTest();
     }
 
 </script>
-
-<script src="../../resources/js-test-post.js"></script>
 </body>
 </html>
index 3d96fecfa4417e1763bd781c424c8a6e9a076377..be94adc51ea889fec721bdedc3d5c7021e092c78 100644 (file)
@@ -1,6 +1,13 @@
 This tests that the AXValueChanged notification is correctly reported for non-native text boxes when content is changed.
 changed innerText
+
+
+
+
 Successfully received AXValueChanged.
 Successfully received AXValueChanged.
 Successfully received AXValueChanged.
+PASS successfullyParsed is true
+
+TEST COMPLETE
 
index 2b58f6a8f514fc297f7cf15f1e8a949e7154a49a..1061ea3881a143bfb7cf19c296fdd13eb4205e2d 100644 (file)
@@ -1,20 +1,17 @@
-<!DOCTYPE HTML PUBLIC>
+<!DOCTYPE html>
 <html>
 <head>
-<script src="../resources/js-test-pre.js"></script>
+<script src="../../resources/js-test.js"></script>
 </head>
 <body>
-This tests that the AXValueChanged notification is correctly reported for non-native text boxes when content is changed.<br>
+<div>This tests that the AXValueChanged notification is correctly reported for non-native text boxes when content is changed.</div>
 <div role="textbox" id="ariaTextBox" aria-multiline="false" tabindex="0">Some text in a textbox.</div>
-<div id="console"></div>
-<div id="notifications"></div>
+<div id="console"</div>
 <script>
     var textboxAxElement;
     if (window.testRunner && window.accessibilityController) {
-        window.testRunner.waitUntilDone();
-
+        jsTestIsAsync = true;
         accessibilityController.logAccessibilityEvents();
-        window.testRunner.dumpAsText();
 
         var ariaTextBox = document.getElementById("ariaTextBox");
         ariaTextBox.focus();
@@ -28,17 +25,15 @@ This tests that the AXValueChanged notification is correctly reported for non-na
 
     function logNotification(notification) {
         if (notification == "AXValueChanged") {
-            document.getElementById("notifications").innerHTML += "Successfully received AXValueChanged.<br>";
+            debug("Successfully received AXValueChanged.");
             pendingNotifications--;
             if (pendingNotifications == 0) {
                 textboxAxElement.removeNotificationListener();
-                window.testRunner.notifyDone();
+                finishJSTest();
             }
         }
     }
 
 </script>
-
-<script src="../resources/js-test-post.js"></script>
 </body>
 </html>
index 07a134b973d02f2fc60dad134290d1b5d58c3ebd..dd9125c208660037b817ab8c5ab4fae758000068 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-    <script src="../../../resources/js-test-pre.js"></script>
+    <script src="../../../resources/js-test.js"></script>
     <script src="../../../editing/editing.js"></script>
     <script src="value-change-helpers.js"></script>
 </head>
                     shouldBeInsertReplace("2", "3");
 
                     webArea.removeNotificationListener();
-                    window.testRunner.notifyDone();
+                    finishJSTest();
                 }
             }
         }
 
         if (window.accessibilityController) {
-             window.testRunner.waitUntilDone();
+            jsTestIsAsync = true;
 
             accessibilityController.enableEnhancedAccessibility(true);
 
             execRedoCommand();
         }
     </script>
-
-    <script src="../../../resources/js-test-post.js"></script>
 </body>
 </html>
index 36c4e58bec13d5a12858fd6099a752272547a2db..ebf00eb99adf6dbb57c3423a85fd837a898fe7fb 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-    <script src="../../../resources/js-test-pre.js"></script>
+    <script src="../../../resources/js-test.js"></script>
     <script src="../../../editing/editing.js"></script>
     <script src="value-change-helpers.js"></script>
 </head>
                     shouldBeInsertReplace("5", "6");
 
                     webArea.removeNotificationListener();
-                    window.testRunner.notifyDone();
+                    finishJSTest();
                 }
             }
         }
 
         if (window.accessibilityController) {
-             window.testRunner.waitUntilDone();
+            jsTestIsAsync = true;
 
             accessibilityController.enableEnhancedAccessibility(true);
 
             execRedoCommand();
         }
     </script>
-
-    <script src="../../../resources/js-test-post.js"></script>
 </body>
 </html>
index 8518b50581f5aeab3372ab7dfc10d219c0e3b7de..d20cba374d1624460544a2432afdec63809620ff 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-    <script src="../../../resources/js-test-pre.js"></script>
+    <script src="../../../resources/js-test.js"></script>
     <script src="../../../editing/editing.js"></script>
     <script src="value-change-helpers.js"></script>
 </head>
                     shouldBeInsertReplace("8", "9");
 
                     webArea.removeNotificationListener();
-                    window.testRunner.notifyDone();
+                    finishJSTest();
                 }
             }
         }
 
         if (window.accessibilityController) {
-             window.testRunner.waitUntilDone();
+            jsTestIsAsync = true;
 
             accessibilityController.enableEnhancedAccessibility(true);
 
             execRedoCommand();
         }
     </script>
-
-    <script src="../../../resources/js-test-post.js"></script>
 </body>
 </html>
index 805ae66e2a6fbfcf6d8aaf27c0dbf994a0ef3d50..2cb5b509dc6b6b09e7979ab9de5182884696050a 100644 (file)
@@ -6,10 +6,7 @@
             var vidAXObject;
             var indentLevel = 0;
 
-            if (window.testRunner) {
-                testRunner.dumpAsText();
-                testRunner.waitUntilDone();
-            }
+            jsTestIsAsync = true;
 
             function indent(count)
             {
@@ -62,8 +59,8 @@
                 
                 dumpChildren(vidAXObject);
 
-                if (window.testRunner && event.type == 'canplaythrough')
-                    testRunner.notifyDone();     
+                if (event.type == 'canplaythrough')
+                    finishJSTest();
             }
         </script>
     </head>
@@ -77,6 +74,7 @@
     
     <div id=console></div>
 
+    <script src="../resources/js-test-post.js"></script>
 </body>
 </html>
 
index 99ac08ac526d2e5a494cce87fb3f147069ba05ed..bae903a6e1902e8a30d040874196cb3caca6a122 100644 (file)
@@ -1,9 +1,8 @@
 <html>
 <head>
-<script src="../resources/js-test-pre.js"></script>
+<script src="../resources/js-test.js"></script>
 <script>
-    if (window.testRunner)
-        testRunner.waitUntilDone();
+    jsTestIsAsync = true;
 
     function runTest() {
         description("This tests that changing the value of a menu list sends a notification even when it's not popped open.");
@@ -15,9 +14,7 @@
         function listener(notification) {
             document.getElementById("console").innerText += "Got notification: " + notification + "\n";
             accessibleMenulist.removeNotificationListener(listener);
-            debug('<br /><span class="pass">TEST COMPLETE</span>');
-            if (window.testRunner)
-                testRunner.notifyDone();
+            finishJSTest();
         }
         accessibleMenulist.addNotificationListener(listener);
 
@@ -26,8 +23,7 @@
 
         // Make the test finish quickly whether we get the notification or not.
         window.setTimeout(function() {
-            if (window.testRunner)
-                testRunner.notifyDone();
+            finishJSTest();
         }, 10);
     }
 
index af1ab935dfcaecb9788c6fc2e13bdfddc32637e2..84cf100959de59b85f1f291b091d57440a305ee4 100644 (file)
@@ -1,9 +1,8 @@
 <html>
 <head>
-<script src="../resources/js-test-pre.js"></script>
+<script src="../resources/js-test.js"></script>
 <script>
-    if (window.testRunner)
-        testRunner.waitUntilDone();
+    jsTestIsAsync = true;
 
     function runTest() {
         description("This tests that navigating in a multiselect list updates selection and the active selected option and sends a notification.");
 
         // Make the test finish quickly whether we get the notification or not.
         window.setTimeout(function() {
-            debug('<br /><span class="pass">TEST COMPLETE</span>');
             if (window.accessibilityController)
                 accessibleMenulist.removeNotificationListener();
-            if (window.testRunner)
-                testRunner.notifyDone();
+            finishJSTest();
         }, 10);
     }
 
index b717ecf0a166476398127b9cb3f396a95bbbdc03..6ab71f68660fe142057cf2c3f860c037187092a6 100644 (file)
@@ -1,6 +1,6 @@
 <html>
 <head>
-<script src="../resources/js-test-pre.js"></script>
+<script src="../resources/js-test.js"></script>
 </head>
 <body>
 
@@ -22,8 +22,6 @@
 description("This test checks that linebreaks explicitly set by the author are properly exposed to ATs.");
 
 if (window.testRunner) {
-  testRunner.dumpAsText();
-
   if (window.accessibilityController) {
 
     document.body.focus();
@@ -41,8 +39,5 @@ if (window.testRunner) {
   }
 }
 </script>
-
-<script src="../resources/js-test-post.js"></script>
-
 </body>
 </html>
index 8d471ecd0a48048df00e75260e1e2ac094ee5bf4..1c5770b74406a8e235f1e987f1d0611ac5c56e8b 100644 (file)
@@ -1,19 +1,15 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script src="../resources/js-test-pre.js"></script>
+<script src="../resources/js-test.js"></script>
 </head>
 <body id="body">
 <p id="description"></p>
 <div id="console"></div>
 <script>
 description("This test just prints the name of the current platform.");
-if (window.testRunner && window.accessibilityController) {
-  testRunner.dumpAsText();
-
-  debug("Platform name: " + accessibilityController.platformName);
-}
+if (window.testRunner && window.accessibilityController)
+    debug("Platform name: " + accessibilityController.platformName);
 </script>
-<script src="../resources/js-test-post.js"></script>
 </body>
 </html>
index 2d1a51fa1089cd8af2558190dc6a16422838bf1e..e5892d50b7eda5389d78ae27261af842f36bee16 100644 (file)
@@ -1,9 +1,5 @@
 <html>
-<script src="../resources/js-test-pre.js"></script>
-<script>
-    if (window.testRunner)
-        testRunner.dumpAsText();
-</script>
+<script src="../resources/js-test.js"></script>
 <body>
     
     <div id="content">
@@ -89,6 +85,5 @@
             document.getElementById("content").style.visibility = "hidden";
         }
     </script>
-<script src="../resources/js-test-post.js"></script>
 </body>
 </html>
index c9be01784cd8935a408796598c53c996fc0eaee9..dfe49896a8d12e42c14e31e6b1ee5c7f210c7d10 100644 (file)
@@ -1,11 +1,7 @@
 <html>
 <head>
-<script src="../resources/js-test-pre.js"></script>
+<script src="../resources/js-test.js"></script>
 </head>
-<script>
-    if (window.testRunner)
-        testRunner.dumpAsText();
-</script>
 <body>
 
 <p id="description"></p>
@@ -62,8 +58,5 @@
 
         }
     </script>
-
-<script src="../resources/js-test-post.js"></script>
-
 </body>
 </html>
index e38828370303a65d02ca672c3a6585b04f29d0f6..cf42a233669d13a2ad2e4e7df7cd855d5e127d5b 100644 (file)
@@ -9,4 +9,7 @@ PASS accessibilityController.focusedElement.childAtIndex(1).isSelectable is true
 PASS accessibilityController.focusedElement.childAtIndex(1).isSelected is false
 PASS accessibilityController.focusedElement.childAtIndex(2).isSelectable is false
 PASS accessibilityController.focusedElement.childAtIndex(2).isSelected is false
+PASS successfullyParsed is true
+
+TEST COMPLETE
 
index 3b5aa4aca5dd13c89198eba64bcf5d8035ec7e6a..92219abf4409bfa85bfdbeab0f1ce60b359c997c 100644 (file)
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="../resources/js-test-pre.js"></script>
+    <script src="../resources/js-test.js"></script>
 </head>
 
 <body id="body">
@@ -21,8 +21,6 @@
     if (window.testRunner && window.accessibilityController) {
         document.getElementById("notDRT").style.visibility = "hidden";
 
-        testRunner.dumpAsText();
-
         document.getElementById("selectElement").focus();
 
         shouldBeTrue('accessibilityController.focusedElement.isMultiSelectable');
index a69121c35bc13008b2a5cf5195dea74406d68c85..d4973beec4709c150aa9ec1b6b78565c4d726dc6 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html>
 <body>
-<script src="../resources/js-test-pre.js"></script>
+<script src="../resources/js-test.js"></script>
 
 <button id="untitled"></button>
 
@@ -18,8 +18,6 @@
 description("This tests that a spin button supports range value attributes.")
 
 if (window.testRunner && window.accessibilityController) {
-    window.testRunner.dumpAsText();
-
     function endsWith(str, suffix) {
         str = '' + str;
         return str.substr(str.length - suffix.length) == suffix;
@@ -45,7 +43,5 @@ if (window.testRunner && window.accessibilityController) {
 }
 
 </script>
-
-<script src="../resources/js-test-post.js"></script>
 </body>
 </html>
index 2680626b3d1fc3f53c54ed7d65c94cbc1100e4b2..ec5698fab1062cd71ff0a5f7e9f4d83154f8a789 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html>
 <body>
-<script src="../resources/js-test-pre.js"></script>
+<script src="../resources/js-test.js"></script>
 <script src="../resources/accessibility-helper.js"></script>
 
 <div id="container" style="position: relative; top: 100px; left: 600px; width:400px; height: 400px;" role="group" tabindex="0">
@@ -36,8 +36,6 @@ function pageY(element) {
 }
 
 if (window.testRunner && window.accessibilityController) {
-    window.testRunner.dumpAsText();
     var container = accessibilityController.accessibleElementById("svgroot");
 
     var x = pageX(container) - 1;
@@ -91,8 +89,6 @@ if (window.testRunner && window.accessibilityController) {
 }
 
 </script>
-
-<script src="../resources/js-test-post.js"></script>
 </body>
 </html>
 
index 424a2ecf82c75fff1c01cebda27df93a0bf9ffbd..50a0cc485ac8e8039f99b4d84fa5166fd7aa75a7 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script src="../resources/js-test-pre.js"></script>
+<script src="../resources/js-test.js"></script>
 </head>
 
 <body id="body">
@@ -16,8 +16,6 @@
 description("This tests that retrieving a cell for a table multiple times doesn't crash.");
 
 if (window.testRunner) {
-  testRunner.dumpAsText();
-
   if (window.accessibilityController) {
     document.getElementById("body").focus();
     var axBody = accessibilityController.focusedElement;
@@ -39,7 +37,5 @@ if (window.testRunner) {
   }
 }
 </script>
-
-<script src="../resources/js-test-post.js"></script>
 </body>
 </html>
index a36ba101ac931f14951c5dc40a85101a18add46e..a86daed77ef3af76add47d8def338cada713b4cc 100644 (file)
@@ -1,9 +1,5 @@
 <html>
-<script src="../resources/js-test-pre.js"></script>
-<script>
-  if (window.testRunner)
-    testRunner.dumpAsText();
-</script>
+<script src="../resources/js-test.js"></script>
 <body>
 
 <table id="table1">
index 9bc3507a46143954e52806a9e9372313de204f6d..0d3c12ef314407f154ca23ab2d00cb84aa0e7726 100644 (file)
@@ -1,14 +1,10 @@
 <html>
 <head>
-  <script src="../resources/js-test-pre.js"></script>
+  <script src="../resources/js-test.js"></script>
   <script>
     var tableAXObject;
     var indentLevel = 0;
 
-    if (window.testRunner) {
-      testRunner.dumpAsText();
-    }
-
     function indent(count) {
       var spaces = "                                                      ";
       return spaces.substr(0, count);
index bde2ebe4a274f05d12e88cd643303624ee70dedd..6a0cf91e17bce78b1af20b4c5a6d2a26aebbaf8a 100644 (file)
@@ -1,9 +1,5 @@
 <html>
-<script src="../resources/js-test-pre.js"></script>
-<script>
-    if (window.testRunner)
-        testRunner.dumpAsText();
-</script>
+<script src="../resources/js-test.js"></script>
 <body id="body">
 
 <div id="content">
@@ -28,6 +24,5 @@
             document.getElementById("content").style.display = "none";
         }
     </script>
-<script src="../resources/js-test-post.js"></script>
 </body>
 </html>
index d0b03c28a48e1f5d36a33fb07fd91a7549696308..1214a19b8df1db966877849dde07480bd514435a 100644 (file)
@@ -1,9 +1,5 @@
 <html>
-<script src="../resources/js-test-pre.js"></script>
-<script>
-    if (window.testRunner)
-        testRunner.dumpAsText();
-</script>
+<script src="../resources/js-test.js"></script>
 <body>
     <div id="console"></div>
     <textarea name="area1" id="area1" rows="5" cols="40">
@@ -61,6 +57,5 @@ line 3
             shouldBe("textareaAXUIElement.insertionPointLineNumber", "0");
         }
     </script>
-<script src="../resources/js-test-post.js"></script>
 </body>
 </html>
index c7387242a9a54d0988f0bcca6012485f11ea3e26..dba10fe974c3f444e155f254ddaa827709b17947 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC>
 <html>
 <head>
-<script src="../resources/js-test-pre.js"></script>
+<script src="../resources/js-test.js"></script>
 </head>
 <body>
 This tests that the AXSelection property is correctly reported for non-native text boxes.<br>
@@ -36,7 +36,6 @@ This tests that the AXSelection property is correctly reported for non-native te
     }
 
     if (window.testRunner && window.accessibilityController) {
-        window.testRunner.dumpAsText();
         var ariaTextBox = document.getElementById("ariaTextBox");
         var textLength = ariaTextBox.textContent.length;
 
@@ -49,7 +48,5 @@ This tests that the AXSelection property is correctly reported for non-native te
     }
 
 </script>
-
-<script src="../resources/js-test-post.js"></script>
 </body>
 </html>
index 456bedfed60de3449cccfd19bb1f3e5bfae6455b..b516b2a16876c9ea9d69321603fcce15871e9afb 100644 (file)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html>
 <body>
-<script src="../resources/js-test-pre.js"></script>
+<script src="../resources/js-test.js"></script>
 
 <div id="container">
 
@@ -45,8 +45,6 @@
 description("This tests that titleUIElement works correctly even when things change dynamically.");
 
 if (window.testRunner && window.accessibilityController) {
-    testRunner.dumpAsText();
-
     function hasTitleUIElement(axElement) {
         var label1 = accessibilityController.accessibleElementById("label1");
         var titleUIElement = axElement.titleUIElement();
@@ -107,7 +105,5 @@ if (window.testRunner && window.accessibilityController) {
 }
 
 </script>
-
-<script src="../resources/js-test-post.js"></script>
 </body>
 </html>
index d49818c34051d42ca6325d2e84e50f566a7ad93d..162bbafef4939a9a8a05c3a1933825e0d0397c6a 100644 (file)
@@ -4,8 +4,8 @@ This tests accessibility objects with role 'unknown' are not being exposed.
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
+PASS findUnknownChild(accessibilityController.focusedElement) == null is true
 PASS successfullyParsed is true
 
 TEST COMPLETE
-PASS findUnknownChild(accessibilityController.focusedElement) == null is true
 
index 9441799a539de8e6aeef9d28f6d0406b8ed1a8cd..ee53f82f66f2ad827d7655735c7176fba6171319 100644 (file)
@@ -1,12 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script src="../resources/js-test-pre.js"></script>
+<script src="../resources/js-test.js"></script>
 <script>
-
-if (window.testRunner)
-  testRunner.dumpAsText();
-
 function findUnknownChild(accessibilityObject) {
     if (accessibilityObject.role == "AXRole: AXUnknown")
         return accessibilityObject;
@@ -39,6 +35,5 @@ function runTest()
 description("This tests accessibility objects with role 'unknown' are not being exposed.");
 
 </script>
-<script src="../resources/js-test-post.js"></script>
 </body>
 </html>
index 106237b55892124e0aefbdc88535c98ac331239a..a03f38844d693bc42461d4a27c1f6e508105a4a2 100644 (file)
@@ -1,11 +1,6 @@
 <html>
     <head>
-        <script src="../../resources/js-test-pre.js"></script>
-
-        <script>
-            if (window.testRunner)
-                testRunner.dumpAsText();
-        </script>
+        <script src="../../resources/js-test.js"></script>
     </head>
     <body id="body">
         <abbr>abbr</abbr>
index 5fe27cbc0a2df27cc503bb50c88dac7eab817138..3d06e05ff48d02f04826f45fc1d978c78a78d2c8 100644 (file)
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="../../resources/js-test-pre.js"></script>
+    <script src="../../resources/js-test.js"></script>
 </head>
 
 <body id="body">
@@ -22,13 +22,12 @@ not cause a crash.</p>
             return;
 
         debug("PASS: Didn't crash.");
-        testRunner.notifyDone();
+        finishJSTest();
     }
     if (window.testRunner && window.accessibilityController) {
         document.getElementById("notDRT").style.visibility = "hidden";
 
-        testRunner.dumpAsText();
-        testRunner.waitUntilDone();
+        jsTestIsAsync = true;
 
         var element = document.getElementById("avnElement");
         element.focus();
index f613456fe6e6ec1ea38d2f97c77a37942be620fc..ee1ad96693cfd796f12352b6138c0bd08510842b 100644 (file)
@@ -1,11 +1,6 @@
 <html>
     <head>
-        <script src="../../resources/js-test-pre.js"></script>
-
-        <script>
-            if (window.testRunner)
-                testRunner.dumpAsText();
-        </script>
+        <script src="../../resources/js-test.js"></script>
     </head>
     <body id="body">
         <h1>h1</h1>
index a5ad367e2f2cc9ce80d72b87988a3851d37af059..dc7956c2da108192a251fa937873d826c780d221 100644 (file)
@@ -1,11 +1,6 @@
 <html>
     <head>
-        <script src="../../resources/js-test-pre.js"></script>
-
-        <script>
-            if (window.testRunner)
-                testRunner.dumpAsText();
-        </script>
+        <script src="../../resources/js-test.js"></script>
     </head>
     <body>
         <img aria-labeledby="desc" alt="alternate text" title="title">
index bf6626022672ee703afebcd6ba4ac9a7030cb08a..6fd4c78c349609969678ae810236e88d9e0dad6a 100644 (file)
@@ -1,11 +1,6 @@
 <html>
     <head>
-        <script src="../../resources/js-test-pre.js"></script>
-
-        <script>
-            if (window.testRunner)
-                testRunner.dumpAsText();
-        </script>
+        <script src="../../resources/js-test.js"></script>
     </head>
     <body id="body">
         <a id="link1" href="img.html" title="title text"><img src="404.png" alt="alt text" title="title text"></a>
index 2d73fe41a942a77b55575a213a310a96eaeebfbf..5810b74d4b79de624eaeb7f2c5d2252f394c4a56 100644 (file)
@@ -1,11 +1,6 @@
 <html>
     <head>
-        <script src="../../resources/js-test-pre.js"></script>
-
-        <script>
-            if (window.testRunner)
-                testRunner.dumpAsText();
-        </script>
+        <script src="../../resources/js-test.js"></script>
     </head>
     <body id="body">
         <p>
index 34fc9414ec1e5746a510970021718622007ff4c2..258da79bb98cf48ae78db1390e3243f0ef7b6364 100644 (file)
@@ -1,11 +1,6 @@
 <html>
     <head>
-        <script src="../../resources/js-test-pre.js"></script>
-
-        <script>
-            if (window.testRunner)
-                testRunner.dumpAsText();
-        </script>
+        <script src="../../resources/js-test.js"></script>
     </head>
     <body id="body">
         <p>
index 37753f667b1c4f77b6629be4277813119425c6cc..d7f57c4020076d209ad099cc29c7ee1f4b2c3341 100644 (file)
@@ -1,11 +1,6 @@
 <html>
     <head>
-        <script src="../../resources/js-test-pre.js"></script>
-
-        <script>
-            if (window.testRunner)
-                testRunner.dumpAsText();
-        </script>
+        <script src="../../resources/js-test.js"></script>
     </head>
     <body id="body">
         <p>
index b58e2acbdbf0750c6f6d00a2b341d9567208bc9a..c05955298cf5dcf685eb10d38f0e15449c05a38e 100644 (file)
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="../../resources/js-test-pre.js"></script>
+    <script src="../../resources/js-test.js"></script>
 </head>
 
 <body id="body">
@@ -22,8 +22,6 @@ elements.</p>
     if (window.testRunner && window.accessibilityController) {
         document.getElementById("notDRT").style.visibility = "hidden";
 
-        testRunner.dumpAsText();
-
         document.getElementById("selectElement").focus();
         shouldBe('accessibilityController.focusedElement.role', '"AXRole: AXList"');
         shouldBe('accessibilityController.focusedElement.childAtIndex(0).role', '"AXRole: AXStaticText"');
index b2f7c2a6a1021daf149028f2fbdca09ad9340e85..7275d96c30878a0e3fbc233236c42ee9a50026b9 100644 (file)
@@ -1,7 +1,7 @@
 <html>
 
 <head>
-    <script src="../../resources/js-test-pre.js"></script>
+    <script src="../../resources/js-test.js"></script>
 </head>
 
 <body id="body">
@@ -20,8 +20,6 @@
     if (window.testRunner && window.accessibilityController) {
         document.getElementById("notDRT").style.visibility = "hidden";
 
-        testRunner.dumpAsText();
-
         document.getElementById("selectElement").focus();
 
         var optionElement = accessibilityController.focusedElement.childAtIndex(0);
index 7b1f772b345c4b37531624135febb590ee2a4353..bad7259298f6b567d73d08d9b43bdfc301752d55 100644 (file)
@@ -1,7 +1,7 @@
 <html>
 
 <head>
-    <script src="../../resources/js-test-pre.js"></script>
+    <script src="../../resources/js-test.js"></script>
 </head>
 
 <body id="body">
@@ -20,8 +20,6 @@
     if (window.testRunner && window.accessibilityController) {
         document.getElementById("notDRT").style.visibility = "hidden";
 
-        testRunner.dumpAsText();
-
         document.getElementById("selectElement").focus();
 
         var optionElement = accessibilityController.focusedElement.childAtIndex(0);
index a946f193701afecddbfef66afe83ca2f80cf969d..f170e49fbf86df762dfb2518be0905c2026bef47 100644 (file)
@@ -1,7 +1,7 @@
 <html>
 
 <head>
-    <script src="../../resources/js-test-pre.js"></script>
+    <script src="../../resources/js-test.js"></script>
 </head>
 
 <body id="body">
@@ -20,8 +20,6 @@
     if (window.testRunner && window.accessibilityController) {
         document.getElementById("notDRT").style.visibility = "hidden";
 
-        testRunner.dumpAsText();
-
         document.getElementById("selectElement").focus();
 
         shouldBe('accessibilityController.focusedElement.role', '"AXRole: AXComboBox"');
index ff31d1153abea406f8ff2178214e67553c134ca8..89e1c68c7c2e925d9027f7362155061080eac421 100644 (file)
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="../../resources/js-test-pre.js"></script>
+    <script src="../../resources/js-test.js"></script>
 </head>
 
 <body>
@@ -37,8 +37,6 @@
     if (window.testRunner && window.accessibilityController) {
         document.getElementById("notDRT").style.visibility = "hidden";
 
-        testRunner.dumpAsText();
-        
         document.body.focus();
         shouldBe('accessibilityController.focusedElement.role', '"document"');
 
index 0aaf1bd78ac577e49d50906300231784e38e5e1e..2ac15997e4ae556ee12adf6d84453a4f7afd6174 100644 (file)
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="../../resources/js-test-pre.js"></script>
+    <script src="../../resources/js-test.js"></script>
 </head>
 
 <body id="body">
@@ -19,8 +19,6 @@
     if (window.testRunner && window.accessibilityController) {
         document.getElementById("notDRT").style.visibility = "hidden";
 
-        testRunner.dumpAsText();
-
         document.getElementById("selectElement").focus();
         var selectElement = accessibilityController.focusedElement;
         var list = accessibilityController.focusedElement.childAtIndex(0);
index 04e8c6b470df190734e30559f7d7f7c9d9ed3c03..8d175c8d4946211808de202bd08abdfdce29f09a 100644 (file)
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="../../resources/js-test-pre.js"></script>
+    <script src="../../resources/js-test.js"></script>
 </head>
 
 <body id="body">
@@ -39,8 +39,6 @@
     if (window.testRunner && window.accessibilityController) {
         document.getElementById("notDRT").style.visibility = "hidden";
 
-        testRunner.dumpAsText();
-
         document.getElementById("selectElement").focus();
         var selectElement = accessibilityController.focusedElement;
         shouldBe('selectElement.role', '"AXRole: combo box"');
index 2245cf892bbb953cd5ed0a514847e6e8ab4ad981..724ab7a2f7362aa12141bdae0a8c34b7a7057bc8 100644 (file)
@@ -1,11 +1,6 @@
 <html>
     <head>
-        <script src="../../resources/js-test-pre.js"></script>
-
-        <script>
-            if (window.testRunner)
-                testRunner.dumpAsText();
-        </script>
+        <script src="../../resources/js-test.js"></script>
     </head>
     <body id="body">
         <p>
index 087f2d09109e7a21ed316a1c371b1ff76ae0168a..50aaa02e77d8abe200fee4675527f90a17d5fe03 100644 (file)
@@ -14,6 +14,7 @@ iframe.isEqual(newIframe): true
 scrollarea.isEqual(newScrollarea): true
 subwebarea.isEqual(newSubwebarea): false
 PASS newSubwebarea.childrenCount > 0 is true
+PASS successfullyParsed is true
 
 TEST COMPLETE
 
index 3d4e954e2443ba54a10ba3c30101ce0377e8dcb2..e81d0c85afb6a71a8710d63ff747c7f37f6955f3 100644 (file)
@@ -40,6 +40,7 @@ PASS root.isEqual(newRoot) is true
 PASS body.isEqual(newBody) is true
 PASS before.isEqual(newBefore) is true
 PASS after.isEqual(newAfter) is true
+PASS successfullyParsed is true
 
 TEST COMPLETE
 
index 74db9dd1041abef7d0ec11acc4e0dcafccd2fe78..94bce826c81909feeda6425273dcb885b593f62e 100644 (file)
@@ -40,6 +40,7 @@ PASS root.isEqual(newRoot) is true
 PASS body.isEqual(newBody) is true
 PASS before.isEqual(newBefore) is true
 PASS after.isEqual(newAfter) is true
+PASS successfullyParsed is true
 
 TEST COMPLETE
 
index 9cbd07b78ee68fbdc674e264807721a8f9474c66..7f17b05df47cacfec0c646b93616cb9b20950a26 100644 (file)
@@ -92,4 +92,7 @@ State at 'canplaythrough' event:
             role: AXRole: AXButton
 
 
+PASS successfullyParsed is true
+
+TEST COMPLETE
 
index 7387038df04e03ed433d79facbd3073327409146..272d32a8e7202e321d85dbd1e333498da69d98cc 100644 (file)
@@ -25,4 +25,7 @@ The table2 cell at (2,0) currently has role  AXRole: AXCell .
 The table2 cell at (1,2) currently has role  AXRole: AXCell .
 The table2 cell at (2,3) currently has role  AXRole: AXCell .
 The table2 cell at (0,2) currently has role  AXRole: AXCell .
+PASS successfullyParsed is true
+
+TEST COMPLETE
 
index 57a492bd7a4957298f63645b3600a90019a37f77..b6363232c3020f0df213b8d16aacaff22eee8a21 100644 (file)
@@ -83,4 +83,7 @@ role: AXRole: AXTable
             role: AXRole: AXStaticText
         role: AXRole: AXCell
             role: AXRole: AXStaticText
+PASS successfullyParsed is true
+
+TEST COMPLETE