From fe705ed8e39ff6eb5c87ea189539312c0621bd5a Mon Sep 17 00:00:00 2001
From: Brendan Chen <me@bchen.dev>
Date: Tue, 28 Jan 2025 20:35:18 -0800
Subject: [PATCH] add mock shuttle and mock eta methods

---
 test/resolvers/EtaResolverTests.test.ts     | 20 ++++++----------
 test/resolvers/ShuttleResolverTests.test.ts |  9 ++-----
 test/testHelpers/repositorySetupHelpers.ts  | 26 ++++++++++++++++++++-
 3 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/test/resolvers/EtaResolverTests.test.ts b/test/resolvers/EtaResolverTests.test.ts
index 57d6735..d7c4107 100644
--- a/test/resolvers/EtaResolverTests.test.ts
+++ b/test/resolvers/EtaResolverTests.test.ts
@@ -4,7 +4,11 @@ import { UnoptimizedInMemoryRepository } from "../../src/repositories/Unoptimize
 import { setUpTestServer } from "../testHelpers/apolloSetupHelpers";
 import { ServerContext } from "../../src/ServerContext";
 import { IEta, IShuttle, IStop, ISystem } from "../../src/entities/entities";
-import { addMockStopToRepository, addMockSystemToRepository } from "../testHelpers/repositorySetupHelpers";
+import {
+  addMockEtaToRepository, addMockShuttleToRepository,
+  addMockStopToRepository,
+  addMockSystemToRepository
+} from "../testHelpers/repositorySetupHelpers";
 import { generateMockEtas, generateMockShuttles, generateMockStops } from "../generators";
 import assert = require("node:assert");
 
@@ -24,19 +28,9 @@ describe("EtaResolvers", () => {
 
   beforeEach(async () => {
     mockSystem = await addMockSystemToRepository(repository);
-
-    const mockShuttles = generateMockShuttles();
-    mockShuttle = mockShuttles[0];
-    mockShuttle.systemId = mockSystem.id;
-    await repository.addOrUpdateShuttle(mockShuttle);
-
+    mockShuttle = await addMockShuttleToRepository(repository, mockSystem.id);
     mockStop = await addMockStopToRepository(repository, mockSystem.id);
-
-    const etas = generateMockEtas();
-    expectedEta = etas[0];
-    expectedEta.stopId = mockStop.id;
-    expectedEta.shuttleId = mockShuttle.id;
-    await repository.addOrUpdateEta(expectedEta);
+    expectedEta = await addMockEtaToRepository(repository, mockStop.id, mockShuttle.id);
   });
 
   async function getResponseForEtaQuery(query: string) {
diff --git a/test/resolvers/ShuttleResolverTests.test.ts b/test/resolvers/ShuttleResolverTests.test.ts
index 95bd8a5..f2be62d 100644
--- a/test/resolvers/ShuttleResolverTests.test.ts
+++ b/test/resolvers/ShuttleResolverTests.test.ts
@@ -6,7 +6,7 @@ import { generateMockEtas, generateMockRoutes, generateMockShuttles, generateMoc
 import { IShuttle, ISystem } from "../../src/entities/entities";
 import assert = require("node:assert");
 import { setUpTestServer } from "../testHelpers/apolloSetupHelpers";
-import { addMockSystemToRepository } from "../testHelpers/repositorySetupHelpers";
+import { addMockShuttleToRepository, addMockSystemToRepository } from "../testHelpers/repositorySetupHelpers";
 
 
 describe("ShuttleResolvers", () => {
@@ -23,12 +23,7 @@ describe("ShuttleResolvers", () => {
 
   beforeEach(async () => {
     mockSystem = await addMockSystemToRepository(repository);
-
-    const mockShuttles = generateMockShuttles();
-    mockShuttle = mockShuttles[0];
-    mockShuttle.systemId = mockSystem.id;
-    mockShuttle.id = "1";
-    await repository.addOrUpdateShuttle(mockShuttle);
+    mockShuttle = await addMockShuttleToRepository(repository, mockSystem.id);
   });
 
 
diff --git a/test/testHelpers/repositorySetupHelpers.ts b/test/testHelpers/repositorySetupHelpers.ts
index efff0eb..60350c5 100644
--- a/test/testHelpers/repositorySetupHelpers.ts
+++ b/test/testHelpers/repositorySetupHelpers.ts
@@ -1,5 +1,11 @@
 import { UnoptimizedInMemoryRepository } from "../../src/repositories/UnoptimizedInMemoryRepository";
-import { generateMockRoutes, generateMockStops, generateMockSystems } from "../generators";
+import {
+  generateMockEtas,
+  generateMockRoutes,
+  generateMockShuttles,
+  generateMockStops,
+  generateMockSystems
+} from "../generators";
 
 export async function addMockSystemToRepository(repository: UnoptimizedInMemoryRepository) {
   const mockSystems = generateMockSystems();
@@ -28,3 +34,21 @@ export async function addMockStopToRepository(repository: UnoptimizedInMemoryRep
   return mockStop;
 }
 
+export async function addMockShuttleToRepository(repository: UnoptimizedInMemoryRepository, systemId: string) {
+  const mockShuttles = generateMockShuttles();
+  const mockShuttle = mockShuttles[0];
+  mockShuttle.systemId = systemId;
+  await repository.addOrUpdateShuttle(mockShuttle);
+  return mockShuttle;
+}
+
+export async function addMockEtaToRepository(repository: UnoptimizedInMemoryRepository, stopId: string, shuttleId: string) {
+  const etas = generateMockEtas();
+  const expectedEta = etas[0];
+  expectedEta.stopId = stopId;
+  expectedEta.shuttleId = shuttleId;
+  await repository.addOrUpdateEta(expectedEta);
+
+  return expectedEta;
+}
+