Use testharness.js instead of js-test.js in LayoutTests/fast/canvas tests.

Use testharness.js instead of js-test.js in LayoutTests/fast/canvas tests.

This change replaces js-test.js assertions with testharness.js assertions. The expectation files are removed as they are not needed anymore.
To simplify review and landing, each change corrects 10 tests.

BUG=639732
Review-Url: https://codereview.chromium.org/2670353002
Cr-Commit-Position: refs/heads/master@{#449311}
Committed: https://chromium.googlesource.com/chromium/src/+/83029845af8ac47ac5c8c0534a2a9fd673a59a3e

[zakerinasab, 2017-02-03 16:43:41]

Description was changed from

==========
Use testharness.js instead of js-test.js in LayoutTests/fast/canvas tests.

This change replaces js-test.js assertions with testharness.js assertions. The
expectation files are removed as they are not needed anymore.
To simplify review and landing, each change corrects 10 tests.

BUG=639732
==========

to

==========
Use testharness.js instead of js-test.js in LayoutTests/fast/canvas tests.

This change replaces js-test.js assertions with testharness.js assertions. The
expectation files are removed as they are not needed anymore.
To simplify review and landing, each change corrects 10 tests.

BUG=639732
==========

[zakerinasab, 2017-02-03 16:43:41]

zakerinasab@chromium.org changed reviewers:
+ junov@chromium.org

[zakerinasab, 2017-02-03 16:44:04]

CL uploaded. PTAL.

[Justin Novosad, 2017-02-08 16:52:33]

https://codereview.chromium.org/2670353002/diff/20001/third_party/WebKit/Layo...
File third_party/WebKit/LayoutTests/fast/canvas/canvas-before-css.html (right):

https://codereview.chromium.org/2670353002/diff/20001/third_party/WebKit/Layo...
third_party/WebKit/LayoutTests/fast/canvas/canvas-before-css.html:20: var data =
ctx.getImageData(x,y,1,1).data;
This is not correct. getImageData is independent of style.  This test is meant
to verify that paint works correctly.  It needs to remain a ref test.

https://codereview.chromium.org/2670353002/diff/20001/third_party/WebKit/Layo...
File third_party/WebKit/LayoutTests/fast/canvas/canvas-blend-image.html (right):

https://codereview.chromium.org/2670353002/diff/20001/third_party/WebKit/Layo...
third_party/WebKit/LayoutTests/fast/canvas/canvas-blend-image.html:152: for (var
i = 0; i < blendModes.length; i++) {
Nit: this could be unrolled with generate_tests

https://codereview.chromium.org/2670353002/diff/20001/third_party/WebKit/Layo...
File third_party/WebKit/LayoutTests/fast/canvas/canvas-blending-clipping.html
(right):

https://codereview.chromium.org/2670353002/diff/20001/third_party/WebKit/Layo...
third_party/WebKit/LayoutTests/fast/canvas/canvas-blending-clipping.html:26:
function runTest() {
Nit: the nested function is not necessary

https://codereview.chromium.org/2670353002/diff/20001/third_party/WebKit/Layo...
third_party/WebKit/LayoutTests/fast/canvas/canvas-blending-clipping.html:33: for
(var i = 0; i < blendModes.length; ++i) {
Nit: this test could be unrolled with generate_tests

[zakerinasab, 2017-02-08 19:04:10]

Comments addressed.

https://codereview.chromium.org/2670353002/diff/20001/third_party/WebKit/Layo...
File third_party/WebKit/LayoutTests/fast/canvas/canvas-before-css.html (right):

https://codereview.chromium.org/2670353002/diff/20001/third_party/WebKit/Layo...
third_party/WebKit/LayoutTests/fast/canvas/canvas-before-css.html:20: var data =
ctx.getImageData(x,y,1,1).data;
On 2017/02/08 16:52:33, Justin Novosad wrote:
> This is not correct. getImageData is independent of style.  This test is meant
> to verify that paint works correctly.  It needs to remain a ref test.

Reverted.

https://codereview.chromium.org/2670353002/diff/20001/third_party/WebKit/Layo...
File third_party/WebKit/LayoutTests/fast/canvas/canvas-blend-image.html (right):

https://codereview.chromium.org/2670353002/diff/20001/third_party/WebKit/Layo...
third_party/WebKit/LayoutTests/fast/canvas/canvas-blend-image.html:152: for (var
i = 0; i < blendModes.length; i++) {
On 2017/02/08 16:52:33, Justin Novosad wrote:
> Nit: this could be unrolled with generate_tests

Done. It seems that you cannot pass more than three parameters to the func param
of generate_tests (I guess max is the number of params of assert_approx_equals),
so I used an array to pass the params.

https://codereview.chromium.org/2670353002/diff/20001/third_party/WebKit/Layo...
File third_party/WebKit/LayoutTests/fast/canvas/canvas-blending-clipping.html
(right):

https://codereview.chromium.org/2670353002/diff/20001/third_party/WebKit/Layo...
third_party/WebKit/LayoutTests/fast/canvas/canvas-blending-clipping.html:26:
function runTest() {
On 2017/02/08 16:52:33, Justin Novosad wrote:
> Nit: the nested function is not necessary

Done.

https://codereview.chromium.org/2670353002/diff/20001/third_party/WebKit/Layo...
third_party/WebKit/LayoutTests/fast/canvas/canvas-blending-clipping.html:33: for
(var i = 0; i < blendModes.length; ++i) {
On 2017/02/08 16:52:33, Justin Novosad wrote:
> Nit: this test could be unrolled with generate_tests

It can be done only if we put the each blend mode with its index into an object
(we need the index later to retrieve the expected color), which doesn't seems to
be a good idea as it needs to modify the blendModes array in
canvas-blending-helpers.js or redefine it in this file.

[Justin Novosad, 2017-02-08 22:11:59]

lgtm

https://codereview.chromium.org/2670353002/diff/40001/third_party/WebKit/Layo...
File third_party/WebKit/LayoutTests/fast/canvas/canvas-blend-image.html (right):

https://codereview.chromium.org/2670353002/diff/40001/third_party/WebKit/Layo...
third_party/WebKit/LayoutTests/fast/canvas/canvas-blend-image.html:172:
testScenario[j][1][2] = i;
Hah, this is an original way to do it. 
I would have used objects instead of multi-dimensional arrays (e.g.
testScenarios[j].blendMode = blendModes[i];

But this is fine.

[zakerinasab, 2017-02-09 15:29:35]

Comments addressed. Trying to land.

https://codereview.chromium.org/2670353002/diff/40001/third_party/WebKit/Layo...
File third_party/WebKit/LayoutTests/fast/canvas/canvas-blend-image.html (right):

https://codereview.chromium.org/2670353002/diff/40001/third_party/WebKit/Layo...
third_party/WebKit/LayoutTests/fast/canvas/canvas-blend-image.html:172:
testScenario[j][1][2] = i;
On 2017/02/08 22:11:59, Justin Novosad wrote:
> Hah, this is an original way to do it. 
> I would have used objects instead of multi-dimensional arrays (e.g.
> testScenarios[j].blendMode = blendModes[i];
> 
> But this is fine.

I tried to fix this, but it seems that testharnessreport.js does not support
passing objects to generate_tests. I tried different workarounds, none of them
worked, and I couldn't find a similar scenario in LayoutTests. Apparently, you
can pass a function as a member of parameter array into generate_tests, and the
function can generate an object for you, but then we need to inject the
blendMode into the parameters used inside the function to create the object.
Anyway, I used a helper variable as a workaround to make the code more readable.

[zakerinasab, 2017-02-09 15:30:22]

The CQ bit was checked by zakerinasab@chromium.org

[commit-bot: I haz the power, 2017-02-09 15:30:41]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[zakerinasab, 2017-02-09 15:32:29]

The CQ bit was unchecked by zakerinasab@chromium.org

[zakerinasab, 2017-02-09 15:33:43]

The CQ bit was checked by zakerinasab@chromium.org

[zakerinasab, 2017-02-09 15:33:43]

The patchset sent to the CQ was uploaded after l-g-t-m from junov@chromium.org
Link to the patchset: https://codereview.chromium.org/2670353002/#ps60001
(title: "Addressing comments")

[commit-bot: I haz the power, 2017-02-09 15:34:06]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-02-09 16:36:32]

CQ is committing da patch.

Bot data: {"patchset_id": 60001, "attempt_start_ts": 1486654423541560,
"parent_rev": "26b0c294dd46ece57188e67ebef70db4a450d45b", "commit_rev":
"83029845af8ac47ac5c8c0534a2a9fd673a59a3e"}

[commit-bot: I haz the power, 2017-02-09 16:37:11]

Description was changed from

==========
Use testharness.js instead of js-test.js in LayoutTests/fast/canvas tests.

This change replaces js-test.js assertions with testharness.js assertions. The
expectation files are removed as they are not needed anymore.
To simplify review and landing, each change corrects 10 tests.

BUG=639732
==========

to

==========
Use testharness.js instead of js-test.js in LayoutTests/fast/canvas tests.

This change replaces js-test.js assertions with testharness.js assertions. The
expectation files are removed as they are not needed anymore.
To simplify review and landing, each change corrects 10 tests.

BUG=639732

Review-Url: https://codereview.chromium.org/2670353002
Cr-Commit-Position: refs/heads/master@{#449311}
Committed:
https://chromium.googlesource.com/chromium/src/+/83029845af8ac47ac5c8c0534a2a...
==========

[commit-bot: I haz the power, 2017-02-09 16:37:19]

Committed patchset #4 (id:60001) as
https://chromium.googlesource.com/chromium/src/+/83029845af8ac47ac5c8c0534a2a...