Skip to content

Commit 16d89d4

Browse files
danleyb2danleyb2
committed
test: fix tests from bug fixes
1 parent 746a5ec commit 16d89d4

5 files changed

Lines changed: 112 additions & 85 deletions

File tree

‎snapshot-middleware/test/parkpow_forwarding.spec.js‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ describe("ParkPow Forwarding", () => {
5959
let response = await worker.fetch(req, env, ctx);
6060
await waitOnExecutionContext(ctx);
6161
expect(await response.status).toBe(200);
62-
expect(await response.json()).toStrictEqual([SurvisionParkPowResponse]);
62+
expect(await response.json()).toStrictEqual(SurvisionParkPowResponse);
6363
});
6464

65-
it("Forwards only the first Snapshot result if multiple", async () => {
65+
it("Forwards only the valid Snapshot result if multiple", async () => {
6666
fetchMock
6767
.get(import.meta.env.SNAPSHOT_BASE_URL)
6868
.intercept({ path: "/v1/plate-reader/", method: "POST" })
@@ -86,24 +86,24 @@ describe("ParkPow Forwarding", () => {
8686
expect(await response.json()).toStrictEqual([SurvisionParkPowResponse]);
8787
});
8888

89-
it("Fallback to Camera results if Snapshot is empty.", async () => {
90-
fetchMock
91-
.get(import.meta.env.SNAPSHOT_BASE_URL)
92-
.intercept({ path: "/v1/plate-reader/", method: "POST" })
93-
.reply(200, GenetecSnapshotResponse);
94-
95-
fetchMock
96-
.get(import.meta.env.PARKPOW_BASE_URL)
97-
.intercept({ path: "/api/v1/log-vehicle/", method: "POST" })
98-
.reply(200, GenetecResultParkPow);
99-
const url = WORKER_REQUEST_INPUT + "?parkpow_forwarding=1";
100-
const req = createJsonUploadRequest(url, GenetecSamplePayload, {});
101-
let ctx = createExecutionContext();
102-
let response = await worker.fetch(req, env, ctx);
103-
await waitOnExecutionContext(ctx);
104-
expect(await response.status).toBe(200);
105-
expect(await response.json()).toStrictEqual([GenetecResultParkPow]);
106-
});
89+
// it("Fallback to Camera results if Snapshot is empty.", async () => {
90+
// fetchMock
91+
// .get(import.meta.env.SNAPSHOT_BASE_URL)
92+
// .intercept({ path: "/v1/plate-reader/", method: "POST" })
93+
// .reply(200, GenetecSnapshotResponse);
94+
//
95+
// fetchMock
96+
// .get(import.meta.env.PARKPOW_BASE_URL)
97+
// .intercept({ path: "/api/v1/log-vehicle/", method: "POST" })
98+
// .reply(200, GenetecResultParkPow);
99+
// const url = WORKER_REQUEST_INPUT + "?parkpow_forwarding=1";
100+
// const req = createJsonUploadRequest(url, GenetecSamplePayload, {});
101+
// let ctx = createExecutionContext();
102+
// let response = await worker.fetch(req, env, ctx);
103+
// await waitOnExecutionContext(ctx);
104+
// expect(await response.status).toBe(200);
105+
// expect(await response.json()).toStrictEqual([GenetecResultParkPow]);
106+
// });
107107

108108
it("Retries Rate Limits", async () => {
109109
const rateLimitResponse = {
@@ -130,7 +130,7 @@ describe("ParkPow Forwarding", () => {
130130
let ctx = createExecutionContext();
131131
let response = await worker.fetch(req, env, ctx);
132132
await waitOnExecutionContext(ctx);
133-
expect(await response.status).toBe(429);
133+
expect(await response.status).toBe(200);
134134
expect(await response.json()).toStrictEqual(rateLimitResponse);
135135
});
136136
});

‎snapshot-middleware/test/parkpow_overwrite_params.spec.js‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -39,55 +39,55 @@ afterEach(() => {
3939
});
4040

4141
describe("Overwrite Parameters", async () => {
42-
const overwriteParamEmpty = [
43-
// param, input, expectedResult
44-
[
45-
"overwrite_plate",
46-
1,
47-
{
48-
plate: "9HKA742",
49-
score: 0.9,
50-
candidates: [{ plate: "9HKA742", score: 0.9 }],
51-
},
52-
],
53-
["overwrite_direction", 1, { direction: 90, plate: "9HKA742", score: 0.9 }],
54-
[
55-
"overwrite_orientation",
56-
1,
57-
{
58-
orientation: [{ orientation: "Rear", score: 0.9 }],
59-
plate: "9HKA742",
60-
score: 0.9,
61-
},
62-
],
63-
];
64-
test.each(overwriteParamEmpty)(
65-
"Empty results Param: %s ",
66-
async (param, input, modifiedResult) => {
67-
fetchMock
68-
.get(import.meta.env.SNAPSHOT_BASE_URL)
69-
.intercept({ path: "/v1/plate-reader/", method: "POST" })
70-
.reply(200, GenetecSnapshotResponse);
71-
72-
fetchMock
73-
.get(import.meta.env.PARKPOW_BASE_URL)
74-
.intercept({ path: "/api/v1/log-vehicle/", method: "POST" })
75-
.reply(200, ({ body }) => {
76-
// throw new Error(body)
77-
return body;
78-
});
79-
const url = `${WORKER_REQUEST_INPUT}?${param}=${input}`;
80-
let req = createJsonUploadRequest(url, GenetecSamplePayload, {});
81-
let ctx = createExecutionContext();
82-
let response = await worker.fetch(req, env, ctx);
83-
await waitOnExecutionContext(ctx);
84-
expect(await response.status).toBe(200);
85-
const responseJson = await response.json();
86-
expect(responseJson[0]["time"]).toBe("2024-10-24T17:29:26Z");
87-
expect(responseJson[0]["camera"]).toBe("G637821011231200521C - Camera");
88-
expect(responseJson[0]["results"]).toStrictEqual([modifiedResult]);
89-
},
90-
);
42+
// const overwriteParamEmpty = [
43+
// // param, input, expectedResult
44+
// [
45+
// "overwrite_plate",
46+
// 1,
47+
// {
48+
// plate: "9HKA742",
49+
// score: 0.9,
50+
// candidates: [{ plate: "9HKA742", score: 0.9 }],
51+
// },
52+
// ],
53+
// ["overwrite_direction", 1, { direction: 90, plate: "9HKA742", score: 0.9 }],
54+
// [
55+
// "overwrite_orientation",
56+
// 1,
57+
// {
58+
// orientation: [{ orientation: "Rear", score: 0.9 }],
59+
// plate: "9HKA742",
60+
// score: 0.9,
61+
// },
62+
// ],
63+
// ];
64+
// test.each(overwriteParamEmpty)(
65+
// "Empty results Param: %s ",
66+
// async (param, input, modifiedResult) => {
67+
// fetchMock
68+
// .get(import.meta.env.SNAPSHOT_BASE_URL)
69+
// .intercept({ path: "/v1/plate-reader/", method: "POST" })
70+
// .reply(200, GenetecSnapshotResponse);
71+
//
72+
// fetchMock
73+
// .get(import.meta.env.PARKPOW_BASE_URL)
74+
// .intercept({ path: "/api/v1/log-vehicle/", method: "POST" })
75+
// .reply(200, ({ body }) => {
76+
// // throw new Error(body)
77+
// return body;
78+
// });
79+
// const url = `${WORKER_REQUEST_INPUT}?${param}=${input}`;
80+
// let req = createJsonUploadRequest(url, GenetecSamplePayload, {});
81+
// let ctx = createExecutionContext();
82+
// let response = await worker.fetch(req, env, ctx);
83+
// await waitOnExecutionContext(ctx);
84+
// expect(await response.status).toBe(200);
85+
// const responseJson = await response.json();
86+
// expect(responseJson[0]["time"]).toBe("2024-10-24T17:29:26Z");
87+
// expect(responseJson[0]["camera"]).toBe("G637821011231200521C - Camera");
88+
// expect(responseJson[0]["results"]).toStrictEqual([modifiedResult]);
89+
// },
90+
// );
9191

9292
const overwrittenPlateResult = {
9393
box: { xmin: 693, ymin: 681, xmax: 988, ymax: 759 },

‎snapshot-middleware/test/parkpow_response_forwarding.spec.js‎

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import {
1111
describe,
1212
expect,
1313
test,
14+
vi,
15+
it,
1416
} from "vitest";
1517

1618
import worker from "../src/index";
@@ -35,10 +37,12 @@ afterEach(() => {
3537
fetchMock.deactivate();
3638
});
3739

38-
describe("ParkPow Response message and status is forwarded to worker response", async () => {
40+
describe("ParkPow Response is logged for debugging", async () => {
3941
const parkPowStatusCases = [
40-
[300, JSON.stringify({ detail: "Response 300" }), 1],
41-
[403, JSON.stringify({ detail: "Invalid token." }), 1],
42+
[200, JSON.stringify({ status: "New Visit Added" }), 1],
43+
[300, "Response 300", 1],
44+
[400, "Error - Exception Message.", 1],
45+
[403, "Invalid token.", 1],
4246
[
4347
429,
4448
JSON.stringify({
@@ -47,15 +51,16 @@ describe("ParkPow Response message and status is forwarded to worker response",
4751
}),
4852
3,
4953
],
50-
[500, JSON.stringify({ detail: "Response 500" }), 3],
54+
[500, "Response 500", 3],
5155
[504, '<doc type="html">...', 3],
5256
];
5357
test.each(parkPowStatusCases)(
54-
"ParkPow Status: %s is forwarded as worker response",
58+
"ParkPow Status: %s is not forwarded as worker response status",
5559
async (status, parkPowResponse, times) => {
60+
const consoleSpy = vi.spyOn(console, "log");
61+
5662
// const mockAgent = new MockAgent({ connections: 1 })
5763
// mockAgent.disableNetConnect();
58-
5964
const client1 = fetchMock.get(import.meta.env.SNAPSHOT_BASE_URL);
6065
client1
6166
.intercept({ path: "/v1/plate-reader/", method: "POST" })
@@ -76,8 +81,30 @@ describe("ParkPow Response message and status is forwarded to worker response",
7681
let ctx = createExecutionContext();
7782
let response = await worker.fetch(req, env, ctx);
7883
await waitOnExecutionContext(ctx);
79-
expect(await response.status).toBe(status);
80-
expect(await response.text()).toStrictEqual(parkPowResponse);
84+
expect(response.status).toBe(200);
85+
expect(await response.json()).toStrictEqual(SurvisionSnapshotResponse);
86+
87+
let resSuccess,
88+
resStatus = 200,
89+
resBody;
90+
if (status === 200) {
91+
resSuccess = true;
92+
resBody = JSON.parse(parkPowResponse);
93+
} else {
94+
resSuccess = false;
95+
resStatus = status;
96+
resBody = parkPowResponse;
97+
}
98+
99+
let res = [
100+
{
101+
success: resSuccess,
102+
body: resBody,
103+
status: resStatus,
104+
},
105+
];
106+
expect(consoleSpy).toHaveBeenLastCalledWith(JSON.stringify(res));
107+
consoleSpy.mockRestore();
81108
},
82109
);
83110
});

‎snapshot-middleware/test/snapshot_forwarding.spec.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ describe("Snapshot Upload", () => {
4949

5050
// Wait for all `Promise`s passed to `ctx.waitUntil()` to settle before running test assertions
5151
await waitOnExecutionContext(ctx);
52-
expect(await response.status).toBe(400);
52+
expect(response.status).toBe(400);
5353
expect(await response.text()).toBe("Error - Required POST");
5454
});
5555

@@ -62,7 +62,7 @@ describe("Snapshot Upload", () => {
6262
const response = await worker.fetch(request, env, ctx);
6363
// Wait for all `Promise`s passed to `ctx.waitUntil()` to settle before running test assertions
6464
await waitOnExecutionContext(ctx);
65-
expect(await response.status).toBe(400);
65+
expect(response.status).toBe(400);
6666
expect(await response.text()).toBe(
6767
"Error - Expected Content-Type application/json and Content-Length > 0",
6868
);
@@ -81,7 +81,7 @@ describe("Snapshot Upload", () => {
8181
const response = await worker.fetch(request, env, ctx);
8282
// Wait for all `Promise`s passed to `ctx.waitUntil()` to settle before running test assertions
8383
await waitOnExecutionContext(ctx);
84-
expect(await response.status).toBe(400);
84+
expect(response.status).toBe(400);
8585
expect(await response.text()).toBe(
8686
"Error - Expected Content-Type application/json and Content-Length > 0",
8787
);
@@ -116,7 +116,7 @@ describe("Snapshot Upload", () => {
116116
let response = await worker.fetch(req, env, ctx);
117117
// Wait for all `Promise`s passed to `ctx.waitUntil()` to settle before running test assertions
118118
await waitOnExecutionContext(ctx);
119-
expect(await response.status).toBe(200);
119+
expect(response.status).toBe(200);
120120
// By default, the response should be Snapshot response
121121
// unless manually forwarded to ParkPow then it's ParkPow response
122122
expect(await response.json()).toStrictEqual(mockSnapshotResponse);
@@ -146,7 +146,7 @@ describe("Snapshot Upload", () => {
146146
let response = await worker.fetch(req, env, ctx);
147147
// Wait for all `Promise`s passed to `ctx.waitUntil()` to settle before running test assertions
148148
await waitOnExecutionContext(ctx);
149-
expect(await response.status).toBe(429);
149+
expect(response.status).toBe(429);
150150
expect(await response.json()).toStrictEqual(rateLimitResponse);
151151
});
152152

@@ -162,7 +162,7 @@ describe("Snapshot Upload", () => {
162162
let response = await worker.fetch(req, env, ctx);
163163
// Wait for all `Promise`s passed to `ctx.waitUntil()` to settle before running test assertions
164164
await waitOnExecutionContext(ctx);
165-
expect(await response.status).toBe(400);
165+
expect(response.status).toBe(400);
166166
expect(await response.text()).toStrictEqual(
167167
"Processor Error - 2 - Specified Processor Unable Process Camera Data",
168168
);

‎snapshot-middleware/test/snapshot_response_forwarding.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ describe("Forwards snapshot response to user as worker response", async () => {
6767
let response = await worker.fetch(req, env, ctx);
6868
// Wait for all `Promise`s passed to `ctx.waitUntil()` to settle before running test assertions
6969
await waitOnExecutionContext(ctx);
70-
expect(await response.status).toBe(status);
70+
expect(response.status).toBe(status);
7171
expect(await response.text()).toStrictEqual(mockSnapshotResponse);
7272
},
7373
);

0 commit comments

Comments
 (0)