test: update tests

Author: EscapedGibbon

src/draw/__tests__/drawLineOnImage.test.ts

@@ -315,6 +315,7 @@ test('different origin, line out of image', () => {
     origin: { column: 0, row: 0 },
     strokeColor: [1],
   });
+
   expect(result).toMatchImageData([
     [1, 0, 0, 0],
     [0, 1, 0, 0],

src/utils/__tests__/setBlendedPixel.test.ts

@@ -14,19 +14,19 @@ test('GREYA image, default options', () => {
 
 test('GREYA images: transparent source, opaque target', () => {
   const image = testUtils.createGreyaImage([[50, 255]]);
-  setBlendedPixel(image, 0, 0, { color: [100, 0] });
+  setBlendedPixel(image, 0, 0, [100, 0]);
   expect(image).toMatchImageData([[50, 255]]);
 });
 
 test('GREYA images: opaque source, transparent target', () => {
   const image = testUtils.createGreyaImage([[50, 0]]);
-  setBlendedPixel(image, 0, 0, { color: [100, 255] });
+  setBlendedPixel(image, 0, 0, [100, 255]);
   expect(image).toMatchImageData([[100, 255]]);
 });
 
 test('GREYA image: alpha different from 255', () => {
   const image = testUtils.createGreyaImage([[50, 64]]);
-  setBlendedPixel(image, 0, 0, { color: [100, 128] });
+  setBlendedPixel(image, 0, 0, [100, 128]);
   const alpha = 128 + 64 * (1 - 128 / 255);
   const component = (100 * 128 + 50 * 64 * (1 - 128 / 255)) / alpha;
   expect(image).toMatchImageData([[component, alpha]]);
@@ -38,7 +38,7 @@ test('asymetrical test', () => {
     [20, 30, 5, 6, 7, 8],
     [1, 2, 3, 4, 5, 6],
   ]);
-  setBlendedPixel(image, 2, 0, { color: [0, 125] });
+  setBlendedPixel(image, 2, 0, [0, 125]);
   expect(image).toMatchImageData([
     [50, 255, 1, 2, 0, 127],
     [20, 30, 5, 6, 7, 8],
@@ -60,7 +60,7 @@ test('2x2 mask, color is 1', () => {
     [1, 0],
     [0, 0],
   ]);
-  setBlendedPixel(mask, 1, 0, { color: [1] });
+  setBlendedPixel(mask, 1, 0, [1]);
 
   expect(mask).toMatchMaskData([
     [1, 1],

src/utils/__tests__/setBlendedVisiblePixel.test.ts

@@ -13,39 +13,25 @@ test('GREYA image, default options', () => {
 });
 
 test('GREYA image: set pixel out of bounds', () => {
-  const image = testUtils.createGreyaImage([
-    [50, 255, 1, 2, 3, 4],
-    [20, 30, 5, 6, 7, 8],
-    [1, 2, 3, 4, 5, 6],
-  ]);
-  setBlendedVisiblePixel(image, 0, 5, { color: [40, 40] });
-  expect(image).toMatchImageData([
+  const data = [
     [50, 255, 1, 2, 3, 4],
     [20, 30, 5, 6, 7, 8],
     [1, 2, 3, 4, 5, 6],
-  ]);
+  ];
+  const image = testUtils.createGreyaImage(data);
+  setBlendedVisiblePixel(image, 0, 5, [40, 40]);
+  expect(image).toMatchImageData(data);
 });
 
 test('RGBA image: set pixel out of bounds', () => {
-  const image = testUtils.createGreyaImage([
+  const data = [
     [50, 255, 1, 200, 2, 3, 4, 200],
     [20, 30, 5, 200, 6, 7, 8, 200],
     [1, 2, 3, 200, 4, 5, 6, 200],
-  ]);
-  setBlendedVisiblePixel(image, 0, 5, { color: [40, 40, 40, 40] });
-  expect(image).toMatchImageData([
-    [50, 255, 1, 200, 2, 3, 4, 200],
-    [20, 30, 5, 200, 6, 7, 8, 200],
-    [1, 2, 3, 200, 4, 5, 6, 200],
-  ]);
-});
-
-test('GREYA image: alpha different from 255', () => {
-  const image = testUtils.createGreyaImage([[50, 64]]);
-  setBlendedVisiblePixel(image, 0, 0, { color: [100, 128] });
-  const alpha = 128 + 64 * (1 - 128 / 255);
-  const component = (100 * 128 + 50 * 64 * (1 - 128 / 255)) / alpha;
-  expect(image).toMatchImageData([[component, alpha]]);
+  ];
+  const image = testUtils.createGreyaImage(data);
+  setBlendedVisiblePixel(image, 0, 5, [40, 40, 40, 40]);
+  expect(image).toMatchImageData(data);
 });
 
 test('asymetrical test', () => {
@@ -54,7 +40,7 @@ test('asymetrical test', () => {
     [20, 30, 5, 6, 7, 8],
     [1, 2, 3, 4, 5, 6],
   ]);
-  setBlendedVisiblePixel(image, 2, 0, { color: [0, 125] });
+  setBlendedVisiblePixel(image, 2, 0, [0, 125]);
   expect(image).toMatchImageData([
     [50, 255, 1, 2, 0, 127],
     [20, 30, 5, 6, 7, 8],