Clean up js-test use in scroll-snap tests
authorap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 15 Aug 2015 05:51:04 +0000 (05:51 +0000)
committerap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 15 Aug 2015 05:51:04 +0000 (05:51 +0000)
https://bugs.webkit.org/show_bug.cgi?id=148046

Reviewed by Brent Fulgham.

* tiled-drawing/scrolling/scroll-snap/scroll-snap-iframe-expected.txt:
* tiled-drawing/scrolling/scroll-snap/scroll-snap-iframe.html:
* tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-2d-overflow-expected.txt:
* tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-2d-overflow.html:
* tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-borders-expected.txt:
* tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-borders.html:
* tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal-expected.txt:
* tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal.html:
* tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-horizontal-expected.txt:
* tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-horizontal.html:
* tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-vertical-expected.txt:
* tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-vertical.html:
* tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical-expected.txt:
* tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical.html:
* tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow-expected.txt:
* tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow-stateless-expected.txt:
* tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow-stateless.html:
* tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow.html:
* tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-padding-expected.txt:
* tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-padding.html:
* tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-rotated-expected.txt:
* tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-rotated.html:

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

23 files changed:
LayoutTests/ChangeLog
LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-iframe-expected.txt
LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-iframe.html
LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-2d-overflow-expected.txt
LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-2d-overflow.html
LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-borders-expected.txt
LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-borders.html
LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal-expected.txt
LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal.html
LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-horizontal-expected.txt
LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-horizontal.html
LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-vertical-expected.txt
LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-vertical.html
LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical-expected.txt
LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical.html
LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow-expected.txt
LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow-stateless-expected.txt
LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow-stateless.html
LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow.html
LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-padding-expected.txt
LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-padding.html
LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-rotated-expected.txt
LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-rotated.html

index 336c632..e1b9fc1 100644 (file)
@@ -1,3 +1,33 @@
+2015-08-14  Alexey Proskuryakov  <ap@apple.com>
+
+        Clean up js-test use in scroll-snap tests
+        https://bugs.webkit.org/show_bug.cgi?id=148046
+
+        Reviewed by Brent Fulgham.
+
+        * tiled-drawing/scrolling/scroll-snap/scroll-snap-iframe-expected.txt:
+        * tiled-drawing/scrolling/scroll-snap/scroll-snap-iframe.html:
+        * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-2d-overflow-expected.txt:
+        * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-2d-overflow.html:
+        * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-borders-expected.txt:
+        * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-borders.html:
+        * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal-expected.txt:
+        * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal.html:
+        * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-horizontal-expected.txt:
+        * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-horizontal.html:
+        * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-vertical-expected.txt:
+        * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-vertical.html:
+        * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical-expected.txt:
+        * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical.html:
+        * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow-expected.txt:
+        * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow-stateless-expected.txt:
+        * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow-stateless.html:
+        * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow.html:
+        * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-padding-expected.txt:
+        * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-padding.html:
+        * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-rotated-expected.txt:
+        * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-rotated.html:
+
 2015-08-14  Jon Honeycutt  <jhoneycutt@apple.com>
 
         Rebase some WK2 test results to include the frame scroll pos. Move the
index b8898b9..05e2d09 100644 (file)
@@ -1,8 +1,5 @@
 Tests that the scroll-snap feature works properly in iframes.
  
-PASS successfullyParsed is true
-
-TEST COMPLETE
 Testing scroll-snap glide for horizontalTarget:
 PASS div scrolled to next window.
 Testing scroll-snap snap for horizontalTarget:
index 332f879..d0d604f 100644 (file)
                 margin: 2px;
             }
         </style>
-        <script src="../../../resources/js-test-pre.js"></script>
+        <script src="../../../resources/js-test.js"></script>
         <script>
+        window.jsTestIsAsync = true;
+
         var iframeScrollPositionBeforeGlide;
         var divScrollPositionBeforeSnap;
 
             return position;
         }
 
