third_party/WebKit/LayoutTests/fast/canvas/getPutImageDataPairTest.html - Issue 2703803002: Use testharness.js instead of js-test.js in LayoutTests/fast/canvas tests.

Unified Diff: third_party/WebKit/LayoutTests/fast/canvas/getPutImageDataPairTest.html

Issue 2703803002: 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/fillText-shadow-expected.txt ('k') | third_party/WebKit/LayoutTests/fast/canvas/getPutImageDataPairTest-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/fast/canvas/getPutImageDataPairTest.html

diff --git a/third_party/WebKit/LayoutTests/fast/canvas/getPutImageDataPairTest.html b/third_party/WebKit/LayoutTests/fast/canvas/getPutImageDataPairTest.html

index 94ac7972b0183d359ec2cb90e6af22c998b00a49..ab075af6ffb9d0b13acf93ef7af947b3db3e6db0 100644

--- a/third_party/WebKit/LayoutTests/fast/canvas/getPutImageDataPairTest.html

+++ b/third_party/WebKit/LayoutTests/fast/canvas/getPutImageDataPairTest.html

@@ -1,33 +1,11 @@

-<!DOCTYPE html>

-<title>putImageData(getImageData) pair test</title>

-<body class="show_output">

-<h3>Test that putImageData(getImageData) pair leaves canvas ImageData the same.</h3>

-<canvas id="c" class="output" width="64" height="64"><p class="fallback">FAIL (fallback content)</p></canvas>

-<br>

-Result: <a id="result"></a>

-<script>

-if (window.testRunner)

- testRunner.dumpAsText();

-var canvas = document.getElementById("c");

-var ctx = canvas.getContext("2d");

-var passed = getPutImageData(50, ctx, 0, 0, 0, 0.0);

-passed |= getPutImageData(50, ctx, 0, 0, 0, 0.5);

-passed |= getPutImageData(50, ctx, 0, 0, 0, 1.0);

-passed |= getPutImageData(50, ctx, 127, 128, 129, 0.49);

-passed |= getPutImageData(50, ctx, 127, 128, 129, 0.51);

-passed |= getPutImageData(50, ctx, 127, 128, 129, 0.5);

-passed |= getPutImageData(50, ctx, 128, 128, 128, 0.0);

-passed |= getPutImageData(50, ctx, 128, 128, 128, 0.5);

-passed |= getPutImageData(50, ctx, 128, 128, 128, 1.0);

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

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

-var result_a = document.getElementById("result");

-if (!passed)

- result_a.innerHTML = "FAIL";

-else

- result_a.innerHTML = "PASS";

+<script>

+var canvas = document.createElement('canvas');

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

-function getPutImageData(numIters, ctx, r, g, b, a) {

+function getPutImageData(numIters, ctx, rgba) {

var x = 0, y = 0, w = ctx.canvas.width, h = ctx.canvas.height;

// Paint the canvas green to start

@@ -35,7 +13,7 @@ function getPutImageData(numIters, ctx, r, g, b, a) {

ctx.fillRect(x,y,w,h);

// Now paint the canvas a random hue of gray

- var color = 'rgba(' + r + ',' + g + ',' + b + ',' + a + ')';

+ var color = 'rgba(' + rgba + ')';

ctx.fillStyle = color;

ctx.fillRect(x,y,w,h);

@@ -45,20 +23,33 @@ function getPutImageData(numIters, ctx, r, g, b, a) {

// Get and put the image data 'numIters' times

for(var i = 0; i < numIters; i++)

- ctx.putImageData(ctx.getImageData(x,y,w,h), x,y);

+ ctx.putImageData(ctx.getImageData(x, y, w, h), x,y);

// Grab new current image data

var currImageData = ctx.getImageData(x, y, w, h);

// Verify that original and new current image datas are equal

- for(var i = 0; i < currImageData.data.length; i++) {

- var origSubpixel = origImageData.data[i];

- var currSubpixel = currImageData.data[i];

- // If even 1 subpixel is off, return failure

- if (origSubpixel != currSubpixel)

- return false;

- }

- return true;

+ var dataMatch = true;

+ for(var i = 0; i < currImageData.data.length; i++)

+ if (origImageData.data[i] != currImageData.data[i]) {

+ dataMatch = false;

+ break;

+ }

+ assert_true(dataMatch);

}

-</script>

+var testScenarios = [

+ ['GetPutImageDataTestCase ', 50, ctx, '0, 0, 0, 0.0'],

+ ['GetPutImageDataTestCase ', 50, ctx, '0, 0, 0, 0.5'],

+ ['GetPutImageDataTestCase ', 50, ctx, '0, 0, 0, 1.0'],

+ ['GetPutImageDataTestCase ', 50, ctx, '127, 128, 129, 0.49'],

+ ['GetPutImageDataTestCase ', 50, ctx, '127, 128, 129, 0.51'],

+ ['GetPutImageDataTestCase ', 50, ctx, '127, 128, 129, 0.5'],

+ ['GetPutImageDataTestCase ', 50, ctx, '128, 128, 128, 0.0'],

+ ['GetPutImageDataTestCase ', 50, ctx, '128, 128, 128, 0.5'],

+ ['GetPutImageDataTestCase ', 50, ctx, '128, 128, 128, 1.0'],

+];

+generate_tests(getPutImageData, testScenarios);

+</script>