Provide mechanism for managing resources across engines and executions

junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ExtensionContext.java

@@ -11,6 +11,7 @@
 package org.junit.jupiter.api.extension;
 
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
+import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
 import java.lang.reflect.AnnotatedElement;
@@ -418,6 +419,29 @@ default void publishReportEntry(String value) {
 	 */
 	Store getStore(Namespace namespace);
 
+	/**
+	 * Returns the store for session-level data.
+	 *
+	 * <p>This store is used to store data that is scoped to the session level.
+	 * The data stored in this store will be available throughout the entire session.
+	 *
+	 * @return the store for session-level data
+	 * @since 5.13
+	 */
+	@API(status = EXPERIMENTAL, since = "5.13")
+	Store getSessionLevelStore(Namespace namespace);
+
+	/**
+	 * Returns the store for request-level data.
+	 *
+	 * <p>This store is used to store data that is scoped to the request level.
+	 * The data stored in this store will be available only for the duration of the current request.
+	 *
+	 * @return the store for request-level data
+	 * @since 5.13
+	 */
+	Store getRequestLevelStore(Namespace namespace);
+
 	/**
 	 * Get the {@link ExecutionMode} associated with the current test or container.
 	 *
@@ -744,6 +768,11 @@ public Namespace append(Object... parts) {
 			Collections.addAll(newParts, parts);
 			return new Namespace(newParts);
 		}
+
+		@API(status = INTERNAL, since = "5.13")
+		public Object[] getParts() {
+			return parts.toArray();
+		}
 	}
 
 }

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/JupiterTestEngine.java

@@ -19,6 +19,7 @@
 import org.junit.jupiter.engine.config.DefaultJupiterConfiguration;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
 import org.junit.jupiter.engine.descriptor.JupiterEngineDescriptor;
+import org.junit.jupiter.engine.descriptor.LauncherStoreFacade;
 import org.junit.jupiter.engine.discovery.DiscoverySelectorResolver;
 import org.junit.jupiter.engine.execution.JupiterEngineExecutionContext;
 import org.junit.jupiter.engine.support.JupiterThrowableCollectorFactory;
@@ -82,8 +83,8 @@ protected HierarchicalTestExecutorService createExecutorService(ExecutionRequest
 
 	@Override
 	protected JupiterEngineExecutionContext createExecutionContext(ExecutionRequest request) {
-		return new JupiterEngineExecutionContext(request.getEngineExecutionListener(),
-			getJupiterConfiguration(request));
+		return new JupiterEngineExecutionContext(request.getEngineExecutionListener(), getJupiterConfiguration(request),
+			new LauncherStoreFacade(request.getRequestLevelStore()));
 	}
 
 	/**

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/AbstractExtensionContext.java

@@ -33,7 +33,6 @@
 import org.junit.jupiter.api.parallel.ExecutionMode;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
 import org.junit.jupiter.engine.execution.DefaultExecutableInvoker;
-import org.junit.jupiter.engine.execution.NamespaceAwareStore;
 import org.junit.jupiter.engine.extension.ExtensionContextInternal;
 import org.junit.jupiter.engine.extension.ExtensionRegistry;
 import org.junit.platform.commons.JUnitException;
@@ -52,7 +51,8 @@
  */
 abstract class AbstractExtensionContext<T extends TestDescriptor> implements ExtensionContextInternal, AutoCloseable {
 
-	private static final NamespacedHierarchicalStore.CloseAction<Namespace> CLOSE_RESOURCES = (__, ___, value) -> {
+	private static final NamespacedHierarchicalStore.CloseAction<org.junit.platform.engine.support.store.Namespace> CLOSE_RESOURCES = (
+			__, ___, value) -> {
 		if (value instanceof CloseableResource) {
 			((CloseableResource) value).close();
 		}
@@ -63,12 +63,14 @@ abstract class AbstractExtensionContext<T extends TestDescriptor> implements Ext
 	private final T testDescriptor;
 	private final Set<String> tags;
 	private final JupiterConfiguration configuration;
-	private final NamespacedHierarchicalStore<Namespace> valuesStore;
+	private final NamespacedHierarchicalStore<org.junit.platform.engine.support.store.Namespace> valuesStore;
 	private final ExecutableInvoker executableInvoker;
 	private final ExtensionRegistry extensionRegistry;
+	private final LauncherStoreFacade launcherStoreFacade;
 
 	AbstractExtensionContext(ExtensionContext parent, EngineExecutionListener engineExecutionListener, T testDescriptor,
-			JupiterConfiguration configuration, ExtensionRegistry extensionRegistry) {
+			JupiterConfiguration configuration, ExtensionRegistry extensionRegistry,
+			LauncherStoreFacade launcherStoreFacade) {
 
 		Preconditions.notNull(testDescriptor, "TestDescriptor must not be null");
 		Preconditions.notNull(configuration, "JupiterConfiguration must not be null");
@@ -78,8 +80,9 @@ abstract class AbstractExtensionContext<T extends TestDescriptor> implements Ext
 		this.engineExecutionListener = engineExecutionListener;
 		this.testDescriptor = testDescriptor;
 		this.configuration = configuration;
-		this.valuesStore = createStore(parent);
+		this.valuesStore = createStore(parent, launcherStoreFacade);
 		this.extensionRegistry = extensionRegistry;
+		this.launcherStoreFacade = launcherStoreFacade;
 
 		// @formatter:off
 		this.tags = testDescriptor.getTags().stream()
@@ -88,9 +91,13 @@ abstract class AbstractExtensionContext<T extends TestDescriptor> implements Ext
 		// @formatter:on
 	}
 
-	private static NamespacedHierarchicalStore<Namespace> createStore(ExtensionContext parent) {
-		NamespacedHierarchicalStore<Namespace> parentStore = null;
-		if (parent != null) {
+	private static NamespacedHierarchicalStore<org.junit.platform.engine.support.store.Namespace> createStore(
+			ExtensionContext parent, LauncherStoreFacade launcherStoreFacade) {
+		NamespacedHierarchicalStore<org.junit.platform.engine.support.store.Namespace> parentStore;
+		if (parent == null) {
+			parentStore = launcherStoreFacade.getRequestLevelStore();
+		}
+		else {
 			parentStore = ((AbstractExtensionContext<?>) parent).valuesStore;
 		}
 		return new NamespacedHierarchicalStore<>(parentStore, CLOSE_RESOURCES);
@@ -188,8 +195,17 @@ protected T getTestDescriptor() {
 
 	@Override
 	public Store getStore(Namespace namespace) {
-		Preconditions.notNull(namespace, "Namespace must not be null");
-		return new NamespaceAwareStore(this.valuesStore, namespace);
+		return launcherStoreFacade.getStoreAdapter(this.valuesStore, namespace);
+	}
+
+	@Override
+	public Store getSessionLevelStore(Namespace namespace) {
+		return launcherStoreFacade.getSessionLevelStore(namespace);
+	}
+
+	@Override
+	public Store getRequestLevelStore(Namespace namespace) {
+		return launcherStoreFacade.getRequestLevelStore(namespace);
 	}
 
 	@Override

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java

@@ -194,7 +194,7 @@ public final JupiterEngineExecutionContext prepare(JupiterEngineExecutionContext
 		ThrowableCollector throwableCollector = createThrowableCollector();
 		ClassExtensionContext extensionContext = new ClassExtensionContext(context.getExtensionContext(),
 			context.getExecutionListener(), this, this.lifecycle, context.getConfiguration(), registry,
-			throwableCollector);
+			context.getLauncherStoreFacade(), throwableCollector);
 
 		// @formatter:off
 		return context.extend()

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassExtensionContext.java

@@ -36,9 +36,10 @@ final class ClassExtensionContext extends AbstractExtensionContext<ClassBasedTes
 
 	ClassExtensionContext(ExtensionContext parent, EngineExecutionListener engineExecutionListener,
 			ClassBasedTestDescriptor testDescriptor, Lifecycle lifecycle, JupiterConfiguration configuration,
-			ExtensionRegistry extensionRegistry, ThrowableCollector throwableCollector) {
+			ExtensionRegistry extensionRegistry, LauncherStoreFacade launcherStoreFacade,
+			ThrowableCollector throwableCollector) {
 
-		super(parent, engineExecutionListener, testDescriptor, configuration, extensionRegistry);
+		super(parent, engineExecutionListener, testDescriptor, configuration, extensionRegistry, launcherStoreFacade);
 
 		this.lifecycle = lifecycle;
 		this.throwableCollector = throwableCollector;

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ContainerTemplateInvocationExtensionContext.java

@@ -30,8 +30,9 @@ final class ContainerTemplateInvocationExtensionContext
 
 	ContainerTemplateInvocationExtensionContext(ExtensionContext parent,
 			EngineExecutionListener engineExecutionListener, ContainerTemplateInvocationTestDescriptor testDescriptor,
-			JupiterConfiguration configuration, ExtensionRegistry extensionRegistry) {
-		super(parent, engineExecutionListener, testDescriptor, configuration, extensionRegistry);
+			JupiterConfiguration configuration, ExtensionRegistry extensionRegistry,
+			LauncherStoreFacade launcherStoreFacade) {
+		super(parent, engineExecutionListener, testDescriptor, configuration, extensionRegistry, launcherStoreFacade);
 	}
 
 	@Override

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ContainerTemplateInvocationTestDescriptor.java

@@ -115,7 +115,8 @@ public JupiterEngineExecutionContext prepare(JupiterEngineExecutionContext conte
 			registry = childRegistry;
 		}
 		ExtensionContext extensionContext = new ContainerTemplateInvocationExtensionContext(
-			context.getExtensionContext(), context.getExecutionListener(), this, context.getConfiguration(), registry);
+			context.getExtensionContext(), context.getExecutionListener(), this, context.getConfiguration(), registry,
+			context.getLauncherStoreFacade());
 		ThrowableCollector throwableCollector = createThrowableCollector();
 		throwableCollector.execute(() -> this.invocationContext.prepareInvocation(extensionContext));
 		return context.extend() //

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicExtensionContext.java

@@ -26,8 +26,8 @@ class DynamicExtensionContext extends AbstractExtensionContext<DynamicNodeTestDe
 
 	DynamicExtensionContext(ExtensionContext parent, EngineExecutionListener engineExecutionListener,
 			DynamicNodeTestDescriptor testDescriptor, JupiterConfiguration configuration,
-			ExtensionRegistry extensionRegistry) {
-		super(parent, engineExecutionListener, testDescriptor, configuration, extensionRegistry);
+			ExtensionRegistry extensionRegistry, LauncherStoreFacade launcherStoreFacade) {
+		super(parent, engineExecutionListener, testDescriptor, configuration, extensionRegistry, launcherStoreFacade);
 	}
 
 	@Override

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicNodeTestDescriptor.java

@@ -46,7 +46,9 @@ public String getLegacyReportingName() {
 	@Override
 	public JupiterEngineExecutionContext prepare(JupiterEngineExecutionContext context) {
 		ExtensionContext extensionContext = new DynamicExtensionContext(context.getExtensionContext(),
-			context.getExecutionListener(), this, context.getConfiguration(), context.getExtensionRegistry());
+			context.getExecutionListener(), this, context.getConfiguration(), context.getExtensionRegistry(),
+			context.getLauncherStoreFacade());
+
 		// @formatter:off
 		return context.extend()
 				.withExtensionContext(extensionContext)

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineDescriptor.java

@@ -52,7 +52,7 @@ public JupiterEngineExecutionContext prepare(JupiterEngineExecutionContext conte
 			context.getConfiguration());
 		EngineExecutionListener executionListener = context.getExecutionListener();
 		ExtensionContext extensionContext = new JupiterEngineExtensionContext(executionListener, this,
-			context.getConfiguration(), extensionRegistry);
+			context.getConfiguration(), extensionRegistry, context.getLauncherStoreFacade());
 
 		// @formatter:off
 		return context.extend()

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterEngineExtensionContext.java

@@ -28,9 +28,9 @@ final class JupiterEngineExtensionContext extends AbstractExtensionContext<Jupit
 
 	JupiterEngineExtensionContext(EngineExecutionListener engineExecutionListener,
 			JupiterEngineDescriptor testDescriptor, JupiterConfiguration configuration,
-			ExtensionRegistry extensionRegistry) {
+			ExtensionRegistry extensionRegistry, LauncherStoreFacade launcherStoreFacade) {
 
-		super(null, engineExecutionListener, testDescriptor, configuration, extensionRegistry);
+		super(null, engineExecutionListener, testDescriptor, configuration, extensionRegistry, launcherStoreFacade);
 	}
 
 	@Override

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/LauncherStoreFacade.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2015-2025 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * https://www.eclipse.org/legal/epl-v20.html
+ */
+
+package org.junit.jupiter.engine.descriptor;
+
+import static org.apiguardian.api.API.Status.INTERNAL;
+
+import org.apiguardian.api.API;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.engine.execution.NamespaceAwareStore;
+import org.junit.platform.commons.JUnitException;
+import org.junit.platform.commons.util.Preconditions;
+import org.junit.platform.engine.support.store.Namespace;
+import org.junit.platform.engine.support.store.NamespacedHierarchicalStore;
+
+@API(status = INTERNAL, since = "5.13")
+public class LauncherStoreFacade {
+
+	private final NamespacedHierarchicalStore<Namespace> requestLevelStore;
+	private final NamespacedHierarchicalStore<Namespace> sessionLevelStore;
+
+	public LauncherStoreFacade(NamespacedHierarchicalStore<Namespace> requestLevelStore) {
+		this.requestLevelStore = requestLevelStore;
+		this.sessionLevelStore = requestLevelStore.getParent().orElseThrow(
+			() -> new JUnitException("Request-level store must have a parent"));
+	}
+
+	NamespacedHierarchicalStore<Namespace> getRequestLevelStore() {
+		return this.requestLevelStore;
+	}
+
+	ExtensionContext.Store getRequestLevelStore(ExtensionContext.Namespace namespace) {
+		return getStoreAdapter(this.requestLevelStore, namespace);
+	}
+
+	ExtensionContext.Store getSessionLevelStore(ExtensionContext.Namespace namespace) {
+		return getStoreAdapter(this.sessionLevelStore, namespace);
+	}
+
+	NamespaceAwareStore<Namespace> getStoreAdapter(NamespacedHierarchicalStore<Namespace> valuesStore,
+			ExtensionContext.Namespace namespace) {
+		Preconditions.notNull(namespace, "Namespace must not be null");
+		return new NamespaceAwareStore<>(valuesStore, convert(namespace));
+	}
+
+	private Namespace convert(ExtensionContext.Namespace namespace) {
+		return Namespace.create(namespace.getParts());
+	}
+}

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodExtensionContext.java

@@ -34,9 +34,10 @@ final class MethodExtensionContext extends AbstractExtensionContext<TestMethodTe
 
 	MethodExtensionContext(ExtensionContext parent, EngineExecutionListener engineExecutionListener,
 			TestMethodTestDescriptor testDescriptor, JupiterConfiguration configuration,
-			ExtensionRegistry extensionRegistry, ThrowableCollector throwableCollector) {
+			ExtensionRegistry extensionRegistry, LauncherStoreFacade launcherStoreFacade,
+			ThrowableCollector throwableCollector) {
 
-		super(parent, engineExecutionListener, testDescriptor, configuration, extensionRegistry);
+		super(parent, engineExecutionListener, testDescriptor, configuration, extensionRegistry, launcherStoreFacade);
 
 		this.throwableCollector = throwableCollector;
 	}

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestMethodTestDescriptor.java

@@ -116,7 +116,10 @@ public JupiterEngineExecutionContext prepare(JupiterEngineExecutionContext conte
 		MutableExtensionRegistry registry = populateNewExtensionRegistry(context);
 		ThrowableCollector throwableCollector = createThrowableCollector();
 		MethodExtensionContext extensionContext = new MethodExtensionContext(context.getExtensionContext(),
-			context.getExecutionListener(), this, context.getConfiguration(), registry, throwableCollector);
+			context.getExecutionListener(), this, context.getConfiguration(), registry,
+			context.getLauncherStoreFacade(), throwableCollector);
+		throwableCollector.execute(() -> prepareExtensionContext(extensionContext));
+
 		// @formatter:off
 		JupiterEngineExecutionContext newContext = context.extend()
 				.withExtensionRegistry(registry)

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateExtensionContext.java

@@ -31,9 +31,9 @@ final class TestTemplateExtensionContext extends AbstractExtensionContext<TestTe
 
 	TestTemplateExtensionContext(ExtensionContext parent, EngineExecutionListener engineExecutionListener,
 			TestTemplateTestDescriptor testDescriptor, JupiterConfiguration configuration,
-			ExtensionRegistry extensionRegistry, TestInstances testInstances) {
+			ExtensionRegistry extensionRegistry, LauncherStoreFacade launcherStoreFacade, TestInstances testInstances) {
 
-		super(parent, engineExecutionListener, testDescriptor, configuration, extensionRegistry);
+		super(parent, engineExecutionListener, testDescriptor, configuration, extensionRegistry, launcherStoreFacade);
 		this.testInstances = testInstances;
 	}
 

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateTestDescriptor.java

@@ -94,7 +94,8 @@ public JupiterEngineExecutionContext prepare(JupiterEngineExecutionContext conte
 		TestInstances testInstances = context.getExtensionContext().getTestInstances().orElse(null);
 
 		ExtensionContext extensionContext = new TestTemplateExtensionContext(context.getExtensionContext(),
-			context.getExecutionListener(), this, context.getConfiguration(), registry, testInstances);
+			context.getExecutionListener(), this, context.getConfiguration(), registry,
+			context.getLauncherStoreFacade(), testInstances);
 
 		// @formatter:off
 		return context.extend()

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/JupiterEngineExecutionContext.java

@@ -15,6 +15,7 @@
 import org.apiguardian.api.API;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.engine.config.JupiterConfiguration;
+import org.junit.jupiter.engine.descriptor.LauncherStoreFacade;
 import org.junit.jupiter.engine.extension.MutableExtensionRegistry;
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.engine.EngineExecutionListener;
@@ -33,9 +34,9 @@ public class JupiterEngineExecutionContext implements EngineExecutionContext {
 	private boolean beforeAllCallbacksExecuted = false;
 	private boolean beforeAllMethodsExecuted = false;
 
-	public JupiterEngineExecutionContext(EngineExecutionListener executionListener,
-			JupiterConfiguration configuration) {
-		this(new State(executionListener, configuration));
+	public JupiterEngineExecutionContext(EngineExecutionListener executionListener, JupiterConfiguration configuration,
+			LauncherStoreFacade launcherStoreFacade) {
+		this(new State(executionListener, configuration, launcherStoreFacade));
 	}
 
 	private JupiterEngineExecutionContext(State state) {
@@ -62,6 +63,10 @@ public JupiterConfiguration getConfiguration() {
 		return this.state.configuration;
 	}
 
+	public LauncherStoreFacade getLauncherStoreFacade() {
+		return this.state.launcherStoreFacade;
+	}
+
 	public TestInstancesProvider getTestInstancesProvider() {
 		return this.state.testInstancesProvider;
 	}
@@ -119,14 +124,17 @@ private static final class State implements Cloneable {
 
 		final EngineExecutionListener executionListener;
 		final JupiterConfiguration configuration;
+		final LauncherStoreFacade launcherStoreFacade;
 		TestInstancesProvider testInstancesProvider;
 		MutableExtensionRegistry extensionRegistry;
 		ExtensionContext extensionContext;
 		ThrowableCollector throwableCollector;
 
-		State(EngineExecutionListener executionListener, JupiterConfiguration configuration) {
+		State(EngineExecutionListener executionListener, JupiterConfiguration configuration,
+				LauncherStoreFacade launcherStoreFacade) {
 			this.executionListener = executionListener;
 			this.configuration = configuration;
+			this.launcherStoreFacade = launcherStoreFacade;
 		}
 
 		@Override