2DContext: Set up tests for new signature of imageData functions

{get,put,create}imageData() functions are reverting from double to long. Added/cleaned up tests for dealing with float inputs. Relevant discussion: whatwg/html#2433
web-platform-tests · Mar 20, 2017 · d14a797 · d14a797
1 parent 317fa3b
commit d14a797
Show file tree

Hide file tree

Showing 10 changed files with 70 additions and 177 deletions.
diff --git a/...ipulation/2d.imageData.create2.round.html → ...pulation/2d.imageData.create2.double.html b/...ipulation/2d.imageData.create2.round.html → ...pulation/2d.imageData.create2.double.html
@@ -1,28 +1,30 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
-<title>Canvas test: 2d.imageData.create2.round</title>
+<title>Canvas test: 2d.imageData.create2.double</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/common/canvas-tests.js"></script>
 <link rel="stylesheet" href="/common/canvas-tests.css">
 <body class="show_output">
 
-<h1>2d.imageData.create2.round</h1>
-<p class="desc">createImageData(w, h) is rounded the same as getImageData(0, 0, w, h)</p>
+<h1>2d.imageData.create2.double</h1>
+<p class="desc">createImageData(w, h) double is converted to long</p>
 
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
 
 <ul id="d"></ul>
 <script>
-var t = async_test("createImageData(w, h) is rounded the same as getImageData(0, 0, w, h)");
+var t = async_test("createImageData(w, h) double is converted to long");
 _addTest(function(canvas, ctx) {
 
 var imgdata1 = ctx.createImageData(10.01, 10.99);
-var imgdata2 = ctx.getImageData(0, 0, 10.01, 10.99);
-_assertSame(imgdata1.width, imgdata2.width, "imgdata1.width", "imgdata2.width");
-_assertSame(imgdata1.height, imgdata2.height, "imgdata1.height", "imgdata2.height");
+var imgdata2 = ctx.createImageData(-10.01, -10.99);
+_assertSame(imgdata1.width, 10, "imgdata1.width", "10");
+_assertSame(imgdata1.height, 10, "imgdata1.height", "10");
+_assertSame(imgdata2.width, 10, "imgdata2.width", "10");
+_assertSame(imgdata2.height, 10, "imgdata2.height", "10");
 
 
 });

diff --git a/2dcontext/pixel-manipulation/2d.imageData.create2.tiny.html b/2dcontext/pixel-manipulation/2d.imageData.create2.tiny.html
diff --git a/2dcontext/pixel-manipulation/2d.imageData.create2.zero.html b/2dcontext/pixel-manipulation/2d.imageData.create2.zero.html
@@ -22,6 +22,8 @@ <h1>2d.imageData.create2.zero</h1>
 assert_throws("INDEX_SIZE_ERR", function() { ctx.createImageData(10, 0); });
 assert_throws("INDEX_SIZE_ERR", function() { ctx.createImageData(0, 10); });
 assert_throws("INDEX_SIZE_ERR", function() { ctx.createImageData(0, 0); });
+assert_throws("INDEX_SIZE_ERR", function() { ctx.createImageData(0.99, 10); });
+assert_throws("INDEX_SIZE_ERR", function() { ctx.createImageData(10, 0.1); });
 
 
 });

