Upgrade junit to 4.13 #51787
Closed
Upgrade junit to 4.13 #51787
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
|
Pinging @elastic/es-core-infra (:Core/Infra/Build) |
|
@elasticmachine ok to test |
|
@racevedoo CI has reported test failes, and there are merge conflicts now too. |
|
@elasticmachine update branch |
|
merge conflict between base and head |
|
There are 2 failures that need to be investigated/worked on:
|
jaymode
added a commit
to jaymode/elasticsearch
that referenced
this pull request
Feb 20, 2020
This commit renames ElasticsearchAssertions#assertThrows to assertThrown to avoid a naming clash with JUnit 4.13+ and static imports of these methods. Additionally, these methods have been updated to make use of expectThrows internally to avoid duplicating the logic there. Relates elastic#51787
|
We discussed this PR in the core/infra weekly and while we appreciate the attempt, we don't think it is worth merging at this time. The main reason is that we would like to stay in sync with RandomizedRunner and Lucene as to which junit version we are using. However, we would like to be prepared for that eventuality, so Jay has opened a PR (#52582) to rename the offending method name collisions. |
jaymode
added a commit
that referenced
this pull request
Feb 21, 2020
This commit renames ElasticsearchAssertions#assertThrows to assertRequestBuilderThrows and assertFutureThrows to avoid a naming clash with JUnit 4.13+ and static imports of these methods. Additionally, these methods have been updated to make use of expectThrows internally to avoid duplicating the logic there. Relates #51787
jaymode
added a commit
to jaymode/elasticsearch
that referenced
this pull request
Feb 21, 2020
This commit renames ElasticsearchAssertions#assertThrows to assertRequestBuilderThrows and assertFutureThrows to avoid a naming clash with JUnit 4.13+ and static imports of these methods. Additionally, these methods have been updated to make use of expectThrows internally to avoid duplicating the logic there. Relates elastic#51787
jaymode
added a commit
that referenced
this pull request
Feb 21, 2020
This commit renames ElasticsearchAssertions#assertThrows to assertRequestBuilderThrows and assertFutureThrows to avoid a naming clash with JUnit 4.13+ and static imports of these methods. Additionally, these methods have been updated to make use of expectThrows internally to avoid duplicating the logic there. Relates #51787 Backport of #52582
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.
There should be no breaking changes. Release notes at: https://github.com/junit-team/junit4/blob/master/doc/ReleaseNotes4.13.md