Skip to content

Commit 5457f96

Browse files
committed
(#340) Refactor Image#data to a Buffer instead of any
1 parent 86fa185 commit 5457f96

5 files changed

+13
-13
lines changed

lib/image.class.spec.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,29 @@ afterEach(() => {
1414

1515
describe("Image class", () => {
1616
it("should return alphachannel = true for > 3 channels", () => {
17-
const SUT = new Image(200, 200, 123, 4, "id");
17+
const SUT = new Image(200, 200, Buffer.from([123]), 4, "id");
1818
expect(SUT.hasAlphaChannel).toBeTruthy();
1919
});
2020

2121
it("should return alphachannel = false for <= 3 channels", () => {
22-
const SUT = new Image(200, 200, 123, 3, "id");
22+
const SUT = new Image(200, 200, Buffer.from([123]), 3, "id");
2323
expect(SUT.hasAlphaChannel).toBeFalsy();
2424
});
2525
it("should return alphachannel = false for <= 3 channels", () => {
26-
const SUT = new Image(200, 200, 123, 2, "id");
26+
const SUT = new Image(200, 200, Buffer.from([123]), 2, "id");
2727
expect(SUT.hasAlphaChannel).toBeFalsy();
2828
});
2929
it("should return alphachannel = false for <= 3 channels", () => {
30-
const SUT = new Image(200, 200, 123, 1, "id");
30+
const SUT = new Image(200, 200, Buffer.from([123]), 1, "id");
3131
expect(SUT.hasAlphaChannel).toBeFalsy();
3232
});
3333

3434
it("should throw for <= 0 channels", () => {
35-
expect(() => new Image(200, 200, 123, 0, "id")).toThrowError("Channel <= 0");
35+
expect(() => new Image(200, 200, Buffer.from([123]), 0, "id")).toThrowError("Channel <= 0");
3636
});
3737

3838
it("should have a default pixel density of 1.0", () => {
39-
const SUT = new Image(200, 200, 123, 1, "id");
39+
const SUT = new Image(200, 200, Buffer.from([123]), 1, "id");
4040
expect(SUT.pixelDensity).toEqual({scaleX: 1.0, scaleY: 1.0});
4141
});
4242

lib/image.class.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export class Image {
1818
constructor(
1919
public readonly width: number,
2020
public readonly height: number,
21-
public readonly data: any,
21+
public readonly data: Buffer,
2222
public readonly channels: number,
2323
public readonly id: string,
2424
public readonly colorMode: ColorMode = ColorMode.BGR,

lib/match-request.class.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ describe("MatchRequest", () => {
99
new Image(
1010
100,
1111
100,
12-
new ArrayBuffer(0),
12+
Buffer.from([]),
1313
3,
1414
"haystack_image"
1515
),
1616
new Image(
1717
100,
1818
100,
19-
new ArrayBuffer(0),
19+
Buffer.from([]),
2020
3,
2121
"needle_image"
2222
),

lib/screen.class.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const providerRegistryMock = mockPartial<ProviderRegistry>({
1919
getScreen(): ScreenProviderInterface {
2020
return mockPartial<ScreenProviderInterface>({
2121
grabScreenRegion(): Promise<Image> {
22-
return Promise.resolve(new Image(searchRegion.width, searchRegion.height, new ArrayBuffer(0), 3, "needle_image"));
22+
return Promise.resolve(new Image(searchRegion.width, searchRegion.height, Buffer.from([]), 3, "needle_image"));
2323
},
2424
screenSize(): Promise<Region> {
2525
return Promise.resolve(searchRegion);
@@ -614,7 +614,7 @@ describe("Screen.", () => {
614614
describe("capture", () => {
615615
it("should capture the whole screen and save image", async () => {
616616
// GIVEN
617-
const screenshot = mockPartial<Image>({data: "pretty pretty image"});
617+
const screenshot = mockPartial<Image>({data: Buffer.from([])});
618618
const grabScreenMock = jest.fn(() => Promise.resolve(screenshot));
619619
const saveImageMock = jest.fn();
620620
providerRegistryMock.getScreen = jest.fn(() => mockPartial<ScreenProviderInterface>({
@@ -641,7 +641,7 @@ describe("Screen.", () => {
641641
describe("captureRegion", () => {
642642
it("should capture the specified region of the screen and save image", async () => {
643643
// GIVEN
644-
const screenshot = mockPartial<Image>({data: "pretty partial image"});
644+
const screenshot = mockPartial<Image>({data: Buffer.from([])});
645645
const regionToCapture = mockPartial<Region>({top: 42, left: 9, height: 10, width: 3.14159265359})
646646
const grabScreenMock = jest.fn(() => Promise.resolve(screenshot));
647647
const saveImageMock = jest.fn();

lib/screen.colorAt.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const providerRegistryMock = mockPartial<ProviderRegistry>({
88
getScreen(): ScreenProviderInterface {
99
return mockPartial<ScreenProviderInterface>({
1010
grabScreenRegion(): Promise<Image> {
11-
return Promise.resolve(new Image(searchRegion.width, searchRegion.height, new ArrayBuffer(0), 3, "needle_image"));
11+
return Promise.resolve(new Image(searchRegion.width, searchRegion.height, Buffer.from([]), 3, "needle_image"));
1212
},
1313
screenSize(): Promise<Region> {
1414
return Promise.resolve(searchRegion);

0 commit comments

Comments
 (0)