Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[chore] Bump AssertJ to 3.19.0, polish tests and isolate tckTest #2706

Merged
merged 5 commits into from
May 19, 2021

Conversation

simonbasle
Copy link
Member

This pr bumps AssertJ to the latest version, which contains some breaking
changes and rewording of error messages.

Additionally, since the bump surfaces an issue with testNG, we isolate tests
that need testNG (the TCK test) in their own testSet.

@simonbasle simonbasle requested a review from a team as a code owner May 19, 2021 11:13
@simonbasle simonbasle added this to the 3.3.18.RELEASE milestone May 19, 2021
@simonbasle simonbasle added the type/chores A task not related to code (build, formatting, process, ...) label May 19, 2021
@simonbasle simonbasle self-assigned this May 19, 2021
@simonbasle simonbasle requested a review from a team May 19, 2021 11:13
Copy link
Contributor

@OlegDokuka OlegDokuka left a comment

Choose a reason for hiding this comment

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

In general, LGTM

@@ -251,7 +251,7 @@ public void taggedAppendedFluxTest() {
.tag("2", "Two");

final Stream<Tuple2<String, String>> scannedTags = Scannable.from(tagged1).tags();
assertThat(scannedTags.iterator())
assertThat(scannedTags)
Copy link
Contributor

Choose a reason for hiding this comment

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

Just wondering why there we use stream without .iterator()).toIterable() but in the above changes we do with

Copy link
Member Author

Choose a reason for hiding this comment

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

looks like there's no particular reason not to directly assert the Stream itself since AssertJ now supports all the necessary containsXxx assertions on these, will change.

@simonbasle
Copy link
Member Author

simonbasle commented May 19, 2021 via email

@simonbasle
Copy link
Member Author

NB: forward-merging will reveal more tests to amend

@simonbasle
Copy link
Member Author

mmh actually it doesn't look like the tck tests are run... looking into it

}

tckTest {
useJUnitPlatform()
Copy link
Member Author

Choose a reason for hiding this comment

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

oops... should be useTestNG() (which would be redundant with line 199 above)

@simonbasle simonbasle requested a review from OlegDokuka May 19, 2021 13:20
Copy link
Contributor

@OlegDokuka OlegDokuka left a comment

Choose a reason for hiding this comment

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

LGTM

@simonbasle simonbasle changed the title [chore] Isolate testNG tests and bump AssertJ to 3.19.0 [chore] Bump AssertJ to 3.19.0, polish tests and isolate tckTest May 19, 2021
@simonbasle simonbasle merged commit b16972b into 3.3.x May 19, 2021
@reactorbot
Copy link

@simonbasle this PR seems to have been merged on a maintenance branch, please ensure the change is merge-forwarded to intermediate maintenance branches and up to main 🙇

@simonbasle simonbasle deleted the tckTestAndBumpAssertJ branch May 19, 2021 14:54
simonbasle added a commit that referenced this pull request May 19, 2021
Conflicts primarily from tests having switched from generic array
creation to list based implementations (which we keep).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type/chores A task not related to code (build, formatting, process, ...)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants