third_party/WebKit/LayoutTests/fast/canvas/canvas-ellipse-zero-lineto.html - Issue 2678493002: Use testharness.js instead of js-test.js in LayoutTests/fast/canvas tests.

Unified Diff: third_party/WebKit/LayoutTests/fast/canvas/canvas-ellipse-zero-lineto.html

Issue 2678493002: Use testharness.js instead of js-test.js in LayoutTests/fast/canvas tests. (Closed)

Patch Set: Created 3 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « third_party/WebKit/LayoutTests/fast/canvas/canvas-ellipse-negative-radius-expected.txt ('k') | third_party/WebKit/LayoutTests/fast/canvas/canvas-ellipse-zero-lineto-expected.txt » ('j') | third_party/WebKit/LayoutTests/fast/canvas/canvas-fillPath-alpha-shadow.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/fast/canvas/canvas-ellipse-zero-lineto.html

diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-ellipse-zero-lineto.html b/third_party/WebKit/LayoutTests/fast/canvas/canvas-ellipse-zero-lineto.html

index 631a7f955cc06fd05b6a9e1c500c0c7ac9ee4690..b40b23a503b018a1748a5c8585678163d4d62764 100644

--- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-ellipse-zero-lineto.html

+++ b/third_party/WebKit/LayoutTests/fast/canvas/canvas-ellipse-zero-lineto.html

@@ -1,11 +1,10 @@

-<!DOCTYPE html>

<html>

-<head></head>

-<body>

+<head><body>

-<script src="../../resources/js-test.js"></script>

+<script src="../../resources/testharness.js"></script>

+<script src="../../resources/testharnessreport.js"></script>

-description("This tests checks that ellipse can draw lines correctly in edge cases.");

