Skip to content

Commit 1112dfd

Browse files
committed
Name leaves after their parents
1 parent 68aee9c commit 1112dfd

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -696,31 +696,31 @@ void stealsSiblingDynamicChildrenOnly() throws Exception {
696696
service = new WorkerThreadPoolHierarchicalTestExecutorService(configuration(2, 3));
697697

698698
var child1Started = new CountDownLatch(1);
699-
var child2Started = new CountDownLatch(1);
700-
var leaf1ASubmitted = new CountDownLatch(1);
701-
var leaf1AStarted = new CountDownLatch(1);
699+
var child3Started = new CountDownLatch(1);
700+
var leaf2ASubmitted = new CountDownLatch(1);
701+
var leaf2AStarted = new CountDownLatch(1);
702702

703703
var child1 = new TestTaskStub(ExecutionMode.CONCURRENT, () -> {
704704
child1Started.countDown();
705-
leaf1ASubmitted.await();
705+
leaf2ASubmitted.await();
706706
}) //
707707
.withName("child1").withLevel(2);
708708

709-
var leaf1a = new TestTaskStub(ExecutionMode.CONCURRENT, () -> {
710-
leaf1AStarted.countDown();
711-
child2Started.await();
709+
var leaf2a = new TestTaskStub(ExecutionMode.CONCURRENT, () -> {
710+
leaf2AStarted.countDown();
711+
child3Started.await();
712712
}) //
713713
.withName("leaf1a").withLevel(3);
714714

715715
var child2 = new TestTaskStub(ExecutionMode.CONCURRENT, () -> {
716-
var futureA = requiredService().submit(leaf1a);
717-
leaf1ASubmitted.countDown();
718-
leaf1AStarted.await();
716+
var futureA = requiredService().submit(leaf2a);
717+
leaf2ASubmitted.countDown();
718+
leaf2AStarted.await();
719719
futureA.get();
720720
}) //
721721
.withName("child2").withType(CONTAINER).withLevel(2);
722722

723-
var child3 = new TestTaskStub(ExecutionMode.CONCURRENT, child2Started::countDown) //
723+
var child3 = new TestTaskStub(ExecutionMode.CONCURRENT, child3Started::countDown) //
724724
.withName("child3").withLevel(2);
725725

726726
var root = new TestTaskStub(ExecutionMode.SAME_THREAD, () -> {
@@ -736,12 +736,12 @@ void stealsSiblingDynamicChildrenOnly() throws Exception {
736736

737737
service.submit(root).get();
738738

739-
assertThat(Stream.of(root, child1, child3, child2, leaf1a)) //
739+
assertThat(Stream.of(root, child1, child3, child2, leaf2a)) //
740740
.allSatisfy(TestTaskStub::assertExecutedSuccessfully);
741741

742742
assertThat(child2.executionThread).isNotEqualTo(child1.executionThread).isNotEqualTo(child3.executionThread);
743743
assertThat(child1.executionThread).isNotEqualTo(child3.executionThread);
744-
assertThat(child1.executionThread).isEqualTo(leaf1a.executionThread);
744+
assertThat(child1.executionThread).isEqualTo(leaf2a.executionThread);
745745
}
746746

747747
private static ExclusiveResource exclusiveResource(LockMode lockMode) {

0 commit comments

Comments
 (0)