HADOOP-19425. [JDK17] Upgrade JUnit from 4 to 5 in hadoop-azure Part1. #7369
+1,239
−1,235
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
slfan1989
changed the title
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
slfan1989
force-pushed
the
HADOOP-19425
branch
from
7f6734c to
b52214a
Compare
|
I am trying to modify the code of hadoop-azure, this is part 1. I am syncing the improvements so that it can be better reviewed: 1. TestNameIn JUnit 5, the Here is an example:
2. TimeoutIn JUnit 5, Here is an example:
3. Assume.assumeNotNull → Assumptions.assumeTrueIn JUnit 5, there is no Here is an example: 4. ExpectedException → assertThrowsIn JUnit 5, the 5. @ignore → @disabledIn JUnit 5, 6. Method Order: @FixMethodOrder → @TestMethodOrderIn JUnit 5, |
|
💔 -1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
@cnauroth @steveloughran @anujmodi2021 Can you help review this PR? Thank you very much! |
|
🎊 +1 overall
This message was automatically generated. |
cnauroth
reviewed
Feb 9, 2025
There was a problem hiding this comment.
Hi @slfan1989 . This looks good to me overall. I entered one question.
Are you able to run these tests against Azure to make sure they're all working? Unfortunately, I can't help with that kind of testing. I can test GCS and S3A (using GCS's S3-compatible XML API), but not the other cloud providers. If you need help with this testing, then you might need to work with someone else.
| @@ -434,10 +431,6 @@ class MatchesPattern extends TypeSafeMatcher<String> { | |||
| } | |||
| } | |||
|
|
|||
| expectedEx.expectMessage(new MatchesPattern( | |||
There was a problem hiding this comment.
Did we lose an expectation here?
There was a problem hiding this comment.
In JUnit 5, org.junit.rules.ExpectedException has been deprecated, and it is recommended to use assertThrows to validate exception throwing, as shown below:
import static org.junit.jupiter.api.Assertions.assertThrows;
@Test
public void shouldThrowException() {
assertThrows(IllegalArgumentException.class, () -> {
someMethodThatThrows();
});
}
The change is primarily in syntax, where assertThrows captures exceptions via lambda expressions, replacing the ExpectedException rule from JUnit 4. However, it does not have any fundamental impact on the logic of unit tests.
I can further improve this unit test to also validate the exception message using a regular expression.
There was a problem hiding this comment.
I have seen the conversions to assertThrows. Those all look good.
Perhaps what I find confusing is that the setupExpectations() method now seems to be a no-op. It seems to define a custom matcher class, but then never use it. Should setupExpectations() be removed, or am I missing something?
There was a problem hiding this comment.
Thank you for your suggestion! I also believe that setupExpectations should be removed. I will continue to improve the code.
@cnauroth Thank you very much for your explanation! I think this change needs to be verified by @steveloughran and @anujmodi2021 together, and I hope it can pass the integration tests. If there are any issues, I will make improvements as needed. |
74 tasks
|
🎊 +1 overall
This message was automatically generated. |
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.
Description of PR
JIRA: HADOOP-19425. Upgrade JUnit from 4 to 5 in hadoop-azure Part1.
How was this patch tested?
Junit Test.
For code changes:
LICENSE,LICENSE-binary,NOTICE-binaryfiles?