Skip to content

Commit 135cdfb

Browse files
EmmaSimonEmmaSimon
committed
test: Fix broken tests
1 parent ce9f81a commit 135cdfb

File tree

2 files changed

+107
-18
lines changed

2 files changed

+107
-18
lines changed

‎androidApp/src/androidTest/java/com/mbta/tid/mbta_app/android/map/HomeMapViewTests.kt‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import com.mbta.tid.mbta_app.repositories.MockGlobalRepository
2525
import com.mbta.tid.mbta_app.repositories.MockRailRouteShapeRepository
2626
import com.mbta.tid.mbta_app.repositories.MockSentryRepository
2727
import com.mbta.tid.mbta_app.repositories.MockStopRepository
28+
import com.mbta.tid.mbta_app.repositories.MockTripRepository
2829
import com.mbta.tid.mbta_app.routes.SheetRoutes
2930
import com.mbta.tid.mbta_app.utils.EasternTimeInstant
3031
import com.mbta.tid.mbta_app.utils.NavigationCallbacks
@@ -61,6 +62,7 @@ class HomeMapViewTests {
6162
MockRailRouteShapeRepository(),
6263
MockSentryRepository(),
6364
MockStopRepository(),
65+
MockTripRepository(),
6466
Clock.System,
6567
Dispatchers.Default,
6668
Dispatchers.IO,
@@ -101,6 +103,7 @@ class HomeMapViewTests {
101103
MockRailRouteShapeRepository(),
102104
MockSentryRepository(),
103105
MockStopRepository(),
106+
MockTripRepository(),
104107
Clock.System,
105108
Dispatchers.Default,
106109
Dispatchers.IO,
@@ -147,6 +150,7 @@ class HomeMapViewTests {
147150
MockRailRouteShapeRepository(),
148151
MockSentryRepository(),
149152
MockStopRepository(),
153+
MockTripRepository(),
150154
Clock.System,
151155
Dispatchers.Default,
152156
Dispatchers.IO,
@@ -193,6 +197,7 @@ class HomeMapViewTests {
193197
MockRailRouteShapeRepository(),
194198
MockSentryRepository(),
195199
MockStopRepository(),
200+
MockTripRepository(),
196201
Clock.System,
197202
Dispatchers.Default,
198203
Dispatchers.IO,
@@ -231,6 +236,7 @@ class HomeMapViewTests {
231236
MockRailRouteShapeRepository(),
232237
MockSentryRepository(),
233238
MockStopRepository(),
239+
MockTripRepository(),
234240
Clock.System,
235241
Dispatchers.Default,
236242
Dispatchers.IO,
@@ -270,6 +276,7 @@ class HomeMapViewTests {
270276
MockRailRouteShapeRepository(),
271277
MockSentryRepository(),
272278
MockStopRepository(),
279+
MockTripRepository(),
273280
Clock.System,
274281
Dispatchers.Default,
275282
Dispatchers.IO,
@@ -309,6 +316,7 @@ class HomeMapViewTests {
309316
MockRailRouteShapeRepository(),
310317
MockSentryRepository(),
311318
MockStopRepository(),
319+
MockTripRepository(),
312320
Clock.System,
313321
Dispatchers.Default,
314322
Dispatchers.IO,
@@ -401,6 +409,7 @@ class HomeMapViewTests {
401409
MockRailRouteShapeRepository(),
402410
MockSentryRepository(),
403411
MockStopRepository(),
412+
MockTripRepository(),
404413
Clock.System,
405414
Dispatchers.Default,
406415
Dispatchers.IO,
@@ -444,6 +453,7 @@ class HomeMapViewTests {
444453
MockRailRouteShapeRepository(),
445454
MockSentryRepository(),
446455
MockStopRepository(),
456+
MockTripRepository(),
447457
Clock.System,
448458
Dispatchers.Default,
449459
Dispatchers.IO,
@@ -484,6 +494,7 @@ class HomeMapViewTests {
484494
MockRailRouteShapeRepository(),
485495
MockSentryRepository(),
486496
MockStopRepository(),
497+
MockTripRepository(),
487498
Clock.System,
488499
Dispatchers.Default,
489500
Dispatchers.IO,

‎shared/src/commonTest/kotlin/com/mbta/tid/mbta_app/repositories/TripRepositoryTest.kt‎

Lines changed: 96 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ package com.mbta.tid.mbta_app.repositories
22

33
import com.mbta.tid.mbta_app.AppVariant
44
import com.mbta.tid.mbta_app.model.Route
5+
import com.mbta.tid.mbta_app.model.RoutePatternKey
6+
import com.mbta.tid.mbta_app.model.RouteSegment
7+
import com.mbta.tid.mbta_app.model.SegmentedRouteShape
58
import com.mbta.tid.mbta_app.model.Shape
6-
import com.mbta.tid.mbta_app.model.TripShape
79
import com.mbta.tid.mbta_app.model.response.ApiResult
8-
import com.mbta.tid.mbta_app.model.response.ShapeWithStops
10+
import com.mbta.tid.mbta_app.model.response.MapFriendlyRouteResponse
911
import com.mbta.tid.mbta_app.model.response.TripSchedulesResponse
1012
import com.mbta.tid.mbta_app.network.MobileBackendClient
1113
import io.ktor.client.engine.mock.MockEngine
@@ -55,14 +57,42 @@ class TripRepositoryTest : KoinTest {
5557
respond(
5658
"""
5759
{
58-
"shape_with_stops": {
59-
"shape": {"id": "shape_id", "polyline": "shape_polyline"},
60-
"stop_ids": ["1", "2", "3"],
61-
"route_id": "66",
62-
"route_pattern_id": "66_rp",
63-
"direction_id": 1
60+
"map_friendly_route_shapes": [
61+
{
62+
"route_id": "66",
63+
"route_shapes": [
64+
{
65+
"direction_id": 1,
66+
"shape": {
67+
"id": "shape_id",
68+
"polyline": "shape_polyline"
69+
},
70+
"source_route_pattern_id": "66_rp",
71+
"source_route_id": "66",
72+
"route_segments": [
73+
{
74+
"id": "1-3",
75+
"stop_ids": ["1","2","3"],
76+
"source_route_pattern_id": "66_rp",
77+
"source_route_id": "66",
78+
"other_patterns_by_stop_id": {
79+
"1": [
80+
{ "route_id": "66", "route_pattern_id": "66_rp_2" }
81+
],
82+
"2": [
83+
{ "route_id": "66", "route_pattern_id": "66_rp_2" }
84+
],
85+
"3": [
86+
{ "route_id": "66", "route_pattern_id": "66_rp_2" }
87+
]
88+
}
89+
}
90+
]
91+
}
92+
]
93+
}
94+
]
6495
}
65-
}
6696
"""
6797
.trimIndent(),
6898
headers = headersOf(HttpHeaders.ContentType, "application/json"),
@@ -75,17 +105,62 @@ class TripRepositoryTest : KoinTest {
75105

76106
runBlocking {
77107
val response = TripRepository().getTripShape(tripId = "12345")
108+
val routeId = Route.Id("66")
78109

79110
assertEquals(
80111
ApiResult.Ok(
81-
TripShape(
82-
shapeWithStops =
83-
ShapeWithStops(
84-
directionId = 1,
85-
routeId = Route.Id("66"),
86-
routePatternId = "66_rp",
87-
shape = Shape(id = "shape_id", polyline = "shape_polyline"),
88-
stopIds = listOf("1", "2", "3"),
112+
MapFriendlyRouteResponse(
113+
routesWithSegmentedShapes =
114+
listOf(
115+
MapFriendlyRouteResponse.RouteWithSegmentedShapes(
116+
routeId = routeId,
117+
segmentedShapes =
118+
listOf(
119+
SegmentedRouteShape(
120+
sourceRoutePatternId = "66_rp",
121+
sourceRouteId = routeId,
122+
directionId = 1,
123+
routeSegments =
124+
listOf(
125+
RouteSegment(
126+
id = "1-3",
127+
sourceRoutePatternId = "66_rp",
128+
sourceRouteId = routeId,
129+
stopIds = listOf("1", "2", "3"),
130+
otherPatternsByStopId =
131+
mapOf(
132+
"1" to
133+
listOf(
134+
RoutePatternKey(
135+
routeId,
136+
"66_rp_2",
137+
)
138+
),
139+
"2" to
140+
listOf(
141+
RoutePatternKey(
142+
routeId,
143+
"66_rp_2",
144+
)
145+
),
146+
"3" to
147+
listOf(
148+
RoutePatternKey(
149+
routeId,
150+
"66_rp_2",
151+
)
152+
),
153+
),
154+
)
155+
),
156+
shape =
157+
Shape(
158+
id = "shape_id",
159+
polyline = "shape_polyline",
160+
),
161+
)
162+
),
163+
)
89164
)
90165
)
91166
),
@@ -147,7 +222,10 @@ class TripRepositoryTest : KoinTest {
147222
val apiResult = TripRepository().getTripShape(tripId = "12345")
148223
assertIs<ApiResult.Error<*>>(apiResult)
149224

150-
assertContains(apiResult.message, "Field 'shape_with_stops' is required for type")
225+
assertContains(
226+
apiResult.message,
227+
"Field 'map_friendly_route_shapes' is required for type",
228+
)
151229
}
152230

153231
stopKoin()

0 commit comments

Comments
 (0)