Replace Assert.fail usage with AssertJ fluent testing #6029
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
nastra
commented
Oct 21, 2022
| @@ -37,178 +34,110 @@ private CustomCheckedException(String message) { | |||
| @Test | |||
| public void testRunSafely() { | |||
| CustomCheckedException exc = new CustomCheckedException("test"); | |||
| try { | |||
There was a problem hiding this comment.
I have to admit that the original test code was quite difficult to read, so I tried to simplify it to the bare minimum
nastra
force-pushed
the
assert-fail-improvements
branch
from
0ba187a to
ac040a6
Compare
nastra
force-pushed
the
assert-fail-improvements
branch
from
ac040a6 to
a06939c
Compare
rdblue
reviewed
Oct 21, 2022
| "Validation should complain about missing field", | ||
| e.getMessage().contains("Cannot find field 'missing' in struct:")); | ||
| } | ||
| Assertions.assertThatThrownBy(() -> unbound.bind(struct)) |
There was a problem hiding this comment.
Wow, this was so old it predated adding the assertThrows methods!
rdblue
reviewed
Oct 21, 2022
| "test finally suppression", | ||
| finallySuppressed.getMessage()); | ||
| } | ||
| Exception suppressedOne = new Exception("test catch suppression"); |
rdblue
reviewed
Oct 21, 2022
| Assertions.assertThatThrownBy( | ||
| () -> | ||
| glueCatalog.createNamespace( | ||
| Namespace.of("denied_" + UUID.randomUUID().toString().replace("-", "")))) |
There was a problem hiding this comment.
In the future, it would be better to put the namespace in a variable to avoid such awkward auto formatting.
rdblue
reviewed
Oct 21, 2022
|
|
||
| Namespace namespace = Namespace.of("allowed_" + UUID.randomUUID().toString().replace("-", "")); | ||
| try { | ||
| glueCatalog.createNamespace(namespace); | ||
| } catch (GlueException e) { | ||
| LOG.error("fail to create or delete Glue database", e); | ||
| Assert.fail("create namespace should succeed"); |
There was a problem hiding this comment.
Is the idea here that the whole test will fail so we don't need to assert?
rdblue
reviewed
Oct 21, 2022
| Assert.assertEquals(message + ", http code", httpCode, e.getHttpCode()); | ||
| Assert.assertEquals(message + ", error code", errorCode, e.getErrorCode()); | ||
| } | ||
| Assertions.assertThatThrownBy(task::run) |
There was a problem hiding this comment.
This seems more complicated than the original try/catch. Not sure it's worth it.
rdblue
reviewed
Oct 21, 2022
| @@ -94,7 +95,7 @@ public void testWriteOption() throws Exception { | |||
| writer.add(record2); | |||
| } | |||
|
|
|||
| Class clazzFileDump = Class.forName("org.apache.orc.tools.FileDump"); | |||
| Class<?> clazzFileDump = Class.forName("org.apache.orc.tools.FileDump"); | |||
There was a problem hiding this comment.
Thanks for adding these! Never good to have types without parameters.
rdblue
approved these changes
Oct 21, 2022
|
Thanks, @nastra! |
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.
This replaces a bunch of code of the form
There are still a few legit places left that use
Assert.fail()so I didn't create a checkstyle rule to prevent usage