diff --git a/test/loaders/ApiBasedRepositoryLoaderTests.test.ts b/test/loaders/ApiBasedRepositoryLoaderTests.test.ts index 691667e..87cb896 100644 --- a/test/loaders/ApiBasedRepositoryLoaderTests.test.ts +++ b/test/loaders/ApiBasedRepositoryLoaderTests.test.ts @@ -7,15 +7,7 @@ import { fetchRouteDataSuccessfulResponse } from "../jsonSnapshots/fetchRouteDat import { fetchStopAndPolylineDataSuccessfulResponse } from "../jsonSnapshots/fetchStopAndPolylineData/fetchStopAndPolylineDataSuccessfulResponse"; -import { - generateMockEtas, - generateMockOrderedStops, - generateMockRoutes, - generateMockShuttles, - generateMockStops, - generateMockSystems -} from "../generators"; -import { IStop } from "../../src/entities/entities"; +import { generateMockRoutes, generateMockShuttles, generateMockStops, generateMockSystems } from "../testHelpers/mockDataGenerators"; import { fetchShuttleDataSuccessfulResponse } from "../jsonSnapshots/fetchShuttleData/fetchShuttleDataSuccessfulResponse"; diff --git a/test/repositories/UnoptimizedInMemoryRepositoryTests.test.ts b/test/repositories/UnoptimizedInMemoryRepositoryTests.test.ts index 906894b..f130ba5 100644 --- a/test/repositories/UnoptimizedInMemoryRepositoryTests.test.ts +++ b/test/repositories/UnoptimizedInMemoryRepositoryTests.test.ts @@ -7,7 +7,7 @@ import { generateMockShuttles, generateMockStops, generateMockSystems -} from "../generators"; +} from "../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/OrderedStopResolverTests.test.ts b/test/resolvers/OrderedStopResolverTests.test.ts index b3bad4b..11c46e4 100644 --- a/test/resolvers/OrderedStopResolverTests.test.ts +++ b/test/resolvers/OrderedStopResolverTests.test.ts @@ -1,7 +1,7 @@ import { beforeEach, describe, expect, it } from "@jest/globals"; import { setupTestServerContext } from "../testHelpers/apolloTestServerHelpers"; import { IRoute, IStop, ISystem } from "../../src/entities/entities"; -import { generateMockOrderedStops, generateMockStops } from "../generators"; +import { generateMockOrderedStops, generateMockStops } from "../testHelpers/mockDataGenerators"; import { addMockRouteToRepository, addMockSystemToRepository } from "../testHelpers/repositorySetupHelpers"; import assert = require("node:assert"); diff --git a/test/resolvers/QueryResolverTests.test.ts b/test/resolvers/QueryResolverTests.test.ts index 2db16be..73f8e83 100644 --- a/test/resolvers/QueryResolverTests.test.ts +++ b/test/resolvers/QueryResolverTests.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from "@jest/globals"; -import { generateMockSystems } from "../generators"; +import { generateMockSystems } from "../testHelpers/mockDataGenerators"; import { setupTestServerContext } from "../testHelpers/apolloTestServerHelpers"; import assert = require("node:assert"); diff --git a/test/resolvers/RouteResolverTests.test.ts b/test/resolvers/RouteResolverTests.test.ts index c4344ad..ba5b403 100644 --- a/test/resolvers/RouteResolverTests.test.ts +++ b/test/resolvers/RouteResolverTests.test.ts @@ -5,7 +5,7 @@ import { addMockStopToRepository, addMockSystemToRepository } from "../testHelpers/repositorySetupHelpers"; -import { generateMockOrderedStops, generateMockShuttles } from "../generators"; +import { generateMockOrderedStops, generateMockShuttles } from "../testHelpers/mockDataGenerators"; import { IRoute, IStop, ISystem } from "../../src/entities/entities"; import assert = require("node:assert"); diff --git a/test/resolvers/ShuttleResolverTests.test.ts b/test/resolvers/ShuttleResolverTests.test.ts index ecc6b71..0811c3b 100644 --- a/test/resolvers/ShuttleResolverTests.test.ts +++ b/test/resolvers/ShuttleResolverTests.test.ts @@ -1,5 +1,5 @@ import { beforeEach, describe, expect, it } from "@jest/globals"; -import { generateMockEtas, generateMockRoutes } from "../generators"; +import { generateMockEtas, generateMockRoutes } from "../testHelpers/mockDataGenerators"; import { IShuttle, ISystem } from "../../src/entities/entities"; import { setupTestServerContext } from "../testHelpers/apolloTestServerHelpers"; import { addMockShuttleToRepository, addMockSystemToRepository } from "../testHelpers/repositorySetupHelpers"; diff --git a/test/resolvers/StopResolverTests.test.ts b/test/resolvers/StopResolverTests.test.ts index 15a5a3d..2a044b1 100644 --- a/test/resolvers/StopResolverTests.test.ts +++ b/test/resolvers/StopResolverTests.test.ts @@ -1,6 +1,6 @@ import { beforeEach, describe, expect, it } from "@jest/globals"; import { setupTestServerContext } from "../testHelpers/apolloTestServerHelpers"; -import { generateMockEtas, generateMockOrderedStops } from "../generators"; +import { generateMockEtas, generateMockOrderedStops } from "../testHelpers/mockDataGenerators"; import { IStop, ISystem } from "../../src/entities/entities"; import { addMockStopToRepository, addMockSystemToRepository } from "../testHelpers/repositorySetupHelpers"; import assert = require("node:assert"); diff --git a/test/resolvers/SystemResolverTests.test.ts b/test/resolvers/SystemResolverTests.test.ts index c5a1fad..7020075 100644 --- a/test/resolvers/SystemResolverTests.test.ts +++ b/test/resolvers/SystemResolverTests.test.ts @@ -1,6 +1,6 @@ import { beforeEach, describe, expect, it } from "@jest/globals"; import { setupTestServerContext } from "../testHelpers/apolloTestServerHelpers"; -import { generateMockRoutes, generateMockShuttles, generateMockStops } from "../generators"; +import { generateMockRoutes, generateMockShuttles, generateMockStops } from "../testHelpers/mockDataGenerators"; import { addMockRouteToRepository, addMockShuttleToRepository, diff --git a/test/generators.ts b/test/testHelpers/mockDataGenerators.ts similarity index 98% rename from test/generators.ts rename to test/testHelpers/mockDataGenerators.ts index eac524a..e284c93 100644 --- a/test/generators.ts +++ b/test/testHelpers/mockDataGenerators.ts @@ -1,4 +1,4 @@ -import { IEta, IOrderedStop, IRoute, IShuttle, IStop, ISystem } from "../src/entities/entities"; +import { IEta, IOrderedStop, IRoute, IShuttle, IStop, ISystem } from "../../src/entities/entities"; // Use a single set of generators in case any of the // interfaces change in the future diff --git a/test/testHelpers/repositorySetupHelpers.ts b/test/testHelpers/repositorySetupHelpers.ts index 60350c5..d9e48e3 100644 --- a/test/testHelpers/repositorySetupHelpers.ts +++ b/test/testHelpers/repositorySetupHelpers.ts @@ -5,7 +5,7 @@ import { generateMockShuttles, generateMockStops, generateMockSystems -} from "../generators"; +} from "./mockDataGenerators"; export async function addMockSystemToRepository(repository: UnoptimizedInMemoryRepository) { const mockSystems = generateMockSystems();