Test DeferredSupplier

Author: mpkorstanje

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

@@ -565,7 +565,7 @@ private void close(CloseAction<N> closeAction) throws Throwable {
 	 * {@link ConcurrentHashMap#compute(Object, BiFunction)} calls and
 	 * prevents recursive updates.
 	 */
-	private static final class DeferredSupplier implements Supplier<@Nullable Object> {
+	static final class DeferredSupplier implements Supplier<@Nullable Object> {
 
 		private final FutureTask<@Nullable Object> task;
 		private final @Nullable Object ownerToken;

platform-tests/src/test/java/org/junit/platform/engine/support/store/NamespacedHierarchicalStoreTests.java

@@ -16,6 +16,7 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.platform.commons.test.ConcurrencyTestingUtils.executeConcurrently;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.inOrder;
@@ -732,6 +733,46 @@ private void assertClosed() {
 
 	}
 
+	@Nested
+	class DeferredSupplierTests {
+
+		@Test
+		void getCanBeInterrupted() {
+			var supplier = new NamespacedHierarchicalStore.DeferredSupplier(() -> {
+				try {
+					Thread.sleep(1000);
+				}
+				catch (InterruptedException e) {
+					throw new ComputeException(e);
+				}
+				return value;
+			});
+			Thread.currentThread().interrupt();
+			assertThrows(InterruptedException.class, () -> {
+				supplier.get();
+			});
+			assertTrue(Thread.interrupted());
+		}
+
+		@Test
+		void getOrThrowCanBeInterrupted() {
+			var supplier = new NamespacedHierarchicalStore.DeferredSupplier(() -> {
+				try {
+					Thread.sleep(1000);
+				}
+				catch (InterruptedException e) {
+					throw new ComputeException(e);
+				}
+				return value;
+			});
+			Thread.currentThread().interrupt();
+			assertThrows(InterruptedException.class, () -> {
+				supplier.getOrThrow();
+			});
+			assertTrue(Thread.interrupted());
+		}
+	}
+
 	private static Object createObject(String display) {
 		return new Object() {
 
@@ -753,5 +794,9 @@ private static final class ComputeException extends RuntimeException {
 		ComputeException(String msg) {
 			super(msg);
 		}
+
+		ComputeException(InterruptedException e) {
+			super(e);
+		}
 	}
 }