Skip to content

Fix setup of test execution context in ThreadLocal #96

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Oct 27, 2025
Merged

Fix setup of test execution context in ThreadLocal #96

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/main/java/org/codehaus/plexus/testing/PlexusExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ public class PlexusExtension implements BeforeEachCallback, AfterEachCallback {

@Override
public void beforeEach(ExtensionContext context) throws Exception {
extensionContextThreadLocal.set(context);
setTestBasedir(getDefaultBasedir(), context);

((DefaultPlexusContainer) getContainer(context))
Expand All @@ -88,6 +87,12 @@ public void beforeEach(ExtensionContext context) throws Exception {
}

private PlexusContainer setupContainer(ExtensionContext context) {
// Store the context in a thread local for static access
// must be done hear as this method is always executed
extensionContextThreadLocal.set(context);
context.getStore(PLEXUS_EXTENSION)
.put("threadLocalCloseable", (AutoCloseable) extensionContextThreadLocal::remove);

// ----------------------------------------------------------------------------
// Context Setup
// ----------------------------------------------------------------------------
Expand Down Expand Up @@ -175,8 +180,6 @@ public void afterEach(ExtensionContext context) throws Exception {
if (container != null) {
container.dispose();
}
context.getStore(PLEXUS_EXTENSION).remove("testBasedir", String.class);
extensionContextThreadLocal.remove();
}

/**
Expand Down