Fix ORCA cross-agency fares #5426
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
this change alters the test so that they test the full integration including the “calculateFares” method rather than just the “populateFares” method
Codecov ReportAll modified lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## dev-2.x #5426 +/- ##
==========================================
Coverage 66.57% 66.58%
- Complexity 15310 15317 +7
==========================================
Files 1792 1792
Lines 69522 69538 +16
Branches 7330 7333 +3
==========================================
+ Hits 46284 46299 +15
Misses 20756 20756
- Partials 2482 2483 +1
☔ View full report in Codecov by Sentry. |
leonardehrenfried
added
Bug
Sandbox
IBI
leonardehrenfried
changed the title
| assertEquals(expectedPrice, fare.getFare(fareType)); | ||
| var itinerary = new Itinerary(legs); | ||
| var itineraryFares = orcaFareService.calculateFares(itinerary); | ||
| assertEquals(expectedPrice, itineraryFares.getFare(fareType)); |
There was a problem hiding this comment.
In a future round of development we probably want to be more specific in our assertions and making sure that the fares are correctly assigned to the individual legs.
There was a problem hiding this comment.
There is a test that checks the leg information is correct, but you're right that eventually all the tests should be checking each leg.
leonardehrenfried
force-pushed
the
fix-orca-cross-agency-fares
branch
from
790cf3f to
1e09af2
Compare
optionsome
approved these changes
Oct 13, 2023
leonardehrenfried
approved these changes
Oct 13, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
The recent changes to fares which grouped legs by their feed ID broke the ORCA fare module's ability to calculate transfers between different agencies. This PR changes the ORCA fare module tests to also test the complexity contained in the super class. Then, it moves the feed grouping logic into an overrideable method which the ORCA module overrides to group all the legs together.
Unit tests
The tests are updated and improved to ensure that this bug would be caught in the future, and then they are used to correct the bug. The results have been double checked by testing some trip plans.