Bugfix: replace countdown latches with awaitility #1506
Merged
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
paullatzelsperger
changed the title
Codecov Report
@@ Coverage Diff @@
## main #1506 +/- ##
=======================================
Coverage 67.32% 67.32%
=======================================
Files 725 725
Lines 16120 16120
Branches 1054 1054
=======================================
Hits 10853 10853
Misses 4785 4785
Partials 482 482 Continue to review full report at Codecov.
|
algattik
reviewed
Jun 21, 2022
.../org/eclipse/dataspaceconnector/contract/negotiation/ContractNegotiationIntegrationTest.java
Outdated
Show resolved
Hide resolved
algattik
reviewed
Jun 21, 2022
.../org/eclipse/dataspaceconnector/contract/negotiation/ContractNegotiationIntegrationTest.java
Outdated
Show resolved
Hide resolved
.../org/eclipse/dataspaceconnector/contract/negotiation/ContractNegotiationIntegrationTest.java
Outdated
Show resolved
Hide resolved
.../org/eclipse/dataspaceconnector/contract/negotiation/ContractNegotiationIntegrationTest.java
Outdated
Show resolved
Hide resolved
| var providerNegotiation = providerStore.findForCorrelationId(consumerNegotiationId); | ||
|
|
||
| // Assert that provider and consumer have the same offers stored | ||
| assertThat(consumerNegotiation).isNotNull(); |
There was a problem hiding this comment.
seems much duplicate code?
There was a problem hiding this comment.
i extracted a method that performs some basic assertions, but I'm not sure whether that makes the code more or less readable.
paullatzelsperger
force-pushed
the
bugfix/1505_negotiation_race_condition
branch
from
ce4c660
to
cb41670
Compare
algattik
approved these changes
Jun 22, 2022
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 this PR changes/adds
Fixes a race condition in the
ContractNegotiationIntegrationTestby replacing theCountdownLatchwithawaitility.Awaitility allows for better control over timed assertions than a latch - here it allows us to assert multiple things, in particular:
pre*method has been calledThe latch only waited for the first condition, whereas Awaitility waits for all of them.
Why it does that
To avoid race conditions, causing sporadically failing tests.
Further notes
ContractNegotiationIntegrationTest@Disabledtests (why are they disabled?)Linked Issue(s)
Closes #1505
Checklist
no-changelog)