HDDS-10033. Improve assertTrue assertions in ozone-manager#5901
Merged
adoroszlai merged 3 commits intoapache:masterfrom Jan 3, 2024
Merged
HDDS-10033. Improve assertTrue assertions in ozone-manager#5901adoroszlai merged 3 commits intoapache:masterfrom
adoroszlai merged 3 commits intoapache:masterfrom
Conversation
adoroszlai
reviewed
Jan 2, 2024
Contributor
adoroszlai
left a comment
adoroszlai
left a comment
There was a problem hiding this comment.
Thanks @wzhallright for working on this. Mostly looks good. There is one failure, and some possibilities for improvement.
Comment on lines
+637
to
+638
| assertThat(logCapturer.getOutput()).contains( | ||
| "for snapshot " + first.getName() + " already exists."); |
Contributor
There was a problem hiding this comment.
This one was assertFalse:
Suggested change
| assertThat(logCapturer.getOutput()).contains( | |
| "for snapshot " + first.getName() + " already exists."); | |
| assertThat(logCapturer.getOutput()).doesNotContain( | |
| "for snapshot " + first.getName() + " already exists."); |
Comment on lines
+518
to
+520
| assertThat(newBlockLocation.getPipeline().getNodes()).contains(dnFour); | ||
| assertThat(newBlockLocation.getPipeline().getNodes()).contains(dnFive); | ||
| assertThat(newBlockLocation.getPipeline().getNodes()).contains(dnSix); |
Contributor
There was a problem hiding this comment.
nit: we can check multiple items in a single call
Suggested change
| assertThat(newBlockLocation.getPipeline().getNodes()).contains(dnFour); | |
| assertThat(newBlockLocation.getPipeline().getNodes()).contains(dnFive); | |
| assertThat(newBlockLocation.getPipeline().getNodes()).contains(dnSix); | |
| assertThat(newBlockLocation.getPipeline().getNodes()) | |
| .contains(dnFour, dnFive, dnSix); |
| cmdtype + " is not categorized in OmUtils#isReadyOnly"); | ||
| assertThat(logCapturer.getOutput()) | ||
| .withFailMessage(cmdtype + " is not categorized in OmUtils#isReadyOnly") | ||
| .doesNotContain("CmdType " + cmdtype + " is not " + "categorized as readOnly or not."); |
Contributor
There was a problem hiding this comment.
nit:
Suggested change
| .doesNotContain("CmdType " + cmdtype + " is not " + "categorized as readOnly or not."); | |
| .doesNotContain("CmdType " + cmdtype + " is not categorized as readOnly or not."); |
Comment on lines
810
to
811
| assertInstanceOf(OMException.class, ex); | ||
| OMException omException = (OMException) ex; |
Contributor
There was a problem hiding this comment.
nit: cast can be removed
Suggested change
| assertInstanceOf(OMException.class, ex); | |
| OMException omException = (OMException) ex; | |
| OMException omException = assertInstanceOf(OMException.class, ex); |
Comment on lines
286
to
288
| assertInstanceOf(S3RevokeSecretResponse.class, omRevokeResponse); | ||
| S3RevokeSecretResponse s3RevokeSecretResponse = | ||
| (S3RevokeSecretResponse) omRevokeResponse; |
Contributor
There was a problem hiding this comment.
nit: cast can be removed
Suggested change
| assertInstanceOf(S3RevokeSecretResponse.class, omRevokeResponse); | |
| S3RevokeSecretResponse s3RevokeSecretResponse = | |
| (S3RevokeSecretResponse) omRevokeResponse; | |
| S3RevokeSecretResponse s3RevokeSecretResponse = | |
| assertInstanceOf(S3RevokeSecretResponse.class, omRevokeResponse); |
(Also in other test cases in this class.)
| assertTrue(jobList.contains(diffJob)); | ||
| assertThat(jobList).contains(diffJob); | ||
| } else { | ||
| assertTrue(jobList.isEmpty()); |
Contributor
There was a problem hiding this comment.
nit: this can be replaced, too. This way test failure shows list contents if it is found not empty.
Suggested change
| assertTrue(jobList.isEmpty()); | |
| assertThat(jobList).isEmpty(); |
Contributor
Author
|
@adoroszlai Thanks for your review. Comments have been fixed, please check. |
adoroszlai
approved these changes
Jan 2, 2024
Contributor
adoroszlai
left a comment
adoroszlai
left a comment
There was a problem hiding this comment.
Thanks @wzhallright for updating the patch.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
What changes were proposed in this pull request?
Improve assertTrue/assertFalse assertions in hadoop-ozone/ozone-manager
(see parent task HDDS-9951 for details)
What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/HDDS-10033
CI
https://github.com/wzhallright/ozone/actions/runs/7382711143