+test(function(t) {

var canvas = document.getElementById('mycanvas');

Justin Novosad 2017/02/06 20:04:23 indent

zakerinasab 2017/02/09 18:02:00 Done.

var ctx = canvas.getContext('2d');

@@ -17,10 +16,10 @@ ctx.fillRect(0, 0, canvas.width, canvas.height);

var imageData = ctx.getImageData(1, 1, 1, 1);

var data = imageData.data;

-shouldBe("imageData.data[1]", "255");

+assert_equals(imageData.data[1], 255);

ctx.save();

-debug("moveTo + empty ellipse (swing == 0)");

+// moveTo + empty ellipse (swing == 0)

ctx.translate(0, 30);

ctx.save();

ctx.beginPath();

@@ -30,11 +29,11 @@ ctx.stroke();

ctx.restore();

imageData = ctx.getImageData(23, 29, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(85, 14, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

-debug("moveTo + empty ellipse (radiusX == 0)");

+// moveTo + empty ellipse (radiusX == 0)

ctx.translate(0, 30);

ctx.save();

ctx.beginPath();

@@ -44,13 +43,13 @@ ctx.stroke();

ctx.restore();

imageData = ctx.getImageData(22, 60, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(86, 43, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(71, 73, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

-debug("moveTo + empty ellipse (radiusY == 0)");

+// moveTo + empty ellipse (radiusY == 0)

ctx.translate(0, 30);

ctx.save();

ctx.beginPath();

@@ -60,13 +59,13 @@ ctx.stroke();

ctx.restore();

imageData = ctx.getImageData(22, 90, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(79, 90, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(87, 94, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

-debug("empty ellipse (swing == 0) + lineTo");

+// empty ellipse (swing == 0) + lineTo

ctx.translate(0, 30);

ctx.save();

ctx.beginPath();

@@ -76,13 +75,13 @@ ctx.stroke();

ctx.restore();

imageData = ctx.getImageData(26, 101, 1, 1);

-shouldBe("imageData.data[1]", "255");

+assert_equals(imageData.data[1], 255);

imageData = ctx.getImageData(32, 103, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(77, 119, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

-debug("empty ellipse (radiusX == 0) + lineTo");

+// empty ellipse (radiusX == 0) + lineTo

ctx.translate(0, 30);

ctx.save();

ctx.beginPath();

@@ -92,13 +91,13 @@ ctx.stroke();

ctx.restore();

imageData = ctx.getImageData(28, 135, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(11, 166, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(76, 151, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

-debug("empty ellipse (radiusY == 0) + lineTo");

+// empty ellipse (radiusY == 0) + lineTo

ctx.translate(0, 30);

ctx.save();

ctx.beginPath();

@@ -108,18 +107,18 @@ ctx.stroke();

ctx.restore();

imageData = ctx.getImageData(27, 183, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(21, 179, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(77, 180, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

ctx.restore();

ctx.translate(100, 0);

ctx.save();

-debug("lineTo + empty ellipse (radiusX == 0) + lineTo");

-debug(" 1. sweepAngle < PI / 2");

+// lineTo + empty ellipse (radiusX == 0) + lineTo

+// 1. sweepAngle < PI / 2

ctx.translate(0, 30);

ctx.save();

ctx.beginPath();

@@ -130,15 +129,15 @@ ctx.stroke();

ctx.restore();

imageData = ctx.getImageData(110, 29, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(122, 22, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(113, 42, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(144, 38, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

-debug(" 2. sweepAngle < PI");

+// 2. sweepAngle < PI

ctx.translate(0, 30);

ctx.save();

ctx.beginPath();

@@ -149,13 +148,13 @@ ctx.stroke();

ctx.restore();

imageData = ctx.getImageData(122, 54, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(112, 76, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(142, 70, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

-debug(" 3. sweepAngle < 2PI");

+// 3. sweepAngle < 2PI

ctx.translate(0, 30);

ctx.save();

ctx.beginPath();

@@ -166,13 +165,13 @@ ctx.stroke();

ctx.restore();

imageData = ctx.getImageData(115, 86, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(110, 104, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(138, 77, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

-debug(" 4. sweepAngle < 4PI");

+// 4. sweepAngle < 4PI

ctx.translate(0, 30);

ctx.save();

ctx.beginPath();

@@ -183,15 +182,15 @@ ctx.stroke();

ctx.restore();

imageData = ctx.getImageData(115, 116, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(111, 136, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(127, 106, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(127, 121, 1, 1);

-shouldBe("imageData.data[1]", "255");

+assert_equals(imageData.data[1], 255);

-debug(" 5. sweepAngle > 4PI");

+// 5. sweepAngle > 4PI

ctx.translate(0, 30);

ctx.save();

ctx.beginPath();

@@ -202,20 +201,20 @@ ctx.stroke();

ctx.restore();

imageData = ctx.getImageData(115, 146, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(111, 166, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(127, 136, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(127, 151, 1, 1);

-shouldBe("imageData.data[1]", "255");

+assert_equals(imageData.data[1], 255);

ctx.restore();

ctx.translate(100, 0);

ctx.save();

-debug("lineTo + empty ellipse (radiusY == 0) + lineTo");

-debug(" 1. sweepAngle < PI / 2");

+// lineTo + empty ellipse (radiusY == 0) + lineTo

+// 1. sweepAngle < PI / 2

ctx.translate(0, 30);

ctx.save();

ctx.beginPath();

@@ -226,13 +225,13 @@ ctx.stroke();

ctx.restore();

imageData = ctx.getImageData(213, 32, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(234, 39, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(240, 36, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

-debug(" 2. sweepAngle < PI");

+// 2. sweepAngle < PI

ctx.translate(0, 30);

ctx.save();

ctx.beginPath();

@@ -243,15 +242,15 @@ ctx.stroke();

ctx.restore();

imageData = ctx.getImageData(232, 69, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(238, 72, 1, 1);

-shouldBe("imageData.data[1]", "255");

+assert_equals(imageData.data[1], 255);

imageData = ctx.getImageData(228, 65, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(242, 61, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

-debug(" 3. sweepAngle < 2PI");

+// 3. sweepAngle < 2PI

ctx.translate(0, 30);

ctx.save();

ctx.beginPath();

@@ -262,15 +261,15 @@ ctx.stroke();

ctx.restore();

imageData = ctx.getImageData(204, 82, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(234, 100, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(212, 92, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(240, 90, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

-debug(" 4. sweepAngle < 4PI");

+// 4. sweepAngle < 4PI

ctx.translate(0, 30);

ctx.save();

ctx.beginPath();

@@ -281,15 +280,15 @@ ctx.stroke();

ctx.restore();

imageData = ctx.getImageData(208, 114, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(235, 130, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(210, 120, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(252, 124, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

-debug(" 5. sweepAngle > 4PI");

+// 5. sweepAngle > 4PI

ctx.translate(0, 30);

ctx.save();

ctx.beginPath();

@@ -300,14 +299,15 @@ ctx.stroke();

ctx.restore();

imageData = ctx.getImageData(208, 144, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(235, 160, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(210, 150, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

imageData = ctx.getImageData(252, 154, 1, 1);

-shouldBe("imageData.data[1]", "0");

+assert_equals(imageData.data[1], 0);

+}, 'This tests checks that ellipse can draw lines correctly in edge cases.');

</script>

</body>

</html>