Skip to content

Commit

Permalink
Fix megre conflict in TransitGroupPriorityServiceTest
Browse files Browse the repository at this point in the history
  • Loading branch information
t2gran committed Jul 23, 2024
1 parent 896805d commit 6764a08
Showing 1 changed file with 12 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,14 @@ void lookupTransitGroupIdByAgency() {

// Verify we get the same result with using the trip, not trip-pattern
assertEquals(EXP_GROUP_ID_BASE, subject.lookupTransitGroupPriorityId(nullTrip));
assertEquals(EXP_GROUP_1, subject.lookupTransitGroupPriorityId(busB2.getTrip(0)));
assertEquals(EXP_GROUP_2, subject.lookupTransitGroupPriorityId(railR3.getTrip(0)));
assertEquals(
EXP_GROUP_1,
subject.lookupTransitGroupPriorityId(busB2.getScheduledTimetable().getTripTimes(0).getTrip())
);
assertEquals(
EXP_GROUP_2,
subject.lookupTransitGroupPriorityId(railR3.getScheduledTimetable().getTripTimes(0).getTrip())
);
}

@Test
Expand All @@ -122,7 +128,10 @@ void lookupTransitPriorityGroupIdByGlobalMode() {

// Verify we get the same result with using the trip, not trip-pattern
assertEquals(EXP_GROUP_ID_BASE, subject.lookupTransitGroupPriorityId(nullTrip));
assertEquals(EXP_GROUP_2, subject.lookupTransitGroupPriorityId(railR1.getTrip(0)));
assertEquals(
EXP_GROUP_2,
subject.lookupTransitGroupPriorityId(railR1.getScheduledTimetable().getTripTimes(0).getTrip())
);
}

private static TestRouteData route(
Expand Down

0 comments on commit 6764a08

Please sign in to comment.