third_party/WebKit/LayoutTests/fast/canvas/canvas-bezier-same-endpoint.html - Issue 2670353002: Use testharness.js instead of js-test.js in LayoutTests/fast/canvas tests.

Unified Diff: third_party/WebKit/LayoutTests/fast/canvas/canvas-bezier-same-endpoint.html

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

Patch Set: Addressing comments 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-arc-zero-lineto-expected.txt ('k') | third_party/WebKit/LayoutTests/fast/canvas/canvas-bezier-same-endpoint-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/fast/canvas/canvas-bezier-same-endpoint.html

diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-bezier-same-endpoint.html b/third_party/WebKit/LayoutTests/fast/canvas/canvas-bezier-same-endpoint.html

index d64da818cd1f7a844599087393a9eaa29d7127ad..fcbcf8e6e3cb1f8eb7ccb8cc73119113e63949aa 100644

--- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-bezier-same-endpoint.html

+++ b/third_party/WebKit/LayoutTests/fast/canvas/canvas-bezier-same-endpoint.html

@@ -1,55 +1,49 @@

-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">

-<html>

-<head>

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

-</head>

-<body>

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

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

-<script>

-description("Bug 105650: Test correct rendering of quadratic and bezier curves with coincident endpoints");

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

-var data;

-function shouldBeYellow(x,y)

- blue_value = ctx.getImageData(x, y, 1, 1).data[2];

- shouldBe("blue_value", "0");

-function shouldBeBlue(x,y)

- blue_value = ctx.getImageData(x, y, 1, 1).data[2];

- shouldBe("blue_value", "255");

-ctx.fillStyle = '#00f';

-ctx.strokeStyle = '#ff0';

-ctx.lineWidth = 30;

-ctx.beginPath();

-ctx.fillRect(0,0,100,100);

-ctx.moveTo(0,0);

-// bezier curve with coincident endpoints, horizontal line

-ctx.bezierCurveTo(0,0,200,0,0,0);

-shouldBeBlue(50,0);

-ctx.stroke();

-shouldBeYellow(50,0);

-shouldBeBlue(0,50);

-shouldBeBlue(70,70);

-// bezier curve with coincident endpoints, vertical line

-ctx.bezierCurveTo(0,200,0,0,0,0);

-ctx.stroke();

-shouldBeYellow(50,0);

-shouldBeBlue(75,75);

-// bezier curve with coincident endpoints

-ctx.bezierCurveTo(200,0,0,200,0,0);

-ctx.stroke();

-shouldBeYellow(75,75);

+<script>

+test(function(t) {

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

+ var data;

+ function shouldBeYellow(x,y)

+ {

+ blue_value = ctx.getImageData(x, y, 1, 1).data[2];

+ assert_equals(blue_value, 0);

+ }

+ function shouldBeBlue(x,y)

+ {

+ blue_value = ctx.getImageData(x, y, 1, 1).data[2];

+ assert_equals(blue_value, 255);

+ }

+ ctx.fillStyle = '#00f';

+ ctx.strokeStyle = '#ff0';

+ ctx.lineWidth = 30;

+ ctx.beginPath();

+ ctx.fillRect(0,0,100,100);

+ ctx.moveTo(0,0);

+ // bezier curve with coincident endpoints, horizontal line

+ ctx.bezierCurveTo(0,0,200,0,0,0);

+ shouldBeBlue(50,0);

+ ctx.stroke();

+ shouldBeYellow(50,0);

+ shouldBeBlue(0,50);

+ shouldBeBlue(70,70);

+ // bezier curve with coincident endpoints, vertical line

+ ctx.bezierCurveTo(0,200,0,0,0,0);

+ ctx.stroke();

+ shouldBeYellow(50,0);

+ shouldBeBlue(75,75);

+ // bezier curve with coincident endpoints

+ ctx.bezierCurveTo(200,0,0,200,0,0);

+ ctx.stroke();

+ shouldBeYellow(75,75);

+}, 'Test correct rendering of quadratic and bezier curves with coincident endpoints (bug 105650)');

</script>

-</body>

-</html>