Add tests

Issue #4434

Author: YongGoose

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

@@ -598,7 +598,7 @@ default <V> V getOrDefault(Object key, Class<V> requiredType, V defaultValue) {
 		 * further details.
 		 *
 		 * <p>If {@code type} implements {@link ExtensionContext.Store.CloseableResource}
-		 * the {@code close()} method will be invoked on the stored object when
+		 * or {@link AutoCloseable} the {@code close()} method will be invoked on the stored object when
 		 * the store is closed.
 		 *
 		 * @param type the type of object to retrieve; never {@code null}
@@ -608,6 +608,7 @@ default <V> V getOrDefault(Object key, Class<V> requiredType, V defaultValue) {
 		 * @see #getOrComputeIfAbsent(Object, Function)
 		 * @see #getOrComputeIfAbsent(Object, Function, Class)
 		 * @see CloseableResource
+		 * @see AutoCloseable
 		 */
 		@API(status = STABLE, since = "5.1")
 		default <V> V getOrComputeIfAbsent(Class<V> type) {
@@ -628,7 +629,7 @@ default <V> V getOrComputeIfAbsent(Class<V> type) {
 		 * {@link #getOrComputeIfAbsent(Object, Function, Class)} instead.
 		 *
 		 * <p>If the created value is an instance of {@link ExtensionContext.Store.CloseableResource}
-		 * the {@code close()} method will be invoked on the stored object when
+		 * or {@link AutoCloseable} the {@code close()} method will be invoked on the stored object when
 		 * the store is closed.
 		 *
 		 * @param key the key; never {@code null}
@@ -640,6 +641,7 @@ default <V> V getOrComputeIfAbsent(Class<V> type) {
 		 * @see #getOrComputeIfAbsent(Class)
 		 * @see #getOrComputeIfAbsent(Object, Function, Class)
 		 * @see CloseableResource
+		 * @see AutoCloseable
 		 */
 		<K, V> Object getOrComputeIfAbsent(K key, Function<K, V> defaultCreator);
 
@@ -655,8 +657,8 @@ default <V> V getOrComputeIfAbsent(Class<V> type) {
 		 * the {@code key} as input), stored, and returned.
 		 *
 		 * <p>If {@code requiredType} implements {@link ExtensionContext.Store.CloseableResource}
-		 * the {@code close()} method will be invoked on the stored object when
-		 * the store is closed.
+		 * or {@link AutoCloseable} the {@code close()} method will be invoked on the stored
+		 * object when the store is closed.
 		 *
 		 * @param key the key; never {@code null}
 		 * @param defaultCreator the function called with the supplied {@code key}
@@ -668,6 +670,7 @@ default <V> V getOrComputeIfAbsent(Class<V> type) {
 		 * @see #getOrComputeIfAbsent(Class)
 		 * @see #getOrComputeIfAbsent(Object, Function)
 		 * @see CloseableResource
+		 * @see AutoCloseable
 		 */
 		<K, V> V getOrComputeIfAbsent(K key, Function<K, V> defaultCreator, Class<V> requiredType);
 
@@ -679,22 +682,23 @@ default <V> V getOrComputeIfAbsent(Class<V> type) {
 		 * overwrite it.
 		 *
 		 * <p>If the {@code value} is an instance of {@link ExtensionContext.Store.CloseableResource}
-		 * the {@code close()} method will be invoked on the stored object when
-		 * the store is closed.
+		 * or {@link AutoCloseable} the {@code close()} method will be invoked on the stored
+		 * object when the store is closed.
 		 *
 		 * @param key the key under which the value should be stored; never
 		 * {@code null}
 		 * @param value the value to store; may be {@code null}
 		 * @see CloseableResource
+		 * @see AutoCloseable
 		 */
 		void put(Object key, Object value);
 
 		/**
 		 * Remove the value that was previously stored under the supplied {@code key}.
 		 *
 		 * <p>The value will only be removed in the current {@link ExtensionContext},
-		 * not in ancestors. In addition, the {@link CloseableResource} API will not
-		 * be honored for values that are manually removed via this method.
+		 * not in ancestors. In addition, the {@link CloseableResource} and {@link AutoCloseable}
+		 * API will not be honored for values that are manually removed via this method.
 		 *
 		 * <p>For greater type safety, consider using {@link #remove(Object, Class)}
 		 * instead.
@@ -711,8 +715,8 @@ default <V> V getOrComputeIfAbsent(Class<V> type) {
 		 * under the supplied {@code key}.
 		 *
 		 * <p>The value will only be removed in the current {@link ExtensionContext},
-		 * not in ancestors. In addition, the {@link CloseableResource} API will not
-		 * be honored for values that are manually removed via this method.
+		 * not in ancestors. In addition, the {@link CloseableResource} and {@link AutoCloseable}
+		 * API will not be honored for values that are manually removed via this method.
 		 *
 		 * @param key the key; never {@code null}
 		 * @param requiredType the required type of the value; never {@code null}

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

@@ -27,7 +27,6 @@
 import org.junit.jupiter.api.extension.ExecutableInvoker;
 import org.junit.jupiter.api.extension.Extension;
 import org.junit.jupiter.api.extension.ExtensionContext;
-import org.junit.jupiter.api.extension.ExtensionContext.Store;
 import org.junit.jupiter.api.extension.MediaType;
 import org.junit.jupiter.api.function.ThrowingConsumer;
 import org.junit.jupiter.api.parallel.ExecutionMode;
@@ -89,6 +88,7 @@ abstract class AbstractExtensionContext<T extends TestDescriptor> implements Ext
 		CLOSE_RESOURCES = (__, ___, value) -> {
 			if (value instanceof Store.CloseableResource) {
 				((Store.CloseableResource) value).close();
+				return;
 			}
 
 			boolean isAutoCloseEnabled = configuration.isAutoCloseEnabled();

Diff for: jupiter-tests/src/test/java/org/junit/jupiter/engine/descriptor/ResourceAutoClosingTests.java

@@ -0,0 +1,95 @@
+/*
+ * 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.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.BeforeAllCallback;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.engine.config.JupiterConfiguration;
+import org.junit.jupiter.engine.extension.ExtensionRegistry;
+import org.junit.platform.launcher.core.NamespacedHierarchicalStoreProviders;
+
+class ResourceAutoClosingTests {
+
+	private final JupiterConfiguration configuration = mock();
+	private final ExtensionRegistry extensionRegistry = mock();
+	private final JupiterEngineDescriptor testDescriptor = mock();
+	private final LauncherStoreFacade launcherStoreFacade = new LauncherStoreFacade(
+		NamespacedHierarchicalStoreProviders.dummyNamespacedHierarchicalStore());
+
+	@BeforeEach
+	void setUp() {
+		when(testDescriptor.getConfiguration()).thenReturn(configuration);
+	}
+
+	@Test
+	void shouldCloseAutoCloseableWhenAutoCloseEnabledIsTrue() throws Exception {
+		AutoCloseableResource resource = new AutoCloseableResource();
+		when(configuration.isAutoCloseEnabled()).thenReturn(true);
+
+		ExtensionContext extensionContext = new JupiterEngineExtensionContext(null, testDescriptor, configuration,
+			extensionRegistry, launcherStoreFacade);
+		ExtensionContext.Store store = extensionContext.getStore(ExtensionContext.StoreScope.EXECUTION_REQUEST,
+			ExtensionContext.Namespace.GLOBAL);
+		store.put("resource", resource);
+
+		((AutoCloseable) extensionContext).close();
+
+		assertThat(resource.closed).isTrue();
+	}
+
+	@Test
+	void shouldNotCloseAutoCloseableWhenAutoCloseEnabledIsFalse() throws Exception {
+		AutoCloseableResource resource = new AutoCloseableResource();
+		when(configuration.isAutoCloseEnabled()).thenReturn(false);
+		ExtensionContext extensionContext = new JupiterEngineExtensionContext(null, testDescriptor, configuration,
+			extensionRegistry, launcherStoreFacade);
+
+		ExtensionContext.Store store = extensionContext.getStore(ExtensionContext.StoreScope.EXECUTION_REQUEST,
+			ExtensionContext.Namespace.GLOBAL);
+		store.put("resource", resource);
+
+		((AutoCloseable) extensionContext).close();
+
+		assertThat(resource.closed).isFalse();
+	}
+
+	static class AutoCloseableResource implements AutoCloseable {
+		private boolean closed = false;
+
+		@Override
+		public void close() {
+			closed = true;
+		}
+	}
+
+	static class AutoCloseableResourceStoreUsingExtension implements BeforeAllCallback {
+		@Override
+		public void beforeAll(ExtensionContext context) {
+			var store = context.getStore(ExtensionContext.Namespace.GLOBAL);
+			store.put("resource", new AutoCloseableResource());
+		}
+	}
+
+	@SuppressWarnings("JUnitMalformedDeclaration")
+	@ExtendWith(AutoCloseableResourceStoreUsingExtension.class)
+	static class AutoCloseableTestCase {
+		@Test
+		void dummyTest() {
+		}
+	}
+}