GH-70: Move from hamcrest to assertj in flight-sql
#772
+150
−162
Conversation
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
rtadepalli
requested review from
lidavidm,
laurentgo,
wgtmac and
jbonofre
as code owners
This comment has been minimized.
This comment has been minimized.
rtadepalli
commented
May 26, 2025
| containsString("SQL"), // pk_key_name | ||
| is("3"), // update_rule | ||
| is("3")); // delete_rule | ||
| new HamcrestCondition<>(nullValue(String.class)), // pk_catalog_name |
There was a problem hiding this comment.
Not particularly certain how to get rid of Hamcrest entirely here. I was aware of HamcrestCondition so using that, but open to suggestions if anyone knows how this list-based matching can be accomplished solely using assertj.
There was a problem hiding this comment.
Entirely overlooked that assertj provides lambda based conditions. Changed. Thanks.
|
I've formatted my changes using |
lidavidm
reviewed
May 27, 2025
| @@ -247,16 +247,15 @@ private static List<List<String>> getNonConformingResultsForGetSqlInfo( | |||
| @Test | |||
| public void testGetTablesSchema() { | |||
| final FlightInfo info = sqlClient.getTables(null, null, null, null, true); | |||
| MatcherAssert.assertThat( | |||
| info.getSchemaOptional(), is(Optional.of(FlightSqlProducer.Schemas.GET_TABLES_SCHEMA))); | |||
| Assertions.assertThat(info.getSchemaOptional()) | |||
There was a problem hiding this comment.
nit, but IMO it's OK to statically import assertThat.
| containsString("SQL"), // pk_key_name | ||
| is("3"), // update_rule | ||
| is("3")); // delete_rule | ||
| new HamcrestCondition<>(nullValue(String.class)), // pk_catalog_name |
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.
What's Changed
Series of PRs to consolidate on using
assertjin tests as part of #70.