core: add check on different constraints #2548
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
Codecov Report
@@ Coverage Diff @@
## dev #2548 +/- ##
=============================================
+ Coverage 37.61% 80.09% +42.48%
- Complexity 1661 1666 +5
=============================================
Files 551 237 -314
Lines 16808 7410 -9398
Branches 2355 942 -1413
=============================================
- Hits 6322 5935 -387
+ Misses 10116 1136 -8980
+ Partials 370 339 -31
Flags with carried forward coverage won't be shown. Click here to find out more. Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
Khoyo
requested changes
Dec 9, 2022
core/src/main/java/fr/sncf/osrd/api/pathfinding/PathfindingRoutesEndpoint.java
Outdated
Show resolved
Hide resolved
eckter
reviewed
Dec 9, 2022
core/src/main/java/fr/sncf/osrd/api/pathfinding/PathfindingRoutesEndpoint.java
Outdated
Show resolved
Hide resolved
core/src/main/java/fr/sncf/osrd/api/pathfinding/PathfindingRoutesEndpoint.java
Outdated
Show resolved
Hide resolved
core/src/main/java/fr/sncf/osrd/api/pathfinding/PathfindingRoutesEndpoint.java
Outdated
Show resolved
Hide resolved
core/src/main/java/fr/sncf/osrd/api/pathfinding/PathfindingRoutesEndpoint.java
Outdated
Show resolved
Hide resolved
…nto mji/pathfinding-error-message # Conflicts: # core/src/main/java/fr/sncf/osrd/api/pathfinding/PathfindingRoutesEndpoint.java
eckter
reviewed
Dec 13, 2022
There was a problem hiding this comment.
Apart from the weird behavior in assertThrows, this looks good to me.
You should clean up the git history, the "fix" commits should be merged with the commit they fix. A simple way to do this is a git rebase -i dev, this opens a text editor and you can replace pick with fixup for fixup commits. This branch shouldn't have more than one or two commits. Then you need to git push --force-with-lease
anisometropie
changed the title
eckter
approved these changes
Dec 14, 2022
Khoyo
approved these changes
Dec 14, 2022
Akctarus
pushed a commit
that referenced
this pull request
Dec 19, 2022
* add check on different constraints * fix checkStyle * fix additional checkStyle * fix additional checkStyle * add electrification & gauge throw tests * correct behaviour when pathfinding is null * correct behaviour when pathfinding is null * fix compilation errors * fix checkstyle errors * correct error origin detection * delete duplicated test + correct checkstyle errors * formatting * remove unecessary line * Handle generic pathfinding error as well * indentation * simplify by making the constraints hashmap static * make constraints private * missing javadoc * String format * Better function flow (return early and the big error handling block at the end) * simplify logic * change assertThrows to assertEquels * Fix generic case * fix style Co-authored-by: Valentin Chanas <[email protected]>
alexandredamiron
pushed a commit
that referenced
this pull request
Jan 17, 2023
* add check on different constraints * fix checkStyle * fix additional checkStyle * fix additional checkStyle * add electrification & gauge throw tests * correct behaviour when pathfinding is null * correct behaviour when pathfinding is null * fix compilation errors * fix checkstyle errors * correct error origin detection * delete duplicated test + correct checkstyle errors * formatting * remove unecessary line * Handle generic pathfinding error as well * indentation * simplify by making the constraints hashmap static * make constraints private * missing javadoc * String format * Better function flow (return early and the big error handling block at the end) * simplify logic * change assertThrows to assertEquels * Fix generic case * fix style Co-authored-by: Valentin Chanas <[email protected]>
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.
closes #2486