-        function finishTest()
-        {
-            finishJSTest();
-            testRunner.notifyDone();            
-        }
-
         function checkForScrollSnap(targetLabel)
         {
             var iframeTarget = document.getElementById(targetLabel);
@@ -64,7 +60,7 @@
             if (targetLabel == 'horizontalTarget')
                 setTimeout(function() { scrollGlideTest('verticalTarget') }, 0);
             else   
-                finishTest();
+                finishJSTest();
         }
 
         function scrollSnapTest(targetLabel)
         function onLoad()
         {
             if (window.eventSender) {
-                window.jsTestIsAsync = true;
-                testRunner.dumpAsText();
-                testRunner.waitUntilDone();
-
                 eventSender.monitorWheelEvents();
                 setTimeout(function() { scrollGlideTest('horizontalTarget') }, 0);
             }
             <iframe id="verticalTarget" class="verticalGallery" src="resources/vertical-mainframe.html"  style="height: 300px; width: 300px"></iframe>
             <div id="console"></div>
         </div>
-        <script src="../../../resources/js-test-post.js"></script>
     </body>
 </html>
\ No newline at end of file
index a6b9722..7a4752c 100644 (file)
@@ -1,6 +1,3 @@
-PASS successfullyParsed is true
-
-TEST COMPLETE
 PASS div successfully scrolled diagonally.
 PASS div successfully snapped diagonally.
 PASS div successfully snapped after dragging along one axis and then scrolling in the other.
index 63947cd..8240166 100644 (file)
                 margin-top: 0px;
             }
         </style>
-        <script src="../../../resources/js-test-pre.js"></script>
+        <script src="../../../resources/js-test.js"></script>
         <script>
+        window.jsTestIsAsync = true;
+
         var divTarget;
         var divScrollPositionBeforeGlide;
         var divScrollPositionBeforeSnap;
         var divScrollPositionBeforeSingleAxisGlide;
 
