Avoid using ThrowableCollector to resolve package cycle

Author: marcphilipp

junit-platform-engine/src/main/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStore.java

@@ -15,10 +15,13 @@
 import static org.apiguardian.api.API.Status.DEPRECATED;
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.MAINTAINED;
+import static org.junit.platform.commons.util.ExceptionUtils.throwAsUncheckedException;
 import static org.junit.platform.commons.util.ReflectionUtils.getWrapperType;
 import static org.junit.platform.commons.util.ReflectionUtils.isAssignableTo;
 
+import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -28,10 +31,8 @@
 
 import org.apiguardian.api.API;
 import org.jspecify.annotations.Nullable;
-import org.junit.platform.commons.util.ExceptionUtils;
 import org.junit.platform.commons.util.Preconditions;
 import org.junit.platform.commons.util.UnrecoverableExceptions;
-import org.junit.platform.engine.support.hierarchical.ThrowableCollector;
 
 /**
  * {@code NamespacedHierarchicalStore} is a hierarchical, namespaced key-value store.
@@ -131,13 +132,26 @@ public void close() {
 		if (!this.closed) {
 			try {
 				if (this.closeAction != null) {
-					ThrowableCollector throwableCollector = new ThrowableCollector(__ -> false);
+					List<Throwable> failures = new ArrayList<>();
 					this.storedValues.entrySet().stream() //
 							.map(e -> e.getValue().evaluateSafely(e.getKey())) //
 							.filter(it -> it != null && it.value != null) //
 							.sorted(EvaluatedValue.REVERSE_INSERT_ORDER) //
-							.forEach(it -> throwableCollector.execute(() -> it.close(this.closeAction)));
-					throwableCollector.assertEmpty();
+							.forEach(it -> {
+								try {
+									it.close(this.closeAction);
+								}
+								catch (Throwable t) {
+									UnrecoverableExceptions.rethrowIfUnrecoverable(t);
+									failures.add(t);
+								}
+							});
+					if (!failures.isEmpty()) {
+						var iterator = failures.iterator();
+						var throwable = iterator.next();
+						iterator.forEachRemaining(throwable::addSuppressed);
+						throw throwAsUncheckedException(throwable);
+					}
 				}
 			}
 			finally {
@@ -474,7 +488,7 @@ private MemoizingSupplier(Supplier<@Nullable Object> delegate) {
 				computeValue();
 			}
 			if (this.value instanceof Failure failure) {
-				throw ExceptionUtils.throwAsUncheckedException(failure.throwable);
+				throw throwAsUncheckedException(failure.throwable);
 			}
 			return this.value;
 		}

platform-tooling-support-tests/src/archUnit/java/platform/tooling/support/tests/ArchUnitTests.java

@@ -63,8 +63,6 @@
 import org.junit.platform.commons.util.ReflectionUtils;
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.reporting.OutputDirectoryProvider;
-import org.junit.platform.engine.support.hierarchical.ThrowableCollector;
-import org.junit.platform.engine.support.store.NamespacedHierarchicalStore;
 
 @AnalyzeClasses(packages = { "org.junit.platform", "org.junit.jupiter", "org.junit.vintage" })
 class ArchUnitTests {
@@ -162,9 +160,6 @@ void freeOfPackageCycles(JavaClasses classes) throws Exception {
 				// Needs more investigation
 				.ignoreDependency(OutputDirectoryProvider.class, TestDescriptor.class) //
 
-				// Needs more investigation
-				.ignoreDependency(NamespacedHierarchicalStore.class, ThrowableCollector.class) //
-
 				.check(classes);
 	}