Use AtomicInteger in JobGroupTest.testShouldCancel_4#2668
Open
trancexpress wants to merge 1 commit into
Open
Conversation
Adjusts JobGroupTest.testShouldCancel_4() to use an atomic data structure, to avoid concurrency issues with incrementing an integer from multiple jobs. See: eclipse-platform#2667
Contributor
Test Results 36 files - 18 36 suites - 18 23m 23s ⏱️ - 10m 24s Results for commit 5968a50. ± Comparison against base commit b885e3b. This pull request skips 25 tests. |
fedejeanne
reviewed
May 22, 2026
Member
fedejeanne
left a comment
fedejeanne
left a comment
There was a problem hiding this comment.
Nice catch, thank you for the contribution!
Just a nit: would it be possible to use AssertJ for more expressive assertions?
Other than that, the PR is fine.
| waitForCompletion(jobGroup); | ||
| assertTrue(numShouldCancelCalled[0] >= NUM_JOBS_LIMIT); | ||
| int called = numShouldCancelCalled.get(); | ||
| assertTrue(called >= NUM_JOBS_LIMIT); |
Member
There was a problem hiding this comment.
Suggested change
| assertTrue(called >= NUM_JOBS_LIMIT); | |
| assertThat(called).isGreaterThanOrEqualTo(NUM_JOBS_LIMIT); |
| // Verify that the group is canceled in a reasonable time, | ||
| // i.e only 10 jobs are allowed to run after the shouldCancel method returned true. | ||
| assertTrue(numShouldCancelCalled[0] < NUM_JOBS_LIMIT + 10); | ||
| assertTrue(called < NUM_JOBS_LIMIT + 10, "Expected fewer jobs to run but got: " + called); |
Member
There was a problem hiding this comment.
Suggested change
| assertTrue(called < NUM_JOBS_LIMIT + 10, "Expected fewer jobs to run but got: " + called); | |
| assertThat(called).isLessThan(NUM_JOBS_LIMIT + 10); |
| return true; | ||
| } | ||
| return false; | ||
| return numShouldCancelCalled.incrementAndGet() >= NUM_JOBS_LIMIT; |
Member
There was a problem hiding this comment.
Nice catch, checking for == was wrong because of the race condition (2 threads executing numShouldCancelCalled[0]++; before one of them reached the if below would skip numbers).
FTR it is now safe to simply do:
return numShouldCancelCalled.incrementAndGet() == NUM_JOBS_LIMIT;... because the comparison (==) uses the now stable value that comes from incrementAndGet() (no race condition there).
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Adjusts
JobGroupTest.testShouldCancel_4()to use an atomic data structure, to avoid concurrency issues with incrementing an integer from multiple jobs.See: #2667