Skip to content

Commit 085c7b9

Browse files
committed
Restore code that provides support for Timeout annotation
1 parent b848b3b commit 085c7b9

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

common/junit-platform-native/src/main/java/org/graalvm/junit/platform/config/jupiter/JupiterConfigProvider.java

+6
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,16 @@ public class JupiterConfigProvider implements PluginConfigProvider {
6767

6868
@Override
6969
public void onLoad(NativeImageConfiguration config) {
70+
/* Provide support for Timeout annotation */
71+
config.registerAllClassMembersForReflection(
72+
"org.junit.jupiter.engine.extension.TimeoutExtension$ExecutorResource",
73+
"org.junit.jupiter.engine.extension.TimeoutInvocationFactory$SingleThreadExecutorResource"
74+
);
7075
}
7176

7277
@Override
7378
public void onTestClassRegistered(Class<?> testClass, NativeImageConfiguration registry) {
79+
/* Provide support for various annotations */
7480
AnnotationUtils.registerClassesFromAnnotationForReflection(testClass, registry, TestMethodOrder.class, TestMethodOrder::value);
7581
AnnotationUtils.registerClassesFromAnnotationForReflection(testClass, registry, ArgumentsSource.class, ArgumentsSource::value);
7682
AnnotationUtils.registerClassesFromAnnotationForReflection(testClass, registry, ExtendWith.class, ExtendWith::value);

native-gradle-plugin/src/main/java/org/graalvm/buildtools/gradle/NativeImagePlugin.java

-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@
110110
import org.gradle.api.tasks.bundling.AbstractArchiveTask;
111111
import org.gradle.api.tasks.bundling.Jar;
112112
import org.gradle.api.tasks.testing.Test;
113-
import org.gradle.internal.impldep.org.junit.platform.launcher.listeners.UniqueIdTrackingListener;
114113
import org.gradle.jvm.toolchain.JavaToolchainService;
115114
import org.gradle.language.base.plugins.LifecycleBasePlugin;
116115
import org.gradle.process.CommandLineArgumentProvider;

0 commit comments

Comments
 (0)