Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix TimetableSnapshot merge conflict #5972

Conversation

vpaturet
Copy link
Contributor

@vpaturet vpaturet commented Jul 16, 2024

Summary

This PR fixes a merge conflict that occured when removing a setter method in TimetableSnapshot in one PR that was used in a unit test in another PR.
This PR refactors the unit test to create the test context method without using the setter method.

Issue

No

Unit tests

Fixed unit test

Documentation

No

@vpaturet vpaturet self-assigned this Jul 16, 2024
@vpaturet vpaturet added Bug Real-Time Update The issue/PR is related to RealTime updates Skip Changelog labels Jul 16, 2024
@vpaturet vpaturet marked this pull request as ready for review July 16, 2024 12:56
@vpaturet vpaturet requested a review from a team as a code owner July 16, 2024 12:56
Copy link

codecov bot commented Jul 16, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 69.63%. Comparing base (8de9f88) to head (e0f60f5).
Report is 5 commits behind head on dev-2.x.

Additional details and impacted files
@@              Coverage Diff              @@
##             dev-2.x    #5972      +/-   ##
=============================================
- Coverage      69.63%   69.63%   -0.01%     
  Complexity     17129    17129              
=============================================
  Files           1937     1937              
  Lines          73742    73741       -1     
  Branches        7546     7546              
=============================================
- Hits           51351    51350       -1     
- Misses         19754    19755       +1     
+ Partials        2637     2636       -1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@vpaturet
Copy link
Contributor Author

Side note: the test is marginally better since it goes through the same public API as an updater (at the cost of a more complex test setup)

@leonardehrenfried leonardehrenfried merged commit 499fb93 into opentripplanner:dev-2.x Jul 16, 2024
5 checks passed
@vpaturet vpaturet deleted the fix_timetable_snapshot_merge_conflict branch July 16, 2024 13:13
@t2gran t2gran added this to the 2.6 (next release) milestone Jul 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Real-Time Update The issue/PR is related to RealTime updates Skip Changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants