From b7299b83592326c03d5d3dca2ae4f548e42671f3 Mon Sep 17 00:00:00 2001 From: Brendan Chen Date: Thu, 31 Jul 2025 22:35:49 -0400 Subject: [PATCH] Move all tests to subdirectories underneath code to be tested --- .../TimedApiBasedRepositoryLoaderTests.test.ts | 8 ++++---- ...piBasedParkingRepositoryLoaderTests.test.ts | 12 ++++++------ ...piBasedShuttleRepositoryLoaderTests.test.ts | 18 +++++++++--------- .../ETANotificationSchedulerTests.test.ts | 16 ++++++++-------- .../AppleNotificationSenderTests.test.ts | 2 +- .../NotificationRepositorySharedTests.test.ts | 6 +++--- .../ParkingRepositorySharedTests.test.ts | 10 +++++----- ...mizedInMemoryShuttleRepositoryTests.test.ts | 4 ++-- .../__tests__}/EtaResolverTests.test.ts | 6 +++--- .../__tests__}/MutationResolverTests.test.ts | 6 +++--- .../OrderedStopResolverTests.test.ts | 8 ++++---- .../ParkingStructureResolverTests.test.ts | 10 +++++----- .../ParkingSystemResolverTests.test.ts | 6 +++--- .../__tests__}/QueryResolverTests.test.ts | 6 +++--- .../__tests__}/RouteResolverTests.test.ts | 10 +++++----- .../__tests__}/ShuttleResolverTests.test.ts | 10 +++++----- .../__tests__}/StopResolverTests.test.ts | 8 ++++---- .../__tests__}/SystemResolverTests.test.ts | 8 ++++---- .../types/__tests__}/CircularQueue.test.ts | 2 +- .../types/__tests__}/TupleKeyTests.test.ts | 2 +- 20 files changed, 79 insertions(+), 79 deletions(-) rename {test/loaders => src/loaders/__tests__}/TimedApiBasedRepositoryLoaderTests.test.ts (81%) rename {test/loaders/parking => src/loaders/parking/__tests__}/ChapmanApiBasedParkingRepositoryLoaderTests.test.ts (88%) rename {test/loaders/shuttle => src/loaders/shuttle/__tests__}/ApiBasedShuttleRepositoryLoaderTests.test.ts (88%) rename {test/notifications/schedulers => src/notifications/schedulers/__tests__}/ETANotificationSchedulerTests.test.ts (87%) rename {test/notifications/senders => src/notifications/senders/__tests__}/AppleNotificationSenderTests.test.ts (98%) rename {test/repositories => src/repositories/notifications/__tests__}/NotificationRepositorySharedTests.test.ts (94%) rename {test/repositories => src/repositories/parking/__tests__}/ParkingRepositorySharedTests.test.ts (93%) rename {test/repositories => src/repositories/shuttle/__tests__}/UnoptimizedInMemoryShuttleRepositoryTests.test.ts (99%) rename {test/resolvers => src/resolvers/__tests__}/EtaResolverTests.test.ts (92%) rename {test/resolvers => src/resolvers/__tests__}/MutationResolverTests.test.ts (97%) rename {test/resolvers => src/resolvers/__tests__}/OrderedStopResolverTests.test.ts (97%) rename {test/resolvers => src/resolvers/__tests__}/ParkingStructureResolverTests.test.ts (88%) rename {test/resolvers => src/resolvers/__tests__}/ParkingSystemResolverTests.test.ts (96%) rename {test/resolvers => src/resolvers/__tests__}/QueryResolverTests.test.ts (95%) rename {test/resolvers => src/resolvers/__tests__}/RouteResolverTests.test.ts (93%) rename {test/resolvers => src/resolvers/__tests__}/ShuttleResolverTests.test.ts (93%) rename {test/resolvers => src/resolvers/__tests__}/StopResolverTests.test.ts (91%) rename {test/resolvers => src/resolvers/__tests__}/SystemResolverTests.test.ts (97%) rename {test/types => src/types/__tests__}/CircularQueue.test.ts (99%) rename {test/types => src/types/__tests__}/TupleKeyTests.test.ts (96%) diff --git a/test/loaders/TimedApiBasedRepositoryLoaderTests.test.ts b/src/loaders/__tests__/TimedApiBasedRepositoryLoaderTests.test.ts similarity index 81% rename from test/loaders/TimedApiBasedRepositoryLoaderTests.test.ts rename to src/loaders/__tests__/TimedApiBasedRepositoryLoaderTests.test.ts index e87556f..de36bf2 100644 --- a/test/loaders/TimedApiBasedRepositoryLoaderTests.test.ts +++ b/src/loaders/__tests__/TimedApiBasedRepositoryLoaderTests.test.ts @@ -1,8 +1,8 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it, jest } from "@jest/globals"; -import { TimedApiBasedRepositoryLoader } from "../../src/loaders/TimedApiBasedRepositoryLoader"; -import { resetGlobalFetchMockJson } from "../testHelpers/fetchMockHelpers"; -import { UnoptimizedInMemoryShuttleRepository } from "../../src/repositories/shuttle/UnoptimizedInMemoryShuttleRepository"; -import { ApiBasedShuttleRepositoryLoader } from "../../src/loaders/shuttle/ApiBasedShuttleRepositoryLoader"; +import { TimedApiBasedRepositoryLoader } from "../TimedApiBasedRepositoryLoader"; +import { resetGlobalFetchMockJson } from "../../../test/testHelpers/fetchMockHelpers"; +import { UnoptimizedInMemoryShuttleRepository } from "../../repositories/shuttle/UnoptimizedInMemoryShuttleRepository"; +import { ApiBasedShuttleRepositoryLoader } from "../shuttle/ApiBasedShuttleRepositoryLoader"; describe("TimedApiBasedRepositoryLoader", () => { let timedLoader: TimedApiBasedRepositoryLoader; diff --git a/test/loaders/parking/ChapmanApiBasedParkingRepositoryLoaderTests.test.ts b/src/loaders/parking/__tests__/ChapmanApiBasedParkingRepositoryLoaderTests.test.ts similarity index 88% rename from test/loaders/parking/ChapmanApiBasedParkingRepositoryLoaderTests.test.ts rename to src/loaders/parking/__tests__/ChapmanApiBasedParkingRepositoryLoaderTests.test.ts index 18f22d5..b5d434a 100644 --- a/test/loaders/parking/ChapmanApiBasedParkingRepositoryLoaderTests.test.ts +++ b/src/loaders/parking/__tests__/ChapmanApiBasedParkingRepositoryLoaderTests.test.ts @@ -1,18 +1,18 @@ import { beforeEach, describe, expect, it, jest } from "@jest/globals"; import { ChapmanApiBasedParkingRepositoryLoader -} from "../../../src/loaders/parking/ChapmanApiBasedParkingRepositoryLoader"; -import { InMemoryParkingRepository } from "../../../src/repositories/parking/InMemoryParkingRepository"; +} from "../ChapmanApiBasedParkingRepositoryLoader"; +import { InMemoryParkingRepository } from "../../../repositories/parking/InMemoryParkingRepository"; import { resetGlobalFetchMockJson, updateGlobalFetchMockJson, updateGlobalFetchMockJsonToThrowSyntaxError -} from "../../testHelpers/fetchMockHelpers"; +} from "../../../../test/testHelpers/fetchMockHelpers"; import { chapmanParkingStructureData -} from "../../jsonSnapshots/chapmanParkingStructureData/chapmanParkingStructureData"; -import { IParkingStructure } from "../../../src/entities/ParkingRepositoryEntities"; -import { assertAsyncCallbackThrowsApiResponseError } from "../../testHelpers/assertAsyncCallbackThrowsApiResponseError"; +} from "../../../../test/jsonSnapshots/chapmanParkingStructureData/chapmanParkingStructureData"; +import { IParkingStructure } from "../../../entities/ParkingRepositoryEntities"; +import { assertAsyncCallbackThrowsApiResponseError } from "../../../../test/testHelpers/assertAsyncCallbackThrowsApiResponseError"; describe("ChapmanApiBasedParkingRepositoryLoader", () => { let loader: ChapmanApiBasedParkingRepositoryLoader; diff --git a/test/loaders/shuttle/ApiBasedShuttleRepositoryLoaderTests.test.ts b/src/loaders/shuttle/__tests__/ApiBasedShuttleRepositoryLoaderTests.test.ts similarity index 88% rename from test/loaders/shuttle/ApiBasedShuttleRepositoryLoaderTests.test.ts rename to src/loaders/shuttle/__tests__/ApiBasedShuttleRepositoryLoaderTests.test.ts index 6b55712..85dd2f5 100644 --- a/test/loaders/shuttle/ApiBasedShuttleRepositoryLoaderTests.test.ts +++ b/src/loaders/shuttle/__tests__/ApiBasedShuttleRepositoryLoaderTests.test.ts @@ -1,21 +1,21 @@ import { afterEach, beforeEach, describe, expect, it, jest } from "@jest/globals"; -import { ApiBasedShuttleRepositoryLoader } from "../../../src/loaders/shuttle/ApiBasedShuttleRepositoryLoader"; -import { UnoptimizedInMemoryShuttleRepository } from "../../../src/repositories/shuttle/UnoptimizedInMemoryShuttleRepository"; -import { fetchRouteDataSuccessfulResponse } from "../../jsonSnapshots/fetchRouteData/fetchRouteDataSuccessfulResponse"; +import { ApiBasedShuttleRepositoryLoader } from "../ApiBasedShuttleRepositoryLoader"; +import { UnoptimizedInMemoryShuttleRepository } from "../../../repositories/shuttle/UnoptimizedInMemoryShuttleRepository"; +import { fetchRouteDataSuccessfulResponse } from "../../../../test/jsonSnapshots/fetchRouteData/fetchRouteDataSuccessfulResponse"; import { fetchStopAndPolylineDataSuccessfulResponse -} from "../../jsonSnapshots/fetchStopAndPolylineData/fetchStopAndPolylineDataSuccessfulResponse"; -import { generateMockRoutes, generateMockShuttles, generateMockStops } from "../../testHelpers/mockDataGenerators"; +} from "../../../../test/jsonSnapshots/fetchStopAndPolylineData/fetchStopAndPolylineDataSuccessfulResponse"; +import { generateMockRoutes, generateMockShuttles, generateMockStops } from "../../../../test/testHelpers/mockDataGenerators"; import { fetchShuttleDataSuccessfulResponse -} from "../../jsonSnapshots/fetchShuttleData/fetchShuttleDataSuccessfulResponse"; -import { fetchEtaDataSuccessfulResponse } from "../../jsonSnapshots/fetchEtaData/fetchEtaDataSuccessfulResponse"; +} from "../../../../test/jsonSnapshots/fetchShuttleData/fetchShuttleDataSuccessfulResponse"; +import { fetchEtaDataSuccessfulResponse } from "../../../../test/jsonSnapshots/fetchEtaData/fetchEtaDataSuccessfulResponse"; import { resetGlobalFetchMockJson, updateGlobalFetchMockJson, updateGlobalFetchMockJsonToThrowSyntaxError -} from "../../testHelpers/fetchMockHelpers"; -import { assertAsyncCallbackThrowsApiResponseError } from "../../testHelpers/assertAsyncCallbackThrowsApiResponseError"; +} from "../../../../test/testHelpers/fetchMockHelpers"; +import { assertAsyncCallbackThrowsApiResponseError } from "../../../../test/testHelpers/assertAsyncCallbackThrowsApiResponseError"; describe("ApiBasedShuttleRepositoryLoader", () => { let loader: ApiBasedShuttleRepositoryLoader; diff --git a/test/notifications/schedulers/ETANotificationSchedulerTests.test.ts b/src/notifications/schedulers/__tests__/ETANotificationSchedulerTests.test.ts similarity index 87% rename from test/notifications/schedulers/ETANotificationSchedulerTests.test.ts rename to src/notifications/schedulers/__tests__/ETANotificationSchedulerTests.test.ts index 3fd9192..1204632 100644 --- a/test/notifications/schedulers/ETANotificationSchedulerTests.test.ts +++ b/src/notifications/schedulers/__tests__/ETANotificationSchedulerTests.test.ts @@ -1,14 +1,14 @@ import { beforeEach, describe, expect, it, jest } from "@jest/globals"; -import { ETANotificationScheduler } from "../../../src/notifications/schedulers/ETANotificationScheduler"; -import { UnoptimizedInMemoryShuttleRepository } from "../../../src/repositories/shuttle/UnoptimizedInMemoryShuttleRepository"; -import { IEta, IShuttle, IStop } from "../../../src/entities/ShuttleRepositoryEntities"; -import { addMockShuttleToRepository, addMockStopToRepository } from "../../testHelpers/repositorySetupHelpers"; -import { AppleNotificationSender } from "../../../src/notifications/senders/AppleNotificationSender"; -import { InMemoryNotificationRepository } from "../../../src/repositories/notifications/InMemoryNotificationRepository"; -import { NotificationRepository } from "../../../src/repositories/notifications/NotificationRepository"; +import { ETANotificationScheduler } from "../ETANotificationScheduler"; +import { UnoptimizedInMemoryShuttleRepository } from "../../../repositories/shuttle/UnoptimizedInMemoryShuttleRepository"; +import { IEta, IShuttle, IStop } from "../../../entities/ShuttleRepositoryEntities"; +import { addMockShuttleToRepository, addMockStopToRepository } from "../../../../test/testHelpers/repositorySetupHelpers"; +import { AppleNotificationSender } from "../../senders/AppleNotificationSender"; +import { InMemoryNotificationRepository } from "../../../repositories/notifications/InMemoryNotificationRepository"; +import { NotificationRepository } from "../../../repositories/notifications/NotificationRepository"; jest.mock("http2"); -jest.mock("../../../src/notifications/senders/AppleNotificationSender"); +jest.mock("../../senders/AppleNotificationSender"); const MockAppleNotificationSender = AppleNotificationSender as jest.MockedClass; diff --git a/test/notifications/senders/AppleNotificationSenderTests.test.ts b/src/notifications/senders/__tests__/AppleNotificationSenderTests.test.ts similarity index 98% rename from test/notifications/senders/AppleNotificationSenderTests.test.ts rename to src/notifications/senders/__tests__/AppleNotificationSenderTests.test.ts index bd7f9ef..b0f83cc 100644 --- a/test/notifications/senders/AppleNotificationSenderTests.test.ts +++ b/src/notifications/senders/__tests__/AppleNotificationSenderTests.test.ts @@ -4,7 +4,7 @@ import { EventEmitter } from "node:events"; import { AppleNotificationSender, NotificationAlertArguments -} from "../../../src/notifications/senders/AppleNotificationSender"; +} from "../AppleNotificationSender"; import { ClientHttp2Session } from "node:http2"; jest.mock("http2"); diff --git a/test/repositories/NotificationRepositorySharedTests.test.ts b/src/repositories/notifications/__tests__/NotificationRepositorySharedTests.test.ts similarity index 94% rename from test/repositories/NotificationRepositorySharedTests.test.ts rename to src/repositories/notifications/__tests__/NotificationRepositorySharedTests.test.ts index fc96674..daf9944 100644 --- a/test/repositories/NotificationRepositorySharedTests.test.ts +++ b/src/repositories/notifications/__tests__/NotificationRepositorySharedTests.test.ts @@ -1,7 +1,7 @@ import { afterEach, beforeEach, describe, expect, it, jest } from "@jest/globals"; -import { InMemoryNotificationRepository } from "../../src/repositories/notifications/InMemoryNotificationRepository"; -import { NotificationEvent, NotificationRepository } from "../../src/repositories/notifications/NotificationRepository"; -import { RedisNotificationRepository } from "../../src/repositories/notifications/RedisNotificationRepository"; +import { InMemoryNotificationRepository } from "../InMemoryNotificationRepository"; +import { NotificationEvent, NotificationRepository } from "../NotificationRepository"; +import { RedisNotificationRepository } from "../RedisNotificationRepository"; interface RepositoryHolder { name: string; diff --git a/test/repositories/ParkingRepositorySharedTests.test.ts b/src/repositories/parking/__tests__/ParkingRepositorySharedTests.test.ts similarity index 93% rename from test/repositories/ParkingRepositorySharedTests.test.ts rename to src/repositories/parking/__tests__/ParkingRepositorySharedTests.test.ts index 04bfe6f..d6d5858 100644 --- a/test/repositories/ParkingRepositorySharedTests.test.ts +++ b/src/repositories/parking/__tests__/ParkingRepositorySharedTests.test.ts @@ -1,9 +1,9 @@ import { afterEach, beforeEach, describe, expect, it, jest } from "@jest/globals"; -import { InMemoryParkingRepository, } from "../../src/repositories/parking/InMemoryParkingRepository"; -import { IParkingStructure } from "../../src/entities/ParkingRepositoryEntities"; -import { HistoricalParkingAverageQueryArguments } from "../../src/repositories/parking/ParkingGetterRepository"; -import { ParkingGetterSetterRepository } from "../../src/repositories/parking/ParkingGetterSetterRepository"; -import { RedisParkingRepository } from "../../src/repositories/parking/RedisParkingRepository"; +import { InMemoryParkingRepository, } from "../InMemoryParkingRepository"; +import { IParkingStructure } from "../../../entities/ParkingRepositoryEntities"; +import { HistoricalParkingAverageQueryArguments } from "../ParkingGetterRepository"; +import { ParkingGetterSetterRepository } from "../ParkingGetterSetterRepository"; +import { RedisParkingRepository } from "../RedisParkingRepository"; interface RepositoryHolder { name: string; diff --git a/test/repositories/UnoptimizedInMemoryShuttleRepositoryTests.test.ts b/src/repositories/shuttle/__tests__/UnoptimizedInMemoryShuttleRepositoryTests.test.ts similarity index 99% rename from test/repositories/UnoptimizedInMemoryShuttleRepositoryTests.test.ts rename to src/repositories/shuttle/__tests__/UnoptimizedInMemoryShuttleRepositoryTests.test.ts index c5a840d..d75d4ba 100644 --- a/test/repositories/UnoptimizedInMemoryShuttleRepositoryTests.test.ts +++ b/src/repositories/shuttle/__tests__/UnoptimizedInMemoryShuttleRepositoryTests.test.ts @@ -1,12 +1,12 @@ import { beforeEach, describe, expect, jest, test } from "@jest/globals"; -import { UnoptimizedInMemoryShuttleRepository } from "../../src/repositories/shuttle/UnoptimizedInMemoryShuttleRepository"; +import { UnoptimizedInMemoryShuttleRepository } from "../UnoptimizedInMemoryShuttleRepository"; import { generateMockEtas, generateMockOrderedStops, generateMockRoutes, generateMockShuttles, generateMockStops, -} from "../testHelpers/mockDataGenerators"; +} from "../../../../test/testHelpers/mockDataGenerators"; // For repositories created in the future, reuse core testing // logic from here and differentiate setup (e.g. creating mocks) diff --git a/test/resolvers/EtaResolverTests.test.ts b/src/resolvers/__tests__/EtaResolverTests.test.ts similarity index 92% rename from test/resolvers/EtaResolverTests.test.ts rename to src/resolvers/__tests__/EtaResolverTests.test.ts index 5611f9a..60332cd 100644 --- a/test/resolvers/EtaResolverTests.test.ts +++ b/src/resolvers/__tests__/EtaResolverTests.test.ts @@ -1,11 +1,11 @@ import { beforeEach, describe, expect, it } from "@jest/globals"; -import { setupTestServerContext, setupTestServerHolder } from "../testHelpers/apolloTestServerHelpers"; -import { IEta, IShuttle, IStop } from "../../src/entities/ShuttleRepositoryEntities"; +import { setupTestServerContext, setupTestServerHolder } from "../../../test/testHelpers/apolloTestServerHelpers"; +import { IEta, IShuttle, IStop } from "../../entities/ShuttleRepositoryEntities"; import { addMockEtaToRepository, addMockShuttleToRepository, addMockStopToRepository, -} from "../testHelpers/repositorySetupHelpers"; +} from "../../../test/testHelpers/repositorySetupHelpers"; import assert = require("node:assert"); describe("EtaResolvers", () => { diff --git a/test/resolvers/MutationResolverTests.test.ts b/src/resolvers/__tests__/MutationResolverTests.test.ts similarity index 97% rename from test/resolvers/MutationResolverTests.test.ts rename to src/resolvers/__tests__/MutationResolverTests.test.ts index 04dbf69..6d229e5 100644 --- a/test/resolvers/MutationResolverTests.test.ts +++ b/src/resolvers/__tests__/MutationResolverTests.test.ts @@ -1,11 +1,11 @@ import { describe, expect, it } from "@jest/globals"; -import { setupTestServerContext, setupTestServerHolder } from "../testHelpers/apolloTestServerHelpers"; +import { setupTestServerContext, setupTestServerHolder } from "../../../test/testHelpers/apolloTestServerHelpers"; import { addMockShuttleToRepository, addMockStopToRepository, -} from "../testHelpers/repositorySetupHelpers"; +} from "../../../test/testHelpers/repositorySetupHelpers"; import assert = require("node:assert"); -import { NotificationInput } from "../../src/generated/graphql"; +import { NotificationInput } from "../../generated/graphql"; describe("MutationResolvers", () => { const holder = setupTestServerHolder() diff --git a/test/resolvers/OrderedStopResolverTests.test.ts b/src/resolvers/__tests__/OrderedStopResolverTests.test.ts similarity index 97% rename from test/resolvers/OrderedStopResolverTests.test.ts rename to src/resolvers/__tests__/OrderedStopResolverTests.test.ts index 5484b3a..84eabaa 100644 --- a/test/resolvers/OrderedStopResolverTests.test.ts +++ b/src/resolvers/__tests__/OrderedStopResolverTests.test.ts @@ -1,8 +1,8 @@ import { beforeEach, describe, expect, it } from "@jest/globals"; -import { setupTestServerContext, setupTestServerHolder } from "../testHelpers/apolloTestServerHelpers"; -import { IRoute, IStop } from "../../src/entities/ShuttleRepositoryEntities"; -import { generateMockOrderedStops, generateMockStops } from "../testHelpers/mockDataGenerators"; -import { addMockRouteToRepository } from "../testHelpers/repositorySetupHelpers"; +import { setupTestServerContext, setupTestServerHolder } from "../../../test/testHelpers/apolloTestServerHelpers"; +import { IRoute, IStop } from "../../entities/ShuttleRepositoryEntities"; +import { generateMockOrderedStops, generateMockStops } from "../../../test/testHelpers/mockDataGenerators"; +import { addMockRouteToRepository } from "../../../test/testHelpers/repositorySetupHelpers"; import assert = require("node:assert"); describe("OrderedStopResolvers", () => { diff --git a/test/resolvers/ParkingStructureResolverTests.test.ts b/src/resolvers/__tests__/ParkingStructureResolverTests.test.ts similarity index 88% rename from test/resolvers/ParkingStructureResolverTests.test.ts rename to src/resolvers/__tests__/ParkingStructureResolverTests.test.ts index 7133c57..7369a00 100644 --- a/test/resolvers/ParkingStructureResolverTests.test.ts +++ b/src/resolvers/__tests__/ParkingStructureResolverTests.test.ts @@ -1,11 +1,11 @@ import { beforeEach, describe, expect, it, jest } from "@jest/globals"; -import { setupTestServerContext, setupTestServerHolder } from "../testHelpers/apolloTestServerHelpers"; -import { InterchangeSystem } from "../../src/entities/InterchangeSystem"; -import { generateParkingStructures } from "../testHelpers/mockDataGenerators"; -import { HistoricalParkingAverageQueryInput } from "../../src/generated/graphql"; +import { setupTestServerContext, setupTestServerHolder } from "../../../test/testHelpers/apolloTestServerHelpers"; +import { InterchangeSystem } from "../../entities/InterchangeSystem"; +import { generateParkingStructures } from "../../../test/testHelpers/mockDataGenerators"; +import { HistoricalParkingAverageQueryInput } from "../../generated/graphql"; import assert = require("node:assert"); -jest.mock("../../src/environment"); +jest.mock("../../environment"); describe("ParkingStructureResolver", () => { const holder = setupTestServerHolder(); diff --git a/test/resolvers/ParkingSystemResolverTests.test.ts b/src/resolvers/__tests__/ParkingSystemResolverTests.test.ts similarity index 96% rename from test/resolvers/ParkingSystemResolverTests.test.ts rename to src/resolvers/__tests__/ParkingSystemResolverTests.test.ts index 951e2c2..e049fb2 100644 --- a/test/resolvers/ParkingSystemResolverTests.test.ts +++ b/src/resolvers/__tests__/ParkingSystemResolverTests.test.ts @@ -1,7 +1,7 @@ import { beforeEach, describe, expect, it } from "@jest/globals"; -import { generateParkingStructures } from "../testHelpers/mockDataGenerators"; -import { setupTestServerContext, setupTestServerHolder } from "../testHelpers/apolloTestServerHelpers"; -import { InterchangeSystem } from "../../src/entities/InterchangeSystem"; +import { generateParkingStructures } from "../../../test/testHelpers/mockDataGenerators"; +import { setupTestServerContext, setupTestServerHolder } from "../../../test/testHelpers/apolloTestServerHelpers"; +import { InterchangeSystem } from "../../entities/InterchangeSystem"; import assert = require("node:assert"); diff --git a/test/resolvers/QueryResolverTests.test.ts b/src/resolvers/__tests__/QueryResolverTests.test.ts similarity index 95% rename from test/resolvers/QueryResolverTests.test.ts rename to src/resolvers/__tests__/QueryResolverTests.test.ts index c24cc61..0f6d942 100644 --- a/test/resolvers/QueryResolverTests.test.ts +++ b/src/resolvers/__tests__/QueryResolverTests.test.ts @@ -3,10 +3,10 @@ import { buildSystemForTesting, setupTestServerContext, setupTestServerHolder -} from "../testHelpers/apolloTestServerHelpers"; +} from "../../../test/testHelpers/apolloTestServerHelpers"; import assert = require("node:assert"); -import { addMockShuttleToRepository, addMockStopToRepository } from "../testHelpers/repositorySetupHelpers"; -import { ScheduledNotification } from "../../src/repositories/notifications/NotificationRepository"; +import { addMockShuttleToRepository, addMockStopToRepository } from "../../../test/testHelpers/repositorySetupHelpers"; +import { ScheduledNotification } from "../../repositories/notifications/NotificationRepository"; // See Apollo documentation for integration test guide // https://www.apollographql.com/docs/apollo-server/testing/testing diff --git a/test/resolvers/RouteResolverTests.test.ts b/src/resolvers/__tests__/RouteResolverTests.test.ts similarity index 93% rename from test/resolvers/RouteResolverTests.test.ts rename to src/resolvers/__tests__/RouteResolverTests.test.ts index 2b13583..0f21a9f 100644 --- a/test/resolvers/RouteResolverTests.test.ts +++ b/src/resolvers/__tests__/RouteResolverTests.test.ts @@ -1,13 +1,13 @@ import { beforeEach, describe, expect, it } from "@jest/globals"; -import { setupTestServerContext, setupTestServerHolder } from "../testHelpers/apolloTestServerHelpers"; +import { setupTestServerContext, setupTestServerHolder } from "../../../test/testHelpers/apolloTestServerHelpers"; import { addMockRouteToRepository, addMockStopToRepository -} from "../testHelpers/repositorySetupHelpers"; -import { generateMockOrderedStops, generateMockShuttles } from "../testHelpers/mockDataGenerators"; -import { IRoute, IStop } from "../../src/entities/ShuttleRepositoryEntities"; +} from "../../../test/testHelpers/repositorySetupHelpers"; +import { generateMockOrderedStops, generateMockShuttles } from "../../../test/testHelpers/mockDataGenerators"; +import { IRoute, IStop } from "../../entities/ShuttleRepositoryEntities"; import assert = require("node:assert"); -import { InterchangeSystem } from "../../src/entities/InterchangeSystem"; +import { InterchangeSystem } from "../../entities/InterchangeSystem"; describe("RouteResolvers", () => { const holder = setupTestServerHolder(); diff --git a/test/resolvers/ShuttleResolverTests.test.ts b/src/resolvers/__tests__/ShuttleResolverTests.test.ts similarity index 93% rename from test/resolvers/ShuttleResolverTests.test.ts rename to src/resolvers/__tests__/ShuttleResolverTests.test.ts index bf8cc5d..6c32ac4 100644 --- a/test/resolvers/ShuttleResolverTests.test.ts +++ b/src/resolvers/__tests__/ShuttleResolverTests.test.ts @@ -1,10 +1,10 @@ import { beforeEach, describe, expect, it } from "@jest/globals"; -import { generateMockEtas, generateMockRoutes } from "../testHelpers/mockDataGenerators"; -import { IShuttle } from "../../src/entities/ShuttleRepositoryEntities"; -import { setupTestServerContext, setupTestServerHolder } from "../testHelpers/apolloTestServerHelpers"; -import { addMockShuttleToRepository } from "../testHelpers/repositorySetupHelpers"; +import { generateMockEtas, generateMockRoutes } from "../../../test/testHelpers/mockDataGenerators"; +import { IShuttle } from "../../entities/ShuttleRepositoryEntities"; +import { setupTestServerContext, setupTestServerHolder } from "../../../test/testHelpers/apolloTestServerHelpers"; +import { addMockShuttleToRepository } from "../../../test/testHelpers/repositorySetupHelpers"; import assert = require("node:assert"); -import { InterchangeSystem } from "../../src/entities/InterchangeSystem"; +import { InterchangeSystem } from "../../entities/InterchangeSystem"; describe("ShuttleResolvers", () => { diff --git a/test/resolvers/StopResolverTests.test.ts b/src/resolvers/__tests__/StopResolverTests.test.ts similarity index 91% rename from test/resolvers/StopResolverTests.test.ts rename to src/resolvers/__tests__/StopResolverTests.test.ts index 6bf31cd..2ae4a9f 100644 --- a/test/resolvers/StopResolverTests.test.ts +++ b/src/resolvers/__tests__/StopResolverTests.test.ts @@ -2,10 +2,10 @@ import { beforeEach, describe, expect, it } from "@jest/globals"; import { setupTestServerContext, setupTestServerHolder -} from "../testHelpers/apolloTestServerHelpers"; -import { generateMockEtas, generateMockOrderedStops } from "../testHelpers/mockDataGenerators"; -import { IStop } from "../../src/entities/ShuttleRepositoryEntities"; -import { addMockStopToRepository } from "../testHelpers/repositorySetupHelpers"; +} from "../../../test/testHelpers/apolloTestServerHelpers"; +import { generateMockEtas, generateMockOrderedStops } from "../../../test/testHelpers/mockDataGenerators"; +import { IStop } from "../../entities/ShuttleRepositoryEntities"; +import { addMockStopToRepository } from "../../../test/testHelpers/repositorySetupHelpers"; import assert = require("node:assert"); describe("StopResolvers", () => { diff --git a/test/resolvers/SystemResolverTests.test.ts b/src/resolvers/__tests__/SystemResolverTests.test.ts similarity index 97% rename from test/resolvers/SystemResolverTests.test.ts rename to src/resolvers/__tests__/SystemResolverTests.test.ts index 6c0e7aa..115df77 100644 --- a/test/resolvers/SystemResolverTests.test.ts +++ b/src/resolvers/__tests__/SystemResolverTests.test.ts @@ -1,18 +1,18 @@ import { beforeEach, describe, expect, it } from "@jest/globals"; -import { setupTestServerContext, setupTestServerHolder } from "../testHelpers/apolloTestServerHelpers"; +import { setupTestServerContext, setupTestServerHolder } from "../../../test/testHelpers/apolloTestServerHelpers"; import { generateMockRoutes, generateMockShuttles, generateMockStops, generateParkingStructures -} from "../testHelpers/mockDataGenerators"; +} from "../../../test/testHelpers/mockDataGenerators"; import { addMockRouteToRepository, addMockShuttleToRepository, addMockStopToRepository, -} from "../testHelpers/repositorySetupHelpers"; +} from "../../../test/testHelpers/repositorySetupHelpers"; import assert = require("node:assert"); -import { InterchangeSystem } from "../../src/entities/InterchangeSystem"; +import { InterchangeSystem } from "../../entities/InterchangeSystem"; describe("SystemResolvers", () => { const holder = setupTestServerHolder(); diff --git a/test/types/CircularQueue.test.ts b/src/types/__tests__/CircularQueue.test.ts similarity index 99% rename from test/types/CircularQueue.test.ts rename to src/types/__tests__/CircularQueue.test.ts index 748396d..fc4ef42 100644 --- a/test/types/CircularQueue.test.ts +++ b/src/types/__tests__/CircularQueue.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from "@jest/globals"; -import { CircularQueue } from "../../src/types/CircularQueue"; +import { CircularQueue } from "../CircularQueue"; interface TestItem { id: number; diff --git a/test/types/TupleKeyTests.test.ts b/src/types/__tests__/TupleKeyTests.test.ts similarity index 96% rename from test/types/TupleKeyTests.test.ts rename to src/types/__tests__/TupleKeyTests.test.ts index b04c3ec..d791371 100644 --- a/test/types/TupleKeyTests.test.ts +++ b/src/types/__tests__/TupleKeyTests.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from "@jest/globals"; -import { TupleKey } from "../../src/types/TupleKey"; +import { TupleKey } from "../TupleKey"; describe("TupleKey", () => { it("stores a value copy of the original tuple", () => {