Allow @ResourceLock on @ClassTemplate classes#5176
Merged
marcphilipp merged 4 commits intojunit-team:mainfrom Dec 7, 2025
Merged
Conversation
Fixes junit-team#5155 Signed-off-by: raccoonback <[email protected]>
Contributor
Author
|
@marcphilipp |
marcphilipp
requested changes
Nov 30, 2025
Signed-off-by: raccoonback <[email protected]>
659c7ea to
ea7cfc8
Compare
Contributor
Author
|
@marcphilipp |
Contributor
Author
|
@marcphilipp |
@ResourceLock on @ClassTemplate classes
marcphilipp
approved these changes
Dec 7, 2025
✅ All tests passed ✅Test Summary
🏷️ Commit: 52b6a09 Test FailureSeparateThreadTimeoutInvocation > throws timeout exception when timeout duration is exceeded (:jupiter-tests:test in macOS) |
Ogu1208
pushed a commit
to Ogu1208/junit-framework
that referenced
this pull request
Dec 11, 2025
Fixes junit-team#5155. --------- Signed-off-by: raccoonback <[email protected]> Co-authored-by: M.P. Korstanje <[email protected]> Co-authored-by: Marc Philipp <[email protected]> Signed-off-by: Ogu1208 <[email protected]>
uglide
added a commit
to uglide/junit-framework
that referenced
this pull request
Dec 22, 2025
) Fixes junit-team#5155. --------- Co-authored-by: raccoonback <[email protected]> Co-authored-by: M.P. Korstanje <[email protected]> Co-authored-by: Marc Philipp <[email protected]>
uglide
added a commit
to uglide/junit-framework
that referenced
this pull request
Dec 22, 2025
) Fixes junit-team#5155. --------- Co-authored-by: raccoonback <[email protected]> Co-authored-by: M.P. Korstanje <[email protected]> Co-authored-by: Marc Philipp <[email protected]> Signed-off-by: Igor Malinovskiy <[email protected]>
marcphilipp
added a commit
that referenced
this pull request
Dec 28, 2025
Fixes #5155. --------- Signed-off-by: raccoonback <[email protected]> Co-authored-by: M.P. Korstanje <[email protected]> Co-authored-by: Marc Philipp <[email protected]> (cherry picked from commit 7c85124)
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
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.
Fixes #5155
This PR enables the use of
@ResourceLockon classes annotated with@ClassTemplate.Background
Currently, applying
@ResourceLockto a@ClassTemplateclass results in the following failure:This happens because
ClassTemplateInvocationTestDescriptor#getExclusiveResources()returns a non-empty set, causing the invocation descriptor to report exclusive resources even though the enclosingClassTemplateTestDescriptoralready collects and exposes them at the class level.Summary of Changes
Override
ClassTemplateInvocationTestDescriptor#getExclusiveResources()to always return an empty set.ClassTemplateTestDescriptor, so the invocation descriptor should not contribute additional exclusive resources.Add a dedicated test
classTemplateWithResourceLockExecutesSuccessfully()to verify that:@ClassTemplateclass annotated with@ResourceLockexecutes successfully.I hereby agree to the terms of the JUnit Contributor License Agreement.
Definition of Done
@APIannotations