Skip to content

Remove unnecessary simulated test duration #5937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mpkorstanje wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Remove unnecessary simulated test duration #5937

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 6 additions & 21 deletions ...ava/org/junit/platform/engine/support/hierarchical/ParallelExecutionIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

package org.junit.platform.engine.support.hierarchical;

import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
Expand Down Expand Up @@ -67,6 +67,7 @@
import org.junit.jupiter.api.TestFactory;
import org.junit.jupiter.api.TestMethodOrder;
import org.junit.jupiter.api.TestReporter;
import org.junit.jupiter.api.Timeout;
import org.junit.jupiter.api.extension.AfterTestExecutionCallback;
import org.junit.jupiter.api.extension.DynamicTestInvocationContext;
import org.junit.jupiter.api.extension.ExtendWith;
Expand Down Expand Up @@ -94,6 +95,7 @@
*/
@ParameterizedClass
@EnumSource(ParallelExecutorServiceType.class)
@Timeout(value = 5, unit = SECONDS)
record ParallelExecutionIntegrationTests(ParallelExecutorServiceType executorServiceType) {

@Test
Expand Down Expand Up @@ -321,7 +323,7 @@ static class IsolatedTestCase {
@BeforeAll
static void initialize() {
sharedResource = new AtomicInteger();
countDownLatch = new CountDownLatch(2);
countDownLatch = new CountDownLatch(1);
}

@Test
Expand Down Expand Up @@ -1044,39 +1046,22 @@ private static void incrementBlockAndCheck(AtomicInteger sharedResource, CountDo
assertEquals(value, sharedResource.get());
}

@SuppressWarnings("ResultOfMethodCallIgnored")
private static int incrementAndBlock(AtomicInteger sharedResource, CountDownLatch countDownLatch)
throws InterruptedException {
var value = sharedResource.incrementAndGet();
countDownLatch.countDown();
countDownLatch.await(estimateSimulatedTestDurationInMilliseconds(), MILLISECONDS);
countDownLatch.await();
return value;
}

@SuppressWarnings("ResultOfMethodCallIgnored")
private static void storeAndBlockAndCheck(AtomicInteger sharedResource, CountDownLatch countDownLatch)
throws InterruptedException {
var value = sharedResource.get();
countDownLatch.countDown();
countDownLatch.await(estimateSimulatedTestDurationInMilliseconds(), MILLISECONDS);
countDownLatch.await();
assertEquals(value, sharedResource.get());
}

/*
* To simulate tests running in parallel tests will modify a shared
* resource, simulate work by waiting, then check if the shared resource was
* not modified by any other thread.
*
* Depending on system performance the simulation of work needs to be longer
* on slower systems to ensure tests can run in parallel.
*
* Currently, CI is known to be slow.
*/
private static long estimateSimulatedTestDurationInMilliseconds() {
var runningInCi = Boolean.parseBoolean(System.getenv("CI"));
return runningInCi ? 1000 : 100;
}

@NullMarked
static class ThreadReporter implements AfterTestExecutionCallback, InvocationInterceptor {

Expand Down
Loading