From 41d9e6ea6e3453f91c28461c92ee546263596bb7 Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 2 Jul 2025 22:50:16 +0200 Subject: [PATCH 1/2] Added HierarchicalTestExecutorService.TestTask::getTestDescriptor Issue: #4711 --- .../HierarchicalTestExecutorService.java | 12 ++++++++++++ .../engine/support/hierarchical/NodeTestTask.java | 5 +++++ 2 files changed, 17 insertions(+) diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorService.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorService.java index 1fed0663e519..4944293358c0 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorService.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorService.java @@ -10,6 +10,7 @@ package org.junit.platform.engine.support.hierarchical; +import static org.apiguardian.api.API.Status.EXPERIMENTAL; import static org.apiguardian.api.API.Status.STABLE; import java.util.List; @@ -18,6 +19,7 @@ import org.apiguardian.api.API; import org.jspecify.annotations.Nullable; import org.junit.platform.engine.ExecutionRequest; +import org.junit.platform.engine.TestDescriptor; import org.junit.platform.engine.support.hierarchical.Node.ExecutionMode; /** @@ -95,6 +97,16 @@ interface TestTask { */ ResourceLock getResourceLock(); + /** + * Get the {@linkplain TestDescriptor test descriptor} of this task. + * + * @throws UnsupportedOperationException if not supported for this TestTask implementation + */ + @API(status = EXPERIMENTAL, since = "6.0") + default TestDescriptor getTestDescriptor() { + throw new UnsupportedOperationException(); + } + /** * Execute this task. */ diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTask.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTask.java index 5249236fd729..6fb309dbab65 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTask.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/NodeTestTask.java @@ -86,6 +86,11 @@ public ExecutionMode getExecutionMode() { .orElseGet(node::getExecutionMode); } + @Override + public TestDescriptor getTestDescriptor() { + return testDescriptor; + } + @Override public String toString() { return "NodeTestTask [" + testDescriptor + "]"; From 8bc574983d261e4fe45abde8c587978c16683daf Mon Sep 17 00:00:00 2001 From: Marc Philipp Date: Thu, 3 Jul 2025 05:15:42 +0000 Subject: [PATCH 2/2] Add @since --- .../support/hierarchical/HierarchicalTestExecutorService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorService.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorService.java index 4944293358c0..23be08c4ed82 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorService.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/HierarchicalTestExecutorService.java @@ -101,6 +101,7 @@ interface TestTask { * Get the {@linkplain TestDescriptor test descriptor} of this task. * * @throws UnsupportedOperationException if not supported for this TestTask implementation + * @since 6.0 */ @API(status = EXPERIMENTAL, since = "6.0") default TestDescriptor getTestDescriptor() {