-        function finishTest() {
-            finishJSTest();
-            testRunner.notifyDone();
-        }
-
         function checkForSingleAxisGlide() {
             if (divTarget.scrollTop == divScrollPositionBeforeSingleAxisGlide.y + 400 && divTarget.scrollLeft == divScrollPositionBeforeSingleAxisGlide.x)
                 testPassed("div successfully snapped after dragging along one axis and then scrolling in the other.");
             else
                 testFailed("div did not honor 2D snap points. (single axis scroll followed by flick on other axis)");
-            finishTest();
+            finishJSTest();
         }
 
         function scrollAndGlideInSingleAxisTest() {
 
         function onLoad() {
             if (window.eventSender) {
-                window.jsTestIsAsync = true;
-                testRunner.dumpAsText();
-                testRunner.waitUntilDone();
-
                 eventSender.monitorWheelEvents();
                 setTimeout(scrollGlideTest, 0);
             } else {
             <div class="cell"></div><div class="cell" id="green"></div><div class="cell"></div><br/>
             <div class="cell"></div><div class="cell" id="green"></div><div class="cell"></div>
         </div>
-        <script src="../../../resources/js-test-post.js"></script>
     </body>
 </html>
index 31a0666..7a772aa 100644 (file)
@@ -1,8 +1,5 @@
 Tests that the scroll-snap feature works properly in overflow regions.
- PASS successfullyParsed is true
-
-TEST COMPLETE
-Testing scroll-snap glide for horizontalTarget:
+ Testing scroll-snap glide for horizontalTarget:
 PASS div scrolled to next window.
 Testing scroll-snap snap for horizontalTarget:
 PASS div honored snap points.
index b94bf19..cb3b248 100644 (file)
             #itemH4, #itemV4 { background-color: yellow; }
             #itemH5, #itemV5 { background-color: fuchsia; }
         </style>
-        <script src="../../../resources/js-test-pre.js"></script>
+        <script src="../../../resources/js-test.js"></script>
         <script>
+        window.jsTestIsAsync = true;
+
         var divScrollPositionBeforeGlide;
         var divScrollPositionBeforeSnap;
 
             return position;
         }
 
-        function finishTest()
-        {
-            finishJSTest();
-            testRunner.notifyDone();            
-        }
-
         function checkForScrollSnap(targetLabel)
         {
             var divTarget = document.getElementById(targetLabel);
@@ -97,7 +93,7 @@
             if (targetLabel == 'horizontalTarget')
                 setTimeout(function() { scrollGlideTest('verticalTarget') }, 0);
             else   
-                finishTest();
+                finishJSTest();
         }
 
         function scrollSnapTest(targetLabel)
         function onLoad()
         {
             if (window.eventSender) {
-                window.jsTestIsAsync = true;
-                testRunner.dumpAsText();
-                testRunner.waitUntilDone();
-
                 eventSender.monitorWheelEvents();
                 setTimeout(function() { scrollGlideTest('horizontalTarget') }, 0);
             } else {
             </div>
             <div id="console"></div>
         </div>
-        <script src="../../../resources/js-test-post.js"></script>
     </body>
 </html>
\ No newline at end of file
index bd0257b..9faf0ab 100644 (file)
             #item4 { background-color: yellow; }
             #item5 { background-color: fuchsia; }
         </style>
-        <script src="../../../resources/js-test-pre.js"></script>
+        <script src="../../../resources/js-test.js"></script>
         <script>
+        window.jsTestIsAsync = true;
+
         var divTarget;
         var divScrollPositionBeforeGlide;
         var divScrollPositionBeforeSnap;
@@ -35,7 +37,7 @@
             else
                 testPassed("div honored snap points.");
 
-            testRunner.notifyDone();
+            finishJSTest();
         }
 
         function scrollSnapTest() {
@@ -91,8 +93,6 @@
         function onLoad() {
 
             if (window.eventSender) {
-                testRunner.waitUntilDone();
-
                 eventSender.monitorWheelEvents();
                 setTimeout(scrollGlideTest, 0);
             } else {
         <div id="item3" class="colorBox"></div>
         <div id="item4" class="colorBox"></div>
         <div id="item5" class="colorBox"></div>
-        <script src="../../../resources/js-test-post.js"></script>
     </body>
 </html>
\ No newline at end of file
index f8e4030..a8d6f09 100644 (file)
             #item4 { background-color: yellow; }
             #item5 { background-color: fuchsia; }
         </style>
-        <script src="../../../resources/js-test-pre.js"></script>
+        <script src="../../../resources/js-test.js"></script>
         <script>
+        window.jsTestIsAsync = true;
+
         var divTarget;
         var divScrollPositionBeforeGlide;
         var divScrollPositionBeforeSnap;
@@ -35,7 +37,7 @@
             else
                 testPassed("div honored snap points.");
 
-            testRunner.notifyDone();
+            finishJSTest();
         }
 
         function scrollSnapTest() {
@@ -91,8 +93,6 @@
         function onLoad() {
 
             if (window.eventSender) {
-                testRunner.waitUntilDone();
-
                 eventSender.monitorWheelEvents();
                 setTimeout(scrollGlideTest, 0);
             } else {
         <div id="item3" class="colorBox"></div>
         <div id="item4" class="colorBox"></div>
         <div id="item5" class="colorBox"></div>
-        <script src="../../../resources/js-test-post.js"></script>
     </body>
 </html>
\ No newline at end of file
index 4c5ff37..1c71b0d 100644 (file)
             #item4 { background-color: yellow; }
             #item5 { background-color: fuchsia; }
         </style>
-        <script src="../../../resources/js-test-pre.js"></script>
+        <script src="../../../resources/js-test.js"></script>
         <script>
+        window.jsTestIsAsync = true;
+
         var divTarget;
         var divScrollPositionBeforeGlide;
         var divScrollPositionBeforeSnap;
@@ -35,7 +37,7 @@
             else
                 testPassed("div honored snap points.");
 
-            testRunner.notifyDone();
+            finishJSTest();
         }
 
         function scrollSnapTest() {
@@ -91,8 +93,6 @@
         function onLoad() {
 
             if (window.eventSender) {
-                testRunner.waitUntilDone();
-
                 eventSender.monitorWheelEvents();
                 setTimeout(scrollGlideTest, 0);
             } else {
         <div id="item3" class="colorBox"></div>
         <div id="item4" class="colorBox"></div>
         <div id="item5" class="colorBox"></div>
-        <script src="../../../resources/js-test-post.js"></script>
     </body>
 </html>
\ No newline at end of file
index 11eb3a6..301adf9 100644 (file)
             #item4 { background-color: yellow; }
             #item5 { background-color: fuchsia; }
         </style>
-        <script src="../../../resources/js-test-pre.js"></script>
+        <script src="../../../resources/js-test.js"></script>
         <script>
+        window.jsTestIsAsync = true;
+
         var divTarget;
         var divScrollPositionBeforeGlide;
         var divScrollPositionBeforeSnap;
@@ -35,7 +37,7 @@
             else
                 testPassed("div honored snap points.");
 
-            testRunner.notifyDone();
+            finishJSTest();
         }
 
         function scrollSnapTest() {
@@ -91,8 +93,6 @@
         function onLoad() {
 
             if (window.eventSender) {
-                testRunner.waitUntilDone();
-
                 eventSender.monitorWheelEvents();
                 setTimeout(scrollGlideTest, 0);
             } else {
         <div id="item3" class="colorBox"></div>
         <div id="item4" class="colorBox"></div>
         <div id="item5" class="colorBox"></div>
-        <script src="../../../resources/js-test-post.js"></script>
     </body>
 </html>
\ No newline at end of file
index 31a0666..7a772aa 100644 (file)
@@ -1,8 +1,5 @@
 Tests that the scroll-snap feature works properly in overflow regions.
- PASS successfullyParsed is true
-
-TEST COMPLETE
-Testing scroll-snap glide for horizontalTarget:
+ Testing scroll-snap glide for horizontalTarget:
 PASS div scrolled to next window.
 Testing scroll-snap snap for horizontalTarget:
 PASS div honored snap points.
index 3621139..22b8be9 100644 (file)
@@ -1,8 +1,5 @@
 Tests that the scroll-snap feature works properly in overflow regions when using a mechanical mouse wheel.
- PASS successfullyParsed is true
-
-TEST COMPLETE
-PASS div honored snap points.
+ PASS div honored snap points.
 PASS successfullyParsed is true
 
 TEST COMPLETE
index f4d1ce8..8d181ec 100644 (file)
             #item0, #item2 { background-color: red; }
             #item1 { background-color: green; }
         </style>
-        <script src="../../../resources/js-test-pre.js"></script>
+        <script src="../../../resources/js-test.js"></script>
         <script>
-        function finishTest()
-        {
-            finishJSTest();
-            testRunner.notifyDone();
-        }
+        window.jsTestIsAsync = true;
 
         function locationInWindowCoordinates(element)
         {
@@ -63,7 +59,7 @@
                 else
                     testPassed("div honored snap points.");
 
-                finishTest();
+                finishJSTest();
             }, 2000);
         }
 
         function onLoad()
         {
             if (window.eventSender) {
-                window.jsTestIsAsync = true;
-                testRunner.dumpAsText();
-                testRunner.waitUntilDone();
-
                 eventSender.monitorWheelEvents();
                 setTimeout(scrollSnapTest, 0);
             } else {
             </div>
             <div id="console"></div>
         </div>
-        <script src="../../../resources/js-test-post.js"></script>
     </body>
 </html>
\ No newline at end of file
index 2167855..f4ee06c 100644 (file)
             #itemH4, #itemV4 { background-color: yellow; }
             #itemH5, #itemV5 { background-color: fuchsia; }
         </style>
-        <script src="../../../resources/js-test-pre.js"></script>
+        <script src="../../../resources/js-test.js"></script>
         <script>
+        window.jsTestIsAsync = true;
+
         var divScrollPositionBeforeGlide;
         var divScrollPositionBeforeSnap;
 
             return position;
         }
 
-        function finishTest()
-        {
-            finishJSTest();
-            testRunner.notifyDone();            
-        }
-
         function checkForScrollSnap(targetLabel)
         {
             var divTarget = document.getElementById(targetLabel);
@@ -87,7 +83,7 @@
             if (targetLabel == 'horizontalTarget')
                 setTimeout(function() { scrollGlideTest('verticalTarget') }, 0);
             else   
-                finishTest();
+                finishJSTest();
         }
 
         function scrollSnapTest(targetLabel)
         function onLoad()
         {
             if (window.eventSender) {
-                window.jsTestIsAsync = true;
-                testRunner.dumpAsText();
-                testRunner.waitUntilDone();
-
                 eventSender.monitorWheelEvents();
                 setTimeout(function() { scrollGlideTest('horizontalTarget') }, 0);
             } else {
             </div>
             <div id="console"></div>
         </div>
-        <script src="../../../resources/js-test-post.js"></script>
     </body>
 </html>
\ No newline at end of file
index 31a0666..7a772aa 100644 (file)
@@ -1,8 +1,5 @@
 Tests that the scroll-snap feature works properly in overflow regions.
- PASS successfullyParsed is true
-
-TEST COMPLETE
-Testing scroll-snap glide for horizontalTarget:
+ Testing scroll-snap glide for horizontalTarget:
 PASS div scrolled to next window.
 Testing scroll-snap snap for horizontalTarget:
 PASS div honored snap points.
index c6368a9..8c99d61 100644 (file)
             #itemH4, #itemV4 { background-color: yellow; }
             #itemH5, #itemV5 { background-color: fuchsia; }
         </style>
-        <script src="../../../resources/js-test-pre.js"></script>
+        <script src="../../../resources/js-test.js"></script>
         <script>
+        window.jsTestIsAsync = true;
+
         var divScrollPositionBeforeGlide;
         var divScrollPositionBeforeSnap;
 
             return position;
         }
 
-        function finishTest()
-        {
-            finishJSTest();
-            testRunner.notifyDone();            
-        }
-
         function checkForScrollSnap(targetLabel)
         {
             var divTarget = document.getElementById(targetLabel);
@@ -95,7 +91,7 @@
             if (targetLabel == 'horizontalTarget')
                 setTimeout(function() { scrollGlideTest('verticalTarget') }, 0);
             else   
-                finishTest();
+                finishJSTest();
         }
 
         function scrollSnapTest(targetLabel)
         function onLoad()
         {
             if (window.eventSender) {
-                window.jsTestIsAsync = true;
-                testRunner.dumpAsText();
-                testRunner.waitUntilDone();
-
                 eventSender.monitorWheelEvents();
                 setTimeout(function() { scrollGlideTest('horizontalTarget') }, 0);
             } else {
             </div>
             <div id="console"></div>
         </div>
-        <script src="../../../resources/js-test-post.js"></script>
     </body>
 </html>
\ No newline at end of file
index 31a0666..7a772aa 100644 (file)
@@ -1,8 +1,5 @@
 Tests that the scroll-snap feature works properly in overflow regions.
- PASS successfullyParsed is true
-
-TEST COMPLETE
-Testing scroll-snap glide for horizontalTarget:
+ Testing scroll-snap glide for horizontalTarget:
 PASS div scrolled to next window.
 Testing scroll-snap snap for horizontalTarget:
 PASS div honored snap points.
index d13e3e7..5674051 100644 (file)
             #itemH4, #itemV4 { background-color: yellow; }
             #itemH5, #itemV5 { background-color: fuchsia; }
         </style>
-        <script src="../../../resources/js-test-pre.js"></script>
+        <script src="../../../resources/js-test.js"></script>
         <script>
+        window.jsTestIsAsync = true;
+
         var divScrollPositionBeforeGlide;
         var divScrollPositionBeforeSnap;
 
             return position;
         }
 
-        function finishTest()
-        {
-            finishJSTest();
-            testRunner.notifyDone();            
-        }
-
         function checkForScrollSnap(targetLabel)
         {
             var divTarget = document.getElementById(targetLabel);
@@ -89,7 +85,7 @@
             if (targetLabel == 'horizontalTarget')
                 setTimeout(function() { scrollGlideTest('verticalTarget') }, 0);
             else   
-                finishTest();
+                finishJSTest();
         }
 
         function scrollSnapTest(targetLabel)
         function onLoad()
         {
             if (window.eventSender) {
-                window.jsTestIsAsync = true;
-                testRunner.dumpAsText();
-                testRunner.waitUntilDone();
-
                 eventSender.monitorWheelEvents();
                 setTimeout(function() { scrollGlideTest('horizontalTarget') }, 0);
             } else {
             </div>
             <div id="console"></div>
         </div>
-        <script src="../../../resources/js-test-post.js"></script>
     </body>
-</html>
\ No newline at end of file
+</html>