Chromium Code Reviews Chromium Code Reviews
Issue 2676493005:
Use testharness.js instead of js-test.js in LayoutTests/fast/canvas tests. (Closed)
| Index: third_party/WebKit/LayoutTests/fast/canvas/canvas-fillText-invalid-maxWidth.html |
| diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-fillText-invalid-maxWidth.html b/third_party/WebKit/LayoutTests/fast/canvas/canvas-fillText-invalid-maxWidth.html |
| index a73061f2a3a1140d0938cbc55da8112815823ed1..22a602afb7c7c35c43a04fb70d000bb848a5d29f 100644 |
| --- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-fillText-invalid-maxWidth.html |
| +++ b/third_party/WebKit/LayoutTests/fast/canvas/canvas-fillText-invalid-maxWidth.html |
| @@ -1,10 +1,52 @@ |
| -<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> |
| -<html> |
| -<head> |
| -<script src="../../resources/js-test.js"></script> |
| -</head> |
| +<script src="../../resources/testharness.js"></script> |
| +<script src="../../resources/testharnessreport.js"></script> |
| <body> |
| -<script src="script-tests/canvas-fillText-invalid-maxWidth.js"></script> |
| +<script> |
| +test(function(t) { |
| + |
| +var canvas = document.createElement('canvas'); |
|
Justin Novosad
2017/02/03 18:39:32
indent
zakerinasab
2017/02/09 18:11:03
Done.
|
| +var ctx = canvas.getContext('2d'); |
| +var canvasWidth = 100; |
| +var canvasHeight = 50; |
| +canvas.setWidth = canvasWidth; |
| +canvas.setHeight = canvasHeight; |
| + |
| +ctx.fillStyle = '#0f0'; |
| +ctx.fillRect(0, 0, canvasWidth, canvasHeight); |
| +ctx.font = '35px Arial, sans-serif'; |
| + |
| +ctx.fillStyle = '#f00'; |
| +ctx.fillText("fail fail fail fail fail", 5, 35, 0); |
| + |
| +var imageData = ctx.getImageData(0, 0, canvasWidth, canvasHeight); |
| +var w = imageData.width, h = imageData.height, d = imageData.data; |
| +for (var i = 0; i < h; ++i) { |
| + for (var j = 0; j < w; ++j) { |
| + if (d[4 * (w * i + j) + 0] != 0) assert_equals(d[4 * (w * i + j) + 0], 0); |
|
Justin Novosad
2017/02/03 18:39:32
Calling assert_equals inside a big loop is a bad i
zakerinasab
2017/02/09 18:11:03
Done.
|
| + if (d[4 * (w * i + j) + 1] != 255) assert_equals(d[4 * (w * i + j) + 1], 255); |
| + if (d[4 * (w * i + j) + 2] != 0) assert_equals(d[4 * (w * i + j) + 2], 0); |
| + if (d[4 * (w * i + j) + 3] != 255) assert_equals(d[4 * (w * i + j) + 3], 255); |
| + } |
| +} |
| + |
| +ctx.fillStyle = '#0f0'; |
| +ctx.fillRect(0, 0, canvasWidth, canvasHeight); |
| + |
| +ctx.fillStyle = '#f00'; |
| +ctx.fillText("fail fail fail fail fail", 5, 35, -1); |
| + |
| +var imageData = ctx.getImageData(0, 0, canvasWidth, canvasHeight); |
| +var w = imageData.width, h = imageData.height, d = imageData.data; |
| +for (var i = 0; i < h; ++i) { |
| + for (var j = 0; j < w; ++j) { |
| + if (d[4 * (w * i + j) + 0] != 0) assert_equals(d[4 * (w * i + j) + 0], 0); |
|
Justin Novosad
2017/02/03 18:39:32
same here
zakerinasab
2017/02/09 18:11:03
Done.
|
| + if (d[4 * (w * i + j) + 1] != 255) assert_equals(d[4 * (w * i + j) + 1], 255); |
| + if (d[4 * (w * i + j) + 2] != 0) assert_equals(d[4 * (w * i + j) + 2], 0); |
| + if (d[4 * (w * i + j) + 3] != 255) assert_equals(d[4 * (w * i + j) + 3], 255); |
| + } |
| +} |
| + |
| +}, 'Series of tests to ensure that fillText() does not display any text when maxWidth is invalid.'); |
| +</script> |
| </body> |
| -</html> |
