Chromium Code Reviews Chromium Code Reviews
Issue 2700823002:
Use testharness.js instead of js-test.js in LayoutTests/fast/canvas tests. (Closed)
| Index: third_party/WebKit/LayoutTests/fast/canvas/draw-focus-if-needed-scrolls-horiz.html |
| diff --git a/third_party/WebKit/LayoutTests/fast/canvas/draw-focus-if-needed-scrolls-horiz.html b/third_party/WebKit/LayoutTests/fast/canvas/draw-focus-if-needed-scrolls-horiz.html |
| index 46a66d9702b9ee2b48972bfbb217b6fec97fa9bc..8441f959bb56ae5fa064394b89e52018195ac156 100644 |
| --- a/third_party/WebKit/LayoutTests/fast/canvas/draw-focus-if-needed-scrolls-horiz.html |
| +++ b/third_party/WebKit/LayoutTests/fast/canvas/draw-focus-if-needed-scrolls-horiz.html |
| @@ -1,9 +1,6 @@ |
| -<!DOCTYPE HTML> |
| -<head> |
| -<title>Canvas test: drawFocusIfNeeded scrolls</title> |
| -<script src="../../resources/js-test.js"></script> |
| -</head> |
| -<body style="padding: 0; margin: 0"> |
| +<script src="../../resources/testharness.js"></script> |
| +<script src="../../resources/testharnessreport.js"></script> |
| + |
| <div style="width: 6500px;"> |
| <div style="float: left; border: 1px solid #000; width: 1000px; height: 300px"> |
| 1000-pixel box |
| @@ -13,9 +10,9 @@ |
| <button id="right_button"></button> |
| </canvas> |
| </div> |
| + |
| <script> |
| -if (window.testRunner) |
| - testRunner.dumpAsText(); |
| +test(function(t) { |
| var canvas = document.getElementById("canvas"); |
|
Justin Novosad
2017/02/24 21:23:06
indent
zakerinasab
2017/02/27 15:36:24
Done.
|
| var context = canvas.getContext("2d"); |
| @@ -39,23 +36,24 @@ function draw() { |
| document.getElementById("right_button").focus(); |
| window.scrollTo(0, 0); |
| -shouldBe("window.pageXOffset", "0"); |
| +assert_true(window.pageXOffset == 0); |
| draw(); |
| var minXOffset = RIGHT_BUTTON_X_POS + canvas.offsetLeft - window.innerWidth; |
| var maxXOffset = RIGHT_BUTTON_X_POS + canvas.offsetLeft; |
| -shouldBeGreaterThanOrEqual("window.pageXOffset", "minXOffset"); |
| -shouldBeGreaterThanOrEqual("maxXOffset", "window.pageXOffset"); |
| +assert_true(window.pageXOffset >= minXOffset); |
| +assert_true(maxXOffset >= window.pageXOffset); |
| document.getElementById("left_button").focus(); |
| -shouldBeGreaterThanOrEqual("window.pageXOffset", "minXOffset"); |
| -shouldBeGreaterThanOrEqual("maxXOffset", "window.pageXOffset"); |
| +assert_true(window.pageXOffset >= minXOffset); |
| +assert_true(maxXOffset >= window.pageXOffset); |
| draw(); |
| minXOffset = LEFT_BUTTON_X_POS + canvas.offsetLeft - window.innerWidth; |
| maxXOffset = LEFT_BUTTON_X_POS + canvas.offsetLeft; |
| -shouldBeGreaterThanOrEqual("window.pageXOffset", "minXOffset"); |
| -shouldBeGreaterThanOrEqual("maxXOffset", "window.pageXOffset"); |
| +assert_true(window.pageXOffset >= minXOffset); |
| +assert_true(maxXOffset >= window.pageXOffset); |
| +}, 'Canvas test: drawFocusIfNeeded scrolls'); |
| </script> |
| </body> |
