Move testHelpers directory up one level

This commit is contained in:
2025-07-31 22:41:05 -04:00
parent b7299b8359
commit 14fbdc7408
28 changed files with 46 additions and 53 deletions

View File

@@ -1,6 +1,6 @@
import { afterEach, beforeAll, beforeEach, describe, expect, it, jest } from "@jest/globals"; import { afterEach, beforeAll, beforeEach, describe, expect, it, jest } from "@jest/globals";
import { TimedApiBasedRepositoryLoader } from "../TimedApiBasedRepositoryLoader"; import { TimedApiBasedRepositoryLoader } from "../TimedApiBasedRepositoryLoader";
import { resetGlobalFetchMockJson } from "../../../test/testHelpers/fetchMockHelpers"; import { resetGlobalFetchMockJson } from "../../../testHelpers/fetchMockHelpers";
import { UnoptimizedInMemoryShuttleRepository } from "../../repositories/shuttle/UnoptimizedInMemoryShuttleRepository"; import { UnoptimizedInMemoryShuttleRepository } from "../../repositories/shuttle/UnoptimizedInMemoryShuttleRepository";
import { ApiBasedShuttleRepositoryLoader } from "../shuttle/ApiBasedShuttleRepositoryLoader"; import { ApiBasedShuttleRepositoryLoader } from "../shuttle/ApiBasedShuttleRepositoryLoader";

View File

