root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Ensure that a test engine is available to AOT test processing 

See gh-32192
This commit is contained in:
Andy Wilkinson 2022-09-05 09:39:20 +01:00
parent cf84ae7ad8
commit 3dfe28c9f1
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootAotPlugin.java
View File

@ -86,7 +86,8 @@ public class SpringBootAotPlugin implements Plugin<Project> {
return sourceSets.create(newSourceSetName, (sourceSet) -> {
sourceSet.getJava().setSrcDirs(List.of("build/generated/" + newSourceSetName + "Sources"));
sourceSet.getResources().setSrcDirs(List.of("build/generated/" + newSourceSetName + "Resources"));
sourceSet.setCompileClasspath(sourceSet.getCompileClasspath().plus(existingSourceSet.getOutput()));
sourceSet.setCompileClasspath(sourceSet.getCompileClasspath().plus(existingSourceSet.getCompileClasspath())
.plus(existingSourceSet.getOutput()));
existingSourceSet.setRuntimeClasspath(existingSourceSet.getRuntimeClasspath().plus(sourceSet.getOutput()));
ConfigurationContainer configurations = project.getConfigurations();
Configuration implementation = configurations.getByName(sourceSet.getImplementationConfigurationName());
@ -151,7 +152,7 @@ public class SpringBootAotPlugin implements Plugin<Project> {
ProcessTestAot.class, (task) -> {
configureAotTask(project, aotTestSourceSet, task,
project.getLayout().getBuildDirectory().dir("generated/aotTestClasses"));
task.setTestClassesDirs(testSourceSet.getOutput().getClassesDirs());
task.setTestSourceSet(testSourceSet);
});
configureDependsOn(project, aotTestSourceSet, processTestAot);
}

10
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/aot/ProcessTestAot.java
View File

@ -29,6 +29,7 @@ import org.gradle.api.file.FileCollection;
import org.gradle.api.tasks.CacheableTask;
import org.gradle.api.tasks.Classpath;
import org.gradle.api.tasks.JavaExec;
import org.gradle.api.tasks.SourceSet;
import org.gradle.api.tasks.TaskAction;
import org.springframework.boot.gradle.plugin.SpringBootPlugin;
@ -42,7 +43,7 @@ import org.springframework.boot.gradle.plugin.SpringBootPlugin;
@CacheableTask
public class ProcessTestAot extends AbstractAot {
private final FileCollection junitPlatformLauncher;
private final Configuration junitPlatformLauncher;
private FileCollection testClassesDirs;
@ -84,7 +85,14 @@ public class ProcessTestAot extends AbstractAot {
.collect(Collectors.joining(File.pathSeparator)));
args.addAll(processorArgs());
this.setArgs(args);
this.classpath(this.junitPlatformLauncher);
super.exec();
}
public void setTestSourceSet(SourceSet testSourceSet) {
setTestClassesDirs(testSourceSet.getOutput().getClassesDirs());
this.junitPlatformLauncher.extendsFrom(
getProject().getConfigurations().getByName(testSourceSet.getImplementationConfigurationName()));
}
}