diff --git a/2dcontext/pixel-manipulation/2d.imageData.get.double.html b/2dcontext/pixel-manipulation/2d.imageData.get.double.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
+<title>Canvas test: 2d.imageData.get.double</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/canvas-tests.js"></script>
+<link rel="stylesheet" href="/common/canvas-tests.css">
+<body class="show_output">
+
+<h1>2d.imageData.get.double</h1>
+<p class="desc">createImageData(w, h) double is converted to long</p>
+
+
+<p class="output">Actual output:</p>
+<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+
+<ul id="d"></ul>
+<script>
+var t = async_test("createImageData(w, h) double is converted to long");
+_addTest(function(canvas, ctx) {
+
+var imgdata1 = ctx.getImageData(0, 0, 10.01, 10.99);
+var imgdata2 = ctx.getImageData(0, 0, -10.01, -10.99);
+_assertSame(imgdata1.width, 10, "imgdata1.width", "10");
+_assertSame(imgdata1.height, 10, "imgdata1.height", "10");
+_assertSame(imgdata2.width, 10, "imgdata2.width", "10");
+_assertSame(imgdata2.height, 10, "imgdata2.height", "10");
+
+
+});
+</script>
+
diff --git a/2dcontext/pixel-manipulation/2d.imageData.get.tiny.html b/2dcontext/pixel-manipulation/2d.imageData.get.tiny.html
diff --git a/2dcontext/pixel-manipulation/2d.imageData.get.zero.html b/2dcontext/pixel-manipulation/2d.imageData.get.zero.html
@@ -22,6 +22,10 @@ <h1>2d.imageData.get.zero</h1>
 assert_throws("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, 10, 0); });
 assert_throws("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, 0, 10); });
 assert_throws("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, 0, 0); });
+assert_throws("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, 0.1, 10); });
+assert_throws("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, 10, 0.99); });
+assert_throws("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, -0.1, 10); });
+assert_throws("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, 10, -0.99); });
 
 
 });

diff --git a/2dcontext/tools/tests2d.yaml b/2dcontext/tools/tests2d.yaml
@@ -9276,22 +9276,6 @@
             isTransparentBlack = false;
     @assert isTransparentBlack;
 
-- name: 2d.imageData.create2.tiny
-  desc: createImageData(sw, sh) works for sizes smaller than one pixel
-  testing:
-    - 2d.imageData.create2.size
-    - 2d.imageData.one
-  code: |
-    var imgdata = ctx.createImageData(0.0001, 0.0001);
-    @assert imgdata.data.length === imgdata.width*imgdata.height*4;
-    @assert imgdata.width === 1;
-    @assert imgdata.height === 1;
-    var isTransparentBlack = true;
-    for (var i = 0; i < imgdata.data.length; ++i)
-        if (imgdata.data[i] !== 0)
-            isTransparentBlack = false;
-    @assert isTransparentBlack;
-
 - name: 2d.imageData.create2.negative
   desc: createImageData(sw, sh) takes the absolute magnitude of the size arguments
   testing:
@@ -9313,6 +9297,8 @@
     @assert throws INDEX_SIZE_ERR ctx.createImageData(10, 0);
     @assert throws INDEX_SIZE_ERR ctx.createImageData(0, 10);
     @assert throws INDEX_SIZE_ERR ctx.createImageData(0, 0);
+    @assert throws INDEX_SIZE_ERR ctx.createImageData(0.99, 10);
+    @assert throws INDEX_SIZE_ERR ctx.createImageData(10, 0.1);
 
 - name: 2d.imageData.create2.nonfinite
   desc: createImageData() throws TypeError if arguments are not finite
@@ -9333,15 +9319,17 @@
   code: |
     @assert throws TypeError ctx.createImageData(null);
 
-- name: 2d.imageData.create2.round
-  desc: createImageData(w, h) is rounded the same as getImageData(0, 0, w, h)
+- name: 2d.imageData.create2.double
+  desc: createImageData(w, h) double is converted to long
   testing:
-    - 2d.imageData.createround
+    - 2d.imageData.create2.size
   code: |
     var imgdata1 = ctx.createImageData(10.01, 10.99);
-    var imgdata2 = ctx.getImageData(0, 0, 10.01, 10.99);
-    @assert imgdata1.width === imgdata2.width;
-    @assert imgdata1.height === imgdata2.height;
+    var imgdata2 = ctx.createImageData(-10.01, -10.99);
+    @assert imgdata1.width === 10;
+    @assert imgdata1.height === 10;
+    @assert imgdata2.width === 10;
+    @assert imgdata2.height === 10;
 
 - name: 2d.imageData.get.basic
   desc: getImageData() exists and returns something
@@ -9371,6 +9359,10 @@
     @assert throws INDEX_SIZE_ERR ctx.getImageData(1, 1, 10, 0);
     @assert throws INDEX_SIZE_ERR ctx.getImageData(1, 1, 0, 10);
     @assert throws INDEX_SIZE_ERR ctx.getImageData(1, 1, 0, 0);
+    @assert throws INDEX_SIZE_ERR ctx.getImageData(1, 1, 0.1, 10);
+    @assert throws INDEX_SIZE_ERR ctx.getImageData(1, 1, 10, 0.99);
+    @assert throws INDEX_SIZE_ERR ctx.getImageData(1, 1, -0.1, 10);
+    @assert throws INDEX_SIZE_ERR ctx.getImageData(1, 1, 10, -0.99);
 
 - name: 2d.imageData.get.nonfinite
   desc: getImageData() throws TypeError if arguments are not finite
@@ -9488,15 +9480,17 @@
     @assert imgdata2.width > imgdata1.width;
     @assert imgdata2.height > imgdata1.height;
 
-- name: 2d.imageData.get.tiny
-  desc: getImageData() works for sizes smaller than one pixel
+- name: 2d.imageData.get.double
+  desc: createImageData(w, h) double is converted to long
   testing:
-    - 2d.imageData.one
+    - 2d.imageData.get.basic
   code: |
-    var imgdata = ctx.getImageData(0, 0, 0.0001, 0.0001);
-    @assert imgdata.data.length === imgdata.width*imgdata.height*4;
-    @assert imgdata.width === 1;
-    @assert imgdata.height === 1;
+    var imgdata1 = ctx.getImageData(0, 0, 10.01, 10.99);
+    var imgdata2 = ctx.getImageData(0, 0, -10.01, -10.99);
+    @assert imgdata1.width === 10;
+    @assert imgdata1.height === 10;
+    @assert imgdata2.width === 10;
+    @assert imgdata2.height === 10;
 
 - name: 2d.imageData.get.nonpremul
   desc: getImageData() returns non-premultiplied colours

diff --git a/offscreen-canvas/pixel-manipulation/2d.imageData.create2.tiny.html b/offscreen-canvas/pixel-manipulation/2d.imageData.create2.tiny.html
diff --git a/offscreen-canvas/pixel-manipulation/2d.imageData.create2.tiny.worker.js b/offscreen-canvas/pixel-manipulation/2d.imageData.create2.tiny.worker.js
diff --git a/offscreen-canvas/tools/tests2d.yaml b/offscreen-canvas/tools/tests2d.yaml
@@ -4936,22 +4936,6 @@
             isTransparentBlack = false;
     @assert isTransparentBlack;
 
-- name: 2d.imageData.create2.tiny
-  desc: createImageData(sw, sh) works for sizes smaller than one pixel
-  testing:
-    - 2d.imageData.create2.size
-    - 2d.imageData.one
-  code: |
-    var imgdata = ctx.createImageData(0.0001, 0.0001);
-    @assert imgdata.data.length === imgdata.width*imgdata.height*4;
-    @assert imgdata.width === 1;
-    @assert imgdata.height === 1;
-    var isTransparentBlack = true;
-    for (var i = 0; i < imgdata.data.length; ++i)
-        if (imgdata.data[i] !== 0)
-            isTransparentBlack = false;
-    @assert isTransparentBlack;
-
 - name: 2d.imageData.create2.negative
   desc: createImageData(sw, sh) takes the absolute magnitude of the size arguments
   testing: