Retain invoke all order

Author: mpkorstanje

junit-platform-engine/src/main/java/org/junit/platform/engine/support/hierarchical/WorkerThreadPoolHierarchicalTestExecutorService.java

@@ -345,6 +345,7 @@ private List<WorkQueue.Entry> forkConcurrentChildren(List<? extends TestTask> ch
 				Consumer<TestTask> isolatedTaskCollector, List<TestTask> sameThreadTasks) {
 
 			List<WorkQueue.Entry> queueEntries = new ArrayList<>(children.size());
+			int index = 0;
 			for (TestTask child : children) {
 				if (requiresGlobalReadWriteLock(child)) {
 					isolatedTaskCollector.accept(child);
@@ -353,7 +354,7 @@ else if (child.getExecutionMode() == SAME_THREAD) {
 					sameThreadTasks.add(child);
 				}
 				else {
-					queueEntries.add(workQueue.createEntry(child));
+					queueEntries.add(workQueue.createEntry(child, index++));
 				}
 			}
 
@@ -645,14 +646,14 @@ private static class WorkQueue implements Iterable<WorkQueue.Entry> {
 		private final Set<Entry> queue = new ConcurrentSkipListSet<>();
 
 		Entry add(TestTask task) {
-			Entry entry = createEntry(task);
+			Entry entry = createEntry(task, 0);
 			LOGGER.trace(() -> "forking: " + entry.task);
 			return doAdd(entry);
 		}
 
-		Entry createEntry(TestTask task) {
+		Entry createEntry(TestTask task, int index) {
 			var uniqueId = task.getTestDescriptor().getUniqueId();
-			return new Entry(uniqueId, task, new CompletableFuture<>());
+			return new Entry(uniqueId, task, new CompletableFuture<>(), index);
 		}
 
 		void addAll(Collection<Entry> entries) {
@@ -685,7 +686,7 @@ public Iterator<Entry> iterator() {
 			return queue.iterator();
 		}
 
-		private record Entry(UniqueId id, TestTask task, CompletableFuture<@Nullable Void> future)
+		private record Entry(UniqueId id, TestTask task, CompletableFuture<@Nullable Void> future, int index)
 				implements Comparable<Entry> {
 
 			@SuppressWarnings("FutureReturnValueIgnored")
@@ -710,6 +711,10 @@ public int compareTo(Entry that) {
 				if (result != 0) {
 					return result;
 				}
+				result = Integer.compare(that.index(), this.index());
+				if (result != 0) {
+					return result;
+				}
 				return compareBy(that.id(), this.id());
 			}
 

platform-tests/src/test/java/org/junit/platform/engine/support/hierarchical/WorkerThreadPoolHierarchicalTestExecutorServiceTests.java

@@ -29,6 +29,8 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.time.Instant;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
@@ -473,6 +475,36 @@ void executesChildrenInOrder() throws Exception {
 				.isSorted();
 	}
 
+	@Test
+	void executesChildrenInInvokeAllOrder() throws Exception {
+		service = new WorkerThreadPoolHierarchicalTestExecutorService(configuration(1, 1));
+
+		var leaf1a = new TestTaskStub(ExecutionMode.CONCURRENT) //
+				.withName("leaf1a").withLevel(2);
+		var leaf1b = new TestTaskStub(ExecutionMode.CONCURRENT) //
+				.withName("leaf1b").withLevel(2);
+		var leaf1c = new TestTaskStub(ExecutionMode.CONCURRENT) //
+				.withName("leaf1c").withLevel(2);
+		var leaf1d = new TestTaskStub(ExecutionMode.CONCURRENT) //
+				.withName("leaf1d").withLevel(2);
+
+		List<TestTaskStub> children = Arrays.asList(leaf1d, leaf1a, leaf1b, leaf1c);
+		Collections.shuffle(children);
+		
+		var root = new TestTaskStub(ExecutionMode.SAME_THREAD,
+			() -> requiredService().invokeAll(children)) //
+					.withName("root").withLevel(1);
+
+		service.submit(root).get();
+
+		assertThat(List.of(root, leaf1a, leaf1b, leaf1c, leaf1d)) //
+				.allSatisfy(TestTaskStub::assertExecutedSuccessfully);
+
+		assertThat(children) //
+				.extracting(TestTaskStub::startTime) //
+				.isSorted();
+	}
+
 	@Test
 	void workIsStolenInReverseOrder() throws Exception {
 		service = new WorkerThreadPoolHierarchicalTestExecutorService(configuration(2, 2));