-
Notifications
You must be signed in to change notification settings - Fork 46
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
core, editoast: return conflict requirements #8758
Conversation
9193c19
to
bb6ee07
Compare
bb6ee07
to
c8b9439
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, I leave you in the expert hands of core maintainers for your questions.
core/src/main/kotlin/fr/sncf/osrd/api/api_v2/conflicts/ConflictDetectionResponse.kt
Outdated
Show resolved
Hide resolved
core/src/main/kotlin/fr/sncf/osrd/api/api_v2/conflicts/ConflictDetectionResponse.kt
Outdated
Show resolved
Hide resolved
c8b9439
to
0e32823
Compare
core/src/main/java/fr/sncf/osrd/api/ConflictDetectionEndpoint.java
Outdated
Show resolved
Hide resolved
a8228b7
to
5208c44
Compare
095b8a3
to
9f42af5
Compare
Is this the kind of test that you had in mind? I just kind of abused the first test here, but could easily move it to another test (maybe one with multiple conflicts? which one? I also wouldn't want to hardcode tons of expected output fields...). |
9f42af5
to
d941c58
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Apart from the fix needed on the unit test, this looks good. Thanks :)
core/src/test/java/fr/sncf/osrd/standalone_sim/ConflictDetectionTest.java
Outdated
Show resolved
Hide resolved
d941c58
to
018d1fa
Compare
Closes: #8680 Signed-off-by: Simon Ser <[email protected]>
018d1fa
to
97091e0
Compare
Closes: #8680
There are two TODOs left which are open questions for reviewers.