Apply comment

Issue #4434

Author: YongGoose

documentation/src/docs/asciidoc/user-guide/extensions.adoc

@@ -918,15 +918,6 @@ public class MyResource implements Store.CloseableResource, AutoCloseable {
 
 This ensures that your resource will be properly closed regardless of which JUnit Jupiter version is being used.
 
-To determine if your extension is running under JUnit Jupiter 5.13+, you can check if auto-close is enabled via the configuration:
-
-[source,java,indent=0]
-----
-boolean isJupiter513OrNewer = context.getConfigurationParameter("junit.jupiter.extensions.autoclose.enabled")
-    .map(Boolean::parseBoolean)
-    .orElse(true); // Default is true in 5.13+
-----
-
 [[extensions-supported-utilities]]
 === Supported Utilities in Extensions
 

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

@@ -64,9 +64,9 @@ public interface TestInstantiationAwareExtension extends Extension {
 	 * <li>{@link ExtensionContext#getTestMethod() getTestMethod()} is no longer
 	 * empty, unless the {@link TestInstance.Lifecycle#PER_CLASS PER_CLASS}
 	 * lifecycle is used.</li>
-	 * <li>If the callback adds a new {@link Store.CloseableResource} to the
-	 * {@link Store Store}, the resource is closed just after the instance is
-	 * destroyed.</li>
+	 * <li>If the callback adds a new {@link Store.CloseableResource} or
+	 * {@link AutoCloseable} to the {@link Store Store}, the resource is closed
+	 * just after the instance is destroyed.</li>
 	 * <li>The callbacks can now access data previously stored by
 	 * {@link TestTemplateInvocationContext}, unless the
 	 * {@link TestInstance.Lifecycle#PER_CLASS PER_CLASS} lifecycle is used.</li>
@@ -87,7 +87,6 @@ public interface TestInstantiationAwareExtension extends Extension {
 	 *                    configuration parameters; never {@code null}
 	 * @since 5.12
 	 */
-	@SuppressWarnings("deprecation")
 	@API(status = EXPERIMENTAL, since = "5.12")
 	default ExtensionContextScope getTestInstantiationExtensionContextScope(ExtensionContext rootContext) {
 		return ExtensionContextScope.DEFAULT;

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

@@ -89,18 +89,19 @@ abstract class AbstractExtensionContext<T extends TestDescriptor> implements Ext
 	@SuppressWarnings("deprecation")
 	private NamespacedHierarchicalStore.CloseAction<org.junit.platform.engine.support.store.Namespace> createCloseResources() {
 		return (__, ___, value) -> {
-			if (value instanceof Store.CloseableResource) {
-				((Store.CloseableResource) value).close();
-				return;
-			}
-
 			boolean isAutoCloseEnabled = this.configuration.isAutoCloseEnabled();
-			if (!isAutoCloseEnabled) {
+
+			if (value instanceof AutoCloseable && isAutoCloseEnabled) {
+				((AutoCloseable) value).close();
 				return;
 			}
 
-			if (value instanceof AutoCloseable) {
-				((AutoCloseable) value).close();
+			if (value instanceof Store.CloseableResource) {
+				if (isAutoCloseEnabled) {
+					engineExecutionListener.reportingEntryPublished(testDescriptor, ReportEntry.from("WARNING",
+						"Type implements CloseableResource but not AutoCloseable: " + value.getClass().getName()));
+				}
+				((Store.CloseableResource) value).close();
 			}
 		};
 	}

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

@@ -70,14 +70,9 @@ public <K, V> V getOrComputeIfAbsent(K key, Function<K, V> defaultCreator, Class
 			() -> this.valuesStore.getOrComputeIfAbsent(this.namespace, key, defaultCreator, requiredType));
 	}
 
-	@SuppressWarnings("deprecation")
 	@Override
 	public void put(Object key, Object value) {
 		Preconditions.notNull(key, "key must not be null");
-
-		if (value instanceof CloseableResource && !(value instanceof AutoCloseable)) {
-			LOGGER.warn(() -> "The object implements CloseableResource but not AutoCloseable: " + value.getClass());
-		}
 		accessStore(() -> this.valuesStore.put(this.namespace, key, value));
 	}
 

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TempDirectory.java

@@ -53,6 +53,7 @@
 import org.junit.jupiter.api.extension.ExtensionConfigurationException;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
+import org.junit.jupiter.api.extension.ExtensionContext.Store;
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.api.extension.ParameterResolver;
 import org.junit.jupiter.api.io.CleanupMode;
@@ -134,12 +135,7 @@ private static void installFailureTracker(ExtensionContext context) {
 	}
 
 	private static void installFailureTracker(ExtensionContext context, ExtensionContext parentContext) {
-		context.getStore(NAMESPACE).put(FAILURE_TRACKER, (AutoCloseable) () -> context.getParent() //
-				.ifPresent(parentContext -> {
-					if (selfOrChildFailed(context)) {
-						parentContext.getStore(NAMESPACE).put(CHILD_FAILED, true);
-					}
-				}));
+		context.getStore(NAMESPACE).put(FAILURE_TRACKER, new FailureTracker(context, parentContext));
 	}
 
 	private void injectStaticFields(ExtensionContext context, Class<?> testClass) {
@@ -298,7 +294,8 @@ private static ExtensionContext.Store getContextSpecificStore(ExtensionContext c
 		return context.getStore(NAMESPACE.append(context));
 	}
 
-	static class CloseablePath implements AutoCloseable {
+	@SuppressWarnings("deprecation")
+	static class CloseablePath implements Store.CloseableResource, AutoCloseable {
 
 		private static final Logger LOGGER = LoggerFactory.getLogger(CloseablePath.class);
 
@@ -613,4 +610,23 @@ public String toString() {
 
 	}
 
+	@SuppressWarnings("deprecation")
+	private static class FailureTracker implements Store.CloseableResource, AutoCloseable {
+
+		private final ExtensionContext context;
+		private final ExtensionContext parentContext;
+
+		private FailureTracker(ExtensionContext context, ExtensionContext parentContext) {
+			this.context = context;
+			this.parentContext = parentContext;
+		}
+
+		@Override
+		public void close() {
+			if (selfOrChildFailed(context)) {
+				getContextSpecificStore(parentContext).put(CHILD_FAILED, true);
+			}
+		}
+	}
+
 }

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/extension/TimeoutInvocationFactory.java

@@ -51,8 +51,8 @@ private ScheduledExecutorService getThreadExecutorForSameThreadInvocation() {
 		return store.getOrComputeIfAbsent(SingleThreadExecutorResource.class).get();
 	}
 
-	@SuppressWarnings("deprecation")
-	private static abstract class ExecutorResource implements Store.CloseableResource {
+	@SuppressWarnings({ "deprecation", "try" })
+	private static abstract class ExecutorResource implements Store.CloseableResource, AutoCloseable {
 
 		protected final ScheduledExecutorService executor;
 
@@ -65,7 +65,7 @@ ScheduledExecutorService get() {
 		}
 
 		@Override
-		public void close() throws Throwable {
+		public void close() throws Exception {
 			executor.shutdown();
 			boolean terminated = executor.awaitTermination(5, TimeUnit.SECONDS);
 			if (!terminated) {
@@ -75,6 +75,7 @@ public void close() throws Throwable {
 		}
 	}
 
+	@SuppressWarnings("try")
 	static class SingleThreadExecutorResource extends ExecutorResource {
 
 		@SuppressWarnings("unused")

junit-jupiter-params/src/main/java/org/junit/jupiter/params/ParameterizedInvocationContext.java

@@ -76,8 +76,8 @@ private void storeParameterInfo(ExtensionContext context) {
 		new DefaultParameterInfo(declarations, accessor).store(context);
 	}
 
-	@SuppressWarnings("deprecation")
-	private static class CloseableArgument implements ExtensionContext.Store.CloseableResource {
+	@SuppressWarnings({ "deprecation", "try" })
+	private static class CloseableArgument implements ExtensionContext.Store.CloseableResource, AutoCloseable {
 
 		private final AutoCloseable autoCloseable;
 
@@ -86,7 +86,7 @@ private static class CloseableArgument implements ExtensionContext.Store.Closeab
 		}
 
 		@Override
-		public void close() throws Throwable {
+		public void close() throws Exception {
 			this.autoCloseable.close();
 		}
 

jupiter-tests/src/test/java/org/junit/jupiter/api/extension/CloseableResourceIntegrationTests.java

@@ -79,9 +79,16 @@ static class ThrowingOnCloseExtension implements BeforeEachCallback {
 
 		@Override
 		public void beforeEach(ExtensionContext context) {
-			context.getStore(GLOBAL).put("throwingResource", (AutoCloseable) () -> {
-				throw new RuntimeException("Exception in onClose");
-			});
+			context.getStore(GLOBAL).put("throwingResource", new ThrowingResource());
+		}
+	}
+
+	@SuppressWarnings({ "deprecation", "try" })
+	static class ThrowingResource implements ExtensionContext.Store.CloseableResource, AutoCloseable {
+
+		@Override
+		public void close() throws Exception {
+			throw new RuntimeException("Exception in onClose");
 		}
 	}
 

jupiter-tests/src/test/java/org/junit/jupiter/engine/ClassTemplateInvocationTests.java

@@ -1438,7 +1438,8 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
 
 	}
 
-	private static class CustomCloseableResource implements AutoCloseable {
+	@SuppressWarnings("deprecation")
+	private static class CustomCloseableResource implements ExtensionContext.Store.CloseableResource {
 
 		static boolean closed;