@@ -7,12 +7,12 @@ import {
resetGlobalFetchMockJson, resetGlobalFetchMockJson,
updateGlobalFetchMockJson, updateGlobalFetchMockJson,
updateGlobalFetchMockJsonToThrowSyntaxError updateGlobalFetchMockJsonToThrowSyntaxError
} from "../../../../test/testHelpers/fetchMockHelpers"; } from "../../../../testHelpers/fetchMockHelpers";
import { import {
chapmanParkingStructureData chapmanParkingStructureData
} from "../../../../test/jsonSnapshots/chapmanParkingStructureData/chapmanParkingStructureData"; } from "../../../../testHelpers/jsonSnapshots/chapmanParkingStructureData/chapmanParkingStructureData";
import { IParkingStructure } from "../../../entities/ParkingRepositoryEntities"; import { IParkingStructure } from "../../../entities/ParkingRepositoryEntities";
import { assertAsyncCallbackThrowsApiResponseError } from "../../../../test/testHelpers/assertAsyncCallbackThrowsApiResponseError"; import { assertAsyncCallbackThrowsApiResponseError } from "../../../../testHelpers/assertAsyncCallbackThrowsApiResponseError";
describe("ChapmanApiBasedParkingRepositoryLoader", () => { describe("ChapmanApiBasedParkingRepositoryLoader", () => {
let loader: ChapmanApiBasedParkingRepositoryLoader; let loader: ChapmanApiBasedParkingRepositoryLoader;

View File

@@ -1,21 +1,21 @@
import { afterEach, beforeEach, describe, expect, it, jest } from "@jest/globals"; import { afterEach, beforeEach, describe, expect, it, jest } from "@jest/globals";
import { ApiBasedShuttleRepositoryLoader } from "../ApiBasedShuttleRepositoryLoader"; import { ApiBasedShuttleRepositoryLoader } from "../ApiBasedShuttleRepositoryLoader";
import { UnoptimizedInMemoryShuttleRepository } from "../../../repositories/shuttle/UnoptimizedInMemoryShuttleRepository"; import { UnoptimizedInMemoryShuttleRepository } from "../../../repositories/shuttle/UnoptimizedInMemoryShuttleRepository";
import { fetchRouteDataSuccessfulResponse } from "../../../../test/jsonSnapshots/fetchRouteData/fetchRouteDataSuccessfulResponse"; import { fetchRouteDataSuccessfulResponse } from "../../../../testHelpers/jsonSnapshots/fetchRouteData/fetchRouteDataSuccessfulResponse";
import { import {
fetchStopAndPolylineDataSuccessfulResponse fetchStopAndPolylineDataSuccessfulResponse
} from "../../../../test/jsonSnapshots/fetchStopAndPolylineData/fetchStopAndPolylineDataSuccessfulResponse"; } from "../../../../testHelpers/jsonSnapshots/fetchStopAndPolylineData/fetchStopAndPolylineDataSuccessfulResponse";
import { generateMockRoutes, generateMockShuttles, generateMockStops } from "../../../../test/testHelpers/mockDataGenerators"; import { generateMockRoutes, generateMockShuttles, generateMockStops } from "../../../../testHelpers/mockDataGenerators";
import { import {
fetchShuttleDataSuccessfulResponse fetchShuttleDataSuccessfulResponse
} from "../../../../test/jsonSnapshots/fetchShuttleData/fetchShuttleDataSuccessfulResponse"; } from "../../../../testHelpers/jsonSnapshots/fetchShuttleData/fetchShuttleDataSuccessfulResponse";
import { fetchEtaDataSuccessfulResponse } from "../../../../test/jsonSnapshots/fetchEtaData/fetchEtaDataSuccessfulResponse"; import { fetchEtaDataSuccessfulResponse } from "../../../../testHelpers/jsonSnapshots/fetchEtaData/fetchEtaDataSuccessfulResponse";
import { import {
resetGlobalFetchMockJson, resetGlobalFetchMockJson,
updateGlobalFetchMockJson, updateGlobalFetchMockJson,
updateGlobalFetchMockJsonToThrowSyntaxError updateGlobalFetchMockJsonToThrowSyntaxError
} from "../../../../test/testHelpers/fetchMockHelpers"; } from "../../../../testHelpers/fetchMockHelpers";
import { assertAsyncCallbackThrowsApiResponseError } from "../../../../test/testHelpers/assertAsyncCallbackThrowsApiResponseError"; import { assertAsyncCallbackThrowsApiResponseError } from "../../../../testHelpers/assertAsyncCallbackThrowsApiResponseError";
describe("ApiBasedShuttleRepositoryLoader", () => { describe("ApiBasedShuttleRepositoryLoader", () => {
let loader: ApiBasedShuttleRepositoryLoader; let loader: ApiBasedShuttleRepositoryLoader;

View File

@@ -2,7 +2,7 @@ import { beforeEach, describe, expect, it, jest } from "@jest/globals";
import { ETANotificationScheduler } from "../ETANotificationScheduler"; import { ETANotificationScheduler } from "../ETANotificationScheduler";
import { UnoptimizedInMemoryShuttleRepository } from "../../../repositories/shuttle/UnoptimizedInMemoryShuttleRepository"; import { UnoptimizedInMemoryShuttleRepository } from "../../../repositories/shuttle/UnoptimizedInMemoryShuttleRepository";
import { IEta, IShuttle, IStop } from "../../../entities/ShuttleRepositoryEntities"; import { IEta, IShuttle, IStop } from "../../../entities/ShuttleRepositoryEntities";
import { addMockShuttleToRepository, addMockStopToRepository } from "../../../../test/testHelpers/repositorySetupHelpers"; import { addMockShuttleToRepository, addMockStopToRepository } from "../../../../testHelpers/repositorySetupHelpers";
import { AppleNotificationSender } from "../../senders/AppleNotificationSender"; import { AppleNotificationSender } from "../../senders/AppleNotificationSender";
import { InMemoryNotificationRepository } from "../../../repositories/notifications/InMemoryNotificationRepository"; import { InMemoryNotificationRepository } from "../../../repositories/notifications/InMemoryNotificationRepository";
import { NotificationRepository } from "../../../repositories/notifications/NotificationRepository"; import { NotificationRepository } from "../../../repositories/notifications/NotificationRepository";

View File

@@ -6,7 +6,7 @@ import {
generateMockRoutes, generateMockRoutes,
generateMockShuttles, generateMockShuttles,
generateMockStops, generateMockStops,
} from "../../../../test/testHelpers/mockDataGenerators"; } from "../../../../testHelpers/mockDataGenerators";
// For repositories created in the future, reuse core testing // For repositories created in the future, reuse core testing
// logic from here and differentiate setup (e.g. creating mocks) // logic from here and differentiate setup (e.g. creating mocks)

View File

@@ -1,11 +1,11 @@
import { beforeEach, describe, expect, it } from "@jest/globals"; import { beforeEach, describe, expect, it } from "@jest/globals";
import { setupTestServerContext, setupTestServerHolder } from "../../../test/testHelpers/apolloTestServerHelpers"; import { setupTestServerContext, setupTestServerHolder } from "../../../testHelpers/apolloTestServerHelpers";
import { IEta, IShuttle, IStop } from "../../entities/ShuttleRepositoryEntities"; import { IEta, IShuttle, IStop } from "../../entities/ShuttleRepositoryEntities";
import { import {
addMockEtaToRepository, addMockEtaToRepository,
addMockShuttleToRepository, addMockShuttleToRepository,
addMockStopToRepository, addMockStopToRepository,
} from "../../../test/testHelpers/repositorySetupHelpers"; } from "../../../testHelpers/repositorySetupHelpers";
import assert = require("node:assert"); import assert = require("node:assert");
describe("EtaResolvers", () => { describe("EtaResolvers", () => {

View File

@@ -1,9 +1,9 @@
import { describe, expect, it } from "@jest/globals"; import { describe, expect, it } from "@jest/globals";
import { setupTestServerContext, setupTestServerHolder } from "../../../test/testHelpers/apolloTestServerHelpers"; import { setupTestServerContext, setupTestServerHolder } from "../../../testHelpers/apolloTestServerHelpers";
import { import {
addMockShuttleToRepository, addMockShuttleToRepository,
addMockStopToRepository, addMockStopToRepository,
} from "../../../test/testHelpers/repositorySetupHelpers"; } from "../../../testHelpers/repositorySetupHelpers";
import assert = require("node:assert"); import assert = require("node:assert");
import { NotificationInput } from "../../generated/graphql"; import { NotificationInput } from "../../generated/graphql";

View File

@@ -1,8 +1,8 @@
import { beforeEach, describe, expect, it } from "@jest/globals"; import { beforeEach, describe, expect, it } from "@jest/globals";
import { setupTestServerContext, setupTestServerHolder } from "../../../test/testHelpers/apolloTestServerHelpers"; import { setupTestServerContext, setupTestServerHolder } from "../../../testHelpers/apolloTestServerHelpers";
import { IRoute, IStop } from "../../entities/ShuttleRepositoryEntities"; import { IRoute, IStop } from "../../entities/ShuttleRepositoryEntities";
import { generateMockOrderedStops, generateMockStops } from "../../../test/testHelpers/mockDataGenerators"; import { generateMockOrderedStops, generateMockStops } from "../../../testHelpers/mockDataGenerators";
import { addMockRouteToRepository } from "../../../test/testHelpers/repositorySetupHelpers"; import { addMockRouteToRepository } from "../../../testHelpers/repositorySetupHelpers";
import assert = require("node:assert"); import assert = require("node:assert");
describe("OrderedStopResolvers", () => { describe("OrderedStopResolvers", () => {

View File

@@ -1,7 +1,7 @@
import { beforeEach, describe, expect, it, jest } from "@jest/globals"; import { beforeEach, describe, expect, it, jest } from "@jest/globals";
import { setupTestServerContext, setupTestServerHolder } from "../../../test/testHelpers/apolloTestServerHelpers"; import { setupTestServerContext, setupTestServerHolder } from "../../../testHelpers/apolloTestServerHelpers";
import { InterchangeSystem } from "../../entities/InterchangeSystem"; import { InterchangeSystem } from "../../entities/InterchangeSystem";
import { generateParkingStructures } from "../../../test/testHelpers/mockDataGenerators"; import { generateParkingStructures } from "../../../testHelpers/mockDataGenerators";
import { HistoricalParkingAverageQueryInput } from "../../generated/graphql"; import { HistoricalParkingAverageQueryInput } from "../../generated/graphql";
import assert = require("node:assert"); import assert = require("node:assert");

View File

@@ -1,6 +1,6 @@
import { beforeEach, describe, expect, it } from "@jest/globals"; import { beforeEach, describe, expect, it } from "@jest/globals";
import { generateParkingStructures } from "../../../test/testHelpers/mockDataGenerators"; import { generateParkingStructures } from "../../../testHelpers/mockDataGenerators";
import { setupTestServerContext, setupTestServerHolder } from "../../../test/testHelpers/apolloTestServerHelpers"; import { setupTestServerContext, setupTestServerHolder } from "../../../testHelpers/apolloTestServerHelpers";
import { InterchangeSystem } from "../../entities/InterchangeSystem"; import { InterchangeSystem } from "../../entities/InterchangeSystem";
import assert = require("node:assert"); import assert = require("node:assert");

View File

@@ -3,9 +3,9 @@ import {
buildSystemForTesting, buildSystemForTesting,
setupTestServerContext, setupTestServerContext,
setupTestServerHolder setupTestServerHolder
} from "../../../test/testHelpers/apolloTestServerHelpers"; } from "../../../testHelpers/apolloTestServerHelpers";
import assert = require("node:assert"); import assert = require("node:assert");
import { addMockShuttleToRepository, addMockStopToRepository } from "../../../test/testHelpers/repositorySetupHelpers"; import { addMockShuttleToRepository, addMockStopToRepository } from "../../../testHelpers/repositorySetupHelpers";
import { ScheduledNotification } from "../../repositories/notifications/NotificationRepository"; import { ScheduledNotification } from "../../repositories/notifications/NotificationRepository";
// See Apollo documentation for integration test guide // See Apollo documentation for integration test guide

View File

@@ -1,10 +1,10 @@
import { beforeEach, describe, expect, it } from "@jest/globals"; import { beforeEach, describe, expect, it } from "@jest/globals";
import { setupTestServerContext, setupTestServerHolder } from "../../../test/testHelpers/apolloTestServerHelpers"; import { setupTestServerContext, setupTestServerHolder } from "../../../testHelpers/apolloTestServerHelpers";
import { import {
addMockRouteToRepository, addMockRouteToRepository,
addMockStopToRepository addMockStopToRepository
} from "../../../test/testHelpers/repositorySetupHelpers"; } from "../../../testHelpers/repositorySetupHelpers";
import { generateMockOrderedStops, generateMockShuttles } from "../../../test/testHelpers/mockDataGenerators"; import { generateMockOrderedStops, generateMockShuttles } from "../../../testHelpers/mockDataGenerators";
import { IRoute, IStop } from "../../entities/ShuttleRepositoryEntities"; import { IRoute, IStop } from "../../entities/ShuttleRepositoryEntities";
import assert = require("node:assert"); import assert = require("node:assert");
import { InterchangeSystem } from "../../entities/InterchangeSystem"; import { InterchangeSystem } from "../../entities/InterchangeSystem";

View File

@@ -1,8 +1,8 @@
import { beforeEach, describe, expect, it } from "@jest/globals"; import { beforeEach, describe, expect, it } from "@jest/globals";
import { generateMockEtas, generateMockRoutes } from "../../../test/testHelpers/mockDataGenerators"; import { generateMockEtas, generateMockRoutes } from "../../../testHelpers/mockDataGenerators";
import { IShuttle } from "../../entities/ShuttleRepositoryEntities"; import { IShuttle } from "../../entities/ShuttleRepositoryEntities";
import { setupTestServerContext, setupTestServerHolder } from "../../../test/testHelpers/apolloTestServerHelpers"; import { setupTestServerContext, setupTestServerHolder } from "../../../testHelpers/apolloTestServerHelpers";
import { addMockShuttleToRepository } from "../../../test/testHelpers/repositorySetupHelpers"; import { addMockShuttleToRepository } from "../../../testHelpers/repositorySetupHelpers";
import assert = require("node:assert"); import assert = require("node:assert");
import { InterchangeSystem } from "../../entities/InterchangeSystem"; import { InterchangeSystem } from "../../entities/InterchangeSystem";

View File

@@ -2,10 +2,10 @@ import { beforeEach, describe, expect, it } from "@jest/globals";
import { import {
setupTestServerContext, setupTestServerContext,
setupTestServerHolder setupTestServerHolder
} from "../../../test/testHelpers/apolloTestServerHelpers"; } from "../../../testHelpers/apolloTestServerHelpers";
import { generateMockEtas, generateMockOrderedStops } from "../../../test/testHelpers/mockDataGenerators"; import { generateMockEtas, generateMockOrderedStops } from "../../../testHelpers/mockDataGenerators";
import { IStop } from "../../entities/ShuttleRepositoryEntities"; import { IStop } from "../../entities/ShuttleRepositoryEntities";
import { addMockStopToRepository } from "../../../test/testHelpers/repositorySetupHelpers"; import { addMockStopToRepository } from "../../../testHelpers/repositorySetupHelpers";
import assert = require("node:assert"); import assert = require("node:assert");
describe("StopResolvers", () => { describe("StopResolvers", () => {

View File

@@ -1,16 +1,16 @@
import { beforeEach, describe, expect, it } from "@jest/globals"; import { beforeEach, describe, expect, it } from "@jest/globals";
import { setupTestServerContext, setupTestServerHolder } from "../../../test/testHelpers/apolloTestServerHelpers"; import { setupTestServerContext, setupTestServerHolder } from "../../../testHelpers/apolloTestServerHelpers";
import { import {
generateMockRoutes, generateMockRoutes,
generateMockShuttles, generateMockShuttles,
generateMockStops, generateMockStops,
generateParkingStructures generateParkingStructures
} from "../../../test/testHelpers/mockDataGenerators"; } from "../../../testHelpers/mockDataGenerators";
import { import {
addMockRouteToRepository, addMockRouteToRepository,
addMockShuttleToRepository, addMockShuttleToRepository,
addMockStopToRepository, addMockStopToRepository,
} from "../../../test/testHelpers/repositorySetupHelpers"; } from "../../../testHelpers/repositorySetupHelpers";
import assert = require("node:assert"); import assert = require("node:assert");
import { InterchangeSystem } from "../../entities/InterchangeSystem"; import { InterchangeSystem } from "../../entities/InterchangeSystem";

View File

@@ -1,7 +0,0 @@
import { describe, expect, test } from "@jest/globals";
describe("sum", () => {
test("adds 1 + 2 to equal 3", () => {
expect(1 + 2).toBe(3);
});
});

View File

@@ -1,12 +1,12 @@
import { readFileSync } from "fs"; import { readFileSync } from "fs";
import { ApolloServer } from "@apollo/server"; import { ApolloServer } from "@apollo/server";
import { MergedResolvers } from "../../src/MergedResolvers"; import { MergedResolvers } from "../src/MergedResolvers";
import { beforeEach } from "@jest/globals"; import { beforeEach } from "@jest/globals";
import { ServerContext } from "../../src/ServerContext"; import { ServerContext } from "../src/ServerContext";
import { InterchangeSystem } from "../../src/entities/InterchangeSystem"; import { InterchangeSystem } from "../src/entities/InterchangeSystem";
import { import {
ChapmanApiBasedParkingRepositoryLoader ChapmanApiBasedParkingRepositoryLoader
} from "../../src/loaders/parking/ChapmanApiBasedParkingRepositoryLoader"; } from "../src/loaders/parking/ChapmanApiBasedParkingRepositoryLoader";
function setUpTestServer() { function setUpTestServer() {

View File

@@ -1,5 +1,5 @@
import { expect } from "@jest/globals"; import { expect } from "@jest/globals";
import { ApiResponseError } from "../../src/loaders/ApiResponseError"; import { ApiResponseError } from "../src/loaders/ApiResponseError";
export async function assertAsyncCallbackThrowsApiResponseError(callback: () => Promise<any>) { export async function assertAsyncCallbackThrowsApiResponseError(callback: () => Promise<any>) {
await expect(callback).rejects.toThrow(ApiResponseError); await expect(callback).rejects.toThrow(ApiResponseError);

View File

@@ -1,5 +1,5 @@
import { IEta, IOrderedStop, IRoute, IShuttle, IStop } from "../../src/entities/ShuttleRepositoryEntities"; import { IEta, IOrderedStop, IRoute, IShuttle, IStop } from "../src/entities/ShuttleRepositoryEntities";
import { IParkingStructure } from "../../src/entities/ParkingRepositoryEntities"; import { IParkingStructure } from "../src/entities/ParkingRepositoryEntities";
// Use a single set of generators in case any of the // Use a single set of generators in case any of the
// interfaces change in the future // interfaces change in the future

View File

@@ -4,7 +4,7 @@ import {
generateMockShuttles, generateMockShuttles,
generateMockStops, generateMockStops,
} from "./mockDataGenerators"; } from "./mockDataGenerators";
import { ShuttleGetterSetterRepository } from "../../src/repositories/shuttle/ShuttleGetterSetterRepository"; import { ShuttleGetterSetterRepository } from "../src/repositories/shuttle/ShuttleGetterSetterRepository";
export async function addMockRouteToRepository(repository: ShuttleGetterSetterRepository, systemId: string) { export async function addMockRouteToRepository(repository: ShuttleGetterSetterRepository, systemId: string) {
const mockRoutes = generateMockRoutes(); const mockRoutes = generateMockRoutes();