Skip to content

Commit ebe1f65

Browse files
committed
Apply Mockito Java Agent to Kotlin tests too
See gh-35207
1 parent 28471c3 commit ebe1f65

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

buildSrc/src/main/java/org/springframework/build/TestConventions.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.gradle.api.tasks.testing.junitplatform.JUnitPlatformOptions;
2626
import org.gradle.testretry.TestRetryPlugin;
2727
import org.gradle.testretry.TestRetryTaskExtension;
28+
import org.jetbrains.kotlin.gradle.targets.jvm.tasks.KotlinJvmTest;
2829

2930
import java.util.Map;
3031

@@ -89,6 +90,11 @@ private void configureMockitoAgent(Project project) {
8990
mockitoAgentConfig.getDependencies().add(mockitoCore);
9091
project.afterEvaluate(p -> {
9192
p.getTasks().withType(Test.class, test -> test.jvmArgs("-javaagent:" + mockitoAgentConfig.getAsPath()));
93+
project.getPlugins().withId("org.jetbrains.kotlin.jvm", plugin -> {
94+
project.getTasks().withType(KotlinJvmTest.class, kotlinTest -> {
95+
kotlinTest.jvmArgs("-javaagent:" + mockitoAgentConfig.getAsPath());
96+
});
97+
});
9298
});
9399
}
94100
}

0 commit comments

Comments
 (0)