Skip to content

Replace QueryAssert.assertThat with assertJ's assertThat#17982

Merged
findepi merged 4 commits intomasterfrom
findepi/replace-queryassert-assertthat-with-assertj-s-assertthat-82c73e
Jun 21, 2023
Merged

Replace QueryAssert.assertThat with assertJ's assertThat#17982
findepi merged 4 commits intomasterfrom
findepi/replace-queryassert-assertthat-with-assertj-s-assertthat-82c73e

Conversation

@findepi
Copy link
Copy Markdown
Member

@findepi findepi commented Jun 20, 2023

Move off deprecated QueryAssert.assertThat to Assertions.assertThat.

Fixes #17690

@findepi findepi added test no-release-notes This pull request does not require release notes entry labels Jun 20, 2023
@findepi findepi requested a review from ebyhr June 20, 2023 20:59
@cla-bot cla-bot bot added the cla-signed label Jun 20, 2023
Copy link
Copy Markdown
Member

@ebyhr ebyhr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good except for CI failure:

Error:  Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.11.0:compile (default-compile) on project trino-product-tests: Compilation failure: Compilation failure: 
Error:  /home/runner/work/trino/trino/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveMerge.java:[377,17] reference to assertThat is ambiguous
Error:    both method <T>assertThat(org.assertj.core.api.AssertProvider<T>) in org.assertj.core.api.Assertions and method <T>assertThat(T) in org.assertj.core.api.Assertions match
Error:  /home/runner/work/trino/trino/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveMerge.java:[379,25] cannot find symbol
Error:    symbol:   method failsWithMessage(java.lang.String)
Error:    location: class io.trino.tempto.query.QueryResult
Error:  /home/runner/work/trino/trino/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveMerge.java:[665,13] reference to assertThat is ambiguous
Error:    both method <T>assertThat(org.assertj.core.api.AssertProvider<T>) in org.assertj.core.api.Assertions and method <T>assertThat(T) in org.assertj.core.api.Assertions match
Error:  /home/runner/work/trino/trino/testing/trino-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveMerge.java:[669,21] cannot find symbol
Error:    symbol:   method failsWithMessage(java.lang.String)
Error:    location: class io.trino.tempto.query.QueryResult

@findepi findepi force-pushed the findepi/replace-queryassert-assertthat-with-assertj-s-assertthat-82c73e branch from 4365b14 to 9c48f9f Compare June 21, 2023 09:38
findepi added 3 commits June 21, 2023 14:46
`assertQueryFailure` should be used instead, per deprecation note.
Move off deprecated `QueryAssert.assertThat` to `Assertions.assertThat`.
@findepi findepi force-pushed the findepi/replace-queryassert-assertthat-with-assertj-s-assertthat-82c73e branch from 9c48f9f to e9391c6 Compare June 21, 2023 12:47
@findepi findepi merged commit 9470c2d into master Jun 21, 2023
@findepi findepi deleted the findepi/replace-queryassert-assertthat-with-assertj-s-assertthat-82c73e branch June 21, 2023 20:32
@github-actions github-actions bot added this to the 420 milestone Jun 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed no-release-notes This pull request does not require release notes entry test

Development

Successfully merging this pull request may close these issues.

Migrate deprecated QueryAssert.assertThat method

3 participants