Apply comment

Issue: junit-team#4238
YongGoose · Jan 15, 2025 · ca6f248 · ca6f248
1 parent 6e679dc
commit ca6f248
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 41 deletions.
diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/VintageTestEngine.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/VintageTestEngine.java
@@ -36,7 +36,7 @@
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.TestEngine;
 import org.junit.platform.engine.UniqueId;
-import org.junit.vintage.engine.descriptor.RunnerScheduler;
+import org.junit.runners.model.RunnerScheduler;
 import org.junit.vintage.engine.descriptor.RunnerTestDescriptor;
 import org.junit.vintage.engine.descriptor.VintageEngineDescriptor;
 import org.junit.vintage.engine.discovery.VintageDiscoverer;
@@ -167,8 +167,9 @@ public void schedule(Runnable childStatement) {
 			@Override
 			public void finished() {
 				try {
-					executorService.shutdown();
-					executorService.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
+					if (executorService.awaitTermination(SHUTDOWN_TIMEOUT_SECONDS, TimeUnit.SECONDS)) {
+						logger.warn(() -> "Executor service did not terminate within the specified timeout");
+					}
 				}
 				catch (InterruptedException e) {
 					logger.warn(e, () -> "Interruption while waiting for parallel test execution to finish");

diff --git a/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerScheduler.java b/junit-vintage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerScheduler.java
diff --git a/...intage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerTestDescriptor.java b/...intage-engine/src/main/java/org/junit/vintage/engine/descriptor/RunnerTestDescriptor.java
@@ -32,6 +32,8 @@
 import org.junit.runner.manipulation.Filter;
 import org.junit.runner.manipulation.Filterable;
 import org.junit.runner.manipulation.NoTestsRemainException;
+import org.junit.runners.ParentRunner;
+import org.junit.runners.model.RunnerScheduler;
 
 /**
  * @since 4.12
@@ -171,8 +173,8 @@ public boolean isIgnored() {
 		return ignored;
 	}
 
-	public void setScheduler(org.junit.runners.model.RunnerScheduler scheduler) {
-		Runner runner = getRunnerToReport(); 
+	public void setScheduler(RunnerScheduler scheduler) {
+		Runner runner = getRunnerToReport();
 		if (runner instanceof ParentRunner) {
 			((ParentRunner<?>) runner).setScheduler(scheduler);
 		}